bundler 1.0.0 → 1.0.2

data/.gitignore

@@ -0,0 +1,12 @@
+.DS_Store
+.*.swp
+tmp
+pkg
+*.gem
+*.rbc
+
+lib/bundler/man
+
+man/*
+!man/*.ronn
+!man/index.txt

data/CHANGELOG.md

@@ -1,6 +1,28 @@
-## 1.0.0
+## 1.0.1 (October 1, 2010)
 
-Features
+Features:
+
+  - Vlad deployment recipe, `require 'bundler/vlad'`
+  - Prettier bundle graphs
+  - Improved gem skeleton for `bundle gem`
+  - Prompt on file clashes when generating a gem
+  - Option to generate binary with gem skeleton
+  - Allow subclassing of GemHelper for custom tasks
+  - Chdir to gem directory during `bundle open`
+
+Bugfixes:
+
+  - Allow gemspec requirements with a list of versions
+  - Accept lockfiles with windows line endings
+  - Respect BUNDLE_WITHOUT env var
+  - Allow `gem "foo", :platform => :jruby`
+  - Specify loaded_from path in fake gemspec
+  - Flesh out gem_helper tasks, raise errors correctly
+  - Respect RBConfig::CONFIG['ruby_install_name'] in binstubs
+
+## 1.0.0 (August 29, 2010)
+
+Features:
 
   - You can now define `:bundle_cmd` in the capistrano task
 
@@ -20,7 +42,7 @@ Bugfixes:
   - Detect new Rubygems sources in the Gemfile and update
     the lockfile
 
-## 1.0.0.rc.6
+## 1.0.0.rc.6 (August 23, 2010)
 
 Features:
 
@@ -38,7 +60,7 @@ Bugfixes:
   - Expand paths in Gemfile relative to the Gemfile and not the current
     working directory.
 
-## 1.0.0.rc.5
+## 1.0.0.rc.5 (August 10, 2010)
 
 Features:
 
@@ -49,7 +71,7 @@ Bugfixes:
   - Fix a regression with determining whether or not to use sudo
   - Allow using the --gemfile flag with the --deployment flag
 
-## 1.0.0.rc.4
+## 1.0.0.rc.4 (August 9, 2010)
 
 Features:
 
@@ -132,7 +154,7 @@ for deployment.
 
 If you want to share gems across deployments, and you use
 Capistrano, symlink release_path/current/vendor/bundle to
-release_path/shared/bundled_gems. This will keep deployments
+release_path/shared/bundle. This will keep deployments
 snappy while maintaining the benefits of clean, deploy-time
 isolation.
 

data/ISSUES.md

@@ -6,7 +6,7 @@ Instructions for common Bundler use-cases can be found on the [Bundler documenta
 
 After reading the documentation, try these troubleshooting steps:
 
-    rm -rf ~/.bundle/ ~/.gem/ .bundle/ Gemfile.lock
+    rm -rf ~/.bundle/ ~/.gem/ .bundle/ vendor/cache/ Gemfile.lock
     bundle install
 
 ## Reporting unresolved problems

data/README.md

@@ -6,22 +6,24 @@ 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.
 
-## Installation and usage
+### Installation and usage
 
 See [gembundler.com](http://gembundler.com) for up-to-date installation and usage instructions.
 
-## Troubleshooting
+### Troubleshooting
 
 For help with common problems, see [ISSUES](http://github.com/carlhuda/bundler/blob/master/ISSUES.md).
 
 ### Development
 
-To see what has changed in each version of bundler, starting with 0.9.5, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md). For information about changes that will happen in the future, see the [ROADMAP](http://github.com/carlhuda/bundler/blob/master/ROADMAP.md).
+To see what has changed in recent versions of bundler, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
 
-## Upgrading from Bundler 0.8 to 0.9 and above
+The `master` branch contains our current progress towards version 1.1. Because of that, please submit bugfix pull requests against the `1-0-stable` branch.
+
+### Upgrading from Bundler 0.8 to 0.9 and above
 
 See [UPGRADING](http://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
 
-## Other questions
+### Other questions
 
 Feel free to chat with the Bundler core team (and many other users) on IRC in the  [#bundler](irc://irc.freenode.net/bundler) channel on Freenode, or via email on the [Bundler mailing list](http://groups.google.com/group/ruby-bundler).

data/Rakefile

@@ -0,0 +1,173 @@
+# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
+
+require 'rubygems'
+require 'rubygems/specification'
+require 'bundler'
+
+def gemspec
+  @gemspec ||= begin
+    file = File.expand_path('../bundler.gemspec', __FILE__)
+    eval(File.read(file), binding, file)
+  end
+end
+
+def sudo?
+  ENV['BUNDLER_SUDO_TESTS']
+end
+
+begin
+  require 'rspec/core/rake_task'
+
+  task :clear_tmp do
+    FileUtils.rm_rf(File.expand_path("../tmp", __FILE__))
+  end
+
+  desc "Run specs"
+  RSpec::Core::RakeTask.new do |t|
+    t.rspec_opts = %w(-fs --color)
+    t.ruby_opts  = %w(-w)
+  end
+
+  task :spec => :build
+
+  namespace :spec do
+    task :sudo do
+      ENV['BUNDLER_SUDO_TESTS'] = '1'
+    end
+
+    task :clean do
+      if sudo?
+        system "sudo rm -rf #{File.expand_path('../tmp', __FILE__)}"
+      else
+        rm_rf 'tmp'
+      end
+    end
+
+    desc "Run the full spec suite including SUDO tests"
+    task :full => ["sudo", "clean", "spec"]
+  end
+
+  # Rubygems 1.3.5, 1.3.6, and HEAD specs
+  rubyopt = ENV["RUBYOPT"]
+  %w(master REL_1_3_5 REL_1_3_6).each do |rg|
+    desc "Run specs with Rubygems #{rg}"
+    RSpec::Core::RakeTask.new("spec_gems_#{rg}") do |t|
+      t.rspec_opts = %w(-fs --color)
+      t.ruby_opts  = %w(-w)
+    end
+
+    task "rubygems_#{rg}" do
+      unless File.directory?("tmp/rubygems_#{rg}")
+        system("git clone git://github.com/jbarnette/rubygems.git tmp/rubygems_#{rg} && cd tmp/rubygems_#{rg} && git reset --hard #{rg}")
+      end
+      ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems_#{rg}/lib")} #{rubyopt}"
+    end
+
+    task "spec_gems_#{rg}" => "rubygems_#{rg}"
+    task :ci => "spec_gems_#{rg}"
+  end
+
+  # Ruby 1.8.6, 1.8.7, and 1.9.2 specs
+  task "ensure_rvm" do
+    raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
+  end
+
+  %w(1.8.6-p399 1.8.7-p249 1.9.2-head).each do |ruby|
+    ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
+
+    desc "Run specs on Ruby #{ruby}"
+    RSpec::Core::RakeTask.new("spec_ruby_#{ruby}") do |t|
+      t.rspec_opts = %w(-fs --color)
+      t.ruby_opts  = %w(-w)
+    end
+
+    task "ensure_ruby_#{ruby}" do
+      raise "Could not find Ruby #{ruby} at #{ruby_cmd}" unless File.exist?(ruby_cmd)
+    end
+
+    task "ensure_ruby_#{ruby}" => "ensure_rvm"
+    task "spec_ruby_#{ruby}" => "ensure_ruby_#{ruby}"
+    task :ci => "spec_ruby_#{ruby}"
+  end
+rescue LoadError
+  task :spec do
+    abort "Run `gem install rspec --pre` to be able to run specs"
+  end
+end
+
+namespace :man do
+  directory "lib/bundler/man"
+
+  Dir["man/*.ronn"].each do |ronn|
+    basename = File.basename(ronn, ".ronn")
+    roff = "lib/bundler/man/#{basename}"
+
+    file roff => ["lib/bundler/man", ronn] do
+      sh "ronn --roff --pipe #{ronn} > #{roff}"
+    end
+
+    file "#{roff}.txt" => roff do
+      sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
+    end
+
+    task :build => "#{roff}.txt"
+  end
+end
+
+desc "Build the man pages"
+task :build => "man:build"
+
+desc "Clean up from the built man pages"
+task :clean do
+  rm_rf "lib/bundler/man"
+end
+
+namespace :vendor do
+  desc "Build the vendor dir"
+  task :build => :clean do
+    sh "git clone git://github.com/wycats/thor.git lib/bundler/vendor/tmp"
+    sh "mv lib/bundler/vendor/tmp/lib/* lib/bundler/vendor/"
+    rm_rf "lib/bundler/vendor/tmp"
+  end
+
+  desc "Clean the vendor dir"
+  task :clean do
+    rm_rf "lib/bundler/vendor"
+  end
+end
+
+begin
+  require 'rake/gempackagetask'
+rescue LoadError
+  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
+else
+  Rake::GemPackageTask.new(gemspec) do |pkg|
+    pkg.gem_spec = gemspec
+  end
+  task :gem => [:build, :gemspec]
+end
+
+desc "install the gem locally"
+task :install => :package do
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
+end
+
+desc "validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
+
+desc "Build the gem"
+task :gem => [:gemspec, :build] do
+  mkdir_p "pkg"
+  sh "gem build bundler.gemspec"
+  mv "#{gemspec.full_name}.gem", "pkg"
+end
+
+desc "Install bundler"
+task :install => :gem do
+  sh "gem install pkg/#{gemspec.full_name}.gem"
+end
+
+task :default => :spec

data/UPGRADING.md

@@ -0,0 +1,103 @@
+## Bundler 0.9 to 1.0 and above
+
+Upgrading from Bundler 0.9 to 1.0 is relatively painless. The
+Gemfile API is the same, so your old Gemfiles should continue
+to work.
+
+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).
+
+The `bundle lock` command is no longer needed, as the
+Gemfile.lock file is now automatically generated by `bundle install`.
+If you have not yet done so, add your Gemfile.lock to source control
+and check it in.
+
+Running `bundle install` no longer updates the versions of your gems.
+If you need to update just one gem, run `bundle update GEMNAME`. To
+update all gems to the newest versions possible, run `bundle update`.
+
+Bundler now supports multiple platforms, using a block syntax to
+declare platform-specific gems:
+
+    platform :jruby do
+      gem "jruby-maven-plugins"
+    end
+
+Deploying using Bundler is even easier than it was before, as Bundler
+now includes a Capistrano recipe. Simply add this line to the top of
+your deploy.rb file to run Bundler automatically as part of deploying:
+
+    require 'bundler/capistrano'
+
+For more details on deploying using bundler, see the documentation
+for the bundler cap task, and the [documentation on deploying](http://gembundler.com/v1.0/deploying.html).
+
+
+## Bundler 0.8 to 0.9 and above
+
+Upgrading to Bundler 0.9 from Bundler 0.8 requires upgrading several
+API calls in your Gemfile, and some workarounds if you are using Rails 2.3.
+
+### Gemfile Removals
+
+Bundler 0.9 removes the following Bundler 0.8 Gemfile APIs:
+
+1. `disable_system_gems`: This is now the default (and only) option
+   for bundler. Bundler uses the system gems you have specified
+   in the Gemfile, and only the system gems you have specified
+   (and their dependencies)
+2. `disable_rubygems`: This is no longer supported. We are looking
+   into ways to get the fastest performance out of each supported
+   scenario, and we will make speed the default where possible.
+3. `clear_sources`: Bundler now defaults to an empty source
+   list. If you want to include Rubygems, you can add the source
+   via source "http://gemcutter.org". If you use bundle init, this
+   source will be automatically added for you in the generated
+   Gemfile
+4. `bundle_path`: You can specify this setting when installing
+   via `bundle install /path/to/bundle`. Bundler will remember
+   where you installed the dependencies to on a particular
+   machine for future installs, loads, setups, etc.
+5. `bin_path`: Bundler no longer generates binaries in the root
+   of your app. You should use `bundle exec` to execute binaries
+   in the current context.
+
+### Gemfile Changes
+
+Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
+
+1. Bundler 0.8 supported :only and :except as APIs for describing
+   groups of gems. Bundler 0.9 supports a single `group` method,
+   which you can use to group gems together. See the above "Group"
+   section for more information.
+
+   This means that `gem "foo", :only => :production` becomes
+   `gem "foo", :group => :production`, and
+   `only :production { gem "foo" }` becomes
+   `group :production { gem "foo" }`
+
+   The short version is: group your gems together logically, and
+   use the available commands to make use of the groups you've
+   created.
+
+2. `:require_as` becomes `:require`
+
+3. `:vendored_at` is fully removed; you should use `:path`
+
+### API Changes
+
+1. `Bundler.require_env(:environment)` becomes
+   `Bundler.require(:multiple, :groups)`. You must
+   now specify the default group (the default group is the
+   group made up of the gems not assigned to any group)
+   explicitly. So `Bundler.require_env(:test)` becomes
+   `Bundler.require(:default, :test)`
+
+2. `require 'vendor/gems/environment'`: In unlocked
+   mode, where using system gems, this becomes
+   `Bundler.setup(:multiple, :groups)`. If you don't
+   specify any groups, this puts all groups on the load
+   path. In locked, mode, it becomes `require '.bundle/environment'`

data/bundler.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'bundler/version'
+
+Gem::Specification.new do |s|
+  s.name        = "bundler"
+  s.version     = Bundler::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Carl Lerche", "Yehuda Katz", "André Arko"]
+  s.email       = ["carlhuda@engineyard.com"]
+  s.homepage    = "http://gembundler.com"
+  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.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "bundler"
+
+  s.add_development_dependency "ronn"
+  s.add_development_dependency "rspec"
+
+  s.files              = `git ls-files`.split("\n") + Dir.glob("lib/bundler/man/**/*")
+  s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables        = %w(bundle)
+  s.default_executable = "bundle"
+  s.require_paths      = ["lib"]
+end

data/lib/bundler.rb

@@ -253,6 +253,7 @@ module Bundler
         ENV["GEM_HOME"] = bundle_path.to_s
       end
 
+      FileUtils.mkdir_p bundle_path.to_s
       Gem.clear_paths
     end
 

data/lib/bundler/capistrano.rb

@@ -2,39 +2,10 @@
 #
 # Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and
 # Bundler will be activated after each new deployment.
+require 'bundler/deployment'
 
 Capistrano::Configuration.instance(:must_exist).load do
   after "deploy:update_code", "bundle:install"
 
-  namespace :bundle do
-    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. You can override any of \
-      these defaults by setting the variables shown below. If capistrano \
-      can not find the 'bundle' cmd then you can override the bundle_cmd \
-      variable to specifiy which one it should use.
-
-        set :bundle_gemfile,      "Gemfile"
-        set :bundle_dir,          fetch(:shared_path)+"/bundle"
-        set :bundle_flags,       "--deployment --quiet"
-        set :bundle_without,      [:development, :test]
-        set :bundle_cmd,          "bundle" # e.g. change to "/opt/ruby/bin/bundle"
-    DESC
-    task :install, :except => { :no_release => true } do
-      bundle_dir     = fetch(:bundle_dir,         " #{fetch(:shared_path)}/bundle")
-      bundle_without = [*fetch(:bundle_without,   [:development, :test])].compact
-      bundle_flags   = fetch(:bundle_flags, "--deployment --quiet")
-      bundle_gemfile = fetch(:bundle_gemfile,     "Gemfile")
-      bundle_cmd     = fetch(:bundle_cmd, "bundle")
-
-      args = ["--gemfile #{fetch(:latest_release)}/#{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?
-
-      run "#{bundle_cmd} install #{args.join(' ')}"
-    end
-  end
+  Bundler::Deployment.define_task(self, :task, :except => { :no_release => true })
 end