bundler 0.9.3 → 0.9.4

data/lib/bundler.rb

@@ -1,10 +1,10 @@
 require 'fileutils'
 require 'pathname'
 require 'yaml'
-require 'bundler/rubygems'
+require 'bundler/rubygems-ext'
 
 module Bundler
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -16,6 +16,7 @@ module Bundler
   autoload :Resolver,            'bundler/resolver'
   autoload :Runtime,             'bundler/runtime'
   autoload :Settings,            'bundler/settings'
+  autoload :SharedHelpers,       'bundler/shared_helpers'
   autoload :Source,              'bundler/source'
   autoload :Specification,       'bundler/specification'
   autoload :UI,                  'bundler/ui'
@@ -106,24 +107,12 @@ module Bundler
       @settings ||= Settings.new(root)
     end
 
-    def default_gemfile
-      if ENV['BUNDLE_GEMFILE']
-        return Pathname.new(ENV['BUNDLE_GEMFILE'])
-      end
-
-      current = Pathname.new(Dir.pwd)
-
-      until current.root?
-        filename = current.join("Gemfile")
-        return filename if filename.exist?
-        current = current.parent
-      end
+  private
 
-      raise GemfileNotFound, "The default Gemfile was not found"
+    def default_gemfile
+      SharedHelpers.default_gemfile
     end
 
-  private
-
     def configure_gem_home_and_path
       if path = settings[:path]
         ENV['GEM_HOME'] = File.expand_path(path, root)

data/lib/bundler/cli.rb

@@ -36,6 +36,7 @@ module Bundler
         missing.each do |d|
           puts "  * #{d}"
         end
+        exit 1
       else
         env.specs
         puts "The Gemfile's dependencies are satisfied"
@@ -43,8 +44,11 @@ module Bundler
     end
 
     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"
+    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"
     def install(path = nil)
+      remove_lockfiles if options[:relock]
+
       opts = options.dup
       opts[:without] ||= []
       opts[:without].map! { |g| g.to_sym }
@@ -52,13 +56,15 @@ module Bundler
       Bundler.settings[:path] = path if path
 
       Installer.install(Bundler.root, Bundler.definition, opts)
+
+      lock if options[:relock]
     end
 
     desc "lock", "Locks the bundle to the current set of dependencies, including all child dependencies."
     def lock
-      if File.exist?("#{Bundler.root}/Gemfile.lock")
+      if locked?
         Bundler.ui.info("The bundle is already locked, relocking.")
-        `rm #{Bundler.root}/Gemfile.lock`
+        remove_lockfiles
       end
 
       environment = Bundler.load
@@ -71,8 +77,12 @@ module Bundler
 
     desc "unlock", "Unlock the bundle. This allows gem versions to be changed"
     def unlock
-      environment = Bundler.load
-      environment.unlock
+      if locked?
+        remove_lockfiles
+        Bundler.ui.info("The bundle is now unlocked. The dependencies may be changed.")
+      else
+        Bundler.ui.info("The bundle is not currently locked.")
+      end
     end
 
     desc "show", "Shows all gems that are part of the bundle."
@@ -100,7 +110,7 @@ module Bundler
       ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
 
       # Set BUNDLE_GEMFILE
-      ENV['BUNDLE_GEMFILE'] = Bundler.default_gemfile
+      ENV['BUNDLE_GEMFILE'] = Bundler::SharedHelpers.default_gemfile.to_s
 
       # Set RUBYOPT
       rubyopt = [ENV["RUBYOPT"]].compact
@@ -112,5 +122,15 @@ module Bundler
       Kernel.exec *ARGV
     end
 
+  private
+
+    def locked?
+      File.exist?("#{Bundler.root}/Gemfile.lock") || File.exist?("#{Bundler.root}/.bundle/environment.rb")
+    end
+
+    def remove_lockfiles
+      FileUtils.rm_f "#{Bundler.root}/Gemfile.lock"
+      FileUtils.rm_f "#{Bundler.root}/.bundle/environment.rb"
+    end
   end
 end

data/lib/bundler/definition.rb

@@ -83,8 +83,8 @@ module Bundler
       end
 
       def dependencies
-        @dependencies ||= @details["dependencies"].map do |args|
-          Bundler::Dependency.new(*args.to_a.flatten)
+        @dependencies ||= @details["dependencies"].map do |dep, opts|
+          Bundler::Dependency.new(dep, opts.delete("version"), opts)
         end
       end
     end

data/lib/bundler/dependency.rb

@@ -3,6 +3,7 @@ require 'rubygems/dependency'
 module Bundler
   class Dependency < Gem::Dependency
     attr_reader :autorequire
+    attr_reader :groups
 
     def initialize(name, version, options = {}, &blk)
       super(name, version)

data/lib/bundler/dsl.rb

@@ -9,7 +9,7 @@ module Bundler
     end
 
     def initialize
-      @sources = [] # Gem.sources.map { |s| Source::Rubygems.new(:uri => s) }
+      @sources = []
       @dependencies = []
       @group = nil
     end
@@ -113,4 +113,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/{rubygems.rb → rubygems-ext.rb}

@@ -1,5 +1,7 @@
+unless defined? Gem
 require 'rubygems'
 require 'rubygems/specification'
+end
 
 module Gem
   @loaded_stacks = Hash.new { |h,k| h[k] = [] }

data/lib/bundler/runtime.rb

@@ -2,6 +2,8 @@ require "digest/sha1"
 
 module Bundler
   class Runtime < Environment
+    include SharedHelpers
+
     def setup(*groups)
       # Has to happen first
       clean_load_path
@@ -29,25 +31,11 @@ module Bundler
     end
 
     def dependencies
-      @definition.actual_dependencies
-    end
-
-    def lock
-      FileUtils.mkdir_p("#{root}/.bundle")
-      write_yml_lock
-      write_rb_lock
-      Bundler.ui.info("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
+      @definition.dependencies
     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.")
+    def actual_dependencies
+      @definition.actual_dependencies
     end
 
     def lock
@@ -60,7 +48,7 @@ module Bundler
     end
 
     def locked?
-      File.exist?("#{root}/Gemfile.lock")
+      File.exist?("#{root}/Gemfile.lock") || File.exist?("#{root}/.bundle/environment.rb")
     end
 
     def dependencies_for(*groups)
@@ -82,7 +70,7 @@ module Bundler
     def specs
       @specs ||= begin
         source_requirements = {}
-        dependencies.each do |dep|
+        actual_dependencies.each do |dep|
           next unless dep.source && dep.source.respond_to?(:local_specs)
           source_requirements[dep.name] = dep.source.local_specs
         end
@@ -123,6 +111,7 @@ module Bundler
     end
 
     def write_rb_lock
+      shared_helpers = File.read(File.expand_path("../shared_helpers.rb", __FILE__))
       template = File.read(File.expand_path("../templates/environment.erb", __FILE__))
       erb = ERB.new(template, nil, '-')
       File.open("#{root}/.bundle/environment.rb", 'w') do |f|
@@ -148,7 +137,11 @@ module Bundler
         { s.name => options }
       end
 
-      details["dependencies"] = @definition.dependencies.map { |d| {d.name => d.version_requirements.to_s} }
+      details["dependencies"] = @definition.dependencies.inject({}) do |h,d|
+        h.merge!({d.name => {"version" => d.version_requirements.to_s,
+                    "group"   => d.groups,
+                    "require" => d.autorequire}})
+      end
       details
     end
 
@@ -184,18 +177,6 @@ module Bundler
       end
     end
 
-    def reverse_rubygems_kernel_mixin
-      # Disable rubygems' gem activation system
-      ::Kernel.class_eval do
-        if private_method_defined?(:gem_original_require)
-          alias rubygems_require require
-          alias require gem_original_require
-        end
-
-        undef gem
-      end
-    end
-
     def cripple_rubygems(specs)
       reverse_rubygems_kernel_mixin
 

data/lib/bundler/setup.rb

@@ -1,3 +1,9 @@
-require 'bundler'
+# This is not actually required by the actual library
+require 'bundler/shared_helpers'
 
-Bundler.setup
+if Bundler::SharedHelpers.in_bundle?
+  require 'rubygems'
+  require 'bundler'
+
+  Bundler.setup
+end

data/lib/bundler/shared_helpers.rb

@@ -0,0 +1,45 @@
+module Bundler
+  module SharedHelpers
+
+    def reverse_rubygems_kernel_mixin
+      require "rubygems"
+
+      # Disable rubygems' gem activation system
+      ::Kernel.class_eval do
+        if private_method_defined?(:gem_original_require)
+          alias rubygems_require require
+          alias require gem_original_require
+        end
+
+        undef gem
+      end
+    end
+
+    def default_gemfile
+      gemfile = find_gemfile
+      gemfile or raise GemfileNotFound, "The default Gemfile was not found"
+      Pathname.new(gemfile)
+    end
+
+    def in_bundle?
+      find_gemfile
+    end
+
+  private
+
+    def find_gemfile
+      return ENV['BUNDLE_GEMFILE'] if ENV['BUNDLE_GEMFILE']
+
+      previous = nil
+      current  = File.expand_path(Dir.pwd)
+
+      until !File.directory?(current) || current == previous
+        filename = File.join(current, 'Gemfile')
+        return filename if File.file?(filename)
+        current, previous = File.expand_path("#{current}/.."), current
+      end
+    end
+
+    extend self
+  end
+end

data/lib/bundler/source.rb

@@ -62,7 +62,7 @@ module Bundler
       def prerelease_specs
         Marshal.load(Gem::RemoteFetcher.fetcher.fetch_path("#{uri}/prerelease_specs.4.8.gz"))
       rescue Gem::RemoteFetcher::FetchError
-        Bundler.logger.warn "Source '#{uri}' does not support prerelease gems"
+        Bundler.ui.warn "Source '#{uri}' does not support prerelease gems"
         []
       end
     end
@@ -286,7 +286,15 @@ module Bundler
       end
 
       def uri_hash
-        Digest::SHA1.hexdigest(URI.parse(uri).normalize.to_s.sub(%r{/$}, ''))
+        if uri =~ %r{^\w+://(\w+@)?}
+          # Downcase the domain component of the URI
+          # and strip off a trailing slash, if one is present
+          input = URI.parse(uri).normalize.to_s.sub(%r{/$},'')
+        else
+          # If there is no URI scheme, assume it is an ssh/git URI
+          input = uri
+        end
+        Digest::SHA1.hexdigest(input)
       end
 
       def cache_path

data/lib/bundler/templates/environment.erb

@@ -1,7 +1,14 @@
 require 'digest/sha1'
 
 # DO NOT MODIFY THIS FILE
+
+<%= shared_helpers %>
+
 module Bundler
+  extend SharedHelpers
+
+  reverse_rubygems_kernel_mixin
+
   FINGERPRINT = <%= gemfile_fingerprint.inspect %>
   LOAD_PATHS = <%= load_paths.inspect %>
   AUTOREQUIRES = <%= autorequires_for_groups.inspect %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -08:00
+date: 2010-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -34,10 +34,11 @@ files:
 - lib/bundler/installer.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
-- lib/bundler/rubygems.rb
+- lib/bundler/rubygems-ext.rb
 - lib/bundler/runtime.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
+- lib/bundler/shared_helpers.rb
 - lib/bundler/source.rb
 - lib/bundler/specification.rb
 - lib/bundler/templates/environment.erb