rubygems-bundler 1.1.0 → 1.1.1

data/.noexec.yaml

@@ -0,0 +1,2 @@
+exclude:
+  - tf

data/.travis.yml

@@ -3,20 +3,16 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - 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
-  - gem install rake
+  - 'curl -L https://get.smf.sh | sh'
+  - 'export PATH=~/.sm/bin:$PATH'
+  - 'sm ext install gem mpapis/sm_gem'
 install: gem install tf -v '>=0.4.1'
 before_script:
   - unset BUNDLE_GEMFILE
@@ -30,10 +26,26 @@ notifications:
       - mpapis@gmail.com
     on_failure: change
 matrix:
+  include:
+    - rvm: jruby-18mode
+      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
+      jdk: openjdk7
+    - rvm: jruby-19mode
+      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
+      jdk: openjdk7
+    - rvm: jruby-head
+      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
+      jdk: openjdk7
   allow_failures:
     - rvm: jruby-18mode
+      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
+      jdk: openjdk7
     - rvm: jruby-19mode
+      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
+      jdk: openjdk7
     - rvm: jruby-head
+      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
+      jdk: openjdk7
     - rvm: rbx-18mode
     - rvm: rbx-19mode
     - rvm: ruby-head

data/README.md

@@ -20,10 +20,10 @@ And you're done!
 ## Configuration
 
 ### ~/.gemrc
-
-It's no more required to modify `~/.gemrc` anymore,
+  
+You no longer need to modify `~/.gemrc`,
 just remove the old entry to be sure it works as expected.
-In case you need to use your own `custom_shebang`
+If you need to use your own `custom_shebang`,
 you can define it in `~/.gemrc` to override the default:
 
     custom_shebang: $env <your_custom_shebang_program>
@@ -67,7 +67,8 @@ Things not going the way you'd like? Try your command again with
 
 [#rubygems-bundler on irc.freenode.net](http://webchat.freenode.net/?channels=#rubygems-bundler)
 
-If you do not get relatively fast an answer make sure to leave an email to secure an later answer.
+If you do not get an answer relatively quickly, 
+be sure to leave your email address so someone can get back to you later.
 
 ## How does this work (ruby_noexec_wrapper)
 
@@ -77,7 +78,7 @@ and every directory above it until it can find a `Gemfile`.
 If the executable you're running is present in your Gemfile,
 it switches to using that `Gemfile` instead (via `Bundle.setup`).
 
-Rubygems and Bundler integration, makes executable wrappers
+Rubygems and Bundler integration makes executable wrappers
 generated by rubygems aware of bundler.
 
 rubygems-bundler was merged with [noexec gem](https://github.com/joshbuddy/noexec) in version **0.9.0**.
@@ -87,9 +88,9 @@ rubygems-bundler was merged with [noexec gem](https://github.com/joshbuddy/noexe
     rubygems-bundler-uninstaller
     gem uninstall rubygems-bundler
 
-this will set all gems to `/usr/bin/env ruby` which is one of the safest choices (especially when using rvm).
+this will set all gems to `/usr/bin/env ruby`, which is one of the safest choices (especially when using rvm).
 
-In case of rvm additional steps will ensure this gem is removed and not installed again:
+When using rvm, these additional steps will ensure this gem is removed and not installed again:
 
     rvm get stable --without-gems=rubygems-bundler
     rvm all-gemsets do gem uninstall --all --executables rubygems-bundler

data/lib/rubygems-bundler/noexec.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module RubygemsBundler
 end
 RubygemsBundler::DEBUG = ENV.key?('NOEXEC_DEBUG')

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/dtf/bundler_comment_test.sh

@@ -1,21 +1,29 @@
 : init
-export BUNDLE_GEMFILE=${TMPDIR:-/tmp}/Gemfile
-printf "source :rubygems\n\ngem 'haml'\n" > ${BUNDLE_GEMFILE}
+export BUNDLE_GEMFILE=${TMPDIR:-/tmp}/rubygems-bunelr_bundler-test/Gemfile
+mkdir -p ${BUNDLE_GEMFILE%/*} # status=0
+printf "source :rubygems\n\ngem 'haml'\ngem 'heroku'\ngem 'jruby-openssl', :require => 'openssl', :platforms => :jruby\n" > ${BUNDLE_GEMFILE}
 
-yes | rake build
-yes | rake install # match=/installed/
-gem install bundler # status=0
+yes | sm gem install         # match=/installed/
+gem regenerate_binstubs      # status=0
+gem install bundler          # status=0
 
 bundle install
 
-head -n 1 $(which haml)   # match=/env ruby_noexec_wrapper/
-which ruby_noexec_wrapper # status=0
+: exclusion
+head -n 1 $(which heroku)    # match=/env ruby_noexec_wrapper/
+yes | NOEXEC_DEBUG=1 heroku update # match=/Using .*/rubygems-bunelr_bundler-test/Gemfile/; match!=/Binary excluded by config/
+printf "exclude:\n - heroku\n" > ${BUNDLE_GEMFILE%/*}/.noexec.yaml
+yes | NOEXEC_DEBUG=1 heroku update # match!=/Using .*/rubygems-bunelr_bundler-test/Gemfile/; match=/Binary excluded by config/
+
+: generated/removed
+head -n 1 $(which haml)      # match=/env ruby_noexec_wrapper/
+which ruby_noexec_wrapper    # status=0
 
 gem list                     # match=/haml/
 rubygems-bundler-uninstaller # match=/haml/
 
-head -n 1 $(which haml)   # match!=/env ruby_noexec_wrapper/
-which ruby_noexec_wrapper # status=1
+head -n 1 $(which haml)      # match!=/env ruby_noexec_wrapper/
+which ruby_noexec_wrapper    # status=1
 
-gem uninstall -x haml     # match=/Successfully uninstalled/
-rm -f ${BUNDLE_GEMFILE}
+gem uninstall -x haml        # match=/Successfully uninstalled/
+rm -rf ${BUNDLE_GEMFILE%/*}  # status=0

data/test/dtf/rails_and_gemfile_comment_test.sh

@@ -6,8 +6,7 @@ export PATH="${test_dir}/fake_gem_home/bin:$PATH"
 mkdir -p "${GEM_HOME}"
 printf "source :rubygems\n\ngem 'rails'\n" > "${test_dir}/Gemfile"
 
-yes | rake build
-yes | rake install        # match=/installed/
+yes | sm gem install        # match=/installed/
 gem install bundler # status=0
 
 : test

data/test/dtf/rubygems_comment_test.sh

@@ -1,8 +1,7 @@
 : init
-yes | rake build
-yes | rake install # match=/installed/
+sm gem install # match=/installed/
 
-gem install haml          # match=/1 gem installed/
+yes | gem install haml          # match=/1 gem installed/
 
 head -n 1 $(which haml)   # match=/env ruby_noexec_wrapper/
 which ruby_noexec_wrapper # status=0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-05 00:00:00 Z
+date: 2013-02-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tf
@@ -45,7 +45,7 @@ extra_rdoc_files: []
 files: 
 - .gem.config
 - .gitignore
-- .noexec.yml
+- .noexec.yaml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile

data/.noexec.yml

@@ -1,2 +0,0 @@
-exclude: [dtf]
-