bundler 0.9.26 → 1.0.0.beta.1

data/lib/bundler/definition.rb

@@ -2,74 +2,243 @@ require "digest/sha1"
 
 module Bundler
   class Definition
-    def self.from_gemfile(gemfile)
+    attr_reader :dependencies, :platforms
+
+    def self.build(gemfile, lockfile, unlock)
+      unlock ||= {}
       gemfile = Pathname.new(gemfile).expand_path
 
       unless gemfile.file?
         raise GemfileNotFound, "#{gemfile} not found"
       end
 
-      Dsl.evaluate(gemfile)
+      # TODO: move this back into DSL
+      builder = Dsl.new
+      builder.instance_eval(File.read(gemfile.to_s), gemfile.to_s, 1)
+      builder.to_definition(lockfile, unlock)
     end
 
-    def self.from_lock(lockfile)
-      begin
-        locked_definition = Locked.new(YAML.load_file(lockfile))
-      rescue ArgumentError
-        raise GemfileError, "Your Gemfile.lock was generated by Bundler 0.10.\n" +
-          "You must delete it if you wish to use Bundler 0.9."
+=begin
+    How does the new system work?
+    ===
+    * Load information from Gemfile and Lockfile
+    * Invalidate stale locked specs
+      * All specs from stale source are stale
+      * All specs that are reachable only through a stale
+        dependency are stale.
+    * If all fresh dependencies are satisfied by the locked
+      specs, then we can try to resolve locally.
+=end
+
+    def initialize(lockfile, dependencies, sources, unlock)
+      @dependencies, @sources, @unlock = dependencies, sources, unlock
+      @specs = nil
+      @unlock[:gems] ||= []
+      @unlock[:sources] ||= []
+
+      if lockfile && File.exists?(lockfile)
+        locked = LockfileParser.new(File.read(lockfile))
+        @platforms      = locked.platforms
+        @locked_deps    = locked.dependencies
+        @last_resolve   = SpecSet.new(locked.specs)
+        @locked_sources = locked.sources
+      else
+        @platforms      = []
+        @locked_deps    = []
+        @last_resolve   = SpecSet.new([])
+        @locked_sources = []
       end
 
-      hash = Digest::SHA1.hexdigest(File.read("#{Bundler.root}/Gemfile"))
-      unless locked_definition.hash == hash
-        raise GemfileChanged, "You changed your Gemfile after locking. Please relock using `bundle lock`"
+      current_platform = Gem.platforms.map { |p| p.to_generic }.compact.last
+      @platforms |= [current_platform]
+
+      converge
+    end
+
+    def resolve_remotely!
+      raise "Specs already loaded" if @specs
+      @sources.each { |s| s.remote! }
+      specs
+    end
+
+    def specs
+      @specs ||= resolve.materialize(requested_dependencies)
+    end
+
+    def missing_specs
+      missing = []
+      resolve.materialize(requested_dependencies, missing)
+      missing
+    end
+
+    def requested_specs
+      @requested_specs ||= begin
+        groups = self.groups - Bundler.settings.without
+        groups.map! { |g| g.to_sym }
+        specs_for(groups)
       end
+    end
+
+    def current_dependencies
+      dependencies.reject { |d| !d.should_include? }
+    end
 
-      locked_definition
+    def specs_for(groups)
+      deps = dependencies.select { |d| (d.groups & groups).any? }
+      deps.delete_if { |d| !d.should_include? }
+      specs.for(expand_dependencies(deps))
     end
 
-    attr_reader :dependencies, :sources
+    def resolve
+      @resolve ||= begin
+        if @last_resolve.valid_for?(expanded_dependencies)
+          @last_resolve
+        else
+          source_requirements = {}
+          dependencies.each do |dep|
+            next unless dep.source
+            source_requirements[dep.name] = dep.source.specs
+          end
 
-    alias actual_dependencies dependencies
+          # Run a resolve against the locally available gems
+          Resolver.resolve(expanded_dependencies, index, source_requirements, @last_resolve)
+        end
+      end
+    end
+
+    def index
+      @index ||= Index.build do |idx|
+        @sources.each do |s|
+          idx.use s.specs
+        end
+      end
+    end
 
-    def initialize(dependencies, sources)
-      @dependencies = dependencies
-      @sources = sources
+    def no_sources?
+      @sources.length == 1 && @sources.first.remotes.empty?
     end
 
     def groups
       dependencies.map { |d| d.groups }.flatten.uniq
     end
 
-    class Locked < Definition
-      def initialize(details)
-        @details = details
+    def to_lock
+      out = ""
+
+      sorted_sources.each do |source|
+        # Add the source header
+        out << source.to_lock
+        # 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] }.
+          each do |spec|
+            out << spec.to_lock
+        end
+        out << "\n"
+      end
+
+      out << "PLATFORMS\n"
+
+      platforms.map { |p| p.to_s }.sort.each do |p|
+        out << "  #{p}\n"
+      end
+
+      out << "\n"
+      out << "DEPENDENCIES\n"
+
+      dependencies.
+        sort_by { |d| d.name }.
+        each do |dep|
+          out << dep.to_lock
       end
 
-      def hash
-        @details["hash"]
+      out
+    end
+
+  private
+
+    def converge
+      converge_sources
+      converge_dependencies
+      converge_locked_specs
+    end
+
+    def converge_sources
+      @sources = (@locked_sources & @sources) | @sources
+      @sources.each do |source|
+        source.unlock! if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
       end
+    end
 
-      def sources
-        @sources ||= @details["sources"].map do |args|
-          name, options = args.to_a.flatten
-          Bundler::Source.const_get(name).new(options)
+    def converge_dependencies
+      (@dependencies + @locked_deps).each do |dep|
+        if dep.source
+          source = @sources.find { |s| dep.source == s }
+          raise "Something went wrong, there is no matching source" unless source
+          dep.source = source
         end
       end
+    end
 
-      def actual_dependencies
-        @actual_dependencies ||= @details["specs"].map do |args|
-          name, details = args.to_a.flatten
-          details["source"] = sources[details["source"]] if details.include?("source")
-          Bundler::Dependency.new(name, details.delete("version"), details)
+    def converge_locked_specs
+      deps = []
+
+      @dependencies.each do |dep|
+        if in_locked_deps?(dep) || satisfies_locked_spec?(dep)
+          deps << dep
         end
       end
 
-      def dependencies
-        @dependencies ||= @details["dependencies"].map do |dep, opts|
-          Bundler::Dependency.new(dep, opts.delete("version"), opts)
+      converged = []
+      @last_resolve.each do |s|
+        s.source = @sources.find { |src| s.source == src }
+
+        next if s.source.nil? || @unlock[:sources].include?(s.name)
+
+        converged << s
+      end
+
+      resolve = SpecSet.new(converged)
+      resolve = resolve.for(expand_dependencies(deps), @unlock[:gems])
+      @last_resolve.select!(resolve.names)
+    end
+
+    def in_locked_deps?(dep)
+      @locked_deps.any? do |d|
+        dep == d && dep.source == d.source
+      end
+    end
+
+    def satisfies_locked_spec?(dep)
+      @last_resolve.any? { |s| s.satisfies?(dep) }
+    end
+
+    def expanded_dependencies
+      @expanded_dependencies ||= expand_dependencies(dependencies)
+    end
+
+    def expand_dependencies(dependencies)
+      deps = []
+      dependencies.each do |dep|
+        dep.gem_platforms(@platforms).each do |p|
+          deps << DepProxy.new(dep, p)
         end
       end
+      deps
+    end
+
+    def sorted_sources
+      @sources.sort_by do |s|
+        # Place GEM at the top
+        [ s.is_a?(Source::Rubygems) ? 1 : 0, s.to_s ]
+      end
+    end
+
+    def requested_dependencies
+      groups = self.groups - Bundler.settings.without
+      groups.map! { |g| g.to_sym }
+      dependencies.reject { |d| !d.should_include? || (d.groups & groups).empty? }
     end
   end
 end

data/lib/bundler/dependency.rb

@@ -5,6 +5,15 @@ module Bundler
   class Dependency < Gem::Dependency
     attr_reader :autorequire
     attr_reader :groups
+    attr_reader :platforms
+
+    PLATFORM_MAP = {
+      :ruby    => Gem::Platform::RUBY,
+      :ruby_18 => Gem::Platform::RUBY,
+      :ruby_19 => Gem::Platform::RUBY,
+      :jruby   => Gem::Platform::JAVA,
+      :mswin   => Gem::Platform::MSWIN
+    }
 
     def initialize(name, version, options = {}, &blk)
       super(name, version)
@@ -12,10 +21,78 @@ module Bundler
       @autorequire = nil
       @groups      = Array(options["group"] || :default).map { |g| g.to_sym }
       @source      = options["source"]
+      @platforms   = Array(options["platforms"])
+      @env         = options["env"]
 
       if options.key?('require')
         @autorequire = Array(options['require'] || [])
       end
     end
+
+    def gem_platforms(valid_platforms)
+      return valid_platforms if @platforms.empty?
+
+      platforms = []
+      @platforms.each do |p|
+        platform = PLATFORM_MAP[p]
+        next unless valid_platforms.include?(platform)
+        platforms |= [platform]
+      end
+      platforms
+    end
+
+    def should_include?
+      current_env? && current_platform?
+    end
+
+    def current_env?
+      return true unless @env
+      if Hash === @env
+        @env.all? do |key, val|
+          ENV[key.to_s] && (String === val ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
+        end
+      else
+        ENV[@env.to_s]
+      end
+    end
+
+    def current_platform?
+      return true if @platforms.empty?
+      @platforms.any? { |p| send("#{p}?") }
+    end
+
+    def to_lock
+      out = "  #{name}"
+
+      unless requirement == Gem::Requirement.default
+        out << " (#{requirement.to_s})"
+      end
+
+      out << '!' if source
+
+      out << "\n"
+    end
+
+  private
+
+    def ruby?
+      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx")
+    end
+
+    def ruby_18?
+      ruby? && RUBY_VERSION < "1.9"
+    end
+
+    def ruby_19?
+      ruby? && RUBY_VERSION >= "1.9"
+    end
+
+    def jruby?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+    end
+
+    def mswin?
+      # w0t?
+    end
   end
 end

data/lib/bundler/dsl.rb

@@ -8,11 +8,16 @@ module Bundler
       builder.to_definition
     end
 
+    VALID_PLATFORMS = [:ruby_18, :ruby_19, :ruby, :jruby, :mswin]
+
     def initialize
-      @source  = nil
-      @sources = []
-      @dependencies = []
-      @group = [:default]
+      @rubygems_source = Source::Rubygems.new
+      @source          = nil
+      @sources         = []
+      @dependencies    = []
+      @groups          = []
+      @platforms       = []
+      @env             = nil
     end
 
     def gem(name, *args)
@@ -29,12 +34,16 @@ module Bundler
     end
 
     def source(source, options = {})
-      @source = case source
-      when :gemcutter, :rubygems, :rubyforge then Source::Rubygems.new("uri" => "http://gemcutter.org")
-      when String then Source::Rubygems.new("uri" => source)
-      else source
+      case source
+      when :gemcutter, :rubygems, :rubyforge then
+        rubygems_source "http://rubygems.org"
+        return
+      when String
+        rubygems_source source
+        return
       end
 
+      @source = source
       options[:prepend] ? @sources.unshift(@source) : @sources << @source
 
       yield if block_given?
@@ -51,15 +60,31 @@ module Bundler
       source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options, &blk
     end
 
-    def to_definition
-      Definition.new(@dependencies, @sources)
+    def to_definition(lockfile, unlock)
+      @sources << @rubygems_source
+      @sources.uniq!
+      Definition.new(lockfile, @dependencies, @sources, unlock)
     end
 
     def group(*args, &blk)
-      old, @group = @group, args
+      @groups.concat args
+      yield
+    ensure
+      args.each { @groups.pop }
+    end
+
+    def platforms(*platforms)
+      @platforms.concat platforms
+      yield
+    ensure
+      platforms.each { @platforms.pop }
+    end
+
+    def env(name)
+      @env, old = name, @env
       yield
     ensure
-      @group = old
+      @env = old
     end
 
     # Deprecated methods
@@ -87,6 +112,11 @@ module Bundler
 
   private
 
+    def rubygems_source(source)
+      @rubygems_source.add_remote source
+      @sources << @rubygems_source
+    end
+
     def _version?(version)
       version && Gem::Version.new(version) rescue false
     end
@@ -117,7 +147,17 @@ module Bundler
         raise InvalidOption, message
       end
 
-      group = opts.delete("group") || @group
+      groups = @groups.dup
+      groups.concat Array(opts.delete("group"))
+      groups = [:default] if groups.empty?
+
+      platforms = @platforms.dup
+      platforms.concat Array(opts.delete("platforms"))
+      platforms.map! { |p| p.to_sym }
+      platforms.each do |p|
+        next if VALID_PLATFORMS.include?(p)
+        raise DslError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}"
+      end
 
       # Normalize git and path options
       ["git", "path"].each do |type|
@@ -128,9 +168,10 @@ module Bundler
         end
       end
 
-      opts["source"] ||= @source
-
-      opts["group"] = group
+      opts["source"]  ||= @source
+      opts["env"]     ||= @env
+      opts["platforms"] = @platforms.dup
+      opts["group"]     = groups
     end
 
     def _deprecated_options(options)