diff options
author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-06 17:25:18 -0700 |
---|---|---|
committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-15 18:39:52 -0700 |
commit | 3abb8229d46993c59c70eb44d6bbd80f55287345 (patch) | |
tree | 8a7d5d8f1a4e85ff0b200aee821b5262a76789f7 | |
parent | 3a889f0214345f91686cc6a804b49a042eaca824 (diff) | |
download | bundler-3abb8229d46993c59c70eb44d6bbd80f55287345.tar.gz |
Add new binstubs for rake and rspec in bin, move executables to exe
-rwxr-xr-x | bin/rake | 8 | ||||
-rwxr-xr-x | bin/rspec | 8 | ||||
-rw-r--r-- | bundler.gemspec | 1 | ||||
-rwxr-xr-x | exe/bundle (renamed from bin/bundle) | 0 | ||||
-rwxr-xr-x | exe/bundle_ruby (renamed from bin/bundle_ruby) | 0 | ||||
-rwxr-xr-x | exe/bundler (renamed from bin/bundler) | 0 | ||||
-rw-r--r-- | spec/support/helpers.rb | 2 |
7 files changed, 18 insertions, 1 deletions
diff --git a/bin/rake b/bin/rake new file mode 100755 index 00000000..4abe5efe --- /dev/null +++ b/bin/rake @@ -0,0 +1,8 @@ +#!/usr/bin/env ruby + +bundler_spec = Gem::Specification.load(File.expand_path("../../bundler.gemspec", __FILE__)) +bundler_spec.dependencies.each do |dep| + gem dep.name, dep.requirement.to_s +end + +load Gem.bin_path('rake', 'rake') diff --git a/bin/rspec b/bin/rspec new file mode 100755 index 00000000..dc429cd5 --- /dev/null +++ b/bin/rspec @@ -0,0 +1,8 @@ +#!/usr/bin/env ruby + +bundler_spec = Gem::Specification.load(File.expand_path("../../bundler.gemspec", __FILE__)) +bundler_spec.dependencies.each do |dep| + gem dep.name, dep.requirement.to_s +end + +load Gem.bin_path('rspec', 'rspec') diff --git a/bundler.gemspec b/bundler.gemspec index 142e3d33..c2a6340b 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -27,6 +27,7 @@ Gem::Specification.new do |s| # we use them to generate the long-form help for each command. s.files += Dir.glob('lib/bundler/man/**/*') + s.bindir = "exe" s.executables = %w(bundle bundler) s.require_paths = ["lib"] end diff --git a/bin/bundle_ruby b/exe/bundle_ruby index d0cfdc27..d0cfdc27 100755 --- a/bin/bundle_ruby +++ b/exe/bundle_ruby diff --git a/bin/bundler b/exe/bundler index 89c823ea..89c823ea 100755 --- a/bin/bundler +++ b/exe/bundler diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index c1d9bfc2..07126cff 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -61,7 +61,7 @@ module Spec sudo = "sudo" if options.delete(:sudo) options["no-color"] = true unless options.key?("no-color") || %w(exec conf).include?(cmd.to_s[0..3]) - bundle_bin = File.expand_path('../../../bin/bundle', __FILE__) + bundle_bin = File.expand_path('../../../exe/bundle', __FILE__) requires = options.delete(:requires) || [] requires << File.expand_path('../fakeweb/'+options.delete(:fakeweb)+'.rb', __FILE__) if options.key?(:fakeweb) |