bundler 0.9.21 → 0.9.22

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.9.22 (April 20, 2010)
+
+Features:
+
+  - cache command now prunes stale .gem files from vendor/cache
+  - init --gemspec command now generates development dependencies
+  - handle Polyglot's changes to Kernel#require with Bundler::ENV_LOADED (#287)
+  - remove .gem files generated after installing a gem from a :path (#286)
+  - improve install/lock messaging (#284)
+
+Bugfixes:
+
+  - ignore cached gems that are for another platform (#288)
+  - install Windows gems that have no architecture set, like rcov (#277)
+  - exec command while locked now includes the bundler lib in $LOAD_PATH (#293)
+  - fix the `rake install` task
+  - add GemspecError so it can be raised without (further) error (#292)
+  - create a parent directory before cloning for git 1.5 compatibility (#285)
+
 ## 0.9.21 (April 16, 2010)
 
 Bugfixes:

data/lib/bundler.rb

@@ -41,6 +41,7 @@ module Bundler
   class GemfileChanged   < GemfileError; status_code(4)  ; end
   class PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
+  class GemspecError     < BundlerError; status_code(14) ; end
   class DeprecatedMethod < BundlerError; status_code(12) ; end
   class DeprecatedOption < BundlerError; status_code(12) ; end
   class InvalidOption    < BundlerError; status_code(15) ; end
@@ -87,12 +88,12 @@ module Bundler
         exit!
       end
     end
-    alias setup gem_setup unless Bundler.respond_to?(:setup)
+    alias setup gem_setup unless defined?(Bundler::ENV_LOADED)
 
     def gem_require(*groups)
       setup(*groups).require(*groups)
     end
-    alias require gem_require unless Bundler.respond_to?(:require)
+    alias require gem_require unless defined?(Bundler::ENV_LOADED)
 
     def load
       @load ||= begin

data/lib/bundler/cli.rb

@@ -88,8 +88,11 @@ module Bundler
       begin
         Installer.install(Bundler.root, Bundler.definition, opts)
       rescue GemfileChanged
-        raise GemfileChanged, "You changed your Gemfile after locking. Please run `bundle install --relock`."
+        raise GemfileChanged, "You changed your Gemfile after locking. " +
+          "Please run `bundle install --relock`."
       end
+      Bundler.ui.confirm "Your bundle is complete! " +
+        "Use `bundle show [gemname]` to see where a bundled gem is installed."
 
       lock if options[:relock]
       cache if Bundler.root.join("vendor/cache").exist?
@@ -103,11 +106,13 @@ module Bundler
     desc "lock", "Locks the bundle to the current set of dependencies, including all child dependencies."
     def lock
       if locked?
-        Bundler.ui.info("The bundle is already locked, relocking.")
+        Bundler.ui.info("Your bundle is already locked, relocking.")
         remove_lockfiles
       end
 
       Bundler.runtime.lock
+      Bundler.ui.confirm("Your bundle is now locked. " +
+        "Use `bundle show [gemname]` to list the gems in the environment.")
     rescue GemNotFound, VersionConflict => e
       Bundler.ui.error(e.message)
       Bundler.ui.warn "Run `bundle install` to install missing gems."
@@ -118,9 +123,9 @@ module Bundler
     def unlock
       if locked?
         remove_lockfiles
-        Bundler.ui.info("The bundle is now unlocked. The dependencies may be changed.")
+        Bundler.ui.info("Your bundle is now unlocked. The dependencies may be changed.")
       else
-        Bundler.ui.info("The bundle is not currently locked.")
+        Bundler.ui.info("Your bundle is not currently locked.")
       end
     end
 
@@ -138,8 +143,10 @@ module Bundler
     map %w(list) => "show"
 
     desc "cache", "Cache all the gems to vendor/cache"
+    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def cache
       Bundler.runtime.cache
+      Bundler.runtime.prune_cache unless options[:no_prune]
     rescue GemNotFound => e
       Bundler.ui.error(e.message)
       Bundler.ui.warn "Run `bundle install` to install missing gems."
@@ -147,6 +154,7 @@ module Bundler
     end
 
     desc "package", "Locks and then caches all of the gems into vendor/cache"
+    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def package
       lock
       cache
@@ -155,15 +163,15 @@ module Bundler
 
     desc "exec", "Run the command in context of the bundle"
     def exec(*)
-      ARGV.delete('exec')
+      ARGV.delete("exec")
 
       # Set PATH
-      paths = (ENV['PATH'] || "").split(File::PATH_SEPARATOR)
+      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
       paths.unshift "#{Bundler.bundle_path}/bin"
       ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
 
       # Set BUNDLE_GEMFILE
-      ENV['BUNDLE_GEMFILE'] = Bundler::SharedHelpers.default_gemfile.to_s
+      ENV["BUNDLE_GEMFILE"] = Bundler::SharedHelpers.default_gemfile.to_s
 
       # Set RUBYOPT
       rubyopt = [ENV["RUBYOPT"]].compact

data/lib/bundler/installer.rb

@@ -37,8 +37,6 @@ module Bundler
       if locked?
         write_rb_lock
       end
-
-      Bundler.ui.confirm "Your bundle is complete! Use `bundle show gemname` to see where a bundled gem is installed."
     end
 
     def dependencies

data/lib/bundler/remote_specification.rb

@@ -17,6 +17,12 @@ module Bundler
       @source_uri = source_uri
     end
 
+    # Needed before installs, since the arch matters then and quick
+    # specs don't bother to include the arch in the platform string
+    def fetch_platform
+      @platform = _remote_specification.platform
+    end
+
     def full_name
       if platform == Gem::Platform::RUBY or platform.nil? then
         "#{@name}-#{@version}"
@@ -26,7 +32,7 @@ module Bundler
     end
 
     # Because Rubyforge cannot be trusted to provide valid specifications
-    # once the remote gem is donwloaded, the backend specification will
+    # once the remote gem is downloaded, the backend specification will
     # be swapped out.
     def __swap__(spec)
       @specification = spec
@@ -36,6 +42,7 @@ module Bundler
 
     def _remote_specification
       @specification ||= begin
+        Bundler.ui.debug "Fetching spec for #{full_name}"
         Gem::SpecFetcher.new.fetch_spec([@name, @version, @platform], URI(@source_uri.to_s))
       end
     end

data/lib/bundler/rubygems_ext.rb

@@ -27,8 +27,16 @@ module Gem
 
     def to_gemfile(path = nil)
       gemfile = "source :gemcutter\n"
-      gemfile << dependencies_to_gemfile(dependencies)
-      gemfile << dependencies_to_gemfile(development_dependencies, :development)
+      gemfile << dependencies_to_gemfile(nondevelopment_dependencies)
+      unless development_dependencies.empty?
+        gemfile << "\n"
+        gemfile << dependencies_to_gemfile(development_dependencies, :development)
+      end
+      gemfile
+    end
+
+    def nondevelopment_dependencies
+      dependencies - development_dependencies
     end
 
     def add_bundler_dependencies(*groups)
@@ -47,7 +55,7 @@ module Gem
     def dependencies_to_gemfile(dependencies, group = nil)
       gemfile = ''
       if dependencies.any?
-        gemfile << "group #{group} do\n" if group
+        gemfile << "group :#{group} do\n" if group
         dependencies.each do |dependency|
           gemfile << '  ' if group
           gemfile << %|gem "#{dependency.name}"|

data/lib/bundler/runtime.rb

@@ -62,12 +62,10 @@ module Bundler
     end
 
     def lock
-      Bundler.ui.info("The bundle is already locked, relocking.") if locked?
       sources.each { |s| s.lock if s.respond_to?(:lock) }
       FileUtils.mkdir_p("#{root}/.bundle")
       write_yml_lock
       write_rb_lock
-      Bundler.ui.confirm("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
     end
 
     def dependencies_for(*groups)
@@ -81,7 +79,6 @@ module Bundler
     alias gems specs
 
     def cache
-      cache_path = "#{root}/vendor/cache/"
       FileUtils.mkdir_p(cache_path)
 
       Bundler.ui.info "Copying .gem files into vendor/cache"
@@ -96,12 +93,26 @@ module Bundler
       end
     end
 
+    def prune_cache
+      FileUtils.mkdir_p(cache_path)
+
+      Bundler.ui.info "Removing outdated .gem files from vendor/cache"
+      cache_path.children.each do |gemfile|
+        spec = Gem::Format.from_file_by_path(gemfile).spec
+        gemfile.rmtree unless specs.include?(spec)
+      end
+    end
+
   private
 
     def load_paths
       specs.map { |s| s.load_paths }.flatten
     end
 
+    def cache_path
+      root.join("vendor/cache")
+    end
+
     def write_yml_lock
       yml = details.to_yaml
       File.open("#{root}/Gemfile.lock", 'w') do |f|

data/lib/bundler/setup.rb

@@ -15,4 +15,8 @@ if Bundler::SharedHelpers.in_bundle?
       exit e.status_code
     end
   end
+
+  # Add bundler to the load path after disabling system gems
+  bundler_lib = File.expand_path("../..", __FILE__)
+  $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
 end

data/lib/bundler/shared_helpers.rb

@@ -32,7 +32,6 @@ module Bundler
     def full_gem_path
       Pathname.new(loaded_from).dirname.expand_path.to_s
     end
-
   end
 
   module SharedHelpers

data/lib/bundler/source.rb

@@ -27,6 +27,7 @@ module Bundler
 
       def fetch(spec)
         Bundler.ui.debug "  * Downloading"
+        spec.fetch_platform
         Gem::RemoteFetcher.fetcher.download(spec, uri, Gem.dir)
       end
 
@@ -143,6 +144,7 @@ module Bundler
 
           Dir["#{@path}/*.gem"].each do |gemfile|
             spec = Gem::Format.from_file_by_path(gemfile).spec
+            next unless Gem::Platform.match(spec.platform)
             spec.source = self
             index << spec
           end
@@ -250,11 +252,7 @@ module Bundler
 
       def generate_bin(spec)
         gem_dir  = spec.full_gem_path
-        gem_file = nil # so we have access after it's set in the block
-
-        Dir.chdir(gem_dir) do
-          gem_file = Gem::Builder.new(spec).build
-        end
+        gem_file = Dir.chdir(gem_dir){ Gem::Builder.new(spec).build }
 
         installer = Gem::Installer.new File.join(gem_dir, gem_file),
           :bin_dir           => "#{Gem.dir}/bin",
@@ -278,6 +276,8 @@ module Bundler
         end
 
         Bundler.ui.warn "The validation message from Rubygems was:\n  #{e.message}"
+      ensure
+        Dir.chdir(gem_dir){ FileUtils.rm_rf(gem_file) if gem_file && File.exist?(gem_file) }
       end
 
     end
@@ -374,6 +374,7 @@ module Bundler
 
       def checkout
         unless File.exist?(path.join(".git"))
+          FileUtils.mkdir_p(path.dirname)
           git %|clone --no-checkout "#{cache_path}" "#{path}"|
         end
         Dir.chdir(path) do

data/lib/bundler/templates/environment.erb

@@ -6,6 +6,7 @@ require 'yaml'
 <%= shared_helpers %>
 
 module Bundler
+  ENV_LOADED   = true
   LOCKED_BY    = '<%= Bundler::VERSION %>'
   FINGERPRINT  = <%= gemfile_fingerprint.inspect %>
   HOME         = '<%= Bundler.home %>'

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.21"
+  VERSION = "0.9.22"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 21
-  version: 0.9.21
+  - 22
+  version: 0.9.22
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -07:00
+date: 2010-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency