diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-02-16 11:22:03 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-02-16 11:22:03 +0100 |
| commit | 99dc9c6fc9880519dddf2cb2557b984792843848 (patch) | |
| tree | 71cf43cba263420f42b4d4aeaa25a865787745ce | |
| parent | 4bbb3d5510d5396eca034a9a8593952b16b15ab5 (diff) | |
| download | gitlab-ce-99dc9c6fc9880519dddf2cb2557b984792843848.tar.gz | |
Inserted spring in the binstubs
Now possible to run:
`bin/rails`
`bin/rspec`
`bin/spinach`
`bin/rake`
| -rw-r--r-- | bin/rails | 4 | ||||
| -rw-r--r-- | bin/rake | 4 | ||||
| -rw-r--r-- | bin/rspec | 7 | ||||
| -rw-r--r-- | bin/spinach | 7 | ||||
| -rw-r--r-- | bin/spring | 18 |
5 files changed, 40 insertions, 0 deletions
diff --git a/bin/rails b/bin/rails index 728cd85aa58..7feb6a30e69 100644 --- a/bin/rails +++ b/bin/rails @@ -1,4 +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' @@ -1,4 +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 100644 index 00000000000..41e37089ac2 --- /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', 'rspec') diff --git a/bin/spinach b/bin/spinach new file mode 100644 index 00000000000..a080e286cfe --- /dev/null +++ b/bin/spinach @@ -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('spinach', 'spinach') diff --git a/bin/spring b/bin/spring new file mode 100644 index 00000000000..253ec37c345 --- /dev/null +++ b/bin/spring @@ -0,0 +1,18 @@ +#!/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) + ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) + ENV["GEM_HOME"] = "" + Gem.paths = ENV + + gem "spring", match[1] + require "spring/binstub" + end +end |