noexec 0.0.3 → 0.0.4

data/lib/noexec/auto.rb

@@ -1,3 +1,57 @@
-require File.expand_path('../../noexec', __FILE__)
+DEBUG = ENV.key?('NOEXEC_DEBUG')
 
-Noexec.setup if Object.const_defined?(:Noexec)
+begin
+  require "rubygems"
+  require "bundler"
+
+  module Bundler
+    class << self
+      def reset!
+        @load = nil
+      end
+    end
+  end
+
+  module Noexec
+    CURRENT = Dir.pwd
+
+    extend self
+
+    def candidate?(gemfile, bin)
+      ENV['BUNDLE_GEMFILE'] = gemfile
+      Bundler.load.specs.each do |spec|
+        next if spec.name == 'bundler'
+        return spec if %w(ruby irb).include?(bin) || spec.executables.include?(bin)
+      end
+      nil
+    ensure
+      Bundler.reset!
+    end
+
+    def setup
+      puts "Noexec" if DEBUG
+      return if File.basename($0) == 'bundle'
+      return if ENV['BUNDLE_GEMFILE']
+      gemfile = File.join(CURRENT, "Gemfile")
+      while true
+        if File.exist?(gemfile)
+          puts "Examining #{gemfile}" if DEBUG
+          if Noexec.candidate?(gemfile, File.basename($0))
+            puts "Using #{gemfile}" if DEBUG
+            ENV['BUNDLE_GEMFILE'] = gemfile
+            Bundler.setup
+            return
+          end
+        end
+        new_gemfile = File.expand_path("../../Gemfile", gemfile)
+        break if new_gemfile == gemfile
+        gemfile = new_gemfile
+      end
+      puts "No valid Gemfile found, moving on" if DEBUG
+    end
+  end
+
+  Noexec.setup
+rescue LoadError
+  warn "bundler not being used, unable to load" if DEBUG
+end

data/lib/noexec/version.rb

@@ -1,3 +1,3 @@
 module Noexec
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noexec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,6 @@ files:
 - README.md
 - Rakefile
 - bin/noexec
-- lib/noexec.rb
 - lib/noexec/auto.rb
 - lib/noexec/version.rb
 - noexec.gemspec
@@ -42,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1682247026677393969
+      hash: 3029085704595461036
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -51,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1682247026677393969
+      hash: 3029085704595461036
 requirements: []
 rubyforge_project: noexec
 rubygems_version: 1.8.15

data/lib/noexec.rb

@@ -1,56 +0,0 @@
-DEBUG = ENV.key?('NOEXEC_DEBUG')
-
-begin
-  require "rubygems"
-  require "bundler"
-
-  module Bundler
-    class << self
-      def reset!
-        @load = nil
-      end
-    end
-  end
-
-  module Noexec
-    CURRENT = Dir.pwd
-
-    extend self
-
-    def candidate?(gemfile, bin)
-      ENV['BUNDLE_GEMFILE'] = gemfile
-      Bundler.load.specs.each do |spec|
-        next if spec.name == 'bundler'
-        return spec if spec.executables.include?(bin)
-      end
-      nil
-    ensure
-      Bundler.reset!
-    end
-
-    def setup
-      puts "Noexec" if DEBUG
-      catch(:done) do
-        throw :done, false if File.basename($0) == 'bundle'
-        gemfile = File.join(CURRENT, "Gemfile")
-        while true
-          if File.exist?(gemfile)
-            puts "Examining #{gemfile}" if DEBUG
-            if Noexec.candidate?(gemfile, File.basename($0))
-              puts "Using #{gemfile}" if DEBUG
-              Bundler.setup
-              throw :done, true
-            end
-          end
-          new_gemfile = File.expand_path("../../Gemfile", gemfile)
-          throw :done, false if new_gemfile == gemfile
-          gemfile = new_gemfile
-        end
-        puts "No valid Gemfile found, moving on" if DEBUG
-        false
-      end
-    end
-  end
-rescue LoadError
-  warn "bundler not being used, unable to load" if DEBUG
-end