bundler 1.5.0.rc.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b55517eaef946a0c5a55f07662dca965e501bf2
-  data.tar.gz: f33ad8374b80d75d6b5ec79059f5a61ec707b263
+  metadata.gz: d6a1c455597080ee1686b208192bc8bbe28a2f52
+  data.tar.gz: 5d5b604070d1790e275b377ee36dab9db0bd9bc7
 SHA512:
-  metadata.gz: 130b5844db4c48d724af351e8dec1232456fd5b5a617c05ce87ca246bcf395a71f9e89bc52d0eb23c6edd0503aeae55fafe9f6a869159ab8f70cceccbb0a36d8
-  data.tar.gz: b47c0b5b410c459374e26d6367ae545327d0a36fe5adda1d236e7cd055ee2d3315be14661c8f88a16e9ea3c37dd4d9c1948f1e6207ede2c74bec42a88f733b91
+  metadata.gz: cf54e78895cdfa87d01b0bf83dcf305c2fae930dd099a21f66a640d4bb593a23d10e02e4718a91419c58316ee0e2f196044c1577d3044d0f96e3fdfccf4a9de6
+  data.tar.gz: 92c8556d766a72dd65781dc41d09f222b981e3b04d12d883eba03c7e029f5e587076342711ad0c6fdb1446eb75dcbb256c35d30042ddaeeeb04150a3f065f722

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.5.0 (2013-12-26)
+
+Features:
+
+  - install missing gems if their specs are present (@hone)
+
+Bugfixes:
+
+  - use print for "Installing…" so messages are thread-safe (@TimMoore)
+
 ## 1.5.0.rc.2 (2013-12-18)
 
 "Features":
@@ -8,7 +18,6 @@
 "Bugfixes":
 
   - Try to catch gem installation race conditions
-  
 
 ## 1.5.0.rc.1 (2013-11-09)
 

data/lib/bundler/source/rubygems.rb

@@ -68,7 +68,7 @@ module Bundler
       end
 
       def install(spec)
-        if installed_specs[spec].any?
+        if installed_specs[spec].any? && gem_dir_exists?(spec)
           return ["Using #{spec.name} (#{spec.version})", nil]
         end
 
@@ -276,6 +276,14 @@ module Bundler
           Bundler.rubygems.sources = old
         end
       end
+
+      def gem_dir_exists?(spec)
+        if spec.name == "bundler"
+          true
+        else
+          File.directory?(spec.full_gem_path)
+        end
+      end
     end
 
   end

data/lib/bundler/vendor/thor/shell/basic.rb

@@ -65,16 +65,13 @@ class Thor
       #
       def say(message="", color=nil, force_new_line=(message.to_s !~ /( |\t)\Z/))
         message = message.to_s
-
         message = set_color(message, *color) if color && can_display_colors?
 
-        spaces = "  " * padding
+        buffer = "  " * padding
+        buffer << message
+        buffer << "\n" if force_new_line && !message.end_with?("\n")
 
-        if force_new_line
-          stdout.puts(spaces + message)
-        else
-          stdout.print(spaces + message)
-        end
+        stdout.print(buffer)
         stdout.flush
       end
 
@@ -91,7 +88,10 @@ class Thor
         status = status.to_s.rjust(12)
         status = set_color status, color, true if color
 
-        stdout.puts "#{status}#{spaces}#{message}"
+        buffer = "#{status}#{spaces}#{message}"
+        buffer << "\n" unless buffer.end_with?("\n")
+
+        stdout.print(buffer)
         stdout.flush
       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.5.0.rc.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.5.0" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/simple_case_spec.rb

@@ -337,6 +337,22 @@ describe "bundle install with gem sources" do
       G
       expect(exitstatus).to eq(0)
     end
+
+    it "reinstalls the gem if the gem dir is missing but the specification file exists" do
+      gemfile(<<-G)
+        source "file://#{gem_repo1}"
+
+        gem 'foo'
+      G
+
+      bundle "install --path vendor/bundle"
+
+      FileUtils.rm_rf(vendored_gems('gems/foo-1.0'))
+
+      bundle "install"
+
+      expect(vendored_gems('gems/foo-1.0')).to exist
+    end
   end
 
   describe "when Bundler root contains regex chars" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc.2
+  version: 1.5.0
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -436,3 +436,4 @@ test_files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
+has_rdoc: