bundler 1.1.pre.5 → 1.1.pre.7

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 1.1.pre.7 (Aug 8, 2011)
+
+Bugfixes:
+
+  - Fixed invalid byte sequence error while installing gem on Ruby 1.9 (#1341)
+
+## 1.1.pre.6 (Aug 8, 2011)
+
+Bugfixes:
+
+  - Fix cross repository dependencies (#1138)
+  - Fix git dependency fetching from API endpoint (#1254)
+  - Fixes for bundle outdated (@joelmoss, #1238)
+  - Fix bundle standalone when using the endpoint (#1240)
+
+Features:
+
+  - Implement `to_ary` to avoid calls to method_missing (@tenderlove, #1274)
+  - bundle clean removes old .gem files (@cldwalker, #1293)
+  - Correcly identify missing child dependency in error message
+  - Run pre-install, post-build, and post-install gem hooks for git gems (@warhammerkid, #1120)
+  - create Gemfile.lock for empty Gemfile (#1218)
+
 ## 1.1.pre.5 (June 11, 2011)
 
 Bugfixes:
@@ -66,7 +89,35 @@ Removed:
   - Removed bundle install <path>
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
-=======
+
+## 1.0.17 (Aug 8, 2011)
+
+Bugfixes:
+
+  - Fix rake issues with rubygems 1.3.x (#1342)
+  - Fixed invalid byte sequence error while installing gem on Ruby 1.9 (#1341)
+
+## 1.0.16 (Aug 8, 2011)
+
+Features:
+
+  - Performance fix for MRI 1.9 (@efficientcloud, #1288)
+  - Shortcuts (like `bundle i`) for all commands (@amatsuda)
+  - Correcly identify missing child dependency in error message
+
+Bugfixes:
+
+  - Allow Windows network share paths with forward slashes (@mtscout6, #1253)
+  - Check for rubygems.org credentials so `rake release` doesn't hang (#980)
+  - Find cached prerelease gems on rubygems 1.3.x (@dburt, #1202)
+  - Fix `bundle install --without` on kiji (@tmm1, #1287)
+  - Get rid of warning in ruby 1.9.3 (@smartinez87, #1231)
+
+Documentation:
+
+  - Documentation for `gem ..., :require => false` (@kmayer, #1292)
+  - Gems provide "executables", they are rarely also binaries (@fxn, #1242)
+
 ## 1.0.15 (June 9, 2011)
 
 Features:

data/ISSUES.md

@@ -50,6 +50,7 @@ Instructions that allow the Bundler team to reproduce your issue are vitally imp
   - 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
+  - Whether you have the `open_gem` gem, which can cause rake activation conflicts
 
 
 If you are using Rails 2.3, please also include:

data/Rakefile

@@ -40,9 +40,9 @@ begin
     end
 
     namespace :rubygems do
-      # Rubygems 1.3.5, 1.3.6, and HEAD specs
+      # 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.3).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.7).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -95,7 +95,7 @@ begin
         raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
       end
 
-      %w(1.8.6-p399 1.8.7-p302 1.9.2-p0).each do |ruby|
+      %w(1.8.6-p420 1.8.7-p334 1.9.2-p180).each do |ruby|
         ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
 
         desc "Run specs on Ruby #{ruby}"

data/UPGRADING.md

@@ -61,8 +61,8 @@ Bundler 0.9 removes the following Bundler 0.8 Gemfile APIs:
    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
+5. `bin_path`: Bundler no longer generates executables in the root
+   of your app. You should use `bundle exec` to execute executables
    in the current context.
 
 ### Gemfile Changes

data/lib/bundler/cli.rb

@@ -14,7 +14,7 @@ module Bundler
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
     end
 
-    check_unknown_options! unless ARGV.include?("exec") || ARGV.include?("config")
+    check_unknown_options!
 
     default_task :install
     class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
@@ -158,10 +158,10 @@ module Bundler
       opts = options.dup
       opts[:without] ||= []
       if opts[:without].size == 1
-        opts[:without].map!{|g| g.split(" ") }
+        opts[:without] = opts[:without].map{|g| g.split(" ") }
         opts[:without].flatten!
       end
-      opts[:without].map!{|g| g.to_sym }
+      opts[:without] = opts[:without].map{|g| g.to_sym }
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
@@ -308,8 +308,9 @@ module Bundler
 
         spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
 
-        if spec.git_version
+        if spec.source.is_a?(Bundler::Source::Git)
           current = current_specs.find{|s| spec.name == s.name }
+          next if current.nil?
         else
           current = spec
           spec = definition.index[current.name].sort_by{|b| b.version }
@@ -381,7 +382,7 @@ module Bundler
         exit 126
       rescue Errno::ENOENT
         Bundler.ui.error "bundler: command not found: #{ARGV.first}"
-        Bundler.ui.warn  "Install missing gem binaries with `bundle install`"
+        Bundler.ui.warn  "Install missing gem executables with `bundle install`"
         exit 127
       end
     end

data/lib/bundler/definition.rb

@@ -159,8 +159,19 @@ module Bundler
 
     def index
       @index ||= Index.build do |idx|
-        @sources.each do |s|
-          s.dependencies = @dependencies if s.is_a?(Bundler::Source::Rubygems)
+        other_sources = @sources.find_all{|s| !s.is_a?(Bundler::Source::Rubygems) }
+        rubygems_sources = @sources.find_all{|s| s.is_a?(Bundler::Source::Rubygems) }
+
+        dependency_names = @dependencies.dup || []
+        dependency_names.map! {|d| d.name }
+        other_sources.each do |s|
+          source_index = s.specs
+          dependency_names += source_index.unmet_dependency_names
+          idx.add_source source_index
+        end
+
+        rubygems_sources.each do |s|
+          s.dependency_names = dependency_names.uniq if s.is_a?(Bundler::Source::Rubygems)
           idx.add_source s.specs
         end
       end

data/lib/bundler/endpoint_specification.rb

@@ -18,5 +18,24 @@ module Bundler
     def fetch_platform
       @plaftorm
     end
+
+    # needed for standalone, load required_paths from local gemspec
+    # after the gem in installed
+    def require_paths
+      if _local_specification
+        _local_specification.require_paths
+      else
+        super
+      end
+    end
+
+    def _local_specification
+      eval(File.read(local_specification_path)) if @loaded_from && File.exists?(local_specification_path)
+    end
+
+    private
+    def local_specification_path
+      "#{installation_path}/specifications/#{full_name}.gemspec"
+    end
   end
 end

data/lib/bundler/fetcher.rb

@@ -6,12 +6,43 @@ module Bundler
   class Fetcher
     REDIRECT_LIMIT = 5
 
+    attr_reader :has_api
+
     class << self
       attr_accessor :disable_endpoint
+
+      @@spec_fetch_map ||= {}
+
+      def fetch(spec)
+        spec, uri = @@spec_fetch_map[spec.full_name]
+        if spec
+          path = download_gem_from_uri(spec, uri)
+          s = Bundler.rubygems.spec_from_gem(path)
+          spec.__swap__(s) if spec.is_a?(RemoteSpecification)
+        end
+      end
+
+      def download_gem_from_uri(spec, uri)
+        spec.fetch_platform
+
+        download_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
+        gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
+
+        FileUtils.mkdir_p("#{download_path}/cache")
+        Bundler.rubygems.download_gem(spec, uri, download_path)
+
+        if Bundler.requires_sudo?
+          Bundler.sudo "mkdir -p #{Bundler.rubygems.gem_dir}/cache"
+          Bundler.sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}"
+        end
+
+        gem_path
+      end
     end
 
     def initialize(remote_uri)
       @remote_uri = remote_uri
+      @has_api    = true # will be set to false if the rubygems index is ever fetched
       @@connection ||= Net::HTTP::Persistent.new nil, :ENV
     end
 
@@ -27,7 +58,7 @@ module Bundler
     end
 
     # return the specs in the bundler format as an index
-    def specs(gem_names, source, spec_fetch_map)
+    def specs(gem_names, source)
       index = Index.new
 
       fetch_remote_specs(gem_names)[@remote_uri].each do |name, version, platform, dependencies|
@@ -39,7 +70,7 @@ module Bundler
           spec = RemoteSpecification.new(name, version, platform, self)
         end
         spec.source = source
-        spec_fetch_map[spec.full_name] = [spec, @remote_uri]
+        @@spec_fetch_map[spec.full_name] = [spec, @remote_uri]
         index << spec
       end
 
@@ -132,6 +163,7 @@ module Bundler
 
     # fetch from modern index: specs.4.8.gz
     def fetch_all_remote_specs
+      @has_api = false
       Bundler.ui.info "Fetching source index for #{@remote_uri}"
       Bundler.ui.debug "Fetching modern index"
       Gem.sources = ["#{@remote_uri}"]

data/lib/bundler/gem_helper.rb

@@ -42,7 +42,6 @@ module Bundler
     def build_gem
       file_name = nil
       sh("gem build '#{spec_path}'") { |out, code|
-        raise out unless out[/Successfully/]
         file_name = File.basename(built_gem_path)
         FileUtils.mkdir_p(File.join(base, 'pkg'))
         FileUtils.mv(built_gem_path, 'pkg')
@@ -70,9 +69,12 @@ module Bundler
 
     protected
     def rubygem_push(path)
-      out, _ = sh("gem push '#{path}'")
-      raise "Gem push failed due to lack of RubyGems.org credentials." if out[/Enter your RubyGems.org credentials/]
-      Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org"
+      if Pathname.new("~/.gem/credentials").expand_path.exist?
+        sh("gem push '#{path}'")
+        Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org"
+      else
+        raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
+      end
     end
 
     def built_gem_path

data/lib/bundler/index.rb

@@ -28,6 +28,10 @@ module Bundler
       end
     end
 
+    def inspect
+      "<Index sources=#{sources.map{|s| s.inspect}} specs.size=#{specs.size}>"
+    end
+
     def empty?
       each { return false }
       true
@@ -76,6 +80,16 @@ module Bundler
       end
     end
 
+    # returns a list of the dependencies
+    def unmet_dependency_names
+      dependency_names = specs.values.map do |array_of_s|
+        array_of_s.map do |s|
+          s.dependencies.map{|d| d.name }
+        end
+      end.flatten.uniq
+      dependency_names.select{|name| specs_by_name(name).empty? }
+    end
+
     def use(other)
       return unless other
       other.each do |s|
@@ -85,6 +99,12 @@ module Bundler
       self
     end
 
+    def size
+      @sources.inject(@specs.size) do |size, source|
+        size += source.size
+      end
+    end
+
     def ==(o)
       all? do |s|
         s2 = o[s].first and (s.dependencies & s2.dependencies).empty?
@@ -134,10 +154,15 @@ module Bundler
       end
     end
 
-    def same_version?(a, b)
-      regex = /^(.*?)(?:\.0)*$/
-
-      a.to_s[regex, 1] == b.to_s[regex, 1]
+    if RUBY_VERSION < '1.9'
+      def same_version?(a, b)
+        regex = /^(.*?)(?:\.0)*$/
+        a.to_s[regex, 1] == b.to_s[regex, 1]
+      end
+    else
+      def same_version?(a, b)
+        a == b
+      end
     end
 
     def spec_satisfies_dependency?(spec, dep)

data/lib/bundler/installer.rb

@@ -28,6 +28,7 @@ module Bundler
 
       if dependencies.empty?
         Bundler.ui.warn "The Gemfile specifies no dependencies"
+        lock
         return
       end
 
@@ -52,7 +53,7 @@ module Bundler
       # the gem.
       Installer.post_install_messages = {}
       specs.each do |spec|
-        spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
+        Bundler::Fetcher.fetch(spec) if spec.source.is_a?(Bundler::Source::Rubygems)
 
         # unless requested_specs.include?(spec)
         #   Bundler.ui.debug "  * Not in requested group; skipping."

data/lib/bundler/lazy_specification.rb

@@ -58,9 +58,11 @@ module Bundler
 
   private
 
-    def method_missing(method, *args, &blk)
-      return super if method == :to_ary
+    def to_ary
+      nil
+    end
 
+    def method_missing(method, *args, &blk)
       raise "LazySpecification has not been materialized yet (calling :#{method} #{args.inspect})" unless @specification
 
       return super unless respond_to?(method)

data/lib/bundler/resolver.rb

@@ -137,7 +137,7 @@ module Bundler
       @stack                = []
       @base                 = base
       @index                = index
-      @gems_size            = {}
+      @deps_for             = {}
       @missing_gems         = Hash.new(0)
       @source_requirements  = source_requirements
     end
@@ -248,11 +248,11 @@ module Bundler
         conflicts = Set.new
 
         # Fetch all gem versions matching the requirement
-        #
-        # TODO: Warn / error when no matching versions are found.
         matching_versions = search(current)
 
+        # If we found no versions that match the current requirement
         if matching_versions.empty?
+          # If this is a top-level Gemfile requirement
           if current.required_by.empty?
             if base = @base[current.name] and !base.empty?
               version = base.first.version
@@ -278,15 +278,8 @@ module Bundler
               end
             end
             raise GemNotFound, message
+          # This is not a top-level Gemfile requirement
           else
-            if @missing_gems[current] >= 5
-              message =  "Bundler could not find find gem #{current.required_by.last},"
-              message << "which is required by gem #{current}."
-              raise GemNotFound, message
-            end
-            @missing_gems[current] += 1
-
-            debug { "    Could not find #{current} by #{current.required_by.last}" }
             @errors[current.name] = [nil, current]
           end
         end
@@ -351,12 +344,15 @@ module Bundler
     end
 
     def gems_size(dep)
-      @gems_size[dep] ||= search(dep).size
+      search(dep).size
     end
 
     def search(dep)
+      return @deps_for[dep.to_s] if @deps_for[dep.to_s]
+
       if base = @base[dep.name] and base.any?
-        d = Gem::Dependency.new(base.first.name, *[dep.requirement.as_list, base.first.version].flatten)
+        reqs = [dep.requirement.as_list, base.first.version.to_s].flatten.compact
+        d = Gem::Dependency.new(base.first.name, *reqs)
       else
         d = dep.dep
       end
@@ -373,10 +369,11 @@ module Bundler
           end
           nested.last << spec
         end
-        nested.map { |a| SpecGroup.new(a) }.select { |sg| sg.for?(dep.__platform) }
+        deps = nested.map{|a| SpecGroup.new(a) }.select{|sg| sg.for?(dep.__platform) }
       else
-        []
+        deps = []
       end
+      @deps_for[dep.to_s] = deps
     end
 
     def clean_req(req)
@@ -456,7 +453,8 @@ module Bundler
           # the rest of the time, the gem cannot be found because it does not exist in the known sources
           else
             if requirement.required_by.first
-              o << "Could not find gem '#{clean_req(requirement)}', required by '#{clean_req(requirement.required_by.first)}', in any of the sources\n"
+              o << "Could not find gem '#{clean_req(requirement)}', which is required by "
+              o << "gem '#{clean_req(requirement.required_by.first)}', in any of the sources."
             else
               o << "Could not find gem '#{clean_req(requirement)} in any of the sources\n"
             end