bundler 0.9.18 → 0.9.19

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.9.19 (April 12, 2010)
+
+Features:
+
+  - suggest `bundle install --relock` when the Gemfile has changed (#272)
+  - source support for Rubygems servers without prerelease gem indexes (#262)
+
+Bugfixes:
+
+  - don't set up all groups every time Bundler.setup is called while locked (#263)
+  - fix #full_gem_path for git gems while locked (#268)
+  - eval gemspecs at the top level, not inside the Bundler class (#269)
+
+
 ## 0.9.18 (April 8, 2010)
 
 Features:

data/lib/bundler.rb

@@ -20,7 +20,7 @@ module Bundler
   autoload :SharedHelpers,       'bundler/shared_helpers'
   autoload :SpecSet,             'bundler/spec_set'
   autoload :Source,              'bundler/source'
-  autoload :Specification,       'bundler/specification'
+  autoload :Specification,       'bundler/shared_helpers'
   autoload :UI,                  'bundler/ui'
 
   class BundlerError < StandardError
@@ -38,6 +38,7 @@ module Bundler
   class GemNotFound      < BundlerError; status_code(7)  ; end
   class VersionConflict  < BundlerError; status_code(6)  ; end
   class GemfileError     < BundlerError; status_code(4)  ; end
+  class GemfileChanged   < GemfileError; status_code(4)  ; end
   class PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
   class DeprecatedMethod < BundlerError; status_code(12) ; end
@@ -66,9 +67,11 @@ module Bundler
     end
 
     def setup(*groups)
-      if groups.empty? || @all_groups_loaded
+      return @setup if @setup
+
+      if groups.empty?
         # Load all groups, but only once
-        @all_groups_loaded ||= load.setup
+        @setup = load.setup
       else
         # Figure out which groups haven't been loaded yet
         unloaded = groups - (@completed_groups || [])
@@ -86,7 +89,7 @@ module Bundler
     def load
       @load ||= begin
         if current_env_file?
-          SharedHelpers.gem_loaded = true
+          @gem_loaded = true
           Kernel.require env_file
           Bundler
         else

data/lib/bundler/cli.rb

@@ -85,7 +85,11 @@ module Bundler
 
       remove_lockfiles if options[:relock]
 
-      Installer.install(Bundler.root, Bundler.definition, opts)
+      begin
+        Installer.install(Bundler.root, Bundler.definition, opts)
+      rescue GemfileChanged
+        raise GemfileChanged, "You changed your Gemfile after locking. Please run `bundle install --relock`."
+      end
 
       lock if options[:relock]
       cache if Bundler.root.join("vendor/cache").exist?

data/lib/bundler/definition.rb

@@ -17,7 +17,7 @@ module Bundler
 
       hash = Digest::SHA1.hexdigest(File.read("#{Bundler.root}/Gemfile"))
       unless locked_definition.hash == hash
-        raise GemfileError, "You changed your Gemfile after locking. Please relock using `bundle lock`"
+        raise GemfileChanged, "You changed your Gemfile after locking. Please relock using `bundle lock`"
       end
 
       locked_definition

data/lib/bundler/setup.rb

@@ -7,7 +7,6 @@ if Bundler::SharedHelpers.in_bundle?
   if env_file.exist?
     require env_file
   else
-    require 'rubygems'
     require 'bundler'
     begin
       Bundler.setup

data/lib/bundler/shared_helpers.rb

@@ -1,4 +1,6 @@
 require 'pathname'
+require 'rubygems'
+Gem.source_index # ensure Rubygems is fully loaded in Ruby 1.9
 
 module Gem
   class Dependency
@@ -11,6 +13,28 @@ module Gem
 end
 
 module Bundler
+  class Specification < Gem::Specification
+    attr_accessor :relative_loaded_from
+
+    def self.from_gemspec(gemspec)
+      spec = allocate
+      gemspec.instance_variables.each do |ivar|
+        spec.instance_variable_set(ivar, gemspec.instance_variable_get(ivar))
+      end
+      spec
+    end
+
+    def loaded_from
+      return super unless relative_loaded_from
+      source.path.join(relative_loaded_from).to_s
+    end
+
+    def full_gem_path
+      Pathname.new(loaded_from).dirname.expand_path.to_s
+    end
+
+  end
+
   module SharedHelpers
     attr_accessor :gem_loaded
 

data/lib/bundler/source.rb

@@ -70,8 +70,14 @@ module Bundler
       end
 
       def fetch_all_specs(&blk)
+        # Fetch all specs, minus prerelease specs
         Gem::SpecFetcher.new.list(true, false).each(&blk)
-        Gem::SpecFetcher.new.list(false, true).each(&blk)
+        # Then fetch the prerelease specs
+        begin
+          Gem::SpecFetcher.new.list(false, true).each(&blk)
+        rescue Gem::RemoteFetcher::FetchError
+          Bundler.ui.warn "Could not fetch prerelease specs from #{self}"
+        end
       end
     end
 
@@ -344,7 +350,7 @@ module Bundler
       def cache
         if cached?
           Bundler.ui.info "Updating #{uri}"
-          in_cache { git %|fetch --quiet "#{uri}" refs/heads/*:refs/heads/*| }
+          in_cache { git %|fetch --force --quiet "#{uri}" refs/heads/*:refs/heads/*| }
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
@@ -357,7 +363,7 @@ module Bundler
           git %|clone --no-checkout "#{cache_path}" "#{path}"|
         end
         Dir.chdir(path) do
-          git "fetch --quiet"
+          git "fetch --force --quiet"
           git "reset --hard #{revision}"
         end
       end

data/lib/bundler/templates/environment.erb

@@ -2,12 +2,12 @@
 # Generated by Bundler <%= Bundler::VERSION %>
 
 require 'digest/sha1'
-require 'rubygems'
 <%= shared_helpers %>
 
 module Bundler
   LOCKED_BY    = '<%= Bundler::VERSION %>'
   FINGERPRINT  = <%= gemfile_fingerprint.inspect %>
+  HOME         = '<%= Bundler.home %>'
   AUTOREQUIRES = <%= autorequires_for_groups.inspect %>
   SPECS        = [
     <% specs_for_lock_file.each do |spec| -%>
@@ -15,14 +15,18 @@ module Bundler
     <% end -%>
   ].map do |hash|
     if hash[:virtual_spec]
-      spec = eval(hash[:virtual_spec], binding, "<virtual spec for '#{hash[:name]}'>")
+      spec = eval(hash[:virtual_spec], TOPLEVEL_BINDING, "<virtual spec for '#{hash[:name]}'>")
     else
       dir = File.dirname(hash[:loaded_from])
-      spec = Dir.chdir(dir){ eval(File.read(hash[:loaded_from]), binding, hash[:loaded_from]) }
+      spec = Dir.chdir(dir){ eval(File.read(hash[:loaded_from]), TOPLEVEL_BINDING, hash[:loaded_from]) }
     end
     spec.loaded_from = hash[:loaded_from]
     spec.require_paths = hash[:load_paths]
-    spec
+    if spec.loaded_from.include?(HOME)
+      Bundler::Specification.from_gemspec(spec)
+    else
+      spec
+    end
   end
 
   extend SharedHelpers
@@ -74,5 +78,5 @@ module Bundler
   end
 
   # Set up load paths unless this file is being loaded after the Bundler gem
-  setup unless gem_loaded
+  setup unless @gem_loaded
 end

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.18"
+  VERSION = "0.9.19"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -07:00
+date: 2010-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rspec
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -27,9 +28,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  name: rspec
+  prerelease: false
   version_requirements: *id001
 description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
@@ -58,7 +58,6 @@ files:
 - lib/bundler/shared_helpers.rb
 - lib/bundler/source.rb
 - lib/bundler/spec_set.rb
-- lib/bundler/specification.rb
 - lib/bundler/templates/environment.erb
 - lib/bundler/templates/Gemfile
 - lib/bundler/ui.rb

data/lib/bundler/specification.rb

@@ -1,23 +0,0 @@
-module Bundler
-  class Specification < Gem::Specification
-    attr_accessor :relative_loaded_from
-
-    def self.from_gemspec(gemspec)
-      spec = allocate
-      gemspec.instance_variables.each do |ivar|
-        spec.instance_variable_set(ivar, gemspec.instance_variable_get(ivar))
-      end
-      spec
-    end
-
-    def loaded_from
-      return super unless relative_loaded_from
-      source.path.join(relative_loaded_from).to_s
-    end
-
-    def full_gem_path
-      Pathname.new(loaded_from).dirname.expand_path.to_s
-    end
-
-  end
-end