bundler 1.3.0.pre → 1.3.0.pre.2

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -1,12 +1,6 @@
 language: ruby
 script: rake spec:travis
-before_script:
-  - rake --version
-  - gem install rake -v '10.0.2'
-  - gem list rake
-  - rake --version
-  - sudo apt-get install groff -y
-  - rake spec:deps
+before_script: rake spec:travis:deps
 notifications:
   email:
     - mail@arko.net
@@ -17,22 +11,31 @@ notifications:
     channels:
       - "irc.freenode.org#bundler"
 rvm:
-  - ruby-head
-  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
-
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
 env:
+  # we need to know if changes to rubygems will break bundler on release
   - RGV=master
+  # test the latest rubygems release with all of our supported rubies
   - RGV=v1.8.24
 matrix:
   allow_failures:
+    # we want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
+    # until the 2.0 rc, it's okay for failures to crop up
+    - rvm: 2.0.0-preview2
+    # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
     - rvm: 1.9.2
   include:
+    # riding the edge
+    - rvm: ruby-head
+      env: RGV=master
+    # 2.0 release track
+    - rvm: 2.0.0-preview2
+      env: RGV=v2.0.0.preview2
     # Bundler 1.x supports Rubygems down to 1.5.3 on Ruby 1.9.3
     - rvm: 1.9.3
       env: RGV=v1.7.2

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.3.0.pre.2 (Dec 9, 2012)
+
+Features:
+
+  - `config` expands local overrides like `local.rack .` (@gkop, #2205)
+  - `gem` generates files correctly for names like `jquery-rails` (@banyan, #2201)
+  - use gems from gists with the :gist option in the Gemfile (@jgaskins)
+
+Bugfixes:
+
+  - Gemfile sources other than rubygems.org work even when .gemrc contains sources
+  - caching git gems now caches specs, fixing e.g. git ls-files (@bison, #2039)
+  - `show GEM` now warns if the directory has been deleted (@rohit, #2070)
+  - git output hidden when running in --quiet mode (@rohit)
+
 ## 1.3.0.pre (Nov 29, 2012)
 
 Features:

data/CONTRIBUTING.md

@@ -0,0 +1,13 @@
+# Creating Issues
+
+If you're having a problem, please see [ISSUES](../ISSUES.md) for troubleshooting steps and a guide for how to submit a ticket that will help us solve the problem you are having as quickly as possible.
+
+# Discussing Bundler
+
+If you'd like to discuss features, ask questions, or just engage in general Bundler-focused discussion, please see the [#bundler](irc://irc.freenode.net/#bundler) IRC channel on Freenode, and the [Bundler mailing list](http://groups.google.com/ruby-bundler) on Google Groups.
+
+# Helping Out
+
+If you'd like to help make Bundler better, you totally rock! Please check out the [CONTRIBUTE](../CONTRIBUTE.md) file for an introduction to the project, guidelines for contributing, and suggestions for things anyone can do that would be helpful.
+
+Thanks for helping us make Bundler better.

data/ISSUES.md

@@ -19,7 +19,7 @@ Please open a ticket with Heroku if you're having trouble deploying. They have a
 After reading the documentation, try these troubleshooting steps:
 
     # remove user-specific gems and git repos
-    rm -rf ~/.bundle/ ~/.gem/
+    rm -rf ~/.bundle/ ~/.gem/bundler/ ~/.gems/cache/bundler/
 
     # remove system-wide git repos and git checkouts
     rm -rf $GEM_HOME/bundler/ $GEM_HOME/cache/bundler/
@@ -33,6 +33,10 @@ After reading the documentation, try these troubleshooting steps:
     # remove the saved resolve of the Gemfile
     rm -rf Gemfile.lock
 
+    # uninstall the rubygems-bundler and open_gem gems
+    rvm gemset use global # if using rvm
+    gem uninstall rubygems-bundler open_gem
+
     # try to install one more time
     bundle install
 
@@ -49,9 +53,11 @@ The Bundler team needs to know some things in order to diagnose and hopefully fi
   - What version of Ruby you are using (run `ruby -v`)
   - What version of Rubygems you are using (run `gem -v`)
   - Whether you are using RVM, and if so what version (run `rvm -v`)
-  - Whether you have the `rubygems-bundler` gem, which can break gem binares (run `gem list rubygems-bundler`)
+  - Whether you have the `rubygems-bundler` gem, which can break gem executables (run `gem list rubygems-bundler`)
   - Whether you have the `open_gem` gem, which can cause rake activation conflicts (run `gem list open_gem`)
 
+If you have either `rubygems-bundler` or `open_gem` installed, please try removing them and then following the troublshooting steps above before opening a new ticket.
+
 If you are using Rails 2.3, please also include:
 
   - Your boot.rb file

data/README.md

@@ -1,16 +1,18 @@
-[![Build Status](https://secure.travis-ci.org/carlhuda/bundler.png?branch=master)](http://travis-ci.org/carlhuda/bundler)
+# Bundler: a gem to bundle gems [![Build Status](https://secure.travis-ci.org/carlhuda/bundler.png?branch=master)](http://travis-ci.org/carlhuda/bundler)
 
-# Bundler: a gem to bundle gems
-
-Bundler is a tool that manages gem dependencies for your ruby application. It
-takes a gem manifest file and is able to fetch, download, and install the gems
-and all child dependencies specified in this manifest. It can manage any update
-to the gem manifest file and update the bundle's gems accordingly. It also lets
-you run any ruby code in context of the bundle's gem environment.
+Bundler manages the gems that a ruby application depends on. Given a list of gems, it can automatically download and install those gems, as well as any other gems needed by the gems that are listed. Before installing gems, it checks the versions of every gem to make sure that they are compatible, and can all be loaded at the same time. After the gems have been installed, Bundler can help you update some or all of them when new versions become available. Finally, it records the exact versions that have been installed, so that others can install the exact same gems.
 
 ### Installation and usage
 
-See [gembundler.com](http://gembundler.com) for up-to-date installation and usage instructions.
+See [gembundler.com](http://gembundler.com) for installation and usage instructions. tl;dr:
+
+```
+gem install bundler
+bundle init
+echo "gem 'rails'" >> Gemfile
+bundle install
+bundle exec rails new myapp
+```
 
 ### Troubleshooting
 
@@ -20,13 +22,7 @@ For help with common problems, see [ISSUES](https://github.com/carlhuda/bundler/
 
 To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
 
-The `master` branch contains our current progress towards version 1.3.
-Please submit pull requests with bugfixes to the stable branch for
-version you would like to fix.
-
-### Upgrading from Bundler 0.8 to 0.9 and above
-
-See [UPGRADING](https://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
+The `master` branch contains our current progress towards version 1.3. Versions 1.0 to 1.2 each have their own stable branches. Please submit bugfixes as pull requests to the stable branch for the version you would like to fix.
 
 ### Other questions
 

data/Rakefile

@@ -1,8 +1,23 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'rubygems'
 require 'bundler/gem_tasks'
+require 'rubygems'
 require 'shellwords'
+require 'benchmark'
+
+# Benchmark task execution
+module Rake
+  class Task
+    alias_method :real_invoke, :invoke
+
+    def invoke(*args)
+      time = Benchmark.measure(@name) do
+        real_invoke(*args)
+      end
+      puts "#{@name} ran for #{time}"
+    end
+  end
+end
 
 task :release => ["man:clean", "man:build"]
 
@@ -13,16 +28,30 @@ rescue
   false
 end
 
-def sudo_task(task)
-  system("sudo -E rake #{task}")
-end
-
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
     sh "#{Gem.ruby} -S gem list ronn | (grep 'ronn' 1> /dev/null) || #{Gem.ruby} -S gem install ronn --no-ri --no-rdoc"
     sh "#{Gem.ruby} -S gem list rspec | (grep 'rspec (2.' 1> /dev/null) || #{Gem.ruby} -S gem install rspec --no-ri --no-rdoc"
   end
+
+  namespace :travis do
+    task :deps do
+      # Give the travis user a name so that git won't fatally error
+      system("sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd")
+      # Strip secure_path so that RVM paths transmit through sudo -E
+      system("sudo sed -i '/secure_path/d' /etc/sudoers")
+      # Install groff for the ronn gem
+      system("sudo apt-get install groff -y")
+      # Recompile ruby-head, because the VM version is quite old
+      if ENV['RUBY_VERSION'] == 'ruby-head'
+        system("rvm reinstall ruby-head")
+        system("ruby --version")
+      end
+      # Install the other gem deps, etc.
+      Rake::Task["spec:deps"].invoke
+    end
+  end
 end
 
 begin
@@ -64,7 +93,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24 master).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24 v2.0.0.preview2).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -85,12 +114,15 @@ begin
 
           Dir.chdir("tmp/rubygems") do
             system("git remote update")
-            system("git checkout #{rg}")
-            system("git pull origin master") if rg == "master"
-            hash = `git rev-parse HEAD`.strip
+            if rg == "master"
+              system("git checkout origin/master")
+            else
+              system("git checkout #{rg}")
+            end
+            hash = `git rev-parse HEAD`.chomp
           end
 
-          puts "Running bundler specs against rubygems '#{rg}' at #{hash}"
+          puts "Checked out rubygems '#{rg}' at #{hash}"
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
           puts "RUBYOPT=#{ENV['RUBYOPT']}"
         end
@@ -115,7 +147,6 @@ begin
 
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
     task :travis do
-      ENV['TRACE'] = 'true' # print debug info when an exception comes up
       rg = ENV['RGV'] || 'master'
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
@@ -124,16 +155,25 @@ begin
       Rake::Task["spec:rubygems:#{rg}"].reenable
 
       puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
-      sudos = sudo_task "spec:rubygems:#{rg}:sudo"
-      chown = system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
+      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')}")
 
       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|
+        if passed
+          puts "\e[0;32m[Travis CI] #{name} passed\e[m"
+        else
+          puts "\e[0;31m[Travis CI] #{name} failed\e[m"
+        end
+      end
+
       unless specs && sudos && realworld
-        fail "Bundler tests failed, please review the log for more information"
+        fail "Spec run failed, please review the log for more information"
       end
     end
   end

data/UPGRADING.md

@@ -8,7 +8,7 @@ The "env" file that 0.9 created at `.bundle/environment.rb` has been
 removed. As a side effect of this, Passenger will only find your
 bundled gems if you install with `bundle install --deployment`.
 Alternatively, you can tell Passenger where you gems are installed,
-[something like this](http://bit.ly/passenger-gem-home).
+[something like this](http://andre.arko.net/2010/08/16/using-passengerpane-with-gem_home-set/).
 
 The `bundle lock` command is no longer needed, as the
 Gemfile.lock file is now automatically generated by `bundle install`.

data/lib/bundler.rb

@@ -288,17 +288,12 @@ module Bundler
 
     def load_gemspec_uncached(file)
       path = Pathname.new(file)
-      # Eval the gemspec from its parent directory
+      # Eval the gemspec from its parent directory, because some gemspecs
+      # depend on "./" relative paths.
       Dir.chdir(path.dirname.to_s) do
-        contents = File.read(path.basename.to_s)
-        if contents =~ /\A---/ # try YAML
-          begin
-            Gem::Specification.from_yaml(contents)
-            # Raises ArgumentError if the file is not valid YAML (on syck)
-            # Psych raises a Psych::SyntaxError
-          rescue YamlSyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
-            eval_gemspec(path, contents)
-          end
+        contents = path.read
+        if contents[0..2] == "---" # YAML header
+          eval_yaml_gemspec(path, contents)
         else
           eval_gemspec(path, contents)
         end
@@ -311,6 +306,14 @@ module Bundler
 
   private
 
+    def eval_yaml_gemspec(path, contents)
+      # If the YAML is invalid, Syck raises an ArgumentError, and Psych
+      # raises a Psych::SyntaxError. See psyched_yaml.rb for more info.
+      Gem::Specification.from_yaml(contents)
+    rescue YamlSyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
+      eval_gemspec(path, contents)
+    end
+
     def eval_gemspec(path, contents)
       eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
     rescue LoadError, SyntaxError => e

data/lib/bundler/cli.rb

@@ -174,9 +174,7 @@ module Bundler
     def install
       opts = options.dup
       if opts[:without]
-        opts[:without].map!{|g| g.split(" ") }
-        opts[:without].flatten!
-        opts[:without].map!{|g| g.to_sym }
+        opts[:without] = opts[:without].map{|g| g.tr(' ', ':') }
       end
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
@@ -314,7 +312,11 @@ module Bundler
       Bundler.load.lock
 
       if gem_name
-        Bundler.ui.info locate_gem(gem_name)
+        path_to_gem = locate_gem(gem_name)
+        unless File.directory?(path_to_gem)
+          Bundler.ui.warn "Warning: The following path to #{gem_name} no longer exists."
+        end
+        Bundler.ui.info path_to_gem
       elsif options[:paths]
         Bundler.load.specs.sort_by { |s| s.name }.each do |s|
           Bundler.ui.info locate_gem(s.name)
@@ -451,7 +453,7 @@ module Bundler
 
     desc "config NAME [VALUE]", "retrieve or set a configuration value"
     long_desc <<-D
-      Retrieves or sets a configuration value. If only parameter is provided, retrieve the value. If two parameters are provided, replace the
+      Retrieves or sets a configuration value. If only one parameter is provided, retrieve the value. If two parameters are provided, replace the
       existing value with the newly provided one.
 
       By default, setting a configuration value sets it for all projects
@@ -520,6 +522,11 @@ module Bundler
           Bundler.ui.info "You are replacing the current local value of #{name}, which is currently #{local.inspect}"
         end
 
+        if name.match(/\Alocal\./)
+          pathname = Pathname.new(args.join(" "))
+          args = [pathname.expand_path.to_s] if pathname.directory?
+        end
+
         Bundler.settings.send("set_#{scope}", name, args.join(" "))
       else
         Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
@@ -593,6 +600,7 @@ module Bundler
     method_option :test, :type => :string, :default => 'rspec', :aliases => '-t', :banner => "Generate a test directory for your library: 'rspec' is the default, but 'minitest' is also supported."
     def gem(name)
       name = name.chomp("/") # remove trailing slash if present
+      namespaced_path = name.tr('-', '/')
       target = File.join(Dir.pwd, name)
       constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
       constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
@@ -601,31 +609,32 @@ module Bundler
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
       opts = {
-        :name           => name,
-        :constant_name  => constant_name,
-        :constant_array => constant_array,
-        :author         => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
-        :email          => git_user_email.empty? ? "TODO: Write your email address" : git_user_email
+        :name            => name,
+        :namespaced_path => namespaced_path,
+        :constant_name   => constant_name,
+        :constant_array  => constant_array,
+        :author          => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
+        :email           => git_user_email.empty? ? "TODO: Write your email address" : git_user_email
       }
-      template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                opts)
-      template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),               opts)
-      template(File.join("newgem/LICENSE.txt.tt"),           File.join(target, "LICENSE.txt"),            opts)
-      template(File.join("newgem/README.md.tt"),             File.join(target, "README.md"),              opts)
-      template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)
-      template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),        opts)
-      template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{name}.rb"),         opts)
-      template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{name}/version.rb"), opts)
+      template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                             opts)
+      template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),                            opts)
+      template(File.join("newgem/LICENSE.txt.tt"),           File.join(target, "LICENSE.txt"),                         opts)
+      template(File.join("newgem/README.md.tt"),             File.join(target, "README.md"),                           opts)
+      template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),                          opts)
+      template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),                     opts)
+      template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{namespaced_path}.rb"),           opts)
+      template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{namespaced_path}/version.rb"),   opts)
       if options[:bin]
-        template(File.join("newgem/bin/newgem.tt"),          File.join(target, 'bin', name),              opts)
+        template(File.join("newgem/bin/newgem.tt"),          File.join(target, 'bin', name),                           opts)
       end
       case options[:test]
       when 'rspec'
-        template(File.join("newgem/rspec.tt"),               File.join(target, ".rspec"),                 opts)
-        template(File.join("newgem/spec/spec_helper.rb.tt"), File.join(target, "spec/spec_helper.rb"),    opts)
-        template(File.join("newgem/spec/newgem_spec.rb.tt"), File.join(target, "spec/#{name}_spec.rb"),   opts)
+        template(File.join("newgem/rspec.tt"),               File.join(target, ".rspec"),                              opts)
+        template(File.join("newgem/spec/spec_helper.rb.tt"), File.join(target, "spec/spec_helper.rb"),                 opts)
+        template(File.join("newgem/spec/newgem_spec.rb.tt"), File.join(target, "spec/#{namespaced_path}_spec.rb"),     opts)
       when 'minitest'
-        template(File.join("newgem/test/minitest_helper.rb.tt"), File.join(target, "test/minitest_helper.rb"), opts)
-        template(File.join("newgem/test/test_newgem.rb.tt"),     File.join(target, "test/test_#{name}.rb"),    opts)
+        template(File.join("newgem/test/minitest_helper.rb.tt"), File.join(target, "test/minitest_helper.rb"),         opts)
+        template(File.join("newgem/test/test_newgem.rb.tt"),     File.join(target, "test/test_#{namespaced_path}.rb"), opts)
       end
       Bundler.ui.info "Initializating git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }

data/lib/bundler/dsl.rb

@@ -201,7 +201,7 @@ module Bundler
     def _normalize_options(name, version, opts)
       _normalize_hash(opts)
 
-      valid_keys = %w(group groups git github path name branch ref tag require submodules platform platforms type)
+      valid_keys = %w(group groups git gist github path name branch ref tag require submodules platform platforms type)
       invalid_keys = opts.keys - valid_keys
       if invalid_keys.any?
         plural = invalid_keys.size > 1
@@ -235,6 +235,10 @@ module Bundler
         opts["git"] = "git://github.com/#{github}.git"
       end
 
+      if gist = opts.delete("gist")
+        opts["git"] = "git://gist.github.com/#{gist}.git"
+      end
+
       ["git", "path"].each do |type|
         if param = opts[type]
           if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/