bundler 0.9.13 → 0.9.14

data/CHANGELOG.md

@@ -1,8 +1,29 @@
-## 0.9.12 (???)
+## 0.9.13 (March 23, 2010)
+
+Bugfixes:
+
+  - exec command now finds binaries from gems installed via :path
+  - gem dependencies are pulled in even if their type is nil
+  - paths with spaces have double-quotes to work on Windows
+  - set GEM_PATH in environment.rb so generators work with Rails 2
+
+## 0.9.12 (March 17, 2010)
+
+  - refactoring, internal cleanup, more solid specs
+
+Features:
+
+  - check command takes a --without option
+  - check command exits 1 if the check fails
 
 Bugfixes:
 
   - perform a topological sort on resolved gems (#191)
+  - gems from git work even when paths or repos have spaces (#196)
+  - Specification#loaded_from returns a String, like Gem::Specification (#197)
+  - specs eval from inside the gem directory, even when locked
+  - virtual gemspecs are now saved in environment.rb for use when loading
+  - unify the Installer's local index and the runtime index (#204)
 
 ## 0.9.11 (March 9, 2010)
 

data/README.md

@@ -274,6 +274,12 @@ Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
 
 ## More information
 
+### Development
+
+For information about future plans and changes that will happen between now and bundler 1.0, see the [ROADMAP](http://github.com/carlhuda/bundler/blob/master/ROADMAP.md). To see what has changed in each version of bundler, starting with 0.9.5, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
+
+### Usage
+
 Explanations of common Bundler use cases can be found in [Using Bundler in Real Life](http://yehudakatz.com/2010/02/09/using-bundler-in-real-life/). The general philosophy behind Bundler 0.9 is explained at some length in [Bundler 0.9: Heading Toward 1.0](http://yehudakatz.com/2010/02/01/bundler-0-9-heading-toward-1-0/). Using Bundler with a Rails 2.3.5 app is explained with more detail in [Bundler 0.9 and Rails 2.3.5](http://andre.arko.net/2010/02/13/using-bundler-09-with-rails-235/).
 
 ### Deploying to memory-constrained servers

data/lib/bundler.rb

@@ -3,8 +3,10 @@ require 'pathname'
 require 'yaml'
 require 'bundler/rubygems_ext'
 
+
 module Bundler
-  VERSION = "0.9.13"
+  VERSION = "0.9.14"
+  ORIGINAL_ENV = ENV.to_hash
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -97,8 +99,12 @@ module Bundler
       home.join("gems")
     end
 
+    def specs_path
+      bundle_path.join("specifications")
+    end
+
     def cache
-      bundle_path.join('cache/bundler')
+      bundle_path.join("cache/bundler")
     end
 
     def root
@@ -109,6 +115,14 @@ module Bundler
       @settings ||= Settings.new(root)
     end
 
+    def with_clean_env
+      bundled_env = ENV.to_hash
+      ENV.replace(ORIGINAL_ENV)
+      yield
+    ensure
+      ENV.replace(bundled_env.to_hash)
+    end
+
   private
 
     def default_gemfile

data/lib/bundler/cli.rb

@@ -10,9 +10,26 @@ module Bundler
     check_unknown_options! unless ARGV.include?("exec")
 
     desc "init", "Generates a Gemfile into the current working directory"
+    method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
     def init
+      opts = options.dup
       if File.exist?("Gemfile")
-        puts "Gemfile already exists at #{Dir.pwd}/Gemfile"
+        Bundler.ui.error "Gemfile already exists at #{Dir.pwd}/Gemfile"
+        exit 1
+      end
+
+      if opts[:gemspec]
+        gemspec = File.expand_path(opts[:gemspec])
+        unless File.exist?(gemspec)
+          Bundler.ui.error "Gem specification #{gemspec} doesn't exist"
+          exit 1
+        end
+        spec = Gem::Specification.load(gemspec)
+        puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
+        File.open('Gemfile', 'w') do |file|
+          file << "# Generated from #{gemspec}\n"
+          file << spec.to_gemfile
+        end
       else
         puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
         FileUtils.cp(File.expand_path('../templates/Gemfile', __FILE__), 'Gemfile')
@@ -111,10 +128,11 @@ module Bundler
         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})"
+          Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})"
         end
       end
     end
+    map %w(list) => "show"
 
     desc "cache", "Cache all the gems to vendor/cache"
     def cache
@@ -162,10 +180,14 @@ module Bundler
 
     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)
+      editor = [ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
+      if editor
+        command = "#{editor} #{locate_gem(name)}"
+        success = system(command)
+        Bundler.ui.info "Could not run '#{command}'" unless success
+      else
+        Bundler.ui.info("To open a bundled gem, set $EDITOR")
+      end
     end
 
     desc "version", "Prints the bundler's version information"

data/lib/bundler/environment.rb

@@ -30,6 +30,10 @@ module Bundler
 
   private
 
+    def sources
+      @definition.sources
+    end
+
     def runtime_gems
       @runtime_gems ||= Index.build do |i|
         sources.each do |s|

data/lib/bundler/index.rb

@@ -7,6 +7,17 @@ module Bundler
     end
 
     def self.installed_gems
+      build do |idx|
+        idx.use bundler_gems
+        idx.use system_gems
+      end
+    end
+
+    def self.bundler_gems
+      Source::BundlerGems.new.specs
+    end
+
+    def self.system_gems
       Source::SystemGems.new.specs
     end
 

data/lib/bundler/installer.rb

@@ -26,18 +26,19 @@ module Bundler
           next
         end
 
-        Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source} "
-
+        if [Source::Rubygems, Source::GemCache].include?(spec.source.class)
+          Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source}"
+        else
+          Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{spec.source}"
+        end
         spec.source.install(spec)
-
-        Bundler.ui.info ""
       end
 
       if locked?
         write_rb_lock
       end
 
-      Bundler.ui.confirm "Your bundle is complete!"
+      Bundler.ui.confirm "Your bundle is complete! Use `bundle show gemname` to see where a bundled gem is installed."
     end
 
     def dependencies
@@ -50,10 +51,6 @@ module Bundler
 
   private
 
-    def sources
-      @definition.sources
-    end
-
     def resolve_locally
       # Return unless all the dependencies have = version requirements
       return if actual_dependencies.any? { |d| ambiguous?(d) }

data/lib/bundler/resolver.rb

@@ -42,7 +42,12 @@ module Bundler
           if origin
             o << "  Conflict on: #{conflict.inspect}:\n"
             o << "    * #{conflict} (#{origin.version}) activated by #{origin.required_by.first}\n"
-            o << "    * #{requirement} required by #{requirement.required_by.first}\n"
+            o << "    * #{requirement} required"
+            if requirement.required_by.first
+              o << " by #{requirement.required_by.first}\n"
+            else
+              o << " in Gemfile\n"
+            end
           else
             o << "  #{requirement} not found in any of the sources\n"
             o << "      required by #{requirement.required_by.first}\n"

data/lib/bundler/rubygems_ext.rb

@@ -16,6 +16,39 @@ module Gem
     def groups
       @groups ||= []
     end
+
+    def git_version
+      Dir.chdir(full_gem_path) do
+        rev = `git rev-parse HEAD`.strip[0...6]
+        branch = `git show-branch --no-color 2>/dev/null`.strip[/\[(.*?)\]/, 1]
+        branch.empty? ? " #{rev}" : " #{branch}-#{rev}"
+      end if File.exist?(File.join(full_gem_path, ".git"))
+    end
+
+    def to_gemfile(path = nil)
+      gemfile = "source :gemcutter\n"
+      gemfile << dependencies_to_gemfile(dependencies)
+      gemfile << dependencies_to_gemfile(development_dependencies, :development)
+    end
+
+  private
+
+    def dependencies_to_gemfile(dependencies, group = nil)
+      gemfile = ''
+      if dependencies.any?
+        gemfile << "group #{group} do\n" if group
+        dependencies.each do |dependency|
+          gemfile << '  ' if group
+          gemfile << %|gem "#{dependency.name}"|
+          req = dependency.requirements_list.first
+          gemfile << %|, "#{req}"| if req
+          gemfile << "\n"
+        end
+        gemfile << "end\n" if group
+      end
+      gemfile
+    end
+
   end
 
   class Dependency

data/lib/bundler/runtime.rb

@@ -95,10 +95,6 @@ module Bundler
 
   private
 
-    def sources
-      @definition.sources
-    end
-
     def load_paths
       specs.map { |s| s.load_paths }.flatten
     end

data/lib/bundler/source.rb

@@ -80,7 +80,11 @@ module Bundler
         @specs ||= begin
           index = Index.new
 
-          Gem::SourceIndex.from_installed_gems.to_a.reverse.each do |name, spec|
+          system_paths = Gem::SourceIndex.installed_spec_directories
+          system_paths.reject!{|d| d == Bundler.specs_path.to_s }
+
+          system_index = Gem::SourceIndex.from_gems_in(*system_paths)
+          system_index.to_a.reverse.each do |name, spec|
             spec.source = self
             index << spec
           end
@@ -98,6 +102,26 @@ module Bundler
       end
     end
 
+    class BundlerGems < SystemGems
+      def specs
+        @specs ||= begin
+          index = Index.new
+
+          bundle_index = Gem::SourceIndex.from_gems_in(Bundler.specs_path)
+          bundle_index.to_a.reverse.each do |name, spec|
+            spec.source = self
+            index << spec
+          end
+
+          index
+        end
+      end
+
+      def to_s
+        "bundler gems"
+      end
+    end
+
     class GemCache
       def initialize(options)
         @path = options["path"]
@@ -138,7 +162,7 @@ module Bundler
     end
 
     class Path
-      attr_reader :path, :options, :default_spec
+      attr_reader :path, :options
 
       def initialize(options)
         @options = options
@@ -148,15 +172,8 @@ module Bundler
           @path = Pathname.new(options["path"]).expand_path(Bundler.root)
         end
 
-        if options["name"]
-          @default_spec = Specification.new do |s|
-            s.name     = options["name"]
-            s.source   = self
-            s.version  = Gem::Version.new(options["version"])
-            s.summary  = "Fake gemspec for #{options["name"]}"
-            s.relative_loaded_from = "#{options["name"]}.gemspec"
-          end
-        end
+        @name = options["name"]
+        @version = options["version"]
       end
 
       def to_s
@@ -178,7 +195,19 @@ module Bundler
             end
           end
 
-          index << default_spec if default_spec && index.empty?
+          if index.empty? && @name && @version
+            index << Specification.new do |s|
+              s.name     = @name
+              s.source   = self
+              s.version  = Gem::Version.new(@version)
+              s.summary  = "Fake gemspec for #{@name}"
+              s.relative_loaded_from = "#{@name}.gemspec"
+              if path.join("bin").exist?
+                binaries = path.join("bin").children.map{|c| c.basename.to_s }
+                s.executables = binaries
+              end
+            end
+          end
         else
           raise PathError, "The path `#{path}` does not exist."
         end
@@ -201,7 +230,7 @@ module Bundler
 
       def generate_bin(spec)
         gem_dir  = spec.full_gem_path
-        gem_file = nil # so we have access once after it's set in the block
+        gem_file = nil # so we have access after it's set in the block
 
         Dir.chdir(gem_dir) do
           gem_file = Gem::Builder.new(spec).build
@@ -313,7 +342,7 @@ module Bundler
       end
 
       def cache
-        if cache_path.exist?
+        if cached?
           Bundler.ui.info "Updating #{uri}"
           in_cache { git %|fetch --quiet "#{uri}" master:master| }
         else
@@ -337,7 +366,12 @@ module Bundler
         @revision ||= in_cache { git("rev-parse #{ref}").strip }
       end
 
+      def cached?
+        cache_path.exist?
+      end
+
       def in_cache(&blk)
+        cache unless cached?
         Dir.chdir(cache_path, &blk)
       end
     end

data/lib/bundler/specification.rb

@@ -18,5 +18,6 @@ module Bundler
     def full_gem_path
       Pathname.new(loaded_from).dirname.expand_path
     end
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 13
-  version: 0.9.13
+  - 14
+  version: 0.9.14
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency