bundler 1.10.6 → 1.11.0.pre.1

data/README.md

@@ -33,8 +33,8 @@ Feel free to chat with the Bundler core team (and many other users) on IRC in th
 
 ### Contributing
 
-If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md)
+If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md).
 
 ### Code of Conduct
 
-Everyone interacting in the Bundler project’s codebases, issue trackers, chat rooms, and mailing lists is expected to follow the [Bundler code of conduct](https://github.com/bundler/bundler/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Bundler project’s codebases, issue trackers, chat rooms, and mailing lists is expected to follow the [Bundler code of conduct](https://github.com/bundler/bundler/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'shellwords'
-require 'benchmark'
+require "shellwords"
+require "benchmark"
 
 RUBYGEMS_REPO = File.expand_path("tmp/rubygems")
 BUNDLER_SPEC = Gem::Specification.load("bundler.gemspec")
@@ -27,84 +27,28 @@ module Rake
   end
 end
 
-def clean_files(files, regex, replacement = '')
-  files.each do |file|
-    contents = File.read(file)
-    contents.gsub!(regex, replacement)
-    File.open(file, 'w') { |f| f << contents }
-  end
-end
-
-namespace :molinillo do
-  task :namespace do
-    files = Dir.glob('lib/bundler/vendor/molinillo*/**/*.rb')
-    clean_files(files, 'Molinillo', 'Bundler::Molinillo')
-    clean_files(files, /require (["'])molinillo/, 'require \1bundler/vendor/molinillo/lib/molinillo')
-  end
-
-  task :clean do
-    files = Dir.glob('lib/bundler/vendor/molinillo*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
-    rm_r files
-  end
-
-  task :update, [:tag] => [] do |t, args|
-    tag = args[:tag]
-    Dir.chdir 'lib/bundler/vendor' do
-      rm_rf 'molinillo'
-      sh "curl -L https://github.com/CocoaPods/molinillo/archive/#{tag}.tar.gz | tar -xz"
-      sh "mv Molinillo-* molinillo"
-    end
-    Rake::Task['molinillo:namespace'].invoke
-    Rake::Task['molinillo:clean'].invoke
-  end
-end
-
-namespace :thor do
-  task :namespace do
-    files = Dir.glob('lib/bundler/vendor/thor*/**/*.rb')
-    clean_files(files, 'Thor', 'Bundler::Thor')
-    clean_files(files, /require (["'])thor/, 'require \1bundler/vendor/thor/lib/thor')
-    clean_files(files, /(autoload\s+[:\w]+,\s+["'])(thor[\w\/]+["'])/, '\1bundler/vendor/thor/lib/\2')
-  end
-
-  task :clean do
-    files = Dir.glob('lib/bundler/vendor/thor*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
-    rm_r files
-  end
-
-  task :update, [:tag] => [] do |t, args|
-    tag = args[:tag]
-    Dir.chdir 'lib/bundler/vendor' do
-      rm_rf 'thor'
-      sh "curl -L https://github.com/erikhuda/thor/archive/#{tag}.tar.gz | tar -xz"
-      sh "mv thor-* thor"
-    end
-    Rake::Task['thor:namespace'].invoke
-    Rake::Task['thor:clean'].invoke
-  end
-end
-
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
+    deps["rubocop"] ||= "= 0.35.1" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement
 
     # JRuby can't build ronn or rdiscount, so we skip that
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
       deps.delete("ronn")
       deps.delete("rdiscount")
     end
 
-    deps.sort_by{|name, _| name }.each do |name, version|
-      sh %{#{Gem.ruby} -S gem list -i "^#{name}$" -v "#{version}" || } +
-         %{#{Gem.ruby} -S gem install #{name} -v "#{version}" --no-ri --no-rdoc}
+    deps.sort_by {|name, _| name }.each do |name, version|
+      sh %(#{Gem.ruby} -S gem list -i "^#{name}$" -v "#{version}" || ) +
+        %(#{Gem.ruby} -S gem install #{name} -v "#{version}" --no-ri --no-rdoc)
     end
 
     # Download and install gems used inside tests
     $LOAD_PATH.unshift("./spec")
-    require 'support/rubygems_ext'
+    require "support/rubygems_ext"
     Spec::Rubygems.setup
   end
 
@@ -118,7 +62,7 @@ namespace :spec do
       sh "sudo apt-get install groff -y"
       # Install graphviz so that the viz specs can run
       sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
-      if RUBY_VERSION < '1.9'
+      if RUBY_VERSION < "1.9"
         # Downgrade Rubygems on 1.8 so Ronn can be required
         # https://github.com/rubygems/rubygems/issues/784
         sh "gem update --system 2.1.11"
@@ -134,36 +78,43 @@ namespace :spec do
 end
 
 begin
-  rspec = BUNDLER_SPEC.development_dependencies.find{|d| d.name == "rspec" }
-  gem 'rspec', rspec.requirement.to_s
-  require 'rspec/core/rake_task'
+  rspec = BUNDLER_SPEC.development_dependencies.find {|d| d.name == "rspec" }
+  gem "rspec", rspec.requirement.to_s
+  require "rspec/core/rake_task"
 
   desc "Run specs"
   RSpec::Core::RakeTask.new
   task :spec => "man:build"
 
+  if RUBY_VERSION >= "1.9.3"
+    # can't go in the gemspec because of the ruby version requirement
+    gem "rubocop", "= 0.35.1"
+    require "rubocop/rake_task"
+    RuboCop::RakeTask.new
+  end
+
   namespace :spec do
     task :clean do
-      rm_rf 'tmp'
+      rm_rf "tmp"
     end
 
     desc "Run the real-world spec suite (requires internet)"
-    task :realworld => ["set_realworld", "spec"]
+    task :realworld => %w(set_realworld spec)
 
     task :set_realworld do
-      ENV['BUNDLER_REALWORLD_TESTS'] = '1'
+      ENV["BUNDLER_REALWORLD_TESTS"] = "1"
     end
 
     desc "Run the spec suite with the sudo tests"
-    task :sudo => ["set_sudo", "spec", "clean_sudo"]
+    task :sudo => %w(set_sudo spec clean_sudo)
 
     task :set_sudo do
-      ENV['BUNDLER_SUDO_TESTS'] = '1'
+      ENV["BUNDLER_SUDO_TESTS"] = "1"
     end
 
     task :clean_sudo do
       puts "Cleaning up sudo test files..."
-      system "sudo rm -rf #{File.expand_path('../tmp/sudo_gem_home', __FILE__)}"
+      system "sudo rm -rf #{File.expand_path("../tmp/sudo_gem_home", __FILE__)}"
     end
 
     # Rubygems specs by version
@@ -171,7 +122,7 @@ begin
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
       branches = %w(master)
-      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.3 v2.4.8)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.5.0)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
@@ -203,7 +154,7 @@ begin
 
           puts "Checked out rubygems '#{rg}' at #{hash}"
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
-          puts "RUBYOPT=#{ENV['RUBYOPT']}"
+          puts "RUBYOPT=#{ENV["RUBYOPT"]}"
         end
 
         task rg => ["man:build", "clone_rubygems_#{rg}"]
@@ -217,7 +168,7 @@ begin
       end
 
       task "setup_co" do
-        rg = File.expand_path ENV['RG']
+        rg = File.expand_path ENV["RG"]
         puts "Running specs against Rubygems in #{rg}..."
         ENV["RUBYOPT"] = "-I#{rg} #{rubyopt}"
       end
@@ -228,7 +179,12 @@ begin
 
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
     task :travis do
-      rg = ENV['RGV'] || raise("Rubygems version is required on Travis!")
+      rg = ENV["RGV"] || raise("Rubygems version is required on Travis!")
+
+      if RUBY_VERSION > "1.9.3"
+        puts "\n\e[1;33m[Travis CI] Running bundler linter\e[m\n\n"
+        Rake::Task["rubocop"].invoke
+      end
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
       specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
@@ -238,14 +194,14 @@ begin
       puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
       sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
       # clean up by chowning the newly root-owned tmp directory back to the travis user
-      system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
+      system("sudo chown -R #{ENV["USER"]} #{File.join(File.dirname(__FILE__), "tmp")}")
 
       Rake::Task["spec:rubygems:#{rg}"].reenable
 
       puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
       realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
 
-      {"specs" => specs, "sudo" => sudos, "realworld" => realworld}.each do |name, passed|
+      { "specs" => specs, "sudo" => sudos, "realworld" => realworld }.each do |name, passed|
         if passed
           puts "\e[0;32m[Travis CI] #{name} passed\e[m"
         else
@@ -254,7 +210,7 @@ begin
       end
 
       unless specs && sudos && realworld
-        fail "Spec run failed, please review the log for more information"
+        raise "Spec run failed, please review the log for more information"
       end
     end
   end
@@ -263,15 +219,19 @@ rescue LoadError
   task :spec do
     abort "Run `rake spec:deps` to be able to run the specs"
   end
+
+  task :rubocop do
+    abort "Run `rake spec:deps` to be able to run rubocop"
+  end
 end
 
 begin
-  require 'ronn'
+  require "ronn"
 
   namespace :man do
     directory "lib/bundler/man"
 
-    sources = Dir["man/*.ronn"].map{|f| File.basename(f, ".ronn") }
+    sources = Dir["man/*.ronn"].map {|f| File.basename(f, ".ronn") }
     sources.map do |basename|
       ronn = "man/#{basename}.ronn"
       roff = "lib/bundler/man/#{basename}"
@@ -289,7 +249,7 @@ begin
 
     task :clean do
       leftovers = Dir["lib/bundler/man/*"].reject do |f|
-        basename = File.basename(f).sub(/\.(txt|ronn)/, '')
+        basename = File.basename(f).sub(/\.(txt|ronn)/, "")
         sources.include?(basename)
       end
       rm leftovers if leftovers.any?
@@ -303,7 +263,7 @@ begin
       rm_rf "lib/bundler/man"
     end
 
-    task(:require) { }
+    task(:require) {}
   end
 
 rescue LoadError
@@ -313,13 +273,36 @@ rescue LoadError
   end
 end
 
+begin
+  require "automatiek"
+
+  Automatiek::RakeTask.new("molinillo") do |lib|
+    lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
+    lib.namespace = "Molinillo"
+    lib.prefix = "Bundler"
+    lib.vendor_lib = "lib/bundler/vendor/molinillo"
+  end
+
+  Automatiek::RakeTask.new("thor") do |lib|
+    lib.download = { :github => "https://github.com/erikhuda/thor" }
+    lib.namespace = "Thor"
+    lib.prefix = "Bundler"
+    lib.vendor_lib = "lib/bundler/vendor/thor"
+  end
+rescue LoadError
+  namespace :vendor do
+    task(:molinillo) { abort "Install the automatiek gem to be able to vendor gems." }
+    task(:thor) { abort "Install the automatiek gem to be able to vendor gems." }
+  end
+end
+
 desc "Update vendored SSL certs to match the certs vendored by Rubygems"
 task :update_certs => "spec:rubygems:clone_rubygems_master" do
-  require 'bundler/ssl_certs/certificate_manager'
+  require "bundler/ssl_certs/certificate_manager"
   Bundler::SSLCerts::CertificateManager.update_from!(RUBYGEMS_REPO)
 end
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 task :build => ["man:build"]
 task :release => ["man:require", "man:build"]
 

data/bin/rake

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+
+bundler_spec = Gem::Specification.load(File.expand_path("../../bundler.gemspec", __FILE__))
+bundler_spec.dependencies.each do |dep|
+  begin
+    gem dep.name, dep.requirement.to_s
+  rescue Gem::LoadError => e
+    $stderr.puts "#{e.message} (#{e.class})"
+  end
+end
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+
+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-core", "rspec")

data/bin/rubocop

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+
+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
+
+gem "rubocop", "= 0.35.1"
+load Gem.bin_path("rubocop", "rubocop")

data/bundler.gemspec

@@ -1,32 +1,34 @@
 # coding: utf-8
-lib = File.expand_path('../lib/', __FILE__)
+lib = File.expand_path("../lib/", __FILE__)
 $:.unshift lib unless $:.include?(lib)
-require 'bundler/version'
+require "bundler/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'bundler'
+  s.name        = "bundler"
   s.version     = Bundler::VERSION
-  s.licenses    = ['MIT']
+  s.licenses    = ["MIT"]
   s.authors     = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"]
   s.email       = ["andre.arko+terence.lee@gmail.com"]
   s.homepage    = "http://bundler.io"
-  s.summary     = %q{The best way to manage your application's dependencies}
-  s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably}
+  s.summary     = "The best way to manage your application's dependencies"
+  s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
 
-  s.required_ruby_version     = '>= 1.8.7'
-  s.required_rubygems_version = '>= 1.3.6'
+  s.required_ruby_version     = ">= 1.8.7"
+  s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_development_dependency 'mustache',  '0.99.6'
-  s.add_development_dependency 'rake',      '~> 10.0'
-  s.add_development_dependency 'rdiscount', '~> 1.6'
-  s.add_development_dependency 'ronn',      '~> 0.7.3'
-  s.add_development_dependency 'rspec',     '~> 3.0'
+  s.add_development_dependency "automatiek", "~> 0.1.0"
+  s.add_development_dependency "mustache",   "0.99.6"
+  s.add_development_dependency "rake",       "~> 10.0"
+  s.add_development_dependency "rdiscount",  "~> 1.6"
+  s.add_development_dependency "ronn",       "~> 0.7.3"
+  s.add_development_dependency "rspec",      "~> 3.0"
 
-  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
   # we don't check in man pages, but we need to ship them because
   # we use them to generate the long-form help for each command.
-  s.files      += Dir.glob('lib/bundler/man/**/*')
+  s.files += Dir.glob("lib/bundler/man/**/*")
 
+  s.bindir        = "exe"
   s.executables   = %w(bundle bundler)
   s.require_paths = ["lib"]
 end

data/exe/bundle

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+# Exit cleanly from an early interrupt
+Signal.trap("INT") { exit 1 }
+
+require "bundler"
+# Check if an older version of bundler is installed
+$LOAD_PATH.each do |path|
+  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
+  err = "Looks like you have a version of bundler that's older than 0.9.\n"
+  err << "Please remove your old versions.\n"
+  err << "An easy way to do this is by running `gem cleanup bundler`."
+  abort(err)
+end
+
+require "bundler/friendly_errors"
+Bundler.with_friendly_errors do
+  require "bundler/cli"
+  Bundler::CLI.start(ARGV, :debug => true)
+end

data/{bin → exe}/bundle_ruby

@@ -2,12 +2,14 @@
 
 Signal.trap("INT") { exit 1 }
 
-require 'bundler/ruby_version'
-require 'bundler/ruby_dsl'
-require 'bundler/shared_helpers'
+require "bundler/ruby_version"
+require "bundler/ruby_dsl"
+require "bundler/shared_helpers"
 
 module Bundler
   class GemfileError < RuntimeError; end
+  class GemfileEvalError < GemfileError; end
+
   class Dsl
     include RubyDsl
 
@@ -18,7 +20,7 @@ module Bundler
     end
 
     def eval_gemfile(gemfile, contents = nil)
-      contents ||= File.open(gemfile, "rb") { |f| f.read }
+      contents ||= File.open(gemfile, "rb", &:read)
       instance_eval(contents, gemfile.to_s, 1)
     rescue SyntaxError => e
       bt = e.message.split("\n")[1..-1]