rubygems-bundler 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/.travis.yml +15 -2
  2. data/Gemfile +2 -0
  3. data/lib/rubygems-bundler/version.rb +1 -1
  4. data/lib/rubygems_plugin.rb +1 -1
  5. data/test/dtf/bundler_comment_test.sh +2 -2
  6. data/test/dtf/rails_and_gemfile_comment_test.sh +3 -3
  7. data/test/dtf/rubygems_comment_test.sh +2 -2
  8. metadata +13 -14
  9. data/.ruby-version +0 -1
data/.travis.yml CHANGED
@@ -3,15 +3,24 @@ rvm:
3
3
  - 1.8.7
4
4
  - 1.9.2
5
5
  - 1.9.3
6
+ - ruby-head
7
+ - jruby-18mode
8
+ - jruby-19mode
9
+ - jruby-head
6
10
  - rbx-18mode
7
11
  - rbx-19mode
12
+ jdk:
13
+ - openjdk7
14
+ env:
15
+ - 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
8
16
  before_install:
9
17
  - 'rm -rf $rvm_path/gems/*/{bin,gems}/rubygems-bundler-* $rvm_path/gems/*/bin/ruby_*_wrapper'
10
18
  - hash -r
11
- install: gem install dtf
19
+ - gem install rake
20
+ install: gem install tf
12
21
  before_script:
13
22
  - unset BUNDLE_GEMFILE
14
- script: dtf --text test/dtf/*
23
+ script: tf --text test/dtf/*
15
24
  notifications:
16
25
  irc:
17
26
  channels:
@@ -22,5 +31,9 @@ notifications:
22
31
  on_failure: change
23
32
  matrix:
24
33
  allow_failures:
34
+ - rvm: jruby-18mode
35
+ - rvm: jruby-19mode
36
+ - rvm: jruby-head
25
37
  - rvm: rbx-18mode
26
38
  - rvm: rbx-19mode
39
+ - rvm: ruby-head
data/Gemfile CHANGED
@@ -1,3 +1,5 @@
1
1
  source "http://rubygems.org"
2
2
 
3
+ #ruby=1.8.7
4
+
3
5
  gemspec
data/lib/rubygems-bundler/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RubygemsBundler
2
- VERSION = "1.0.2"
2
+ VERSION = "1.0.3"
3
3
  end
data/lib/rubygems_plugin.rb CHANGED
@@ -9,7 +9,7 @@ called_version = __FILE__.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
9
9
 
10
10
  # continue only if loaded and called versions all the same, and not shared gems disabled in bundler
11
11
  if rubygems_bundler_spec and rubygems_bundler_spec.version.to_s == called_version and
12
- ( !defined?(Bundler) || ( defined?(Bundler) && !Bundler.settings[:disable_shared_gems]) )
12
+ ( !defined?(Bundler) || ( defined?(Bundler) && Bundler::SharedHelpers.in_bundle? && !Bundler.settings[:disable_shared_gems]) )
13
13
 
14
14
  require 'rubygems/version'
15
15
  require 'rubygems-bundler/wrapper'
data/test/dtf/bundler_comment_test.sh CHANGED
@@ -2,8 +2,8 @@
2
2
  export BUNDLE_GEMFILE=${TMPDIR:-/tmp}/Gemfile
3
3
  printf "source :rubygems\n\ngem 'haml'\n" > ${BUNDLE_GEMFILE}
4
4
 
5
- rake build
6
- rake install # match=/installed/
5
+ yes | rake build
6
+ yes | rake install # match=/installed/
7
7
  gem install bundler # status=0
8
8
 
9
9
  bundle install
data/test/dtf/rails_and_gemfile_comment_test.sh CHANGED
@@ -6,14 +6,14 @@ export PATH="${test_dir}/fake_gem_home/bin:$PATH"
6
6
  mkdir -p "${GEM_HOME}"
7
7
  printf "source :rubygems\n\ngem 'rails'\n" > "${test_dir}/Gemfile"
8
8
 
9
- rake build
10
- rake install # match=/installed/
9
+ yes | rake build
10
+ yes | rake install # match=/installed/
11
11
  gem install bundler # status=0
12
12
 
13
13
  : test
14
14
  builtin cd "${test_dir}"
15
15
  bundle install # match=/Installing rails/
16
- NOEXEC=0 rails new app1
16
+ yes | NOEXEC=0 rails new app1
17
17
  [[ -f app1/Gemfile ]] # status=0
18
18
  [[ -f app1/Gemfile.lock ]] # status=0
19
19
 
data/test/dtf/rubygems_comment_test.sh CHANGED
@@ -1,6 +1,6 @@
1
1
  : init
2
- rake build
3
- rake install # match=/installed/
2
+ yes | rake build
3
+ yes | rake install # match=/installed/
4
4
 
5
5
  gem install haml # match=/1 gem installed/
6
6
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubygems-bundler
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
4
+ hash: 17
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 2
10
- version: 1.0.2
9
+ - 3
10
+ version: 1.0.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Josh Hull
@@ -16,12 +16,12 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2012-05-18 00:00:00 Z
19
+ date: 2012-06-20 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: dtf
23
22
  prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
23
+ name: dtf
24
+ version_requirements: &id001 !ruby/object:Gem::Requirement
25
25
  none: false
26
26
  requirements:
27
27
  - - ">="
@@ -30,12 +30,12 @@ dependencies:
30
30
  segments:
31
31
  - 0
32
32
  version: "0"
33
+ requirement: *id001
33
34
  type: :development
34
- version_requirements: *id001
35
35
  - !ruby/object:Gem::Dependency
36
- name: rake
37
36
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
37
+ name: rake
38
+ version_requirements: &id002 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ">="
@@ -44,12 +44,12 @@ dependencies:
44
44
  segments:
45
45
  - 0
46
46
  version: "0"
47
+ requirement: *id002
47
48
  type: :development
48
- version_requirements: *id002
49
49
  - !ruby/object:Gem::Dependency
50
- name: bundler
51
50
  prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
51
+ name: bundler
52
+ version_requirements: &id003 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ">="
@@ -58,8 +58,8 @@ dependencies:
58
58
  segments:
59
59
  - 0
60
60
  version: "0"
61
+ requirement: *id003
61
62
  type: :development
62
- version_requirements: *id003
63
63
  description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
64
64
  email:
65
65
  - joshbuddy@gmail.com
@@ -73,7 +73,6 @@ extra_rdoc_files: []
73
73
  files:
74
74
  - .gitignore
75
75
  - .noexec.yml
76
- - .ruby-version
77
76
  - .travis.yml
78
77
  - CHANGELOG.md
79
78
  - Gemfile
data/.ruby-version DELETED
@@ -1 +0,0 @@
1
- 1.8.7