polyamory 0.6.0 → 0.6.2

data/README.md

@@ -10,8 +10,20 @@ Frameworks supported:
 * Cucumber in `features/**/*.feature`
 * RSpec + Shoulda in `spec/**/*_spec.rb`
 * test/unit, Shoulda, or anything else in `test/**/*_test.rb` or `test/**/test*.rb`
+* Bats in `test/*.bats`
 
-Features:
+## Installation
+
+    # Mac OS X
+    brew install https://github.com/mislav/polyamory/raw/master/brew/polyamory.rb
+
+    # other
+    gem i polyamory
+
+    # alias for brevity
+    alias pam=polyamory
+
+## Features
 
 *   `polyamory` - Runs the full test suite for any project. For example, it will
     run all of the following:

data/lib/polyamory.rb

@@ -2,7 +2,7 @@ require 'optparse'
 require 'polyamory/runner'
 
 module Polyamory
-  VERSION = '0.6.0'
+  VERSION = '0.6.2'
 
   def self.run(args, dir)
     options = parse_options! args

data/lib/polyamory/bats.rb

@@ -0,0 +1,107 @@
+require 'polyamory/rooted_pathname'
+require 'polyamory/command'
+
+module Polyamory
+  # Internal: Deals with finding Bats files to test
+  # https://github.com/sstephenson/bats#readme
+  class Bats
+    attr_reader :context
+
+    def initialize context
+      @context = context
+    end
+
+    def test_dir
+      @test_dir ||= context.root + 'test'
+    end
+
+    def file_pattern dir
+      "#{dir}/*.bats"
+    end
+
+    def handle? path
+      path.extname == '.bats' || !find_files(path).empty?
+    end
+
+    def find_files dir = test_dir
+      glob file_pattern(dir)
+    end
+
+    # Internal: Memoized find_files in primary dir
+    def all_matching_files
+      @all_matching_files ||= find_files
+    end
+
+    # Public: Resolve a set of files, directories, and patterns to a list of
+    # paths to test.
+    def resolve_paths names
+      if context.tag_filters.any?
+        # Bats doesn't support tags
+        []
+      elsif names.any?
+        paths = []
+        for name in names
+          paths.concat Array(resolve_name name)
+        end
+        paths
+      else
+        [test_dir]
+      end
+    end
+
+    def resolve_name name
+      resolve_as_directory(name) or
+        resolve_as_filename(name) or
+        resolve_as_file_pattern(name) or
+        raise "nothing resolved from #{name}"
+    end
+
+    # "functional" => "test/functional/**"
+    # "test/functional" => "test/functional/**"
+    def resolve_as_directory name
+      [test_dir + name, context.root + name].detect { |dir| handle?(dir) }
+    end
+
+    # "test/unit/hello.bats"
+    def resolve_as_filename name
+      file = context.root + name
+      file if file.file? and handle?(file)
+    end
+
+    # "word" => "test/**" that match "word"
+    def resolve_as_file_pattern name
+      pattern = /(?:\b|_)#{Regexp.escape name}(?:\b|_)/
+      all_matching_files.select {|p| p =~ pattern }
+    end
+
+    # Public: From a list of paths, yank the ones that this knows how to handle,
+    # and build test jobs from it.
+    def pick_jobs paths
+      to_test = []
+      paths.reject! do |path|
+        if handle? path
+          to_test << path
+          true
+        end
+      end
+
+      unless to_test.empty?
+        excess = to_test.slice!(1..-1)
+        warn "warning: bats can only accept one filename; skipping #{excess.map {|p| p.relative }.join(' ')}" unless excess.empty?
+        [test_command(to_test)]
+      else
+        []
+      end
+    end
+
+    def test_command paths
+      Command.new ['bats'] do |test_job|
+        test_job.concat paths.map {|p| p.relative }
+      end
+    end
+
+    def glob pattern
+      RootedPathname.glob pattern, context.root
+    end
+  end
+end

data/lib/polyamory/cucumber.rb

@@ -27,7 +27,7 @@ module Polyamory
         opts << "-I#{path}"
       end
       opts << '%'
-      cmd.env['RUBYOPT'] = opts.join(' ')
+      cmd.env['RUBYOPT'] = opts.join(' ') if opts.size > 1
     end
 
     def cucumber_options

data/lib/polyamory/rspec.rb

@@ -115,7 +115,7 @@ module Polyamory
       opts = []
       opts << '-w' if context.warnings?
       opts << '%'
-      cmd.env['RUBYOPT'] = opts.join(' ')
+      cmd.env['RUBYOPT'] = opts.join(' ') if opts.size > 1
     end
 
     def rspec_options

data/lib/polyamory/runner.rb

@@ -2,6 +2,7 @@ require 'polyamory/rooted_pathname'
 require 'polyamory/test_unit'
 require 'polyamory/rspec'
 require 'polyamory/cucumber'
+require 'polyamory/bats'
 
 module Polyamory
   # Public: Collects test jobs in the root directory and runs them.
@@ -45,8 +46,8 @@ module Polyamory
     def bundle_exec?
       return @bundle_exec if defined? @bundle_exec
       if (setting = options.fetch(:bundler)).nil?
-        setting = !ENV['BUNDLE_GEMFILE'].to_s.empty? ||
-                  (root + 'Gemfile').exist?
+        setting = ENV['RUBYOPT'] !~ /\br?bundler\/setup\b/ &&
+          ( !ENV['BUNDLE_GEMFILE'].to_s.empty? || (root + 'Gemfile').exist? )
       end
       @bundle_exec = setting
     end
@@ -71,7 +72,7 @@ module Polyamory
     end
 
     def collect_jobs
-      [TestUnit, RSpec, Cucumber].inject([]) do |jobs, klass|
+      [TestUnit, RSpec, Cucumber, Bats].inject([]) do |jobs, klass|
         framework = klass.new self
         paths = framework.resolve_paths @names
         jobs.concat framework.pick_jobs(paths)

data/lib/polyamory/test_unit.rb

@@ -126,15 +126,19 @@ module Polyamory
       RootedPathname.glob pattern, context.root
     end
 
+    def rails?
+      (context.root + 'config/environment.rb').exist?
+    end
+
     def add_ruby_options cmd
       opts = []
       opts << '-w' if context.warnings?
-      opts << '-Ilib:test'
+      opts << "-Ilib:#{test_dir.basename}" unless rails?
       for path in context.load_paths
         opts << "-I#{path}"
       end
       opts << '%'
-      cmd.env['RUBYOPT'] = opts.join(' ')
+      cmd.env['RUBYOPT'] = opts.join(' ') if opts.size > 1
     end
 
     def testunit_options

data/test/test_runner.rb

@@ -192,7 +192,7 @@ describe Polyamory::Runner do
     end
 
     it "sets no ruby options" do
-      job.env['RUBYOPT'].must_equal "%"
+      job.env['RUBYOPT'].must_be_nil
     end
 
     describe "example filters" do

metadata

@@ -2,14 +2,14 @@
 name: polyamory
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies: []
 description: A cli runner for all tests regardless of framework
 email: mislav.marohnic@gmail.com
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/polyamory
+- lib/polyamory/bats.rb
 - lib/polyamory/command.rb
 - lib/polyamory/cucumber.rb
 - lib/polyamory/rooted_pathname.rb