bundler 1.3.0.pre.4 → 1.3.0.pre.5

data/.travis.yml

@@ -1,6 +1,12 @@
 language: ruby
 script: rake spec:travis
 before_script: rake spec:travis:deps
+branches:
+  only:
+    - master
+    - 1-2-stable
+    - 1-1-stable
+    - 1-0-stable
 notifications:
   email:
     - mail@arko.net

data/CHANGELOG.md

@@ -1,9 +1,22 @@
+## 1.3.0.pre.5 (Jan 9, 2013)
+
+Features:
+
+  - make `--standalone` require lines ruby engine/version agnostic
+  - add `--dry-run` to `bundle clean` (@wfarr, #2237)
+
+Bugfixes:
+
+  - don't skip writing binstubs when doing `bundle install`
+  - distinguish between ruby 1.9/2.0 when using :platforms (@spastorino)
+
 ## 1.3.0.pre.4 (Jan 3, 2013)
 
 Features:
 
   - `bundle binstubs <gem>` to setup individual binstubs
   - `bundle install --binstubs ""` will remove binstubs option
+  - `bundle clean --dry-run` will print out gems instead of removing them
 
 Bugfixes:
 

data/CONTRIBUTE.md

@@ -14,7 +14,7 @@ The Bundler core team consists of André Arko ([@indirect](http://github.com/ind
 When adding a new feature to Bundler, please follow these steps:
 
   1. [Create an issue](https://github.com/carlhuda/bundler/issues/new) to discuss your feature.
-  2. Base your commits on the master branch, since we follow [SemVer](http://semver.com) and don't add new features to old releases.
+  2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) and don't add new features to old releases.
   3. Commit the code and at least one test covering your changes to a feature branch in your fork.
   4. Put a line in the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the "Features" heading.
   5. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your feature branch.

data/lib/bundler/cli.rb

@@ -351,7 +351,7 @@ module Bundler
       if spec.name == "bundler"
         Bundler.ui.warn "Skipping bundler since can't bundle bundler."
       else
-        installer.generate_bundler_executable_stubs(spec, :force => options[:force])
+        installer.generate_bundler_executable_stubs(spec, :force => options[:force], :binstubs_cmd => true)
       end
     end
 
@@ -672,10 +672,13 @@ module Bundler
     end
 
     desc "clean", "Cleans up unused gems in your bundler directory"
+    method_option "dry-run", :type => :boolean, :default => false, :banner =>
+      "only print out changes, do not actually clean gems"
     method_option "force", :type => :boolean, :default => false, :banner =>
       "forces clean even if --path is not set"
     def clean
       if Bundler.settings[:path] || options[:force]
+        Bundler.settings[:dry_run] = options[:"dry-run"]
         Bundler.load.clean
       else
         Bundler.ui.error "Can only use bundle clean when --path is set or --force is set"

data/lib/bundler/dependency.rb

@@ -81,20 +81,32 @@ module Bundler
 
   private
 
+    def on_18?
+      RUBY_VERSION =~ /^1\.8/
+    end
+
+    def on_19?
+      RUBY_VERSION =~ /^1\.9/
+    end
+
+    def on_20?
+      RUBY_VERSION =~ /^2\.0/
+    end
+
     def ruby?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
 
     def ruby_18?
-      ruby? && RUBY_VERSION < "1.9"
+      ruby? && on_18?
     end
 
     def ruby_19?
-      ruby? && RUBY_VERSION >= "1.9"
+      ruby? && on_19?
     end
 
     def ruby_20?
-      ruby? && RUBY_VERSION >= "2.0"
+      ruby? && on_20?
     end
 
     def mri?
@@ -102,16 +114,16 @@ module Bundler
     end
 
     def mri_18?
-      mri? && RUBY_VERSION < "1.9"
+      mri? && on_18?
     end
 
     def mri_19?
-      mri? && RUBY_VERSION >= "1.9"
+      mri? && on_19?
     end
 
 
     def mri_20?
-      mri? && RUBY_VERSION >= "2.0"
+      mri? && on_20?
     end
 
     def rbx?
@@ -135,15 +147,15 @@ module Bundler
     end
 
     def mingw_18?
-      mingw? && RUBY_VERSION < "1.9"
+      mingw? && on_18?
     end
 
     def mingw_19?
-      mingw? && RUBY_VERSION >= "1.9"
+      mingw? && on_19?
     end
 
     def mingw_20?
-      mingw? && RUBY_VERSION >= "2.0"
+      mingw? && on_20?
     end
 
   end

data/lib/bundler/installer.rb

@@ -137,7 +137,7 @@ module Bundler
         write        = true
         binstub_path = "#{bin_path}/#{executable}"
         next if executable == "bundle"
-        if File.exists?(binstub_path) && !options[:force]
+        if File.exists?(binstub_path) && !options[:force] && options[:binstubs_cmd]
           write = false
           Bundler.ui.warn <<-MSG
             Skipping #{executable} since it already exists. Pass --force to overwrite.
@@ -188,12 +188,16 @@ module Bundler
 
         spec.require_paths.each do |path|
           full_path = File.join(spec.full_gem_path, path)
-          paths << Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
+          gem_path = Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
+          paths << gem_path.to_s.sub("#{SystemRubyVersion.new.engine}/#{RbConfig::CONFIG['ruby_version']}", '#{ruby_engine}/#{ruby_version}')
         end
       end
 
 
       File.open File.join(bundler_path, "setup.rb"), "w" do |file|
+        file.puts "# ruby 1.8.7 doesn't define RUBY_ENGINE"
+        file.puts "ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'"
+        file.puts "ruby_version = RbConfig::CONFIG[\"ruby_version\"]"
         file.puts "path = File.expand_path('..', __FILE__)"
         paths.each do |path|
           file.puts %{$:.unshift File.expand_path("\#{path}/#{path}")}

data/lib/bundler/runtime.rb

@@ -156,38 +156,46 @@ module Bundler
       stale_gem_files      = gem_files - spec_cache_paths
       stale_gemspec_files  = gemspec_files - spec_gemspec_paths
 
-      stale_gem_bins.each {|bin| FileUtils.rm(bin) }
       output = stale_gem_dirs.collect do |gem_dir|
         full_name = Pathname.new(gem_dir).basename.to_s
 
-        FileUtils.rm_rf(gem_dir)
-
         parts   = full_name.split('-')
         name    = parts[0..-2].join('-')
         version = parts.last
         output  = "#{name} (#{version})"
 
-        Bundler.ui.info "Removing #{output}"
+        if Bundler.settings[:dry_run]
+          Bundler.ui.info "Would have removed #{output}"
+        else
+          Bundler.ui.info "Removing #{output}"
+          FileUtils.rm_rf(gem_dir)
+        end
 
         output
       end + stale_git_dirs.collect do |gem_dir|
         full_name = Pathname.new(gem_dir).basename.to_s
 
-        FileUtils.rm_rf(gem_dir)
-
         parts    = full_name.split('-')
         name     = parts[0..-2].join('-')
         revision = parts[-1]
         output   = "#{name} (#{revision})"
 
-        Bundler.ui.info "Removing #{output}"
+        if Bundler.settings[:dry_run]
+          Bundler.ui.info "Would have removed #{output}"
+        else
+          Bundler.ui.info "Removing #{output}"
+          FileUtils.rm_rf(gem_dir)
+        end
 
         output
       end
 
-      stale_gem_files.each {|file| FileUtils.rm(file) if File.exists?(file) }
-      stale_gemspec_files.each {|file| FileUtils.rm(file) if File.exists?(file) }
-      stale_git_cache_dirs.each {|dir| FileUtils.rm_rf(dir) if File.exists?(dir) }
+      unless Bundler.settings[:dry_run]
+        stale_gem_bins.each { |bin| FileUtils.rm(bin) if File.exists?(bin) }
+        stale_gem_files.each { |file| FileUtils.rm(file) if File.exists?(file) }
+        stale_gemspec_files.each { |file| FileUtils.rm(file) if File.exists?(file) }
+        stale_git_cache_dirs.each { |dir| FileUtils.rm_rf(dir) if File.exists?(dir) }
+      end
 
       output
     end

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.3.0.pre.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.3.0.pre.5" unless defined?(::Bundler::VERSION)
 end

data/spec/other/clean_spec.rb

@@ -531,4 +531,32 @@ describe "bundle clean" do
 
     expect(exitstatus).to eq(0)
   end
+
+  it "doesn't remove gems in dry-run mode" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "foo"
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+    G
+
+    bundle :install
+
+    bundle "clean --dry-run"
+
+    expect(out).not_to eq("Removing foo (1.0)")
+    expect(out).to eq("Would have removed foo (1.0)")
+
+    should_have_gems 'thin-1.0', 'rack-1.0.0', 'foo-1.0'
+
+    expect(vendored_gems("bin/rackup")).to exist
+  end
 end

data/spec/runtime/executable_spec.rb

@@ -129,4 +129,21 @@ describe "Running bin/* commands" do
 
     expect(bundled_app("bin/rackup")).to exist
   end
+
+  it "always reinstalls the binstub" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+
+    bundle "install --binstubs bin/"
+
+    File.open(bundled_app("bin/rackup"), 'wb') do |file|
+      file.print "OMG"
+    end
+
+    bundle "install"
+
+    expect(File.read(bundled_app("bin/rackup"))).not_to eq("OMG")
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: -803975870
+  hash: -3803691018
   prerelease: 6
   segments: 
   - 1
   - 3
   - 0
   - pre
-  - 4
-  version: 1.3.0.pre.4
+  - 5
+  version: 1.3.0.pre.5
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-04 00:00:00 Z
+date: 2013-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn