bundler 1.0.0.beta.1 → 1.0.0.beta.2

data/README.md

@@ -1,4 +1,4 @@
-### Note: the master branch is currently unstable while 0.10 is being worked on.<br>The current stable version of bundler is in the branch named `v0.9`.
+### Note: the master branch is currently unstable while 1.0 is in beta.<br>The current stable version of bundler is in the branch named `v0.9`.
 
 ## Bundler : A gem to bundle gems
 

data/lib/bundler.rb

@@ -40,7 +40,6 @@ module Bundler
   class GemfileNotFound  < BundlerError; status_code(10) ; end
   class GemNotFound      < BundlerError; status_code(7)  ; 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 GemspecError     < BundlerError; status_code(14) ; end
@@ -93,7 +92,7 @@ module Bundler
     end
 
     def setup(*groups)
-      return @setup if @setup
+      return @setup if defined?(@setup) && @setup
 
       if groups.empty?
         # Load all groups, but only once

data/lib/bundler/cli.rb

@@ -89,6 +89,10 @@ module Bundler
       "Don't remove stale gems from the cache."
     method_option "no-cache", :type => :boolean, :banner =>
       "Don't update the existing gem cache."
+    method_option "quiet", :type => :boolean, :banner =>
+      "Only output warnings and errors."
+    method_option "local", :type => :boolean, :banner =>
+      "Do not attempt to fetch gems remotely and use the gem cache instead"
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
@@ -99,6 +103,7 @@ module Bundler
       Bundler.settings[:path] = path if path
       Bundler.settings[:disable_shared_gems] = '1' if options["disable-shared-gems"] || path
       Bundler.settings.without = opts[:without]
+      Bundler.ui.be_quiet! if opts[:quiet]
 
       Installer.install(Bundler.root, Bundler.definition, opts)
       cache if Bundler.root.join("vendor/cache").exist?
@@ -129,6 +134,9 @@ module Bundler
       end
 
       Installer.install Bundler.root, Bundler.definition
+      cache if Bundler.root.join("vendor/cache").exist?
+      Bundler.ui.confirm "Your bundle is updated! " +
+        "Use `bundle show [gemname]` to see where a bundled gem is installed."
     end
 
     desc "lock", "Locks the bundle to the current set of dependencies, including all child dependencies."
@@ -249,9 +257,14 @@ module Bundler
     map %w(-v --version) => :version
 
     desc 'viz', "Generates a visual dependency graph"
-    method_option :file, :type => :string, :default => 'gem_graph.png', :aliases => '-f', :banner => "Show the version with each gem name."
-    method_option :version, :type => :boolean, :default => false, :aliases => '-v', :banner => "Show the version with each gem name."
-    method_option :requirements, :type => :boolean, :default => false, :aliases => '-r', :banner => "Show the requirement for each dependency."
+    long_desc <<-D
+      Viz generates a PNG file of the current Gemfile as a dependency graph.
+      Viz requires the ruby-graphviz gem (and its dependencies).
+      The associated gems must also be installed via 'bundle install'.
+    D
+    method_option :file, :type => :string, :default => 'gem_graph.png', :aliases => '-f', :banner => "The name to use for the generated png file."
+    method_option :version, :type => :boolean, :default => false, :aliases => '-v', :banner => "Set to show each gem version."
+    method_option :requirements, :type => :boolean, :default => false, :aliases => '-r', :banner => "Set to show the version of each required dependency."
     def viz
       output_file = File.expand_path(options[:file])
       graph = Graph.new( Bundler.load )

data/lib/bundler/definition.rb

@@ -32,6 +32,7 @@ module Bundler
 
     def initialize(lockfile, dependencies, sources, unlock)
       @dependencies, @sources, @unlock = dependencies, sources, unlock
+      @remote = false
       @specs = nil
       @unlock[:gems] ||= []
       @unlock[:sources] ||= []
@@ -55,8 +56,15 @@ module Bundler
       converge
     end
 
+    def resolve_with_cache!
+      raise "Specs already loaded" if @specs
+      @sources.each { |s| s.cached! }
+      specs
+    end
+
     def resolve_remotely!
       raise "Specs already loaded" if @specs
+      @remote = true
       @sources.each { |s| s.remote! }
       specs
     end
@@ -101,7 +109,7 @@ module Bundler
           end
 
           # Run a resolve against the locally available gems
-          Resolver.resolve(expanded_dependencies, index, source_requirements, @last_resolve)
+          @last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, @last_resolve)
         end
       end
     end
@@ -131,8 +139,9 @@ module Bundler
         # Find all specs for this source
         resolve.
           select  { |s| s.source == source }.
-          sort_by { |s| [s.name, s.platform.to_s == 'ruby' ? "\0" : s.platform.to_s] }.
+          sort_by { |s| s.name }.
           each do |spec|
+            next if spec.name == 'bundler'
             out << spec.to_lock
         end
         out << "\n"
@@ -195,13 +204,16 @@ module Bundler
         s.source = @sources.find { |src| s.source == src }
 
         next if s.source.nil? || @unlock[:sources].include?(s.name)
+        # If the spec is from a path source and it doesn't exist anymore
+        # then we just unlock it.
+        next if s.source.instance_of?(Source::Path) && s.source.specs[s].empty?
 
         converged << s
       end
 
       resolve = SpecSet.new(converged)
-      resolve = resolve.for(expand_dependencies(deps), @unlock[:gems])
-      @last_resolve.select!(resolve.names)
+      resolve = resolve.for(expand_dependencies(deps, true), @unlock[:gems])
+      @last_resolve = resolve
     end
 
     def in_locked_deps?(dep)
@@ -215,14 +227,14 @@ module Bundler
     end
 
     def expanded_dependencies
-      @expanded_dependencies ||= expand_dependencies(dependencies)
+      @expanded_dependencies ||= expand_dependencies(dependencies, @remote)
     end
 
-    def expand_dependencies(dependencies)
+    def expand_dependencies(dependencies, remote = false)
       deps = []
       dependencies.each do |dep|
         dep.gem_platforms(@platforms).each do |p|
-          deps << DepProxy.new(dep, p)
+          deps << DepProxy.new(dep, p) if remote || p == Gem::Platform.local.to_generic
         end
       end
       deps

data/lib/bundler/dsl.rb

@@ -20,6 +20,29 @@ module Bundler
       @env             = nil
     end
 
+    def gemspec(opts)
+      path              = opts && opts[:path] || '.'
+      name              = opts && opts[:name] || '*'
+      development_group = opts && opts[:development_group] || :development
+      gemspecs = Dir[File.join(path, "#{name}.gemspec")]
+      case gemspecs.size
+      when 1
+        spec = Gem::Specification.load(gemspecs.first)
+        spec.runtime_dependencies.each do |dep|
+          gem dep.name, dep.requirement.to_s
+        end
+        group(development_group) do
+          spec.development_dependencies.each do |dep|
+            gem dep.name, dep.requirement.to_s
+          end
+        end
+      when 0
+        raise InvalidOption, "There are no gemspecs at #{path}."
+      else
+        raise InvalidOption, "There are multiple gemspecs at #{path}. Please use the :name option to specify which one."
+      end
+    end
+
     def gem(name, *args)
       options = Hash === args.last ? args.pop : {}
       version = args.last || ">= 0"

data/lib/bundler/index.rb

@@ -1,5 +1,7 @@
 module Bundler
   class Index
+    include Enumerable
+
     def self.build
       i = new
       yield i
@@ -31,8 +33,8 @@ module Bundler
       end
     end
 
-    def search_for_all_platforms(dependency)
-      specs = @specs[dependency.name]
+    def search_for_all_platforms(dependency, base = [])
+      specs = @specs[dependency.name] + base
 
       wants_prerelease = dependency.requirement.prerelease?
       only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
@@ -79,6 +81,12 @@ module Bundler
       self
     end
 
+    def ==(o)
+      all? do |s|
+        s2 = o[s].first and (s.dependencies & s2.dependencies).empty?
+      end
+    end
+
   private
 
     def search_by_spec(spec)

data/lib/bundler/installer.rb

@@ -16,7 +16,9 @@ module Bundler
 
       # Since we are installing, we can resolve the definition
       # using remote specs
-      @definition.resolve_remotely!
+      options["local"] ?
+        @definition.resolve_with_cache! :
+        @definition.resolve_remotely!
 
       # Ensure that BUNDLE_PATH exists
       FileUtils.mkdir_p(Bundler.bundle_path)

data/lib/bundler/lazy_specification.rb

@@ -45,7 +45,7 @@ module Bundler
     end
 
     def __materialize__
-      @specification = source[self]
+      @specification = source.specs.search(Gem::Dependency.new(name, version)).last
     end
 
     def respond_to?(*args)

data/lib/bundler/resolver.rb

@@ -49,11 +49,16 @@ module Bundler
 
       def to_specs
         specs = {}
-        each do |s|
-          next if specs[s.platform]
-          lazy_spec = LazySpecification.new(s.name, s.version, s.platform, s.source)
-          lazy_spec.dependencies.replace s.dependencies
-          specs[s.platform] = lazy_spec
+
+        @activated.each do |p|
+          if s = @specs[p]
+            platform = Gem::Platform.new(s.platform).to_generic
+            next if specs[platform]
+
+            lazy_spec = LazySpecification.new(name, version, platform, source)
+            lazy_spec.dependencies.replace s.dependencies
+            specs[platform] = lazy_spec
+          end
         end
         specs.values
       end
@@ -125,11 +130,12 @@ module Bundler
     end
 
     def initialize(index, source_requirements, base)
-      @errors = {}
-      @stack  = []
-      @base   = base
-      @index  = index
-      @source_requirements = source_requirements
+      @errors               = {}
+      @stack                = []
+      @base                 = base
+      @index                = index
+      @missing_gems         = Hash.new(0)
+      @source_requirements  = source_requirements
     end
 
     def debug
@@ -145,7 +151,7 @@ module Bundler
     end
 
     def start(reqs)
-      activated    = {}
+      activated = {}
 
       resolve(reqs, activated)
     end
@@ -184,6 +190,7 @@ module Bundler
       if existing = activated[current.name] or current.name == 'bundler'
         # Force the current
         if current.name == 'bundler' && !existing
+          # TODO: handle existing still == nil
           existing = search(DepProxy.new(Gem::Dependency.new('bundler', VERSION), Gem::Platform::RUBY)).first
           activated[current.name] = existing
         end
@@ -259,6 +266,17 @@ module Bundler
             end
             raise GemNotFound, message
           else
+            if @missing_gems[current] >= 5
+              msg = "When trying to resolve #{current.required_by.last}, \n" \
+                    "Bundler could not find its dependency \n" \
+                    "#{current} in any source\n"
+
+              raise Bundler::GemNotFound, msg
+            end
+
+            @missing_gems[current] += 1
+
+            debug { "    Could not find #{current} by #{current.required_by.last}" }
             @errors[current.name] = [nil, current]
           end
         end
@@ -291,8 +309,8 @@ module Bundler
       spec_group.required_by << requirement
 
       activated[spec_group.name] = spec_group
-      debug { "  Activating: #{spec.name} (#{spec.version})" }
-      debug { spec.required_by.map { |d| "    * #{d.name} (#{d.requirement})" }.join("\n") }
+      debug { "  Activating: #{spec_group.name} (#{spec_group.version})" }
+      debug { spec_group.required_by.map { |d| "    * #{d.name} (#{d.requirement})" }.join("\n") }
 
       dependencies = spec_group.activate_platform(requirement.__platform)
 
@@ -323,12 +341,13 @@ module Bundler
     end
 
     def search(dep)
-      results = @base[dep.name]
-
-      if results.empty?
-        index = @source_requirements[dep.name] || @index
-        results = index.search_for_all_platforms(dep.dep)
+      if base = @base[dep.name] and base.any?
+        d = Gem::Dependency.new(base.first.name, base.first.version)
+      else
+        d = dep.dep
       end
+      index = @source_requirements[d.name] || @index
+      results = index.search_for_all_platforms(d, @base[d.name])
 
       if results.any?
         version = results.first.version

data/lib/bundler/runtime.rb

@@ -20,7 +20,15 @@ module Bundler
       # Activate the specs
       specs.each do |spec|
         unless spec.loaded_from
-          raise GemNotFound, "#{spec.full_name} is cached, but not installed."
+          raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it."
+        end
+
+        if activated_spec = Gem.loaded_specs[spec.name] and activated_spec.version != spec.version
+          e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
+                                 "but your Gemfile requires #{spec.name} #{spec.version}. Consider using bundle exec."
+          e.name = spec.name
+          e.version_requirement = Gem::Requirement.new(spec.version.to_s)
+          raise e
         end
 
         Gem.loaded_specs[spec.name] = spec

data/lib/bundler/source.rb

@@ -15,8 +15,8 @@ module Bundler
         @options = options
         @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) }
         @allow_remote = false
+        @allow_cached = false
         # Hardcode the paths for now
-        @installed = {}
         @caches = [ Bundler.app_cache ] + Gem.path.map { |p| File.expand_path("#{p}/cache") }
         @spec_fetch_map = {}
       end
@@ -25,11 +25,8 @@ module Bundler
         @allow_remote = true
       end
 
-      def [](spec)
-        installed_specs[spec].first ||
-        @allow_remote && (
-          cached_specs[spec].first  ||
-          remote_specs[spec].first)
+      def cached!
+        @allow_cached = true
       end
 
       def hash
@@ -70,7 +67,7 @@ module Bundler
       end
 
       def specs
-        @specs ||= @allow_remote ? fetch_specs : installed_specs
+        @specs ||= fetch_specs
       end
 
       def fetch(spec)
@@ -81,13 +78,13 @@ module Bundler
       def install(spec)
         path = cached_gem(spec)
 
-        if @installed[spec.full_name]
+        if installed_specs[spec].any?
           Bundler.ui.info "Using #{spec.name} (#{spec.version}) "
           return
-        else
-          Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
         end
 
+        Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
+
         install_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir
         installer = Gem::Installer.new path,
           :install_dir         => install_path,
@@ -141,8 +138,8 @@ module Bundler
       def fetch_specs
         Index.build do |idx|
           idx.use installed_specs
-          idx.use cached_specs
-          idx.use remote_specs
+          idx.use cached_specs if @allow_cached
+          idx.use remote_specs if @allow_remote
         end
       end
 
@@ -150,10 +147,20 @@ module Bundler
         @installed_specs ||= begin
           idx = Index.new
           Gem::SourceIndex.from_installed_gems.to_a.reverse.each do |name, spec|
-            @installed[spec.full_name] = true
+            next if name == 'bundler'
             spec.source = self
             idx << spec
           end
+          # Always have bundler locally
+          bundler = Gem::Specification.new do |s|
+            s.name     = 'bundler'
+            s.version  = VERSION
+            s.platform = Gem::Platform::RUBY
+            s.source   = self
+            # TODO: Remove this
+            s.loaded_from = 'w0t'
+          end
+          idx << bundler
           idx
         end
       end
@@ -163,6 +170,7 @@ module Bundler
           idx = Index.new
           @caches.each do |path|
             Dir["#{path}/*.gem"].each do |gemfile|
+              next if name == 'bundler'
               s = Gem::Format.from_file_by_path(gemfile).spec
               s.source = self
               idx << s
@@ -183,6 +191,7 @@ module Bundler
             Gem.sources = ["#{uri}"]
             fetch_all_remote_specs do |n,v|
               v.each do |name, version, platform|
+                next if name == 'bundler'
                 spec = RemoteSpecification.new(name, version, platform, uri)
                 spec.source = self
                 # Temporary hack until this can be figured out better
@@ -237,7 +246,7 @@ module Bundler
     class Path
       attr_reader :path, :options
       # Kind of a hack, but needed for the lock file parser
-      attr_accessor :name, :version
+      attr_accessor :version
 
       DEFAULT_GLOB = "{,*/}*.gemspec"
 
@@ -245,6 +254,7 @@ module Bundler
         @options = options
         @glob = options["glob"] || DEFAULT_GLOB
 
+        @allow_cached = false
         @allow_remote = false
 
         if options["path"]
@@ -259,6 +269,10 @@ module Bundler
         @allow_remote = true
       end
 
+      def cached!
+        @allow_cached = true
+      end
+
       def self.from_lock(options)
         new(options.merge("path" => options.delete("remote")))
       end
@@ -340,10 +354,6 @@ module Bundler
         index
       end
 
-      def [](spec)
-        specs[spec].first
-      end
-
       def local_specs
         @local_specs ||= load_spec_files
       end
@@ -484,8 +494,9 @@ module Bundler
         @revision = nil
       end
 
+      # TODO: actually cache git specs
       def specs
-        if @allow_remote && !@update
+        if (@allow_remote || @allow_cached) && !@update
         # Start by making sure the git cache is up to date
           cache
           checkout
@@ -506,7 +517,7 @@ module Bundler
       end
 
       def load_spec_files
-        super
+        super if cache_path.exist?
       rescue PathError
         raise PathError, "#{to_s} is not checked out. Please run `bundle install`"
       end

data/lib/bundler/spec_set.rb

@@ -79,16 +79,8 @@ module Bundler
       SpecSet.new(materialized.compact)
     end
 
-    def names
-      lookup.keys
-    end
-
-    def select!(names)
-      @lookup = nil
-      @sorted = nil
-
-      @specs.delete_if { |s| !names.include?(s.name) }
-      self
+    def merge(set)
+      SpecSet.new(sorted + set.to_a)
     end
 
   private

data/lib/bundler/ui.rb

@@ -15,18 +15,19 @@ module Bundler
     class Shell < UI
       def initialize(shell)
         @shell = shell
+        @quiet = false
       end
 
       def debug(msg)
-        @shell.say(msg) if ENV['DEBUG']
+        @shell.say(msg) if ENV['DEBUG'] && !@quiet
       end
 
       def info(msg)
-        @shell.say(msg)
+        @shell.say(msg) if !@quiet
       end
 
       def confirm(msg)
-        @shell.say(msg, :green)
+        @shell.say(msg, :green) if !@quiet
       end
 
       def warn(msg)
@@ -36,6 +37,10 @@ module Bundler
       def error(msg)
         @shell.say(msg, :red)
       end
+
+      def be_quiet!
+        @quiet = true
+      end
     end
 
     class RGProxy < Gem::SilentUI
@@ -52,4 +57,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/version.rb

@@ -1,3 +1,6 @@
 module Bundler
-  VERSION = "1.0.0.beta.1"
+  # 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.2" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 1
-  version: 1.0.0.beta.1
+  - 2
+  version: 1.0.0.beta.2
 platform: ruby
 authors: 
 - Carl Lerche
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency