bundler 1.0.0.beta.9 → 1.0.0.beta.10

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.0.0.beta.10 (July 25, 2010)
+
+  - Last release before 1.0.0.rc.1
+  - Added :mri as a valid platform (platforms :mri { gem "ruby-debug" })
+  - Fix `bundle install` immediately after modifying the :submodule option
+  - Don't write to Gemfile.lock if nothing has changed, fixing situations
+    where bundle install was run with a different user than the app
+    itself
+  - Fix a bug where other platforms were being wiped on `bundle update`
+  - Don't ask for root password on `bundle install` if not needed
+  - Avoid setting `$GEM_HOME` where not needed
+  - First solid pass of `bundle config`
+  - Add build options
+    - `bundle config build.mysql --with-mysql-config=/path/to/config`
+
 ## 1.0.0.beta.9 (July 21, 2010)
 
   - Fix install failure when switching from a path to git source

data/lib/bundler.rb

@@ -208,7 +208,7 @@ module Bundler
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
-      else
+      elsif Gem.dir != bundle_path.to_s
         paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s

data/lib/bundler/cli.rb

@@ -238,17 +238,34 @@ module Bundler
       will show the current value, as well as any superceded values and
       where they were specified.
     D
-    def config(name, *values)
-      locations = Bundler.settings.locations(name)
+    def config(name = nil, *args)
+      values = ARGV.dup
+      values.shift # remove config
+      values.shift # remove the name
+
+      unless name
+        Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
+
+        Bundler.settings.all.each do |setting|
+          Bundler.ui.confirm "#{setting}"
+          with_padding do
+            Bundler.settings.pretty_values_for(setting).each do |line|
+              Bundler.ui.info line
+            end
+          end
+          Bundler.ui.confirm ""
+        end
+        return
+      end
 
       if values.empty?
-        # TODO: Say something more useful here
-        locations.each do |location, value|
-          if value
-            Bundler.ui.info "#{location}: #{value}"
-          end
+        Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
+        with_padding do
+          Bundler.settings.pretty_values_for(name).each { |line| Bundler.ui.info line }
         end
       else
+        locations = Bundler.settings.locations(name)
+
         if local = locations[:local]
           Bundler.ui.info "Your application has set #{name} to #{local.inspect}. This will override the " \
             "system value you are currently setting"

data/lib/bundler/definition.rb

@@ -2,6 +2,8 @@ require "digest/sha1"
 
 module Bundler
   class Definition
+    include GemHelpers
+
     attr_reader :dependencies, :platforms, :sources
 
     def self.build(gemfile, lockfile, unlock)
@@ -34,13 +36,23 @@ module Bundler
       @dependencies, @sources, @unlock = dependencies, sources, unlock
       @remote = false
       @specs = nil
+      @lockfile_contents = ""
 
-      if lockfile && File.exists?(lockfile) && unlock != true
-        locked = LockfileParser.new(File.read(lockfile))
+      if lockfile && File.exists?(lockfile)
+        @lockfile_contents = File.read(lockfile)
+        locked = LockfileParser.new(@lockfile_contents)
         @platforms      = locked.platforms
-        @locked_deps    = locked.dependencies
-        @last_resolve   = SpecSet.new(locked.specs)
-        @locked_sources = locked.sources
+
+        if unlock != true
+          @locked_deps    = locked.dependencies
+          @last_resolve   = SpecSet.new(locked.specs)
+          @locked_sources = locked.sources
+        else
+          @unlock         = {}
+          @locked_deps    = []
+          @last_resolve   = SpecSet.new([])
+          @locked_sources = []
+        end
       else
         @unlock         = {}
         @platforms      = []
@@ -52,7 +64,7 @@ module Bundler
       @unlock[:gems] ||= []
       @unlock[:sources] ||= []
 
-      current_platform = Gem.platforms.map { |p| p.to_generic }.compact.last
+      current_platform = Gem.platforms.map { |p| generic(p) }.compact.last
       @platforms |= [current_platform]
 
       converge
@@ -141,6 +153,16 @@ module Bundler
       dependencies.map { |d| d.groups }.flatten.uniq
     end
 
+    def lock(file)
+      contents = to_lock
+
+      return if @lockfile_contents == contents
+
+      File.open(file, 'w') do |f|
+        f.puts contents
+      end
+    end
+
     def to_lock
       out = ""
 
@@ -267,7 +289,7 @@ module Bundler
       deps = []
       dependencies.each do |dep|
         dep.gem_platforms(@platforms).each do |p|
-          deps << DepProxy.new(dep, p) if remote || p == Gem::Platform.local.to_generic
+          deps << DepProxy.new(dep, p) if remote || p == generic(Gem::Platform.local)
         end
       end
       deps

data/lib/bundler/dependency.rb

@@ -11,6 +11,9 @@ module Bundler
       :ruby    => Gem::Platform::RUBY,
       :ruby_18 => Gem::Platform::RUBY,
       :ruby_19 => Gem::Platform::RUBY,
+      :mri     => Gem::Platform::RUBY,
+      :mri_18  => Gem::Platform::RUBY,
+      :mri_19  => Gem::Platform::RUBY,
       :jruby   => Gem::Platform::JAVA,
       :mswin   => Gem::Platform::MSWIN
     }
@@ -87,6 +90,18 @@ module Bundler
       ruby? && RUBY_VERSION >= "1.9"
     end
 
+    def mri?
+      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
+    end
+
+    def mri_18?
+      mri? && RUBY_VERSION < "1.9"
+    end
+
+    def mri_19?
+      mri? && RUBY_VERSION >= "1.9"
+    end
+
     def jruby?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     end

data/lib/bundler/dsl.rb

@@ -8,7 +8,7 @@ module Bundler
       builder.to_definition
     end
 
-    VALID_PLATFORMS = [:ruby_18, :ruby_19, :ruby, :jruby, :mswin]
+    VALID_PLATFORMS = [:ruby, :ruby_18, :ruby_19, :mri, :mri_18, :mri19, :jruby, :mswin]
 
     def initialize
       @rubygems_source = Source::Rubygems.new

data/lib/bundler/environment.rb

@@ -36,11 +36,7 @@ module Bundler
     end
 
     def lock
-      contents = @definition.to_lock
-
-      File.open(root.join('Gemfile.lock'), 'w') do |f|
-        f.puts contents
-      end
+      @definition.lock(root.join('Gemfile.lock'))
     end
 
     def update(*gems)

data/lib/bundler/installer.rb

@@ -32,7 +32,7 @@ module Bundler
       end
 
       # Ensure that BUNDLE_PATH exists
-      Bundler.mkdir_p(Bundler.bundle_path)
+      Bundler.mkdir_p(Bundler.bundle_path) unless File.exist?(Bundler.bundle_path)
 
       # Must install gems in the order that the resolver provides
       # as dependencies might actually affect the installation of
@@ -45,7 +45,14 @@ module Bundler
         #   next
         # end
 
-        spec.source.install(spec)
+        begin
+          old_args = Gem::Command.build_args
+          Gem::Command.build_args = [Bundler.settings["build.#{spec.name}"]]
+          spec.source.install(spec)
+        ensure
+          Gem::Command.build_args = old_args
+        end
+
         Bundler.ui.info ""
         generate_bundler_executable_stubs(spec) if Bundler.settings[:bin]
         FileUtils.rm_rf(Bundler.tmp)

data/lib/bundler/lazy_specification.rb

@@ -3,7 +3,7 @@ require "rubygems/spec_fetcher"
 
 module Bundler
   class LazySpecification
-    include Gem::MatchPlatform
+    include MatchPlatform
 
     attr_reader :name, :version, :dependencies, :platform
     attr_accessor :source
@@ -68,4 +68,4 @@ module Bundler
     end
 
   end
-end
+end

data/lib/bundler/remote_specification.rb

@@ -7,7 +7,7 @@ module Bundler
   # be seeded with what we're given from the source's abbreviated index - the
   # full specification will only be fetched when necesary.
   class RemoteSpecification
-    include Gem::MatchPlatform
+    include MatchPlatform
 
     attr_reader :name, :version, :platform
     attr_accessor :source
@@ -56,4 +56,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/resolver.rb

@@ -27,6 +27,8 @@ module Bundler
             Gem::Platform::MING]
 
     class SpecGroup < Array
+      include GemHelpers
+
       attr_reader :activated, :required_by
 
       def initialize(a)
@@ -52,7 +54,7 @@ module Bundler
 
         @activated.each do |p|
           if s = @specs[p]
-            platform = Gem::Platform.new(s.platform).to_generic
+            platform = generic(Gem::Platform.new(s.platform))
             next if specs[platform]
 
             lazy_spec = LazySpecification.new(name, version, platform, source)

data/lib/bundler/rubygems_ext.rb

@@ -8,61 +8,15 @@ end
 require 'rubygems'
 require 'rubygems/specification'
 
-module Bundler
-  class DepProxy
-
-    attr_reader :required_by, :__platform, :dep
-
-    def initialize(dep, platform)
-      @dep, @__platform, @required_by = dep, platform, []
-    end
-
-    def hash
-      @hash ||= dep.hash
-    end
-
-    def ==(o)
-      dep == o.dep && __platform == o.__platform
-    end
-
-    alias eql? ==
-
-    def type
-      @dep.type
-    end
-
-    def to_s
-      @dep.to_s
-    end
-
-  private
-
-    def method_missing(*args)
-      @dep.send(*args)
-    end
-
-  end
-end
-
 module Gem
   @loaded_stacks = Hash.new { |h,k| h[k] = [] }
 
-  module MatchPlatform
-    def match_platform(p)
-      Gem::Platform::RUBY == platform or
-      platform.nil? or p == platform or
-      Gem::Platform.new(platform).to_generic == p
-    end
-  end
-
   class Specification
     attr_accessor :source, :location, :relative_loaded_from
 
     alias_method :rg_full_gem_path, :full_gem_path
     alias_method :rg_loaded_from,   :loaded_from
 
-    include MatchPlatform
-
     def full_gem_path
       source.respond_to?(:path) ?
         Pathname.new(loaded_from).dirname.expand_path.to_s :
@@ -169,22 +123,81 @@ module Gem
     MSWIN = Gem::Platform.new('mswin32')
     MING  = Gem::Platform.new('x86-mingw32')
 
-    GENERIC_CACHE = {}
-
-    class << RUBY
-      def to_generic ; self ; end
+    def hash
+      @cpu.hash + @os.hash + @version.hash
     end
 
-    GENERICS = [JAVA, MSWIN, MING, RUBY]
+    alias eql? ==
+  end
+end
+
+module Bundler
+  class DepProxy
+
+    attr_reader :required_by, :__platform, :dep
+
+    def initialize(dep, platform)
+      @dep, @__platform, @required_by = dep, platform, []
+    end
 
     def hash
-      @cpu.hash + @os.hash + @version.hash
+      @hash ||= dep.hash
+    end
+
+    def ==(o)
+      dep == o.dep && __platform == o.__platform
     end
 
     alias eql? ==
 
-    def to_generic
-      GENERIC_CACHE[self] ||= GENERICS.find { |p| self =~ p } || RUBY
+    def type
+      @dep.type
+    end
+
+    def to_s
+      @dep.to_s
     end
+
+  private
+
+    def method_missing(*args)
+      @dep.send(*args)
+    end
+
+  end
+
+  module GemHelpers
+
+    GENERIC_CACHE = {}
+    GENERICS = [
+      Gem::Platform::JAVA,
+      Gem::Platform::MSWIN,
+      Gem::Platform::MING,
+      Gem::Platform::RUBY
+    ]
+
+    def generic(p)
+      if p == Gem::Platform::RUBY
+        return p
+      end
+
+      GENERIC_CACHE[p] ||= GENERICS.find { |p2| p =~ p2 } || Gem::Platform::RUBY
+    end
+  end
+
+  module MatchPlatform
+    include GemHelpers
+
+    def match_platform(p)
+      Gem::Platform::RUBY == platform or
+      platform.nil? or p == platform or
+      generic(Gem::Platform.new(platform)) == p
+    end
+  end
+end
+
+module Gem
+  class Specification
+    include Bundler::MatchPlatform
   end
 end

data/lib/bundler/settings.rb

@@ -19,13 +19,41 @@ module Bundler
       set_key(key, value, @global_config, global_config_file)
     end
 
-    def locations(key)
-      key = key_for(key)
+    def all
+      env_keys = ENV.keys.select { |k| k =~ /BUNDLE_.*/ }
+      keys = @global_config.keys | @local_config.keys | env_keys
+
+      keys.map do |key|
+        key.sub(/^BUNDLE_/, '').gsub(/__/, ".").downcase
+      end
+    end
 
+    def locations(key)
       locations = {}
-      locations[:local]  = @local_config[key]
-      locations[:env]    = ENV[key]
-      locations[:global] = @global_config[key]
+
+      locations[:local]  = @local_config[key] if @local_config.key?(key)
+      locations[:env]    = ENV[key] if ENV[key]
+      locations[:global] = @global_config[key] if @global_config.key?(key)
+      locations
+    end
+
+    def pretty_values_for(exposed_key)
+      key = key_for(exposed_key)
+
+      locations = []
+      if @local_config.key?(key)
+        locations << "Set for your local app (#{local_config_file}): #{@local_config[key].inspect}"
+      end
+
+      if value = ENV[key]
+        locations << "Set via $#{key_for(key)}: #{value.inspect}"
+      end
+
+      if @global_config.key?(key)
+        locations << "Set for the current user (#{global_config_file}): #{@global_config[key].inspect}"
+      end
+
+      return ["You have not configured a value for `#{exposed_key}`"] if locations.empty?
       locations
     end
 
@@ -52,6 +80,10 @@ module Bundler
     end
 
   private
+    def key_for(key)
+      key = key.to_s.sub(".", "__").upcase
+      "BUNDLE_#{key}"
+    end
 
     def set_key(key, value, hash, file)
       key = key_for(key)
@@ -64,10 +96,6 @@ module Bundler
       value
     end
 
-    def key_for(key)
-      "BUNDLE_#{key.to_s.upcase}"
-    end
-
     def global_config_file
       file = ENV["BUNDLE_CONFIG"] || File.join(Gem.user_home, ".bundle/config")
       Pathname.new(file)

data/lib/bundler/source.rb

@@ -460,7 +460,7 @@ module Bundler
     end
 
     class Git < Path
-      attr_reader :uri, :ref, :options
+      attr_reader :uri, :ref, :options, :submodules
 
       def initialize(options)
         super
@@ -491,7 +491,8 @@ module Bundler
         uri == o.uri         &&
         ref == o.ref         &&
         name == o.name       &&
-        version == o.version
+        version == o.version &&
+        submodules == o.submodules
       end
 
       alias == eql?

data/lib/bundler/vendor/thor/shell/basic.rb

@@ -38,10 +38,12 @@ class Thor
         message  = message.to_s
         message  = set_color(message, color) if color
 
+        spaces = "  " * padding
+
         if force_new_line
-          $stdout.puts(message)
+          $stdout.puts(spaces + message)
         else
-          $stdout.print(message)
+          $stdout.print(spaces + message)
         end
         $stdout.flush
       end

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.0.0.beta.9" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.0.beta.10" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 9
-  version: 1.0.0.beta.9
+  - 10
+  version: 1.0.0.beta.10
 platform: ruby
 authors: 
 - Carl Lerche
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
+date: 2010-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency