bundler 1.1.rc.6 → 1.1.rc.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.rc.7 (Dec 29, 2011)
+
+Bugfixes:
+
+  - Fix bug where `clean` would break when using :path with no gemspec
+
 ## 1.1.rc.6 (Dec 22, 2011)
 
 Bugfixes:

data/lib/bundler/rubygems_integration.rb

@@ -269,7 +269,8 @@ module Bundler
     # Rubygems 1.8+
     def backport_base_dir
       Gem::Specification.send(:define_method, :base_dir) do
-        installation_path
+        return Gem.dir unless loaded_from
+        File.dirname File.dirname loaded_from
       end
     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.1.rc.6" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.rc.7" unless defined?(::Bundler::VERSION)
 end

data/spec/other/clean_spec.rb

@@ -468,4 +468,25 @@ describe "bundle clean" do
     exitstatus.should == 0
     out.should == "1.0"
   end
+
+  it "doesn't blow up on path gems without a .gempsec" do
+    relative_path = "vendor/private_gems/bar-1.0"
+    absolute_path = bundled_app(relative_path)
+    FileUtils.mkdir_p("#{absolute_path}/lib/bar")
+    File.open("#{absolute_path}/lib/bar/bar.rb", 'wb') do |file|
+      file.puts "module Bar; end"
+    end
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+      gem "bar", "1.0", :path => "#{relative_path}"
+    G
+
+    bundle "install --path vendor/bundle"
+    bundle :clean, :exitstatus => true
+
+    exitstatus.should eq(0)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15424241
+  hash: 15424243
   prerelease: true
   segments: 
   - 1
   - 1
   - rc
-  - 6
-  version: 1.1.rc.6
+  - 7
+  version: 1.1.rc.7
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 -08:00
+date: 2011-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,20 +235,20 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/bundle
 - lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
 - lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-install.txt
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
@@ -285,81 +285,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: 
-- spec/bundler/dsl_spec.rb
-- spec/bundler/gem_helper_spec.rb
-- spec/bundler/source_spec.rb
-- spec/cache/gems_spec.rb
-- spec/cache/git_spec.rb
-- spec/cache/path_spec.rb
-- spec/cache/platform_spec.rb
-- spec/install/deploy_spec.rb
-- spec/install/deprecated_spec.rb
-- spec/install/gems/c_ext_spec.rb
-- spec/install/gems/dependency_api_spec.rb
-- spec/install/gems/env_spec.rb
-- spec/install/gems/flex_spec.rb
-- spec/install/gems/groups_spec.rb
-- spec/install/gems/packed_spec.rb
-- spec/install/gems/platform_spec.rb
-- spec/install/gems/post_install_spec.rb
-- spec/install/gems/resolving_spec.rb
-- spec/install/gems/simple_case_spec.rb
-- spec/install/gems/standalone_spec.rb
-- spec/install/gems/sudo_spec.rb
-- spec/install/gems/win32_spec.rb
-- spec/install/gemspec_spec.rb
-- spec/install/git_spec.rb
-- spec/install/invalid_spec.rb
-- spec/install/path_spec.rb
-- spec/install/upgrade_spec.rb
-- spec/lock/git_spec.rb
-- spec/lock/lockfile_spec.rb
-- spec/other/check_spec.rb
-- spec/other/clean_spec.rb
-- spec/other/config_spec.rb
-- spec/other/console_spec.rb
-- spec/other/exec_spec.rb
-- spec/other/ext_spec.rb
-- spec/other/help_spec.rb
-- spec/other/init_spec.rb
-- spec/other/newgem_spec.rb
-- spec/other/open_spec.rb
-- spec/other/outdated_spec.rb
-- spec/other/show_spec.rb
-- spec/quality_spec.rb
-- spec/realworld/edgecases_spec.rb
-- spec/resolver/basic_spec.rb
-- spec/resolver/platform_spec.rb
-- spec/runtime/executable_spec.rb
-- spec/runtime/load_spec.rb
-- spec/runtime/platform_spec.rb
-- spec/runtime/require_spec.rb
-- spec/runtime/setup_spec.rb
-- spec/runtime/with_clean_env_spec.rb
-- spec/spec_helper.rb
-- spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
-- spec/support/artifice/endpoint.rb
-- spec/support/artifice/endpoint_500.rb
-- spec/support/artifice/endpoint_api_missing.rb
-- spec/support/artifice/endpoint_basic_authentication.rb
-- spec/support/artifice/endpoint_extra.rb
-- spec/support/artifice/endpoint_extra_missing.rb
-- spec/support/artifice/endpoint_fallback.rb
-- spec/support/artifice/endpoint_marshal_fail.rb
-- spec/support/artifice/endpoint_redirect.rb
-- spec/support/builders.rb
-- spec/support/fakeweb/rack-1.0.0.marshal
-- spec/support/fakeweb/windows.rb
-- spec/support/helpers.rb
-- spec/support/indexes.rb
-- spec/support/matchers.rb
-- spec/support/path.rb
-- spec/support/platforms.rb
-- spec/support/ruby_ext.rb
-- spec/support/rubygems_ext.rb
-- spec/support/rubygems_hax/platform.rb
-- spec/support/sudo.rb
-- spec/update/gems_spec.rb
-- spec/update/git_spec.rb
-- spec/update/source_spec.rb
+test_files: []
+