polyamory 0.0.2 → 0.0.4

data/lib/polyamory.rb

@@ -137,7 +137,7 @@ class Polyamory
       'spec'
     elsif file_exists? '.rspec'
       'rspec'
-    elsif helper.exist?
+    elsif file_exists? helper
       File.open(helper) do |file|
         while file.gets
           return $&.downcase if $_ =~ /\bR?Spec\b/
@@ -167,7 +167,7 @@ class Polyamory
   
   def prepare_cmdline(args)
     args = args.map { |p| p.to_s }
-    args = %w[bundle exec] + args if args.first != 'polyamory' and bundler?
+    args = %w[bundle exec] + args if bundler?
     args
   end
   
@@ -175,25 +175,38 @@ class Polyamory
     args = prepare_cmdline(args)
     puts args.join(' ')
 
-    # TODO: hack; make this configurable, use bundler
-    with_rubyopt(args.first == 'polyamory' ? '-rubygems' : nil) do
-      if many
-        system(*args)
-        exit $?.exitstatus unless $?.success?
-      else
-        exec(*args)
+    unless noop?
+      # TODO: hack; make this configurable, use bundler
+      with_rubyopt(!bundler? ? '-rubygems' : nil) do
+        with_rubylib('lib', args.include?('polyamory') ? 'test' : nil) do
+          if many
+            system(*args)
+            exit $?.exitstatus unless $?.success?
+          else
+            exec(*args)
+          end
+        end
       end
-    end unless noop?
+    end
   end
   
   def with_rubyopt(value)
-    old_value = ENV['RUBYOPT']
-    ENV['RUBYOPT'] = "#{value} #{old_value}"
+    with_env('RUBYOPT', "#{value} %s") { yield }
+  end
+  
+  def with_rubylib(*values)
+    value = values.flatten.compact.join(':')
+    with_env('RUBYLIB', "#{value}:%s") { yield }
+  end
+  
+  def with_env(key, value)
+    old_value = ENV[key]
+    ENV[key] = value % old_value
     
     begin
       yield
     ensure
-      ENV['RUBYOPT'] = old_value
+      ENV[key] = old_value
     end
   end
   

metadata

@@ -1,66 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: polyamory
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
-- "Mislav Marohni\xC4\x87"
+authors:
+- Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-30 00:00:00 +01:00
-default_executable: 
+date: 2011-04-25 00:00:00.000000000Z
 dependencies: []
-
 description: A tool that knows how to run your tests regardless of framework
 email: mislav.marohnic@gmail.com
-executables: 
+executables:
 - polyamory
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/polyamory
 - lib/polyamory.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/mislav/polyamory
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Runs your tests
 test_files: []
-
+has_rdoc: false