bundler 1.0.0 → 1.0.2

data/lib/bundler/cli.rb

@@ -42,7 +42,7 @@ module Bundler
       if manpages.include?(command)
         root = File.expand_path("../man", __FILE__)
 
-        if have_groff?
+        if have_groff? && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
           groff   = "groff -Wall -mtty-char -mandoc -Tascii"
           pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'more'
 
@@ -211,7 +211,7 @@ module Bundler
       Bundler.settings[:path] = opts[:path] if opts[:path]
       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
       Bundler.settings[:disable_shared_gems] = '1' if Bundler.settings[:path]
-      Bundler.settings.without = opts[:without]
+      Bundler.settings.without = opts[:without] unless opts[:without].empty?
       Bundler.ui.be_quiet! if opts[:quiet]
 
       Installer.install(Bundler.root, Bundler.definition, opts)
@@ -398,9 +398,12 @@ module Bundler
     def open(name)
       editor = [ENV['BUNDLER_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
+        gem_path = locate_gem(name)
+        Dir.chdir(gem_path) do
+          command = "#{editor} #{gem_path}"
+          success = system(command)
+          Bundler.ui.info "Could not run '#{command}'" unless success
+        end
       else
         Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
       end
@@ -453,24 +456,23 @@ module Bundler
     end
 
     desc "gem GEM", "Creates a skeleton for creating a rubygem"
+    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."
     def gem(name)
       target = File.join(Dir.pwd, name)
-      if File.exist?(name)
-        Bundler.ui.error "File already exists at #{File.join(Dir.pwd, name)}"
-        exit 1
-      end
-
       constant_name = name.split('_').map{|p| p.capitalize}.join
       constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/
       constant_array = constant_name.split('::')
       FileUtils.mkdir_p(File.join(target, 'lib', name))
       opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array}
-      template(File.join('newgem', 'Gemfile.tt'),                     File.join(target, 'Gemfile'),                 opts)
-      template(File.join('newgem', 'Rakefile.tt'),                    File.join(target, 'Rakefile'),                opts)
-      template(File.join('newgem', 'gitignore.tt'),                   File.join(target, '.gitignore'),              opts)
-      template(File.join('newgem', 'newgem.gemspec.tt'),              File.join(target, "#{name}.gemspec"),         opts)
-      template(File.join('newgem', 'lib', 'newgem.rb.tt'),            File.join(target, 'lib', "#{name}.rb"),       opts)
-      template(File.join('newgem', 'lib', 'newgem', 'version.rb.tt'), File.join(target, 'lib', name, 'version.rb'), opts)
+      template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                opts)
+      template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),               opts)
+      template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)
+      template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),        opts)
+      template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{name}.rb"),         opts)
+      template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{name}/version.rb"), opts)
+      if options[:bin]
+        template(File.join("newgem/bin/newgem.tt"),          File.join(target, 'bin', name),              opts)
+      end
       Bundler.ui.info "Initializating git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }
     end

data/lib/bundler/deployment.rb

@@ -0,0 +1,37 @@
+module Bundler
+  class Deployment
+    def self.define_task(context, task_method = :task, opts = {})
+      context.send :namespace, :bundle do
+        send :desc, <<-DESC
+          Install the current Bundler environment. By default, gems will be \
+          installed to the shared/bundle path. Gems in the development and \
+          test group will not be installed. The install command is executed \
+          with the --deployment and --quiet flags. You can override any of \
+          these defaults by setting the variables shown below. If the bundle \
+          cmd cannot be found then you can override the bundle_cmd variable \
+          to specifiy which one it should use.
+
+            set :bundle_gemfile,      "Gemfile"
+            set :bundle_dir,          File.join(fetch(:shared_path), 'bundle')
+            set :bundle_flags,        "--deployment --quiet"
+            set :bundle_without,      [:development, :test]
+            set :bundle_cmd,          "bundle" # e.g. change to "/opt/ruby/bin/bundle"
+        DESC
+        send task_method, :install, opts do
+          bundle_cmd     = context.fetch(:bundle_cmd, "bundle")
+          bundle_flags   = context.fetch(:bundle_flags, "--deployment --quiet")
+          bundle_dir     = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), 'bundle'))
+          bundle_gemfile = context.fetch(:bundle_gemfile, "Gemfile")
+          bundle_without = [*context.fetch(:bundle_without, [:development, :test])].compact
+
+          args = ["--gemfile #{File.join(context.fetch(:current_release), bundle_gemfile)}"]
+          args << "--path #{bundle_dir}" unless bundle_dir.to_s.empty?
+          args << bundle_flags.to_s
+          args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
+
+          run "#{bundle_cmd} install #{args.join(' ')}"
+        end
+      end
+    end
+  end
+end

data/lib/bundler/dsl.rb

@@ -32,11 +32,11 @@ module Bundler
         spec = Gem::Specification.load(gemspecs.first)
         gem spec.name, :path => path
         spec.runtime_dependencies.each do |dep|
-          gem dep.name, dep.requirement.to_s
+          gem dep.name, *dep.requirement.as_list
         end
         group(development_group) do
           spec.development_dependencies.each do |dep|
-            gem dep.name, dep.requirement.to_s
+            gem dep.name, *dep.requirement.as_list
           end
         end
       when 0
@@ -226,7 +226,7 @@ module Bundler
 
       opts["source"]  ||= @source
       opts["env"]     ||= @env
-      opts["platforms"] = @platforms.dup
+      opts["platforms"] = platforms.dup
       opts["group"]     = groups
     end
 

data/lib/bundler/gem_helper.rb

@@ -6,7 +6,7 @@ module Bundler
   class GemHelper
     def self.install_tasks(opts = nil)
       dir = caller.find{|c| /Rakefile:/}[/^(.*?)\/Rakefile:/, 1]
-      GemHelper.new(dir, opts && opts[:name]).install
+      self.new(dir, opts && opts[:name]).install
     end
 
     attr_reader :spec_path, :base, :gemspec
@@ -40,7 +40,7 @@ module Bundler
     def build_gem
       file_name = nil
       sh("gem build #{spec_path}") { |out, err|
-        raise err if err[/ERROR/]
+        raise err if !out[/Successfully/]
         file_name = File.basename(built_gem_path)
         FileUtils.mkdir_p(File.join(base, 'pkg'))
         FileUtils.mv(built_gem_path, 'pkg')
@@ -52,11 +52,8 @@ module Bundler
     def install_gem
       built_gem_path = build_gem
       out, err, code = sh_with_code("gem install #{built_gem_path}")
-      if err[/ERROR/]
-        Bundler.ui.error err
-      else
-        Bundler.ui.confirm "#{name} (#{version}) installed"
-      end
+      raise err if err[/ERROR/]
+      Bundler.ui.confirm "#{name} (#{version}) installed"
     end
 
     def release_gem

data/lib/bundler/graph.rb

@@ -1,7 +1,7 @@
 module Bundler
   class Graph
 
-    USER_OPTIONS = {:style => 'filled, bold', :fillcolor => '#cccccc'}.freeze
+    USER_OPTIONS = {:style => 'filled', :fillcolor => '#B9B9D5'}.freeze
 
     def initialize(env)
       @env = env
@@ -21,7 +21,7 @@ module Bundler
       require 'graphviz'
       populate
 
-      graph_viz = GraphViz::new('Gemfile', {:concentrate => true, :dpi => 65 } )
+      graph_viz = GraphViz::new('Gemfile', {:concentrate => true, :normalize => true, :nodesep => 0.55})
       graph_viz.edge[:fontname] = graph_viz.node[:fontname] = 'Arial, Helvetica, SansSerif'
       graph_viz.edge[:fontsize] = 12
 
@@ -38,7 +38,7 @@ module Bundler
 
       group_nodes = {}
       @groups.each do |name, dependencies|
-        group_nodes[name] = graph_viz.add_node(name.to_s, { :shape => 'folder', :fontsize => 16 }.merge(USER_OPTIONS))
+        group_nodes[name] = graph_viz.add_node(name.to_s, { :shape => 'box3d', :fontsize => 16 }.merge(USER_OPTIONS))
         dependencies.each do |dependency|
           options = { :weight => 2 }
           if show_dependency_requirements && (dependency.requirement.to_s != ">= 0")

data/lib/bundler/installer.rb

@@ -71,6 +71,7 @@ module Bundler
       bin_path = Bundler.bin_path
       template = File.read(File.expand_path('../templates/Executable', __FILE__))
       relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path)
+      ruby_command = Thor::Util.ruby_command
 
       spec.executables.each do |executable|
         next if executable == "bundle"

data/lib/bundler/lockfile_parser.rb

@@ -11,7 +11,7 @@ module Bundler
       @specs        = []
       @state        = :source
 
-      lockfile.split(/\n+/).each do |line|
+      lockfile.split(/(\r?\n)+/).each do |line|
         if line == "DEPENDENCIES"
           @state = :dependency
         elsif line == "PLATFORMS"

data/lib/bundler/man/bundle

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE" "1" "August 2010" "" ""
+.TH "BUNDLE" "1" "October 2010" "" ""
 .
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management

data/lib/bundler/man/bundle-config

@@ -0,0 +1,92 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-CONFIG" "1" "October 2010" "" ""
+.
+.SH "NAME"
+\fBbundle\-config\fR \- Set bundler configuration options
+.
+.SH "SYNOPSIS"
+\fBbundle config\fR [\fIname\fR [\fIvalue\fR]]
+.
+.SH "DESCRIPTION"
+This command allows you to interact with bundler\'s configuration system\. Bundler retrieves its configuration from the local application (\fBapp/\.bundle/config\fR), environment variables, and the user\'s home directory (\fB~/\.bundle/config\fR), in that order of priority\.
+.
+.P
+Executing \fBbundle config\fR with no parameters will print a list of all bundler configuration for the current bundle, and where that configuration was set\.
+.
+.P
+Executing \fBbundle config <name>\fR will print the value of that configuration setting, and where it was set\.
+.
+.P
+Executing \fBbundle config <name> <value>\fR will set that configuration to the value specified for all bundles executed as the current user\. The configuration will be stored in \fB~/\.bundle/config\fR\.
+.
+.SH "BUILD OPTIONS"
+You can use \fBbundle config\fR to give bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\.
+.
+.P
+A very common example, the \fBmysql\fR gem, requires Snow Leopard users to pass configuration flags to \fBgem install\fR to specify where to find the \fBmysql_config\fR executable\.
+.
+.IP "" 4
+.
+.nf
+
+gem install mysql \-\- \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Since the specific location of that executable can change from machine to machine, you can specify these flags on a per\-machine basis\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config build\.mysql \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
+.
+.fi
+.
+.IP "" 0
+.
+.P
+After running this command, every time bundler needs to install the \fBmysql\fR gem, it will pass along the flags you specified\.
+.
+.SH "CONFIGURATION KEYS"
+Configuration keys in bundler have two forms: the canonical form and the environment variable form\.
+.
+.P
+For instance, passing the \fB\-\-without\fR flag to bundle install(1) \fIbundle\-install\.1\.html\fR prevents Bundler from installing certain groups specified in the Gemfile(5)\. Bundler persists this value in \fBapp/\.bundle/config\fR so that calls to \fBBundler\.setup\fR do not try to find gems from the \fBGemfile\fR that you didn\'t install\. Additionally, subsequent calls to bundle install(1) \fIbundle\-install\.1\.html\fR remember this setting and skip those groups\.
+.
+.P
+The canonical form of this configuration is \fB"without"\fR\. To convert the canonical form to the environment variable form, capitalize it, and prepend \fBBUNDLE_\fR\. The environment variable form of \fB"without"\fR is \fBBUNDLE_WITHOUT\fR\.
+.
+.SH "LIST OF AVAILABLE KEYS"
+The following is a list of all configuration keys and their purpose\. You can learn more about their operation in bundle install(1) \fIbundle\-install\.1\.html\fR\.
+.
+.TP
+\fBpath\fR (\fBBUNDLE_PATH\fR)
+The location on disk to install gems\. Defaults to \fB$GEM_HOME\fR in development and \fBvendor/bundler\fR when \fB\-\-deployment\fR is used
+.
+.TP
+\fBfrozen\fR (\fBBUNDLE_FROZEN\fR)
+Disallow changes to the \fBGemfile\fR\. Defaults to \fBtrue\fR when \fB\-\-deployment\fR is used\.
+.
+.TP
+\fBwithout\fR (\fBBUNDLE_WITHOUT\fR)
+A \fB:\fR\-separated list of groups whose gems bundler should not install
+.
+.TP
+\fBbin\fR (\fBBUNDLE_BIN\fR)
+Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\.
+.
+.TP
+\fBgemfile\fR (\fBBUNDLE_GEMFILE\fR)
+The name of the file that bundler should use as the \fBGemfile\fR\. This location of this file also sets the root of the project, which is used to resolve relative paths in the \fBGemfile\fR, among other things\. By default, bundler will search up from the current working directory until it finds a \fBGemfile\fR\.
+.
+.P
+In general, you should set these settings per\-application by using the applicable flag to the bundle install(1) \fIbundle\-install\.1\.html\fR command\.
+.
+.P
+You can set them globally either via environment variables or \fBbundle config\fR, whichever is preferable for your setup\. If you use both, environment variables will take preference over global settings\.

data/lib/bundler/man/bundle-config.txt

@@ -1,66 +1,108 @@
+BUNDLE-CONFIG(1)					      BUNDLE-CONFIG(1)
 
 
 
+NAME
+       bundle-config - Set bundler configuration options
 
+SYNOPSIS
+       bundle config [name [value]]
 
+DESCRIPTION
+       This  command  allows you to interact with bundler's configuration sys-
+       tem. Bundler retrieves its configuration  from  the  local  application
+       (app/.bundle/config), environment variables, and the user's home direc-
+       tory (~/.bundle/config), in that order of priority.
 
+       Executing bundle config with no parameters will print  a  list  of  all
+       bundler configuration for the current bundle, and where that configura-
+       tion was set.
 
+       Executing bundle config <name> will print the value of that  configura-
+       tion setting, and where it was set.
 
+       Executing  bundle  config <name> <value> will set that configuration to
+       the value specified for all bundles executed as the current  user.  The
+       configuration will be stored in ~/.bundle/config.
 
+BUILD OPTIONS
+       You  can use bundle config to give bundler the flags to pass to the gem
+       installer every time bundler tries to install a particular gem.
 
+       A very common example, the mysql gem, requires Snow  Leopard  users  to
+       pass  configuration  flags  to gem install to specify where to find the
+       mysql_config executable.
 
 
 
+	   gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
 
 
 
+       Since the specific location of that executable can change from  machine
+       to machine, you can specify these flags on a per-machine basis.
 
 
 
+	   bundle config build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
 
 
 
+       After  running  this  command,  every time bundler needs to install the
+       mysql gem, it will pass along the flags you specified.
 
+CONFIGURATION KEYS
+       Configuration keys in bundler have two forms: the  canonical  form  and
+       the environment variable form.
 
+       For  instance,  passing	the  --without	flag to bundle install(1) bun-
+       dle-install.1.html prevents  Bundler  from  installing  certain	groups
+       specified  in  the Gemfile(5). Bundler persists this value in app/.bun-
+       dle/config so that calls to Bundler.setup do not try to find gems  from
+       the  Gemfile that you didn't install. Additionally, subsequent calls to
+       bundle install(1) bundle-install.1.html remember this setting and  skip
+       those groups.
 
+       The  canonical  form of this configuration is "without". To convert the
+       canonical form to the environment variable  form,  capitalize  it,  and
+       prepend	BUNDLE_.  The  environment  variable form of "without" is BUN-
+       DLE_WITHOUT.
 
+LIST OF AVAILABLE KEYS
+       The following is a list of all configuration keys  and  their  purpose.
+       You  can  learn	more  about  their operation in bundle install(1) bun-
+       dle-install.1.html.
 
+       path (BUNDLE_PATH)
+	      The location on disk to install gems. Defaults to  $GEM_HOME  in
+	      development and vendor/bundler when --deployment is used
 
+       frozen (BUNDLE_FROZEN)
+	      Disallow changes to the Gemfile. Defaults to true when --deploy-
+	      ment is used.
 
+       without (BUNDLE_WITHOUT)
+	      A :-separated list of  groups  whose  gems  bundler  should  not
+	      install
 
+       bin (BUNDLE_BIN)
+	      Install  executables  from  gems	in the bundle to the specified
+	      directory. Defaults to false.
 
+       gemfile (BUNDLE_GEMFILE)
+	      The name of the file that bundler should	use  as  the  Gemfile.
+	      This  location  of  this file also sets the root of the project,
+	      which is used to resolve relative paths in  the  Gemfile,  among
+	      other  things.  By default, bundler will search up from the cur-
+	      rent working directory until it finds a Gemfile.
 
+       In general, you should set these settings per-application by using  the
+       applicable flag to the bundle install(1) bundle-install.1.html command.
 
+       You can set them globally either via environment  variables  or	bundle
+       config,	whichever is preferable for your setup. If you use both, envi-
+       ronment variables will take preference over global settings.
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+				 October 2010		      BUNDLE-CONFIG(1)

data/lib/bundler/man/bundle-exec

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-EXEC" "1" "August 2010" "" ""
+.TH "BUNDLE\-EXEC" "1" "October 2010" "" ""
 .
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle