summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-27 14:29:20 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-28 13:33:53 +0100
commit4e1c4ad7e3955e987ecd7d0ec1dba168e546ac7c (patch)
tree616c9ba9291038c7fc794586d3705210fcfb1af4
parent167ce7ac245523dfb89bc3d63508b6bfcdf02d88 (diff)
downloadgitlab-ci-4e1c4ad7e3955e987ecd7d0ec1dba168e546ac7c.tar.gz
Added the rails 4 binstubs and injected spring
* Added rails 4 binstubs with `rake rails:update:bin` * Injected spring all of them with `spring binstub --all` * Added Byebug for easier debugging Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
-rwxr-xr-xbin/bundle3
-rwxr-xr-xbin/rails8
-rwxr-xr-xbin/rake8
-rwxr-xr-xbin/rspec7
-rwxr-xr-xbin/spring15
7 files changed, 53 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 0e7a3d7..a52ecf5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,6 +87,7 @@ group :development do
gem 'annotate'
gem 'quiet_assets'
gem "letter_opener"
+ gem "spring-commands-rspec"
end
@@ -97,6 +98,7 @@ group :development, :test do
gem 'poltergeist'
gem 'factory_girl_rails'
gem "ffaker"
+ gem "byebug"
gem 'shoulda-matchers'
gem 'guard-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index c98e681..979c046 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,6 +45,9 @@ GEM
bootstrap-sass (3.0.3.0)
sass (~> 3.2)
builder (3.1.4)
+ byebug (3.2.0)
+ columnize (~> 0.8)
+ debugger-linecache (~> 1.2)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -65,6 +68,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
+ columnize (0.9.0)
connection_pool (1.2.0)
coveralls (0.7.0)
multi_json (~> 1.3)
@@ -74,6 +78,7 @@ GEM
thor
crack (0.4.1)
safe_yaml (~> 0.9.0)
+ debugger-linecache (1.2.0)
default_value_for (3.0.0.1)
activerecord (>= 3.2.0, < 5.0)
descendants_tracker (0.0.4)
@@ -287,6 +292,9 @@ GEM
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.4.7)
+ spring (1.3.3)
+ spring-commands-rspec (1.0.4)
+ spring (>= 0.9.1)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -343,6 +351,7 @@ DEPENDENCIES
acts-as-taggable-on (~> 3.4)
annotate
bootstrap-sass (~> 3.0)
+ byebug
capybara
coffee-rails (~> 4.0.0)
coveralls
@@ -388,6 +397,7 @@ DEPENDENCIES
sinatra
slack-notifier (~> 1.0.0)
slim
+ spring-commands-rspec
stamp
state_machine
therubyracer
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000..66e9889
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 0000000..7feb6a3
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+ load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 0000000..8017a02
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+ load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/rspec b/bin/rspec
new file mode 100755
index 0000000..20060eb
--- /dev/null
+++ b/bin/rspec
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+ load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 0000000..7b45d37
--- /dev/null
+++ b/bin/spring
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+ require "rubygems"
+ require "bundler"
+
+ if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
+ Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
+ gem "spring", match[1]
+ require "spring/binstub"
+ end
+end