bundler 0.9.10 → 0.9.11

data/ROADMAP.textile

@@ -0,0 +1,51 @@
+We will be releasing one more point release (0.10.x) followed by 1.0. While
+the following reflects our current thinking, critical bugs may alter it
+somewhat.
+
+h1. 0.10
+
+* No breaking changes to the Gemfile are expected
+* We expect to modify the format of Gemfile.lock.
+** This should be the final change; it will not change for 1.0
+** The Gemfile.lock generated by 0.9 will continue to work until 1.0
+** If you use Bundler 0.10, we will transparently update the format
+** This means: you will not be able to upgrade a locked app
+   directly from 0.9 to 1.0.
+* Bundler 0.10 will automatically generate Gemfile.lock when any
+  resolve is successful.
+* bundle install will conservatively update Gemfile.lock from the
+  last successful resolve if the Gemfile has been modified since
+  the last use of bundler.
+** This means that adding a new gem to the Gemfile that does not
+   conflict with existing gems will not force an update of other
+   gems.
+** This also means that we will not force an update to previously
+   resolved dependencies as long as they are compatible with some
+   valid version of the new dependency.
+** When removing a gem, bundle install will simply remove it, without
+   recalculating all dependencies.
+* We will be adding `bundle update` for the case where you *do*
+  wish to re-resolve all dependencies and update everything to the
+  latest version.
+** bundle update will also take a gem name, if you want to force
+   an update to just a single gem (and its dependencies).
+* Add a way to install dependencies that require build options
+* Add a way to specify groups that are opt-in at install-time,
+  rather than opt-out.
+* Some additional features that we have tagged for 0.10. For up
+  to date information, please visit
+  http://github.com/carlhuda/bundler/issues/labels/0.10
+
+h1. 1.0
+
+* No breaking changes to the Gemfile are expected
+* No breaking changes to the Gemfile.lock are expected
+* No major changes to the workflow are expected
+* Reduce open bug count to 0
+* Some additional features that require more thought. For details,
+  see http://github.com/carlhuda/bundler/issues/labels/1.0
+
+h1. No Breaking changes
+
+We expect no breaking changes of the Gemfile, Gemfile.lock, or
+basic workflow for 1.x releases.

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems_ext'
 
 module Bundler
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -36,6 +36,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 PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
   class DeprecatedMethod < BundlerError; status_code(12) ; end
   class DeprecatedOption < BundlerError; status_code(12) ; end

data/lib/bundler/cli.rb

@@ -7,7 +7,7 @@ Gem.configuration
 
 module Bundler
   class CLI < Thor
-    ARGV = ::ARGV.dup
+    check_unknown_options! unless ARGV.include?("exec")
 
     desc "init", "Generates a Gemfile into the current working directory"
     def init
@@ -31,14 +31,21 @@ module Bundler
       # Check top level dependencies
       missing = env.dependencies.select { |d| env.index.search(d).empty? }
       if missing.any?
-        puts "The following dependencies are missing"
+        Bundler.ui.error "The following dependencies are missing"
         missing.each do |d|
-          puts "  * #{d}"
+          Bundler.ui.error "  * #{d}"
         end
+        Bundler.ui.error "Try running `bundle install`"
         exit 1
       else
-        env.specs
-        puts "The Gemfile's dependencies are satisfied"
+        not_installed = env.specs.select { |spec| !spec.loaded_from }
+
+        if not_installed.any?
+          not_installed.each { |s| Bundler.ui.error "#{s.name} (#{s.version}) is cached, but not installed" }
+          Bundler.ui.error "Try running `bundle install`"
+        else
+          Bundler.ui.info "The Gemfile's dependencies are satisfied"
+        end
       end
     end
 
@@ -46,11 +53,14 @@ module Bundler
     method_option "without", :type => :array,   :banner => "Exclude gems that are part of the specified named group."
     method_option "relock",  :type => :boolean, :banner => "Unlock, install the gems, and relock."
     method_option "disable-shared-gems", :type => :boolean, :banner => "Do not use any shared gems, such as the system gem repository."
+    method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
       opts[:without].map! { |g| g.to_sym }
 
+      # Can't use Bundler.settings for this because settings needs gemfile.dirname
+      ENV['BUNDLE_GEMFILE'] = opts[:gemfile] if opts[:gemfile]
       Bundler.settings[:path] = path if path
       Bundler.settings[:disable_shared_gems] = '1' if options["disable-shared-gems"]
       Bundler.settings.without = opts[:without]
@@ -90,12 +100,16 @@ module Bundler
       end
     end
 
-    desc "show", "Shows all gems that are part of the bundle."
-    def show
-      environment = Bundler.load
-      Bundler.ui.info "Gems included by the bundle:"
-      environment.specs.sort_by { |s| s.name }.each do |s|
-        Bundler.ui.info "  * #{s.name} (#{s.version})"
+    desc "show GEM", "Shows all gems that are part of the bundle, or the path to a given gem"
+    def show(gem_name = nil)
+      if gem_name
+        Bundler.ui.info locate_gem(gem_name)
+      else
+        environment = Bundler.load
+        Bundler.ui.info "Gems included by the bundle:"
+        environment.specs.sort_by { |s| s.name }.each do |s|
+          Bundler.ui.info "  * #{s.name} (#{s.version})"
+        end
       end
     end
 
@@ -129,15 +143,28 @@ module Bundler
       ENV['BUNDLE_GEMFILE'] = Bundler::SharedHelpers.default_gemfile.to_s
 
       # Set RUBYOPT
+      locked_env = Bundler.root.join(".bundle/environment.rb")
       rubyopt = [ENV["RUBYOPT"]].compact
-      rubyopt.unshift "-rbundler/setup"
-      rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
+      if locked_env.exist?
+        rubyopt.unshift "-r#{locked_env.to_s}"
+      else
+        rubyopt.unshift "-rbundler/setup"
+        rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
+      end
       ENV["RUBYOPT"] = rubyopt.join(' ')
 
       # Run
       Kernel.exec *ARGV
     end
 
+    desc "open GEM", "Opens the source directory of the given bundled gem"
+    def open(name)
+      editor = ENV['EDITOR']
+      return Bundler.ui.info("To open a bundled gem, set $EDITOR") if editor.nil? || editor.empty?
+      command = "#{editor} #{locate_gem(name)}"
+      Bundler.ui.info "Could not run '#{command}'" unless system(command)
+    end
+
     desc "version", "Prints the bundler's version information"
     def version
       Bundler.ui.info "Bundler version #{Bundler::VERSION}"
@@ -155,11 +182,17 @@ module Bundler
       FileUtils.rm_f "#{Bundler.root}/.bundle/environment.rb"
     end
 
+    def locate_gem(name)
+      spec = Bundler.load.specs.find{|s| s.name == name }
+      raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
+      spec.full_gem_path
+    end
+
     def self.printable_tasks
       tasks = super.dup
-      tasks.reject!{|t| t.first =~ /cache/ }
+      nodoc = /^bundle (cache)/
+      tasks.reject!{|t| t.first =~ nodoc }
       tasks
     end
-
   end
 end

data/lib/bundler/dsl.rb

@@ -12,14 +12,14 @@ module Bundler
       @source  = nil
       @sources = []
       @dependencies = []
-      @group = nil
+      @group = [:default]
     end
 
     def gem(name, *args)
       options = Hash === args.last ? args.pop : {}
       version = args.last || ">= 0"
-      if options[:group]
-        options[:group] = options[:group].to_sym
+      if group = options[:groups] || options[:group]
+        options[:group] = group
       end
 
       _deprecated_options(options)
@@ -55,8 +55,8 @@ module Bundler
       Definition.new(@dependencies, @sources)
     end
 
-    def group(name, options = {}, &blk)
-      old, @group = @group, name.to_sym
+    def group(*args, &blk)
+      old, @group = @group, args
       yield
     ensure
       @group = old

data/lib/bundler/environment.rb

@@ -22,7 +22,7 @@ module Bundler
     def group_spec(specs, spec, groups)
       spec.groups.concat(groups)
       spec.groups.uniq!
-      spec.bundler_dependencies.select { |d| d.type != :development }.each do |d|
+      spec.dependencies.select { |d| d.type != :development }.each do |d|
         spec = specs.find { |s| s.name == d.name }
         group_spec(specs, spec, groups)
       end

data/lib/bundler/index.rb

@@ -5,14 +5,7 @@ module Bundler
     end
 
     def self.from_cached_specs(path)
-      index = Index.new
-
-      Dir["#{path}/*.gem"].each do |gemfile|
-        spec = Gem::Format.from_file_by_path(gemfile).spec
-        index << spec
-      end
-
-      index
+      Source::GemCache.new("path" => path).specs
     end
 
     def initialize

data/lib/bundler/installer.rb

@@ -15,7 +15,10 @@ module Bundler
       # Ensure that BUNDLE_PATH exists
       FileUtils.mkdir_p(Bundler.bundle_path)
 
-      specs.sort_by { |s| s.name }.each do |spec|
+      # Must install gems in the order that the resolver provides
+      # as dependencies might actually affect the installation of
+      # the gem.
+      specs.each do |spec|
         spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
 
         if spec.groups & Bundler.settings.without == spec.groups
@@ -68,9 +71,8 @@ module Bundler
 
       # Simple logic for now. Can improve later.
       specs.length == actual_dependencies.length && specs
-    rescue Bundler::GemNotFound
+    rescue GemNotFound, PathError => e
       nil
-      raise if ENV["OMG"]
     end
 
     def resolve_remotely
@@ -100,10 +102,11 @@ module Bundler
         other_sources.each do |source|
           i = source.specs
           Bundler.ui.debug "Source: Processing index"
-          index = i.merge(index).freeze
+          index = i.merge(index)
         end
 
         index = Index.from_installed_gems.merge(index)
+        index = Index.from_cached_specs("#{Bundler.bundle_path}/cache").merge(index)
 
         if File.directory?("#{root}/vendor/cache")
           index = cache_source.specs.merge(index)
@@ -128,11 +131,13 @@ module Bundler
           index = source.local_specs.merge(index)
         end
 
+        index = Index.from_installed_gems.merge(index)
+
         if File.directory?("#{root}/vendor/cache")
           index = cache_source.specs.merge(index).freeze
         end
 
-        Index.from_installed_gems.merge(index)
+        Index.from_cached_specs("#{Bundler.bundle_path}/cache").merge(index)
       end
     end
 

data/lib/bundler/remote_specification.rb

@@ -34,13 +34,6 @@ module Bundler
 
   private
 
-    def _remote_uri
-      # "#{@source_uri}/quick/Marshal.4.8/#{@name}-#{@version}.gemspec.rz"
-      tuple = [@name, @version, @platform]
-      tuple = tuple - [nil, 'ruby', '']
-      "#{@source_uri}/quick/Marshal.4.8/#{tuple.join("-")}.gemspec.rz"
-    end
-
     def _remote_specification
       @specification ||= begin
         Gem::SpecFetcher.new.fetch_spec([@name, @version, @platform], URI(@source_uri.to_s))

data/lib/bundler/resolver.rb

@@ -53,19 +53,13 @@ module Bundler
         nil
       end
       if result
-        # Order gems in order of dependencies. Every gem's dependency is at
-        # a smaller index in the array.
+        # Dependency ordering was busted anyway. This will be revisted in 0.10
         ordered = []
-        result.values.each do |spec1|
-          index = nil
-          place = ordered.detect do |spec2|
-            spec1.bundler_dependencies.any? { |d| d.name == spec2.name }
-          end
-          place ?
-            ordered.insert(ordered.index(place), spec1) :
-            ordered << spec1
-        end
-        ordered.reverse
+        ordered << result['rake']
+        ordered.concat result.values
+        ordered.compact!
+        ordered.uniq!
+        ordered
       end
     end
 
@@ -204,7 +198,7 @@ module Bundler
       # Now, we have to loop through all child dependencies and add them to our
       # array of requirements.
       debug { "    Dependencies"}
-      spec.bundler_dependencies.each do |dep|
+      spec.dependencies.each do |dep|
         next if dep.type == :development
         debug { "    * #{dep.name} (#{dep.requirement})" }
         dep.required_by.replace(requirement.required_by)

data/lib/bundler/rubygems_ext.rb

@@ -16,21 +16,15 @@ module Gem
     def groups
       @groups ||= []
     end
-
-    def bundler_dependencies
-      original = dependencies
-      original << Dependency.new("rake", ">= 0") if implicit_rake_dependency?
-      original
-    end
-
-  private
-
-    def implicit_rake_dependency?
-      extensions.any? { |e| e =~ /rakefile|mkrf_conf/i }
-    end
   end
 
   class Dependency
     attr_accessor :source, :groups
+
+    alias :to_yaml_properties_before_crazy to_yaml_properties
+
+    def to_yaml_properties
+      to_yaml_properties_before_crazy.reject { |p| ["@source", "@groups"].include?(p.to_s) }
+    end
   end
 end

data/lib/bundler/source.rb

@@ -107,9 +107,15 @@ module Bundler
 
       def specs
         @specs ||= begin
-          specs = Index.from_cached_specs(@path)
-          specs.each { |s| s.source = self }
-          specs
+          index = Index.new
+
+          Dir["#{@path}/*.gem"].each do |gemfile|
+            spec = Gem::Format.from_file_by_path(gemfile).spec
+            spec.source = self
+            index << spec
+          end
+
+          index
         end
       end
 
@@ -161,7 +167,7 @@ module Bundler
           Dir["#{path}/#{@glob}"].each do |file|
             file = Pathname.new(file)
             # Eval the gemspec from its parent directory
-            if spec = Dir.chdir(file.dirname) { eval(File.read(file.basename)) }
+            if spec = Dir.chdir(file.dirname) { eval(File.read(file.basename), binding, file.expand_path.to_s) }
               spec = Specification.from_gemspec(spec)
               spec.loaded_from = file.to_s
               spec.source = self
@@ -170,6 +176,8 @@ module Bundler
           end
 
           index << default_spec if default_spec && index.empty?
+        else
+          raise PathError, "The path `#{path}` does not exist."
         end
 
         index.freeze
@@ -211,9 +219,9 @@ module Bundler
                         "This prevents bundler from installing bins or native extensions, but " \
                         "that may not affect its functionality."
 
-        if !spec.extensions.empty? && !spec.emails.empty?
+        if !spec.extensions.empty? && !spec.email.empty?
           Bundler.ui.warn "If you need to use this package without installing it from a gem " \
-                          "repository, please contact #{spec.emails.join(", or ")} and ask them " \
+                          "repository, please contact #{spec.email} and ask them " \
                           "to modify their .gemspec so it can work with `gem build`."
         end
 
@@ -228,7 +236,7 @@ module Bundler
       def initialize(options)
         super
         @uri  = options["uri"]
-        @ref  = options["ref"] || options["branch"] || 'master'
+        @ref  = options["ref"] || options["branch"] || options["tag"] || 'master'
       end
 
       def to_s
@@ -265,6 +273,12 @@ module Bundler
         checkout
       end
 
+      def load_spec_files
+        super
+      rescue PathError
+        raise PathError, "#{to_s} is not checked out. Please run `bundle install`"
+      end
+
     private
 
       def git(command)
@@ -276,7 +290,7 @@ module Bundler
       end
 
       def base_name
-        File.basename(uri, ".git")
+        File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)},''), ".git")
       end
 
       def uri_hash
@@ -308,7 +322,7 @@ module Bundler
 
       def checkout
         unless File.exist?("#{path}/.git")
-          %x(git clone --no-checkout #{cache_path} #{path})
+          %x(git clone --no-checkout file://#{cache_path} #{path})
         end
         Dir.chdir(path) do
           git "fetch --quiet"

data/lib/bundler/templates/environment.erb

@@ -42,7 +42,7 @@ module Bundler
   def self.require(*groups)
     groups = [:default] if groups.empty?
     groups.each do |group|
-      (AUTOREQUIRES[group] || []).each do |file, explicit|
+      (AUTOREQUIRES[group.to_sym] || []).each do |file, explicit|
         if explicit
           Kernel.require file
         else

data/lib/bundler/vendor/thor/invocation.rb

@@ -119,6 +119,11 @@ class Thor
       end
     end
 
+    # Invokes using shell padding.
+    def invoke_with_padding(*args)
+      with_padding { invoke(*args) }
+    end
+
     protected
 
       # Configuration values that are shared between invocations.

data/lib/bundler/vendor/thor/parser/arguments.rb

@@ -51,6 +51,10 @@ class Thor
 
     private
 
+      def last?
+        @pile.empty?
+      end
+
       def peek
         @pile.first
       end

data/lib/bundler/vendor/thor/parser/options.rb

@@ -3,9 +3,9 @@ class Thor
   # under Ruby's license.
   #
   class Options < Arguments #:nodoc:
-    LONG_RE     = /^(--\w+[-\w+]*)$/
+    LONG_RE     = /^(--\w+(?:-\w+)*)$/
     SHORT_RE    = /^(-[a-z])$/i
-    EQ_RE       = /^(--\w+[-\w+]*|-[a-z])=(.*)$/i
+    EQ_RE       = /^(--\w+(?:-\w+)*|-[a-z])=(.*)$/i
     SHORT_SQ_RE = /^-([a-z]{2,})$/i # Allow either -x -v or -xv style for single char args
     SHORT_NUM   = /^(-[a-z])#{NUMERIC}$/i
 
@@ -68,7 +68,7 @@ class Thor
           switch = normalize_switch(switch)
           option = switch_option(switch)
           @assigns[option.human_name] = parse_peek(switch, option)
-        elsif peek =~ /^\-/
+        elsif current_is_switch_formatted?
           @unknown << shift
         else
           shift
@@ -99,6 +99,19 @@ class Thor
         end
       end
 
+      def switch_formatted?(arg)
+        case arg
+        when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM, SHORT_SQ_RE
+          true
+        else
+          false
+        end
+      end
+
+      def current_is_switch_formatted?
+        switch_formatted? peek
+      end
+
       def switch?(arg)
         switch_option(arg) || @shorts.key?(arg)
       end
@@ -135,13 +148,14 @@ class Thor
       # Parse the value at the peek analyzing if it requires an input or not.
       #
       def parse_peek(switch, option)
-        unless current_is_value?
+        if current_is_switch_formatted? || last?
           if option.boolean?
             # No problem for boolean types
           elsif no_or_skip?(switch)
             return nil # User set value to nil
           elsif option.string? && !option.required?
-            return option.human_name # Return the option name
+            # Return the default if there is one, else the human name
+            return option.default || option.human_name
           else
             raise MalformattedArgumentError, "No value provided for option '#{switch}'"
           end

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

@@ -45,19 +45,16 @@ class Thor
 
     # Holds the shell for the given Thor instance. If no shell is given,
     # it gets a default shell from Thor::Base.shell.
-    #
     def shell
       @shell ||= Thor::Base.shell.new
     end
 
     # Sets the shell for this thor class.
-    #
     def shell=(shell)
       @shell = shell
     end
 
     # Common methods that are delegated to the shell.
-    #
     SHELL_DELEGATED_METHODS.each do |method|
       module_eval <<-METHOD, __FILE__, __LINE__
         def #{method}(*args)
@@ -66,6 +63,14 @@ class Thor
       METHOD
     end
 
+    # Yields the given block with padding.
+    def with_padding
+      shell.padding += 1
+      yield
+    ensure
+      shell.padding -= 1
+    end
+
     protected
 
       # Allow shell to be shared between invocations.

data/lib/bundler/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.13.3".freeze
+  VERSION = "0.13.4".freeze
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Carl Lerche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -08:00
+date: 2010-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -70,6 +70,7 @@ files:
 - lib/bundler.rb
 - LICENSE
 - README.markdown
+- ROADMAP.textile
 has_rdoc: true
 homepage: http://github.com/carlhuda/bundler
 licenses: []