bundler 0.9.0.pre4 → 0.9.0.pre5

data/README.markdown

@@ -85,7 +85,7 @@ To do this, include the following at the beginning of your code.
 
     begin
       # Require the preresolved locked set of gems.
-      require File.expand_path('../vendor/environment', __FILE__)
+      require File.expand_path('../.bundle/environment', __FILE__)
     rescue LoadError
       # Fallback on doing the resolve at runtime.
       require "rubygems"

data/bin/bundle

@@ -3,6 +3,6 @@ require 'bundler/cli'
 begin
   Bundler::CLI.start
 rescue Bundler::BundlerError => e
-  puts e.message
+  Bundler.ui.error e.message
   exit e.status_code
 end

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems'
 
 module Bundler
-  VERSION = "0.9.0.pre4"
+  VERSION = "0.9.0.pre5"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -14,6 +14,7 @@ module Bundler
   autoload :Installer,           'bundler/installer'
   autoload :RemoteSpecification, 'bundler/remote_specification'
   autoload :Resolver,            'bundler/resolver'
+  autoload :Settings,            'bundler/settings'
   autoload :Source,              'bundler/source'
   autoload :Specification,       'bundler/specification'
   autoload :UI,                  'bundler/ui'
@@ -33,13 +34,14 @@ module Bundler
   class GemNotFound     < BundlerError; status_code(7)  ; end
   class VersionConflict < BundlerError; status_code(6)  ; end
   class GemfileError    < BundlerError; status_code(4)  ; end
+  class GitError        < BundlerError; status_code(11) ; end
 
   class << self
     attr_writer :ui, :bundle_path
 
     def configure
       @configured ||= begin
-        point_gem_home(env[:bundle_path])
+        configure_gem_home_and_path
         true
       end
     end
@@ -49,7 +51,10 @@ module Bundler
     end
 
     def bundle_path
-      @bundle_path ||= Pathname.new(env[:bundle_path] || Gem.dir)
+      @bundle_path ||= begin
+        path = settings[:path] || "#{Gem.user_home}/.bundle"
+        Pathname.new(path).expand_path(root)
+      end
     end
 
     def setup(*groups)
@@ -89,6 +94,10 @@ module Bundler
       default_gemfile.dirname
     end
 
+    def settings
+      @settings ||= Settings.new(root)
+    end
+
   private
 
     def default_gemfile
@@ -103,22 +112,16 @@ module Bundler
       raise GemfileNotFound, "The default Gemfile was not found"
     end
 
-    def env
-      @env ||= begin
-        env    = {}
-        file   = "#{root}/.bundleconfig"
-        config = File.exist?(file) ? YAML.load_file(file) : {}
-        %w(BUNDLE_PATH).each do |key|
-          env[key.downcase.to_sym] = config[key] || ENV[key]
-        end
-        env
+    def configure_gem_home_and_path
+      if path = settings[:path]
+        ENV['GEM_HOME'] = File.expand_path(path, root)
+        ENV['GEM_PATH'] = ''
+      else
+        gem_home, gem_path = Gem.dir, Gem.path
+        ENV["GEM_PATH"] = [gem_home, gem_path].flatten.compact.join(File::PATH_SEPARATOR)
+        ENV["GEM_HOME"] = bundle_path.to_s
       end
-    end
 
-    def point_gem_home(path)
-      return unless path
-      ENV['GEM_HOME'] = File.expand_path(path, root)
-      ENV['GEM_PATH'] = ''
       Gem.clear_paths
     end
   end

data/lib/bundler/cli.rb

@@ -48,11 +48,13 @@ module Bundler
 
     desc "install", "Install the current environment to the system"
     method_option :without, :type => :array, :banner => "Exclude gems thar are part of the specified named group"
-    def install
+    def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
       opts[:without].map! { |g| g.to_sym }
 
+      Bundler.settings[:path] = path if path
+
       Installer.install(Bundler.root, Bundler.definition, opts)
     end
 
@@ -62,6 +64,12 @@ module Bundler
       environment.lock
     end
 
+    desc "unlock", "Unlock the bundle. This allows gem versions to be changed"
+    def unlock
+      environment = Bundler.load
+      environment.unlock
+    end
+
     desc "show", "Shows all gems that are part of the bundle."
     def show
       environment = Bundler.load

data/lib/bundler/definition.rb

@@ -64,13 +64,15 @@ module Bundler
 
       def actual_dependencies
         @actual_dependencies ||= @details["specs"].map do |args|
-          Gem::Dependency.new(*args.to_a.flatten)
+          name, details = args.to_a.flatten
+          details["source"] = sources[details["source"]] if details.include?("source")
+          Bundler::Dependency.new(name, details.delete("version"), details)
         end
       end
 
       def dependencies
         @dependencies ||= @details["dependencies"].map do |args|
-          Gem::Dependency.new(*args.to_a.flatten)
+          Bundler::Dependency.new(*args.to_a.flatten)
         end
       end
     end

data/lib/bundler/dsl.rb

@@ -25,8 +25,8 @@ module Bundler
 
     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)
+      when :gemcutter, :rubygems, :rubyforge then Source::Rubygems.new("uri" => "http://gemcutter.org")
+      when String then Source::Rubygems.new("uri" => source)
       else source
       end
 
@@ -34,12 +34,12 @@ module Bundler
       source
     end
 
-    def path(path, options = {})
-      source Source::Path.new(options.merge(:path => path)), options
+    def path(path, options = {}, source_options = {})
+      source Source::Path.new(_normalize_hash(options).merge("path" => path)), source_options
     end
 
-    def git(uri, options = {})
-      source Source::Git.new(options.merge(:uri => uri)), options
+    def git(uri, options = {}, source_options = {})
+      source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options
     end
 
     def to_definition
@@ -59,21 +59,29 @@ module Bundler
       version && Gem::Version.new(version) rescue false
     end
 
-    def _normalize_options(name, version, opts)
+    def _normalize_hash(opts)
       opts.each do |k, v|
+        next if String === k
+        opts.delete(k)
         opts[k.to_s] = v
       end
+    end
 
-      opts["group"] ||= @group
+    def _normalize_options(name, version, opts)
+      _normalize_hash(opts)
+
+      group = opts.delete("group") || @group
 
       # Normalize git and path options
       ["git", "path"].each do |type|
         if param = opts[type]
-          source = send(type, param, opts.merge(:prepend => true))
+          source = send(type, param, opts.dup, :prepend => true)
           source.default_spec name, version if _version?(version)
           opts["source"] = source
         end
       end
+
+      opts["group"] = group
     end
   end
 end

data/lib/bundler/environment.rb

@@ -20,15 +20,26 @@ module Bundler
     end
 
     def dependencies
-      @definition.dependencies
+      @definition.actual_dependencies
     end
 
     def lock
-      Bundler.ui.info("The bundle is already locked, relocking.")
-      FileUtils.mkdir_p("#{root}/vendor")
+      Bundler.ui.info("The bundle is already locked, relocking.") if locked?
+      FileUtils.mkdir_p("#{root}/.bundle")
       write_yml_lock
       write_rb_lock
-      Bundler.ui.info("The bundle is locked. Use `bundle show` to list the gems in the environment.")
+      Bundler.ui.info("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
+    end
+
+    def unlock
+      unless locked?
+        Bundler.ui.info("The bundle is not currently locked.")
+        return
+      end
+
+      FileUtils.rm_f("#{root}/.bundle/environment.rb")
+      FileUtils.rm_f("#{root}/Gemfile.lock")
+      Bundler.ui.info("The bundle is now unlocked. The dependencies may be changed.")
     end
 
     def locked?
@@ -70,6 +81,7 @@ module Bundler
         possibilities = Gem.path.map { |p| "#{p}/cache/#{spec.full_name}.gem" }
         cached_path = possibilities.find { |p| File.exist? p }
         Bundler.ui.info "  * #{File.basename(cached_path)}"
+        next if File.expand_path(File.dirname(cached_path)) == File.expand_path(pack_path)
         FileUtils.cp(cached_path, pack_path)
       end
     end
@@ -113,7 +125,7 @@ module Bundler
     def write_rb_lock
       template = File.read(File.expand_path("../templates/environment.erb", __FILE__))
       erb = ERB.new(template, nil, '-')
-      File.open("#{root}/vendor/environment.rb", 'w') do |f|
+      File.open("#{root}/.bundle/environment.rb", 'w') do |f|
         f.puts erb.result(binding)
       end
     end
@@ -128,7 +140,13 @@ module Bundler
     def details
       details = {}
       details["sources"] = sources.map { |s| { s.class.name.split("::").last => s.options} }
-      details["specs"] = specs.map { |s| {s.name => s.version.to_s} }
+
+      details["specs"] = specs.map do |s|
+        options = {"version" => s.version.to_s}
+        options["source"] = sources.index(s.source) if sources.include?(s.source)
+        { s.name => options }
+      end
+
       details["dependencies"] = dependencies.map { |d| {d.name => d.version_requirements.to_s} }
       details
     end

data/lib/bundler/installer.rb

@@ -20,15 +20,19 @@ module Bundler
       end
 
       specs.sort_by { |s| s.name }.each do |spec|
-        Bundler.ui.info "* #{spec.name} (#{spec.version})"
+        # unless spec.source.is_a?(Source::SystemGems)
+          Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source} "
+        # end
+
         if (spec.groups & options[:without]).any?
-          Bundler.ui.info "  * Not in requested group... skipping."
+          Bundler.ui.debug "  * Not in requested group... skipping."
           next
         end
         spec.source.install(spec)
+        Bundler.ui.info ""
       end
 
-      Bundler.ui.confirm "You have bundles. Now, go have fun."
+      Bundler.ui.confirm "Your bundle is complete!"
     end
 
     def dependencies
@@ -47,13 +51,7 @@ module Bundler
 
     def resolve_locally
       # Return unless all the dependencies have = version requirements
-      return unless dependencies.all? { |d| unambiguous?(d) }
-
-      index = local_index
-      sources.each do |source|
-        next unless source.respond_to?(:local_specs)
-        index = source.local_specs.merge(index)
-      end
+      return if dependencies.any? { |d| ambiguous?(d) }
 
       source_requirements = {}
       dependencies.each do |dep|
@@ -68,6 +66,7 @@ module Bundler
       specs.length == dependencies.length && specs
     rescue Bundler::GemNotFound
       nil
+      raise if ENV["OMG"]
     end
 
     def resolve_remotely
@@ -101,19 +100,35 @@ module Bundler
       end
     end
 
-    def unambiguous?(dep)
-      dep.version_requirements.requirements.all? { |op,_| op == '=' }
+    def ambiguous?(dep)
+      dep.version_requirements.requirements.any? { |op,_| op != '=' }
     end
 
     def index
       @index ||= begin
-        index = local_index
+        index = Index.new
 
-        sources.each do |source|
+        if File.directory?("#{root}/vendor/cache")
+          index = cache_source.specs.merge(index).freeze
+        end
+
+        rg_sources = sources.select { |s| s.is_a?(Source::Rubygems) }
+        other_sources = sources.select { |s| !s.is_a?(Source::Rubygems)   }
+
+        other_sources.each do |source|
           i = source.specs
-          Bundler.ui.info "Source: Processing index... "
+          Bundler.ui.debug "Source: Processing index... "
           index = i.merge(index).freeze
-          Bundler.ui.info "Done."
+          Bundler.ui.debug "Done."
+        end
+
+        index = Index.from_installed_gems.merge(index)
+
+        rg_sources.each do |source|
+          i = source.specs
+          Bundler.ui.debug "Source: Processing index... "
+          index = i.merge(index).freeze
+          Bundler.ui.debug "Done."
         end
 
         index
@@ -122,18 +137,23 @@ module Bundler
 
     def local_index
       @local_index ||= begin
-        index = Index.from_installed_gems.freeze
+        index = Index.new
+
+        sources.each do |source|
+          next unless source.respond_to?(:local_specs)
+          index = source.local_specs.merge(index)
+        end
 
         if File.directory?("#{root}/vendor/cache")
           index = cache_source.specs.merge(index).freeze
         end
 
-        index
+        Index.from_installed_gems.merge(index)
       end
     end
 
     def cache_source
-      Source::GemCache.new(:path => "#{root}/vendor/cache")
+      Source::GemCache.new("path" => "#{root}/vendor/cache")
     end
 
   end

data/lib/bundler/settings.rb

@@ -0,0 +1,29 @@
+module Bundler
+  class Settings
+    def initialize(root)
+      @root   = root
+      @config = File.exist?(config_file) ? YAML.load_file(config_file) : {}
+    end
+
+    def [](key)
+      key = "BUNDLE_#{key.to_s.upcase}"
+      @config[key] || ENV[key]
+    end
+
+    def []=(key, value)
+      key = "BUNDLE_#{key.to_s.upcase}"
+      @config[key] = value
+      FileUtils.mkdir_p(config_file.dirname)
+      File.open(config_file, 'w') do |f|
+        f.puts @config.to_yaml
+      end
+      value
+    end
+
+  private
+
+    def config_file
+      Pathname.new("#{@root}/.bundle/config")
+    end
+  end
+end

data/lib/bundler/source.rb

@@ -1,6 +1,7 @@
 require "rubygems/remote_fetcher"
 require "rubygems/format"
 require "digest/sha1"
+require "open3"
 
 module Bundler
   module Source
@@ -9,11 +10,15 @@ module Bundler
 
       def initialize(options = {})
         @options = options
-        @uri = options[:uri]
+        @uri = options["uri"]
         @uri = URI.parse(@uri) unless @uri.is_a?(URI)
         raise ArgumentError, "The source must be an absolute URI" unless @uri.absolute?
       end
 
+      def to_s
+        "rubygems repository at `#{uri}`"
+      end
+
       def specs
         @specs ||= fetch_specs
       end
@@ -21,9 +26,9 @@ module Bundler
       def install(spec)
         destination = Gem.dir
 
-        Bundler.ui.info "  * Downloading..."
+        Bundler.ui.debug "  * Downloading..."
         gem_path  = Gem::RemoteFetcher.fetcher.download(spec, uri, destination)
-        Bundler.ui.info "  * Installing..."
+        Bundler.ui.debug "  * Installing..."
         installer = Gem::Installer.new gem_path,
           :install_dir => Gem.dir,
           :ignore_dependencies => true
@@ -35,14 +40,14 @@ module Bundler
 
       def fetch_specs
         index = Index.new
-        Bundler.ui.info "Source: Fetching remote index for `#{uri}`... "
+        Bundler.ui.info "Fetching source index from `#{uri}`... "
         (main_specs + prerelease_specs).each do |name, version, platform|
           next unless Gem::Platform.match(platform)
           spec = RemoteSpecification.new(name, version, platform, @uri)
           spec.source = self
           index << spec
         end
-        Bundler.ui.info "done."
+        Bundler.ui.info "Done."
         index.freeze
       end
 
@@ -75,17 +80,21 @@ module Bundler
       end
 
       def to_s
-        "System gem source"
+        "system gems"
       end
 
       def install(spec)
-        Bundler.ui.info "  * already installed... skipping"
+        Bundler.ui.debug "  * already installed... skipping"
       end
     end
 
     class GemCache
       def initialize(options)
-        @path = options[:path]
+        @path = options["path"]
+      end
+
+      def to_s
+        ".gem files at #{@path}"
       end
 
       def specs
@@ -105,7 +114,7 @@ module Bundler
       def install(spec)
         destination = Gem.dir
 
-        Bundler.ui.info "  * Installing from pack..."
+        Bundler.ui.debug "  * Installing from pack..."
         installer = Gem::Installer.new "#{@path}/#{spec.full_name}.gem",
           :install_dir => Gem.dir,
           :ignore_dependencies => true
@@ -119,11 +128,15 @@ module Bundler
 
       def initialize(options)
         @options = options
-        @glob = options[:glob] || "{,*/}*.gemspec"
-        @path = options[:path]
+        @glob = options["glob"] || "{,*/}*.gemspec"
+        @path = options["path"]
         @default_spec = nil
       end
 
+      def to_s
+        "source code at #{@path}"
+      end
+
       def default_spec(*args)
         return @default_spec if args.empty?
         name, version = *args
@@ -160,7 +173,7 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.info "  * Using path `#{path}`..."
+        Bundler.ui.debug "  * Using path `#{path}`..."
       end
 
       alias specs local_specs
@@ -172,23 +185,24 @@ module Bundler
 
       def initialize(options)
         @options = options
-        @glob = options[:glob] || "{,*/}*.gemspec"
-        @uri  = options[:uri]
-        @ref  = options[:ref] || options[:branch] || 'master'
+        @glob = options["glob"] || "{,*/}*.gemspec"
+        @uri  = options["uri"]
+        @ref  = options["ref"] || options["branch"] || 'master'
+      end
+
+      def to_s
+        ref = @options["ref"] ? @options["ref"][0..6] : @ref
+        "#{@uri} (at #{ref})"
       end
 
       def options
-        @options.merge(:ref => revision)
+        @options.merge("ref" => revision)
       end
 
       def path
         Bundler.install_path.join("#{base_name}-#{uri_hash}-#{ref}")
       end
 
-      def to_s
-        @uri
-      end
-
       def specs
         @specs ||= begin
           index = Index.new
@@ -220,21 +234,19 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.info "  * Using git `#{uri}`..."
+        Bundler.ui.debug "  * Using git `#{uri}`..."
 
         if @installed
-          Bundler.ui.info "  * Already checked out revision: #{ref}..."
+          Bundler.ui.debug "  * Already checked out revision: #{ref}..."
         else
-          Bundler.ui.info "  * Checking out revision: #{ref}..."
+          Bundler.ui.debug "  * Checking out revision: #{ref}..."
           FileUtils.mkdir_p(path)
           Dir.chdir(path) do
             unless File.exist?(".git")
-              %x(git clone --recursive --no-checkout #{cache_path} #{path})
+              %x(git clone --no-checkout #{cache_path} #{path})
             end
-            %x(git fetch --quiet)
-            %x(git reset --hard #{revision})
-            %x(git submodule init)
-            %x(git submodule update)
+            git "fetch --quiet"
+            git "reset --hard #{revision}"
           end
           @installed = true
         end
@@ -242,6 +254,14 @@ module Bundler
 
     private
 
+      def git(command)
+        out = %x{git #{command}}
+        if $? != 0
+          raise GitError, "An error has occurred in git. Cannot complete bundling."
+        end
+        out
+      end
+
       def base_name
         File.basename(uri, ".git")
       end
@@ -256,18 +276,18 @@ module Bundler
 
       def cache
         if cache_path.exist?
-          Bundler.ui.info "Source: Updating `#{uri}`... "
-          in_cache { `git fetch --quiet #{uri} master:master` }
+          Bundler.ui.info "Updating `#{uri}`... "
+          in_cache { git "fetch --quiet #{uri} master:master" }
         else
-          Bundler.ui.info "Source: Cloning `#{uri}`... "
+          Bundler.ui.info "Fetching `#{uri}`... "
           FileUtils.mkdir_p(cache_path.dirname)
-          `git clone #{uri} #{cache_path} --bare --no-hardlinks`
+          git "clone #{uri} #{cache_path} --bare --no-hardlinks"
         end
         Bundler.ui.info "Done."
       end
 
       def revision
-        @revision ||= in_cache { `git rev-parse #{ref}`.strip }
+        @revision ||= in_cache { git("rev-parse #{ref}").strip }
       end
 
       def in_cache(&blk)

data/lib/bundler/ui.rb

@@ -17,6 +17,10 @@ module Bundler
         @shell = shell
       end
 
+      # TODO: Add debug mode
+      def debug(msg)
+      end
+
       def info(msg)
         @shell.say(msg)
       end
@@ -30,7 +34,7 @@ module Bundler
       end
 
       def error(msg)
-        @shell.say(msg, :error)
+        @shell.say(msg, :red)
       end
     end
 
@@ -41,9 +45,9 @@ module Bundler
 
       def say(message)
         if message =~ /native extensions/
-          @ui.info "  * #{message}"
+          @ui.info "with native extensions "
         else
-          @ui.info(message)
+          @ui.debug(message)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.pre4
+  version: 0.9.0.pre5
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -08:00
+date: 2010-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems.rb
+- lib/bundler/settings.rb
 - lib/bundler/setup.rb
 - lib/bundler/source.rb
 - lib/bundler/specification.rb