guard-phpunit2 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a16be8b1d2ec405ff1fe94fa9fbcb4ef35be484
-  data.tar.gz: 26e55626cffb430aacb78b4a23306f865bef9a1e
+  metadata.gz: 23ebbfeb770bcb05bbe01d1ebcb1d3fad5aeb4ee
+  data.tar.gz: 6c45a2dd92051ed9265abb95db01ff2ab2dea3bf
 SHA512:
-  metadata.gz: ddb199b714863f6ad04ceeb5a679bced3b3c0084c3e76c6dd301f14c4d39dac956da90b11a57cc9510c05eff581b9af1ea0f69dfb9b606e2b0bdfba273d49b5d
-  data.tar.gz: 1141a9f175c2e1f3914a823c474da864432bcffa46363897686ee35d95d597387f25e9a55a82e60e495c5ea448e8f6f82a8f1643da5eca89b8aaf3097737c076
+  metadata.gz: a562f8b60ad6ba3bd4759690b3bf005c3c29075f071d14c2183cd1a78d810e8f133929f5f6e6a8e6295c8ba5431ccdf6ee22e05c85f408a12bf2d31b973f7589
+  data.tar.gz: b436baa26822f98553c3670f94234366718cdb71ed1940180ede6546fac4e75db097908afaf82bbb0ac4a1d58a3a56ac5850d3497172f1227bdcb4f27d19faec

data/README.md

@@ -41,7 +41,7 @@ search for tests and run them on start (if you enabled the `:all_on_start` optio
 
 ### Example PHP project
 
-The [PHPUnit documentaion][4] uses the [Object Freezer][5] library as an example on how
+The [PHPUnit documentation][4] uses the [Object Freezer][5] library as an example on how
 to organize tests. This project uses the `Tests` directory for its tests.
 
 An example of the Guardfile for the same project would look

data/lib/guard/phpunit2.rb

@@ -1,5 +1,4 @@
-require 'guard'
-require 'guard/guard'
+require 'guard/compat/plugin'
 require 'guard/phpunit2/version'
 
 module Guard
@@ -7,7 +6,7 @@ module Guard
   # The PHPUnit guard gets notified about system
   # events.
   #
-  class PHPUnit2 < Guard
+  class PHPUnit2 < Plugin
 
     autoload :Inspector, 'guard/phpunit2/inspector'
     autoload :Formatter, 'guard/phpunit2/formatter'
@@ -36,10 +35,10 @@ module Guard
     # @option options [String] :cli The CLI arguments passed to phpunit
     # @option options [String] :tests_path the path where all tests exist
     #
-    def initialize(watchers = [], options = {})
+    def initialize(options = {})
       defaults = DEFAULT_OPTIONS.clone
       @options = defaults.merge(options)
-      super(watchers, @options)
+      super(@options)
 
       @failed_paths     = []
       @previous_failed = false

data/lib/guard/phpunit2/formatter.rb

@@ -16,9 +16,9 @@ module Guard
         def parse_output(text)
           results = {
             :tests    => look_for_words_in('(?:Tests:|tests)',    text),
-            :failures => look_for_words_in('Failures:', text),
+            :failures => look_for_words_in('(?:Failures:|failures)', text),
             :errors   => look_for_words_in('Errors:', text),
-            :pending  => look_for_words_in(['Skipped:', 'Incomplete:'], text),
+            :pending  => look_for_words_in(['(?:Skipped:|skipped)', 'Incomplete:'], text),
             :duration => look_for_duration_in(text)
           }
           results.freeze

data/lib/guard/phpunit2/notifier.rb

@@ -13,7 +13,7 @@ module Guard
         # @param [Hash] options the notifier options
         #
         def notify(message, options)
-          ::Guard::Notifier.notify(message, options)
+          Compat::UI.notify(message, options)
         end
 
         # Displays a notification about the tests results.

data/lib/guard/phpunit2/realtime_runner.rb

@@ -40,6 +40,7 @@ module Guard
         end
 
         def execute_phpunit(tests_folder, options)
+	  require 'tempfile'
           log_file = Tempfile.new "guard-phpunit2"
           execute_command(phpunit_command(tests_folder, options, log_file.path))
 

data/lib/guard/phpunit2/runner.rb

@@ -34,7 +34,7 @@ module Guard
           return false if paths.empty?
 
           unless phpunit_exists?(options)
-            UI.error('the provided php unit command is invalid or phpunit is not installed on your machine.', :reset => true)
+            Compat::UI.error('the provided php unit command is invalid or phpunit is not installed on your machine.', :reset => true)
             return false
           end
 
@@ -100,7 +100,7 @@ module Guard
         #
         def notify_start(paths, options)
           message = options[:message] || "Running: #{paths.join(' ')}"
-          UI.info(message, :reset => true)
+          Compat::UI.info(message, :reset => true)
         end
 
         # Displays a notification about the tests results.

data/lib/guard/phpunit2/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PHPUnit2Version
-    VERSION = '0.2.8'
+    VERSION = '0.3.0'
   end
 end

data/spec/guard/phpunit2/notifier_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
+require 'guard/phpunit2/notifier'
 
 describe Guard::PHPUnit2::Notifier do
 
-  let(:guard_notifier) { Guard::Notifier }
+  let(:guard_notifier) { Guard::Compat::UI }
 
   describe '.notify' do
     it 'calls the guard notifier' do

data/spec/guard/phpunit2/realtime_runner_spec.rb

@@ -5,7 +5,7 @@ describe Guard::PHPUnit2::RealtimeRunner do
   let(:formatter) { Guard::PHPUnit2::Formatter }
   let(:logreader) { Guard::PHPUnit2::LogReader }
   let(:notifier)  { Guard::PHPUnit2::Notifier  }
-  let(:ui)        { Guard::UI                 }
+  let(:ui)        { Guard::Compat::UI          }
 
   describe '#run' do
     before do
@@ -21,7 +21,7 @@ describe Guard::PHPUnit2::RealtimeRunner do
 
     context 'when passed an empty paths list' do
       it 'returns false' do
-        subject.run([]).should be_false
+        subject.run([]).should be false
       end
     end
 

data/spec/guard/phpunit2/runner_spec.rb

@@ -4,7 +4,7 @@ describe Guard::PHPUnit2::Runner do
 
   let(:formatter) { Guard::PHPUnit2::Formatter }
   let(:notifier)  { Guard::PHPUnit2::Notifier  }
-  let(:ui)        { Guard::UI                 }
+  let(:ui)        { Guard::Compat::UI          }
 
   describe '#run' do
     before do
@@ -20,7 +20,7 @@ describe Guard::PHPUnit2::Runner do
 
     context 'when passed an empty paths list' do
       it 'returns false' do
-        subject.run([]).should be_false
+        subject.run([]).should be false
       end
     end
 

data/spec/guard/phpunit2_spec.rb

@@ -9,15 +9,15 @@ describe Guard::PHPUnit2 do
   describe '#initialize' do
     context 'when no options are provided' do
       it 'sets a default :all_on_start option' do
-        subject.options[:all_on_start].should be_true
+        subject.options[:all_on_start].should be true
       end
 
       it 'sets a default :all_after_pass option' do
-        subject.options[:all_after_pass].should be_true
+        subject.options[:all_after_pass].should be true
       end
 
       it 'sets a default :keep_failed option' do
-        subject.options[:keep_failed].should be_true
+        subject.options[:keep_failed].should be true
       end
 
       it 'sets a default :tests_path option' do
@@ -25,33 +25,33 @@ describe Guard::PHPUnit2 do
       end
 
       it 'sets a default :notification option' do
-        subject.options[:notification].should be_true
+        subject.options[:notification].should be true
       end
 
       it 'sets a default :realtime option' do
-        subject.options[:realtime].should be_false
+        subject.options[:realtime].should be false
       end
     end
 
     context 'when other options are provided' do
 
-      subject { Guard::PHPUnit2.new(nil, { :all_on_start   => false,
-                                          :all_after_pass => false,
-                                          :keep_failed    => false,
-                                          :cli            => '--colors',
-                                          :tests_path     => 'tests',
-                                          :realtime       => true}) }
+      subject { Guard::PHPUnit2.new({ :all_on_start   => false,
+				      :all_after_pass => false,
+				      :keep_failed    => false,
+				      :cli            => '--colors',
+				      :tests_path     => 'tests',
+				      :realtime       => true}) }
 
       it 'sets :all_on_start with the provided option' do
-        subject.options[:all_on_start].should be_false
+        subject.options[:all_on_start].should be false
       end
 
       it 'sets :all_after_pass with the provided option' do
-        subject.options[:all_after_pass].should be_false
+        subject.options[:all_after_pass].should be false
       end
 
       it 'sets :keep_failed with the provided option' do
-        subject.options[:keep_failed].should be_false
+        subject.options[:keep_failed].should be false
       end
 
       it 'sets :cli with the provided option' do
@@ -63,7 +63,7 @@ describe Guard::PHPUnit2 do
       end
 
       it 'sets :realtime with the provided option' do
-        subject.options[:realtime].should be_true
+        subject.options[:realtime].should be true
       end
     end
 
@@ -82,7 +82,7 @@ describe Guard::PHPUnit2 do
     end
 
     context 'with the :all_on_start option set to false' do
-      subject { Guard::PHPUnit2.new(nil, :all_on_start => false) }
+      subject { Guard::PHPUnit2.new(:all_on_start => false) }
 
       it 'calls #run_all' do
         subject.should_not_receive(:run_all)
@@ -110,7 +110,7 @@ describe Guard::PHPUnit2 do
 
   describe 'realtime handling' do
     describe 'realtime endabled' do
-      let(:guard) { Guard::PHPUnit2.new(nil, {:realtime => true }) }
+      let(:guard) { Guard::PHPUnit2.new({:realtime => true }) }
       it 'should call run on the realtimerunner' do
         Guard::PHPUnit2::RealtimeRunner.should_receive(:run).and_return(true)
         guard.run_on_changes ['tests/firstTest.php']
@@ -118,7 +118,7 @@ describe Guard::PHPUnit2 do
     end
 
     describe 'realtime disabled' do
-      let(:guard) { Guard::PHPUnit2.new(nil, {:realtime => false }) }
+      let(:guard) { Guard::PHPUnit2.new({:realtime => false }) }
 
       it 'should call run on the Runner class' do
         Guard::PHPUnit2::Runner.should_receive(:run).and_return(true)
@@ -129,7 +129,7 @@ describe Guard::PHPUnit2 do
 
   describe '#run_on_changes' do
     before do
-      inspector.stub(:clean).and_return { |paths| paths }
+      inspector.stub(:clean) { |paths| paths }
     end
 
     it 'cleans the changed paths before running the tests' do
@@ -171,7 +171,7 @@ describe Guard::PHPUnit2 do
       end
 
       context 'with the :keep_failed option set to false' do
-        subject { Guard::PHPUnit2.new(nil, :keep_failed => false) }
+	subject { Guard::PHPUnit2.new(:keep_failed => false) }
 
         it 'runs the next changed files normally without the failed tests' do
           expect { subject.run_on_changes ['tests/firstTest.php'] }.to throw_symbol :task_has_failed
@@ -204,7 +204,7 @@ describe Guard::PHPUnit2 do
       end
 
       context 'with the :all_after_pass option set to false' do
-        subject { Guard::PHPUnit2.new(nil, :all_after_pass => false) }
+	subject { Guard::PHPUnit2.new(:all_after_pass => false) }
 
         it 'does not call #run_all' do
           subject.should_not_receive(:run_all)

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 require 'rspec'
+require 'guard/notifier'
+require 'guard/compat/test/helper'
 require 'guard/phpunit2'
 
 RSpec.configure do |config|
 
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.color_enabled = true
+  config.color = true
+  config.raise_errors_for_deprecations!
   config.filter_run :focus
 
   config.before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-phpunit2
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Maher Sallam
@@ -12,13 +12,27 @@ bindir: bin
 cert_chain: []
 date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -26,9 +40,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'