diff options
author | Stefan Lance <stefan@lances.net> | 2015-07-20 13:06:13 -0500 |
---|---|---|
committer | Stefan Lance <stefan@lances.net> | 2015-07-20 13:06:13 -0500 |
commit | 7aa5c54e3f6a0bc7dfe650b88f6f3be629a89f86 (patch) | |
tree | 653abee0f76fb7e46a038ecc8f894f73ba9bc24f | |
parent | 9fcdb5675ffbdd2e9bd54f4c30b9b13f8dfa32e9 (diff) | |
parent | d592cc04806a77392d33b6ad076e685ab9417dd0 (diff) | |
download | bundler-7aa5c54e3f6a0bc7dfe650b88f6f3be629a89f86.tar.gz |
Merge pull request #3843 from smlance/sml-fix-2-0-dev
Fix conflict resolution mistakes
-rw-r--r-- | .travis.yml | 3 | ||||
-rwxr-xr-x | bin/bundle | 11 | ||||
-rwxr-xr-x | bin/bundler | 11 | ||||
-rw-r--r-- | lib/bundler/deployment.rb | 66 | ||||
-rw-r--r-- | lib/bundler/dsl.rb | 3 | ||||
-rw-r--r-- | man/bundle-install.ronn | 1 | ||||
-rw-r--r-- | spec/support/helpers.rb | 2 |
7 files changed, 5 insertions, 92 deletions
diff --git a/.travis.yml b/.travis.yml index 8bd1cfec76..bbcdb2d791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ before_script: travis_retry rake spec:travis:deps branches: only: - master - - 2-0-dev + - /.+-dev$/ + - /.+-stable$/ notifications: email: diff --git a/bin/bundle b/bin/bundle deleted file mode 100755 index 43da771776..0000000000 --- a/bin/bundle +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env ruby - -# Exit cleanly from an early interrupt -Signal.trap("INT") { exit 1 } - -require 'bundler/friendly_errors' -Bundler.with_friendly_errors do - require 'bundler' - require 'bundler/cli' - Bundler::CLI.start(ARGV, :debug => true) -end diff --git a/bin/bundler b/bin/bundler deleted file mode 100755 index 43da771776..0000000000 --- a/bin/bundler +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env ruby - -# Exit cleanly from an early interrupt -Signal.trap("INT") { exit 1 } - -require 'bundler/friendly_errors' -Bundler.with_friendly_errors do - require 'bundler' - require 'bundler/cli' - Bundler::CLI.start(ARGV, :debug => true) -end diff --git a/lib/bundler/deployment.rb b/lib/bundler/deployment.rb deleted file mode 100644 index 2a76ccc859..0000000000 --- a/lib/bundler/deployment.rb +++ /dev/null @@ -1,66 +0,0 @@ -$stderr.puts "DEPRECATION: Bundler no longer integrates with " \ - "Capistrano, but Capistrano provides its own integration with " \ - "Bundler via the capistrano-bundler gem. Use it instead." - -module Bundler - class Deployment - def self.define_task(context, task_method = :task, opts = {}) - if defined?(Capistrano) && context.is_a?(Capistrano::Configuration) - context_name = "capistrano" - role_default = "{:except => {:no_release => true}}" - error_type = ::Capistrano::CommandError - else - context_name = "vlad" - role_default = "[:app]" - error_type = ::Rake::CommandFailedError - end - - roles = context.fetch(:bundle_roles, false) - opts[:roles] = roles if roles - - context.send :namespace, :bundle do - send :desc, <<-DESC - Install the current Bundler environment. By default, gems will be \ - installed to the shared/bundle path. Gems in the development and \ - test group will not be installed. The install command is executed \ - with the --deployment and --quiet flags. If the bundle cmd cannot \ - be found then you can override the bundle_cmd variable to specify \ - which one it should use. The base path to the app is fetched from \ - the :latest_release variable. Set it for custom deploy layouts. - - You can override any of these defaults by setting the variables shown below. - - N.B. bundle_roles must be defined before you require 'bundler/#{context_name}' \ - in your deploy.rb file. - - set :bundle_gemfile, "Gemfile" - set :bundle_dir, File.join(fetch(:shared_path), 'bundle') - set :bundle_flags, "--deployment --quiet" - set :bundle_without, [:development, :test] - set :bundle_with, [:mysql] - set :bundle_cmd, "bundle" # e.g. "/opt/ruby/bin/bundle" - set :bundle_roles, #{role_default} # e.g. [:app, :batch] - DESC - send task_method, :install, opts do - bundle_cmd = context.fetch(:bundle_cmd, "bundle") - bundle_flags = context.fetch(:bundle_flags, "--deployment --quiet") - bundle_dir = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), 'bundle')) - bundle_gemfile = context.fetch(:bundle_gemfile, "Gemfile") - bundle_without = [*context.fetch(:bundle_without, [:development, :test])].compact - bundle_with = [*context.fetch(:bundle_with, [])].compact - app_path = context.fetch(:latest_release) - if app_path.to_s.empty? - raise error_type.new("Cannot detect current release path - make sure you have deployed at least once.") - end - args = ["--gemfile #{File.join(app_path, bundle_gemfile)}"] - args << "--path #{bundle_dir}" unless bundle_dir.to_s.empty? - args << bundle_flags.to_s - args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty? - args << "--with #{bundle_with.join(" ")}" unless bundle_with.empty? - - run "cd #{app_path} && #{bundle_cmd} install #{args.join(' ')}" - end - end - end - end -end diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index a87a0f825a..9280598988 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -224,10 +224,9 @@ module Bundler # TODO 2.0 remove this deprecated git source git_source(:bitbucket) do |repo_name| - # Double quotes here make some dsl_spec.rb specs fail - warn_deprecated_git_source(:bitbucket, 'https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git') user_name, repo_name = repo_name.split "/" repo_name ||= user_name + warn_deprecated_git_source(:bitbucket, "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git") "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git" end end diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn index e8103ed8c1..e3b39c12b5 100644 --- a/man/bundle-install.ronn +++ b/man/bundle-install.ronn @@ -9,6 +9,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile [--jobs=NUMBER] [--local] [--deployment] + [--force] [--cache] [--no-prune] [--path PATH] diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 4673a0a8b5..bdb6326a30 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -60,7 +60,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) |