rubygems-bundler 1.0.2 → 1.0.3

data/.travis.yml

@@ -3,15 +3,24 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - ruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
   - rbx-18mode
   - rbx-19mode
+jdk:
+  - openjdk7
+env:
+  - 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
 before_install:
   - 'rm -rf $rvm_path/gems/*/{bin,gems}/rubygems-bundler-* $rvm_path/gems/*/bin/ruby_*_wrapper'
   - hash -r
-install: gem install dtf
+  - gem install rake
+install: gem install tf
 before_script:
   - unset BUNDLE_GEMFILE
-script: dtf --text test/dtf/*
+script: tf --text test/dtf/*
 notifications:
   irc:
     channels:
@@ -22,5 +31,9 @@ notifications:
     on_failure: change
 matrix:
   allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
     - rvm: rbx-18mode
     - rvm: rbx-19mode
+    - rvm: ruby-head

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+#ruby=1.8.7
+
 gemspec

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/rubygems_plugin.rb

@@ -9,7 +9,7 @@ called_version = __FILE__.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
 
 # continue only if loaded and called versions all the same, and not shared gems disabled in bundler
 if rubygems_bundler_spec and rubygems_bundler_spec.version.to_s == called_version and
-  ( !defined?(Bundler) || ( defined?(Bundler) && !Bundler.settings[:disable_shared_gems]) )
+  ( !defined?(Bundler) || ( defined?(Bundler) && Bundler::SharedHelpers.in_bundle? && !Bundler.settings[:disable_shared_gems]) )
 
   require 'rubygems/version'
   require 'rubygems-bundler/wrapper'

data/test/dtf/bundler_comment_test.sh

@@ -2,8 +2,8 @@
 export BUNDLE_GEMFILE=${TMPDIR:-/tmp}/Gemfile
 printf "source :rubygems\n\ngem 'haml'\n" > ${BUNDLE_GEMFILE}
 
-rake build
-rake install # match=/installed/
+yes | rake build
+yes | rake install # match=/installed/
 gem install bundler # status=0
 
 bundle install

data/test/dtf/rails_and_gemfile_comment_test.sh

@@ -6,14 +6,14 @@ export PATH="${test_dir}/fake_gem_home/bin:$PATH"
 mkdir -p "${GEM_HOME}"
 printf "source :rubygems\n\ngem 'rails'\n" > "${test_dir}/Gemfile"
 
-rake build
-rake install        # match=/installed/
+yes | rake build
+yes | rake install        # match=/installed/
 gem install bundler # status=0
 
 : test
 builtin cd "${test_dir}"
 bundle install             # match=/Installing rails/
-NOEXEC=0 rails new app1
+yes | NOEXEC=0 rails new app1
 [[ -f app1/Gemfile ]]      # status=0
 [[ -f app1/Gemfile.lock ]] # status=0
 

data/test/dtf/rubygems_comment_test.sh

@@ -1,6 +1,6 @@
 : init
-rake build
-rake install # match=/installed/
+yes | rake build
+yes | rake install # match=/installed/
 
 gem install haml          # match=/1 gem installed/
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,12 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-18 00:00:00 Z
+date: 2012-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dtf
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: dtf
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
   type: :development
-  version_requirements: *id003
 description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
 email: 
 - joshbuddy@gmail.com
@@ -73,7 +73,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .noexec.yml
-- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile

data/.ruby-version

@@ -1 +0,0 @@
-1.8.7