guard-sporkminitest 0.0.1 → 0.0.2

data/.gemspec

@@ -4,7 +4,7 @@ require 'guard/sporkminitest/version'
 
 Gem::Specification.new do |gem|
   gem.name        = 'guard-sporkminitest'
-  gem.version     = Guard::SporkMinitest::VERSION
+  gem.version     = Guard::SporkMinitestVERSION
   gem.authors     = ['Yann Lugrin', '☈king']
   gem.email       = ['rking-guard-sporkminitest@sharpsaw.org']
   gem.homepage    = 'https://github.com/rking/guard-minitest'

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
+source :rubygems
 gemspec

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'minitest' do
+guard 'sporkminitest' do
   watch(%r|^spec/(.*)_spec\.rb|)
   watch(%r|^lib/(.*)([^/]+)\.rb|)  { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r|^spec/spec_helper\.rb|) { 'spec' }

data/Rakefile

@@ -3,6 +3,8 @@ Bundler::GemHelper.install_tasks
 
 require 'minitest/unit'
 
+task :default => :test
+
 desc 'Run all tests'
 task :test do
   ENV['QUIET'] ||= 'true'
@@ -15,57 +17,3 @@ task :test do
   test_files = Dir['spec/**/*_spec.rb']
   test_files.each { |f| require f }
 end
-
-task :default => :test
-
-require 'rbconfig'
-namespace(:test) do
-  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i
-    desc "Run all specs on multiple ruby versions (requires pik)"
-    task(:portability) do
-      puts 'minitest can\'t be tested on MS Windows for now'
-    end
-  else
-    desc "Run all specs on multiple ruby versions (requires rvm)"
-    task(:portability) do
-      travis_config_file = File.expand_path("../.travis.yml", __FILE__)
-      begin
-        travis_options ||= YAML::load_file(travis_config_file)
-      rescue => ex
-        puts "Travis config file '#{travis_config_file}' could not be found: #{ex.message}"
-        return
-      end
-
-      travis_options['rvm'].each do |version|
-        system <<-BASH
-          bash -c 'source ~/.rvm/scripts/rvm;
-                   rvm #{version};
-                   ruby_version_string_size=`ruby -v | wc -m`
-                   echo;
-                   for ((c=1; c<$ruby_version_string_size+21; c++)); do echo -n "="; done
-                   echo;
-                   echo "minitest version 1 - `ruby -v`";
-                   for ((c=1; c<$ruby_version_string_size+21; c++)); do echo -n "="; done
-                   echo;
-                   BUNDLE_GEMFILE=./gemfiles/minitest-1.7 bundle install;
-                   BUNDLE_GEMFILE=./gemfiles/minitest-1.7 bundle exec rake test 2>&1'
-        BASH
-        if version =~ /^1\.9/
-          system <<-BASH
-            bash -c 'source ~/.rvm/scripts/rvm;
-                     rvm #{version};
-                     ruby_version_string_size=`ruby -v | wc -m`
-                     echo;
-                     for ((c=1; c<$ruby_version_string_size+21; c++)); do echo -n "="; done
-                     echo;
-                     echo "minitest version 2 - `ruby -v`";
-                     for ((c=1; c<$ruby_version_string_size+21; c++)); do echo -n "="; done
-                     echo;
-                     BUNDLE_GEMFILE=./gemfiles/minitest-2.1 bundle install;
-                     BUNDLE_GEMFILE=./gemfiles/minitest-2.1 bundle exec rake test 2>&1'
-          BASH
-        end
-      end
-    end
-  end
-end

data/lib/guard/sporkminitest.rb

@@ -4,9 +4,10 @@ require 'guard/guard'
 
 module Guard
   class SporkMinitest < Guard
+    VERSION = '0.0.2'
 
-    autoload :Runner,    'guard/sporkminitest/runner'
-    autoload :Inspector, 'guard/sporkminitest/inspector'
+    require 'guard/sporkminitest/runner'
+    require 'guard/sporkminitest/inspector'
 
     def initialize(watchers = [], options = {})
       super
@@ -15,17 +16,9 @@ module Guard
       @inspector = Inspector.new(@runner.test_folders, @runner.test_file_patterns)
     end
 
-    def start
-      true
-    end
-
-    def stop
-      true
-    end
-
-    def reload
-      true
-    end
+    def start; true end
+    def stop; true end
+    def reload; true end
 
     def run_all
       paths = @inspector.clean_all

data/lib/guard/sporkminitest/notifier.rb

@@ -5,6 +5,7 @@ module Guard
   class SporkMinitestNotifier
 
     def self.guard_message(test_count, assertion_count, failure_count, error_count, skip_count, duration)
+      # TODO: use a dang Hash
       message = "#{test_count} examples, #{assertion_count} assertions, #{failure_count} failures, #{error_count} errors"
       if skip_count > 0
         message << " (#{skip_count} skips)"

data/lib/guard/sporkminitest/runner.rb

@@ -12,12 +12,7 @@ module Guard
       end
 
       def initialize(options = {})
-        parse_deprecated_options(options)
-
         @options = {
-          :bundler            => File.exist?("#{Dir.pwd}/Gemfile"),
-          :rubygems           => false,
-          :drb                => false,
           :test_folders       => %w[test spec],
           :test_file_patterns => %w[*_test.rb test_*.rb *_spec.rb],
           :cli                => ''
@@ -31,25 +26,13 @@ module Guard
       def run(paths, options = {})
         message = options[:message] || "Running: #{paths.join(' ')}"
         UI.info message, :reset => true
-        system(minitest_command(paths))
+        system 'testdrb', *paths
       end
 
       def cli_options
         @options[:cli] ||= ''
       end
 
-      def bundler?
-        @options[:bundler]
-      end
-
-      def rubygems?
-        !bundler? && @options[:rubygems]
-      end
-
-      def drb?
-        @options[:drb]
-      end
-
       def test_folders
         @options[:test_folders]
       end
@@ -58,50 +41,6 @@ module Guard
         @options[:test_file_patterns]
       end
 
-      private
-
-      def minitest_command(paths)
-        cmd_parts = []
-
-        # Does nothing but slow things down. Please correct me if I'm wrong:
-        # cmd_parts << "bundle exec" if bundler?
-        if drb?
-          cmd_parts << 'testdrb'
-          cmd_parts += paths.map{ |path| "./#{path}" }
-        else
-          # TODO: nuke this branch
-          cmd_parts << 'ruby'
-          cmd_parts += test_folders.map{|f| %[-I"#{f}"] }
-          cmd_parts << '-r rubygems' if rubygems?
-          cmd_parts << '-r bundler/setup' if bundler?
-          cmd_parts += paths.map{ |path| "-r ./#{path}" }
-          cmd_parts << "-r #{File.expand_path('../runners/default_runner.rb', __FILE__)}"
-          cmd_parts << '-e \'MiniTest::Unit.autorun\''
-          cmd_parts << '--' << cli_options unless cli_options.empty?
-        end
-
-        cmd_parts.join(' ')
-      end
-
-      def parse_deprecated_options(options)
-        options[:cli] ||= ''
-
-        # TODO remove this
-        if options.key?(:notify)
-          UI.info %{DEPRECATION WARNING: The :notify option is deprecated. Guard notification configuration is used.}
-        end
-
-        [:seed, :verbose].each do |key|
-          if value = options.delete(key)
-             options[:cli] << " --#{key}"
-            if ![TrueClass, FalseClass].include?(value.class)
-              options[:cli] << " #{value}"
-            end
-
-            UI.info %{DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument "--#{key}" to MiniTest with the :cli option.}
-          end
-        end
-      end
     end
   end
 end

data/lib/guard/sporkminitest/runners/default_runner.rb

@@ -1,8 +1,5 @@
 # encoding: utf-8
 require 'minitest/unit'
 
-if MiniTest::Unit::VERSION =~ /^1/
-  load File.expand_path('../version_1_runner.rb', __FILE__)
-else
-  load File.expand_path('../version_2_runner.rb', __FILE__)
-end
+warn "TODO: inline version_2_runner"
+load File.expand_path('../version_2_runner.rb', __FILE__)

data/lib/guard/sporkminitest/runners/version_1_runner.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'minitest/unit'
-require 'guard/minitest/notifier'
+
+require 'guard/sporkminitest/notifier'
 
 module MiniTest
   class MiniTest::Unit
@@ -10,7 +11,7 @@ module MiniTest
       start = Time.now
       run_without_guard(args)
       duration = Time.now - start
-      ::Guard::MinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration)
+      ::Guard::SporkMinitestNotifier.notify(test_count, assertion_count, failures, errors, skips, duration)
     end
 
   end

data/lib/guard/sporkminitest/runners/version_2_runner.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'minitest/unit'
-require 'guard/minitest/notifier'
+require 'guard/sporkminitest/notifier'
 
 module MiniTest
   class MiniTest::Unit

data/lib/guard/sporkminitest/version.rb

@@ -1,6 +1,3 @@
-# encoding: utf-8
 module Guard
-  module SporkMinitest
-    VERSION = '0.0.1'
-  end
+  SporkMinitestVERSION = '0.0.2'
 end

data/spec/guard/{minitest → sporkminitest}/inspector_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Guard::Minitest::Inspector do
-  subject { Guard::Minitest::Inspector.new(%w[test spec], %w[*_test.rb test_*.rb *_spec.rb]) }
+describe Guard::SporkMinitest::Inspector do
+  subject { Guard::SporkMinitest::Inspector.new(%w[test spec], %w[*_test.rb test_*.rb *_spec.rb]) }
 
   describe 'clean' do
 

data/spec/guard/{minitest → sporkminitest}/notifier_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 require 'spec_helper'
-require 'guard/minitest/notifier'
+require 'guard/sporkminitest/notifier'
 
-describe Guard::MinitestNotifier do
-  subject { Guard::MinitestNotifier }
+describe 'Guard::SporkMinitestNotifier' do
+  subject { Guard::SporkMinitestNotifier }
 
   it 'should format message without skipped test' do
     message = subject.guard_message(1, 2, 3, 4, 0, 10.0)

data/spec/guard/sporkminitest/runner_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'spec_helper'
+describe Guard::SporkMinitest::Runner do
+  subject { Guard::SporkMinitest::Runner }
+
+  describe 'options' do
+    describe 'cli_options' do
+      it 'default should be empty string' do
+        subject.new.cli_options.must_equal ''
+      end
+      it 'should be set with \'cli\'' do
+        subject.new(:cli => '--test').cli_options.must_equal '--test'
+      end
+    end
+  end
+
+  describe 'run' do
+    before(:each) do
+      Dir.stubs(:pwd).returns(fixtures_path.join('empty'))
+    end
+    describe 'drb' do
+      it 'should run with drb' do
+        runner = subject.new(:test_folders => %w[test], :drb => true)
+        Guard::UI.expects(:info)
+        runner.expects(:system).with *%w(testdrb test/test_minitest.rb)
+        runner.run(['test/test_minitest.rb'], :drb => true)
+      end
+    end
+  end
+end

data/spec/guard/{minitest_spec.rb → sporkminitest_spec.rb}

@@ -1,78 +1,58 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Guard::Minitest do
-  subject { Guard::Minitest }
+describe Guard::SporkMinitest do
+  subject { Guard::SporkMinitest }
 
   let(:runner) { stub('runner', :test_folders => [], :test_file_patterns => []) }
   let(:inspector) { stub('inspector') }
   let(:guard) { subject.new }
 
   before(:each) do
-    Guard::Minitest::Runner.stubs(:new).returns(runner)
-    Guard::Minitest::Inspector.stubs(:new).returns(inspector)
+    Guard::SporkMinitest::Runner.stubs(:new).returns(runner)
+    Guard::SporkMinitest::Inspector.stubs(:new).returns(inspector)
   end
 
   after(:each) do
-    Guard::Minitest::Runner.unstub(:new)
-    Guard::Minitest::Inspector.unstub(:new)
+    Guard::SporkMinitest::Runner.unstub(:new)
+    Guard::SporkMinitest::Inspector.unstub(:new)
   end
 
   describe 'initialization' do
-
     it 'should initialize runner with options' do
-      Guard::Minitest::Runner.expects(:new).with({}).returns(runner)
+      Guard::SporkMinitest::Runner.expects(:new).with({}).returns(runner)
       subject.new
     end
 
     it 'should initialize inspector with options' do
-      Guard::Minitest::Inspector.expects(:new).with(runner.test_folders, runner.test_file_patterns).returns(inspector)
+      Guard::SporkMinitest::Inspector.expects(:new).with(runner.test_folders, runner.test_file_patterns).returns(inspector)
       subject.new
     end
-
   end
 
   describe 'start' do
-
-    it 'should return true' do
-      guard.start.must_equal true
-    end
-
+    it 'should return true' do guard.start.must_equal true end
   end
-
   describe 'stop' do
-
-    it 'should return true' do
-      guard.stop.must_equal true
-    end
-
+    it 'should return true' do guard.stop.must_equal true end
   end
-
   describe 'reload' do
-
-    it 'should return true' do
-      guard.reload.must_equal true
-    end
-
+    it 'should return true' do guard.reload.must_equal true end
   end
 
   describe 'run_all' do
-
     it 'should run all tests' do
       inspector.stubs(:clean_all).returns(['test/guard/minitest/test_inspector.rb', 'test/guard/test_minitest.rb'])
       runner.expects(:run).with(['test/guard/minitest/test_inspector.rb', 'test/guard/test_minitest.rb'], {:message => 'Running all tests'}).returns(true)
       guard.run_all.must_equal true
     end
-
   end
 
   describe 'run_on_changes' do
-
     it 'should run minitest in paths' do
       inspector.stubs(:clean).with(['test/guard/minitest/test_inspector.rb']).returns(['test/guard/minitest/test_inspector.rb'])
       runner.expects(:run).with(['test/guard/minitest/test_inspector.rb']).returns(true)
       guard.run_on_changes(['test/guard/minitest/test_inspector.rb']).must_equal true
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 require 'minitest/spec'
 require 'mocha/setup'
 
-require 'guard/minitest'
+require 'guard/sporkminitest'
 
 class MiniTest::Spec < MiniTest::Unit::TestCase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-sporkminitest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -183,10 +183,10 @@ files:
 - lib/guard/sporkminitest/templates/Guardfile
 - lib/guard/sporkminitest/version.rb
 - spec/fixtures/bundler/Gemfile
-- spec/guard/minitest/inspector_spec.rb
-- spec/guard/minitest/notifier_spec.rb
-- spec/guard/minitest/runner_spec.rb
-- spec/guard/minitest_spec.rb
+- spec/guard/sporkminitest/inspector_spec.rb
+- spec/guard/sporkminitest/notifier_spec.rb
+- spec/guard/sporkminitest/runner_spec.rb
+- spec/guard/sporkminitest_spec.rb
 - spec/spec_helper.rb
 - test/guard/minitest/test_inspector.rb
 - test/guard/minitest_test.rb
@@ -222,10 +222,10 @@ test_files:
 - .gemspec
 - lib/guard/sporkminitest/inspector.rb
 - spec/fixtures/bundler/Gemfile
-- spec/guard/minitest/inspector_spec.rb
-- spec/guard/minitest/notifier_spec.rb
-- spec/guard/minitest/runner_spec.rb
-- spec/guard/minitest_spec.rb
+- spec/guard/sporkminitest/inspector_spec.rb
+- spec/guard/sporkminitest/notifier_spec.rb
+- spec/guard/sporkminitest/runner_spec.rb
+- spec/guard/sporkminitest_spec.rb
 - spec/spec_helper.rb
 - test/guard/minitest/test_inspector.rb
 has_rdoc: 

data/spec/guard/minitest/runner_spec.rb

@@ -1,175 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Guard::Minitest::Runner do
-  subject { Guard::Minitest::Runner }
-
-  describe 'options' do
-
-    describe 'cli_options' do
-      it 'default should be empty string' do
-        subject.new.cli_options.must_equal ''
-      end
-
-      it 'should be set with \'cli\'' do
-        subject.new(:cli => '--test').cli_options.must_equal '--test'
-      end
-    end
-
-    describe 'deprecated options' do
-      describe 'seed' do
-        it 'should set cli options' do
-          Guard::UI.expects(:info).with('DEPRECATION WARNING: The :seed option is deprecated. Pass standard command line argument "--seed" to MiniTest with the :cli option.')
-          subject.new(:seed => 123456789).cli_options.must_match /--seed 123456789/
-        end
-      end
-
-      describe 'verbose' do
-        it 'should set cli options' do
-          Guard::UI.expects(:info).with('DEPRECATION WARNING: The :verbose option is deprecated. Pass standard command line argument "--verbose" to MiniTest with the :cli option.')
-          subject.new(:verbose => true).cli_options.must_match /--verbose/
-        end
-      end
-    end
-
-    describe 'bundler' do
-      it 'default should be true if Gemfile exist' do
-        Dir.stubs(:pwd).returns(fixtures_path.join('bundler'))
-        subject.new.bundler?.must_equal true
-      end
-
-      it 'default should be false if Gemfile don\'t exist' do
-        Dir.stubs(:pwd).returns(fixtures_path.join('empty'))
-        subject.new.bundler?.must_equal false
-      end
-
-      it 'should be forced to false' do
-        Dir.stubs(:pwd).returns(fixtures_path.join('bundler'))
-        subject.new(:bundler => false).bundler?.must_equal false
-      end
-    end
-
-    describe 'rubygems' do
-      it 'default should be false if Gemfile exist' do
-        Dir.stubs(:pwd).returns(fixtures_path.join('bundler'))
-        subject.new.rubygems?.must_equal false
-      end
-
-      it 'default should be false if Gemfile don\'t exist' do
-        Dir.stubs(:pwd).returns(fixtures_path.join('empty'))
-        subject.new.rubygems?.must_equal false
-      end
-
-      it 'should be set to true if bundler is disabled' do
-        subject.new(:bundler => false, :rubygems => true).rubygems?.must_equal true
-      end
-
-      it 'should not be set to true if bundler is enabled' do
-        subject.new(:bundler => true, :rubygems => true).rubygems?.must_equal false
-      end
-    end
-
-    describe 'drb' do
-      it 'default should be false' do
-        subject.new.drb?.must_equal false
-      end
-
-      it 'should be set' do
-        subject.new(:drb => true).drb?.must_equal true
-      end
-    end
-  end
-
-  describe 'run' do
-    before(:each) do
-      Dir.stubs(:pwd).returns(fixtures_path.join('empty'))
-      @default_runner = File.expand_path('../../../../lib/guard/minitest/runners/default_runner.rb', __FILE__)
-    end
-
-    it 'should run with specified seed' do
-      runner = subject.new(:test_folders => %w[test], :cli => '--seed 12345')
-      runner.expects(:system).with(
-        "ruby -I\"test\" -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun' -- --seed 12345"
-      )
-      runner.run(['test/test_minitest.rb'])
-    end
-
-    it 'should run in verbose mode' do
-      runner = subject.new(:test_folders => %w[test], :cli => '--verbose')
-      runner.expects(:system).with(
-        "ruby -I\"test\" -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun' -- --verbose"
-      )
-      runner.run(['test/test_minitest.rb'])
-    end
-
-    describe 'in empty folder' do
-
-      before(:each) do
-        Dir.stubs(:pwd).returns(fixtures_path.join('empty'))
-      end
-
-      it 'should run without bundler and rubygems' do
-        runner = subject.new(:test_folders => %w[test])
-        Guard::UI.expects(:info)
-        runner.expects(:system).with(
-          "ruby -I\"test\" -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun'"
-        )
-        runner.run(['test/test_minitest.rb'])
-      end
-
-      it 'should run without bundler but rubygems' do
-        runner = subject.new(:test_folders => %w[test], :rubygems => true)
-        Guard::UI.expects(:info)
-        runner.expects(:system).with(
-          "ruby -I\"test\" -r rubygems -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun'"
-        )
-        runner.run(['test/test_minitest.rb'])
-      end
-
-    end
-
-    describe 'in bundler folder' do
-      before(:each) do
-        Dir.stubs(:pwd).returns(fixtures_path.join('bundler'))
-      end
-
-      it 'should run with bundler but not rubygems' do
-        runner = subject.new(:test_folders => %w[test], :bundler => true, :rubygems => false)
-        Guard::UI.expects(:info)
-        runner.expects(:system).with(
-          "bundle exec ruby -I\"test\" -r bundler/setup -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun'"
-        )
-        runner.run(['test/test_minitest.rb'])
-      end
-
-      it 'should run without bundler but rubygems' do
-        runner = subject.new(:test_folders => %w[test], :bundler => false, :rubygems => true)
-        Guard::UI.expects(:info)
-        runner.expects(:system).with(
-          "ruby -I\"test\" -r rubygems -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun'"
-        )
-        runner.run(['test/test_minitest.rb'], :bundler => false, :rubygems => true)
-      end
-
-      it 'should run without bundler and rubygems' do
-        runner = subject.new(:test_folders => %w[test], :bundler => false, :rubygems => false)
-        Guard::UI.expects(:info)
-        runner.expects(:system).with(
-          "ruby -I\"test\" -r ./test/test_minitest.rb -r #{@default_runner} -e 'MiniTest::Unit.autorun'"
-        )
-        runner.run(['test/test_minitest.rb'], :bundler => false, :rubygems => false)
-      end
-
-    end
-
-    describe 'drb' do
-      it 'should run with drb' do
-        runner = subject.new(:test_folders => %w[test], :drb => true)
-        Guard::UI.expects(:info)
-        runner.expects(:system).with('testdrb ./test/test_minitest.rb')
-        runner.run(['test/test_minitest.rb'], :drb => true)
-      end
-
-    end
-  end
-end