guard-phpunit2 0.2.3 → 0.2.6

data/lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_skipped.phpt

@@ -0,0 +1,19 @@
+--TEST--
+phpunit Number - Only skipped tests 
+--FILE--
+<?php
+$group     = 'skipped';
+$testClass = 'NumberTest';
+
+$_SERVER['argv'][1] = '--group';
+$_SERVER['argv'][2] = $group;
+$_SERVER['argv'][3] = dirname(__FILE__) . "/_files/${testClass}.php";
+
+require_once 'PHPUnit/Autoload.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+%rS+%r
+
+Finished in %i second%S
+%i tests, 0 assertions, %i skipped

data/lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_skipped_variation.phpt

@@ -0,0 +1,20 @@
+--TEST--
+phpunit Number - Only skipped tests and colors enabled  
+--FILE--
+<?php
+$group     = 'skipped';
+$testClass = 'NumberTest';
+
+$_SERVER['argv'][1] = '--group';
+$_SERVER['argv'][2] = $group;
+$_SERVER['argv'][3] = '--colors';
+$_SERVER['argv'][4] = dirname(__FILE__) . "/_files/${testClass}.php";
+
+require_once 'PHPUnit/Autoload.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+SS
+
+Finished in %i second%S
+2 tests, 0 assertions, 2 skipped

data/lib/guard/phpunit/formatters/PHPUnit-Progress/VERSION

@@ -0,0 +1,2 @@
+https://github.com/joshuastine/phpunit-progress
+Jun 2, 2013

data/lib/guard/phpunit/formatters/PHPUnit-Progress/phpunit.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit printerClass="PHPUnit_Extensions_Progress_ResultPrinter">
+</phpunit>

data/lib/guard/phpunit2/formatter.rb

@@ -15,7 +15,7 @@ module Guard
         #
         def parse_output(text)
           results = {
-            :tests    => look_for_words_in('[Tests:|tests]',    text),
+            :tests    => look_for_words_in('(?:Tests:|tests)',    text),
             :failures => look_for_words_in('Failures:', text),
             :errors   => look_for_words_in('Errors:', text),
             :pending  => look_for_words_in(['Skipped:', 'Incomplete:'], text),
@@ -40,11 +40,11 @@ module Guard
           if text =~ %r{FAILURES} || text =~ %r{OK, but incomplete or skipped tests!}
             strings_list.each do |s|
               text =~ %r{
-                #{s}s?  # then the string
-                [ ]     # then a space
+                #{s}    # then the string
+                \s+     # then a space
                 (\d+)   # count of what we are looking for
                 .*      # then whatever
-                \Z      # start looking at the end of the text
+                $      # start looking at the end of the text
               }x
               count += $1.to_i unless $1.nil?
             end
@@ -52,10 +52,10 @@ module Guard
             strings_list.each do |s|
               text =~ %r{
                 (\d+)   # count of what we are looking for
-                [ ]     # then a space
-                #{s}s?  # then the string
+                \s+     # then a space
+                #{s}    # then the string
                 .*      # then whatever
-                \Z      # start looking at the end of the text
+                $      # start looking at the end of the text
               }x
               count += $1.to_i unless $1.nil?
             end
@@ -70,8 +70,11 @@ module Guard
         # @return [Integer] the duration
         #
         def look_for_duration_in(text)
-          text =~ %r{Time: (\d)+ seconds?.*\Z}m
-          $1.nil? ? 0 : $1.to_i
+          text      =~ %r{Time: (\d+)\s+(\w+)?.*$}
+          time      = $1.nil? ? 0 : $1.to_i
+          time_name = $2.nil? ? "sec" : $2
+
+          return time, time_name
         end
       end
     end

data/lib/guard/phpunit2/notifier.rb

@@ -43,7 +43,7 @@ module Guard
           message = "#{results[:tests]} tests, #{results[:failures]} failures"
           message << "\n#{results[:errors]} errors"    if results[:errors]  > 0
           message << " (#{results[:pending]} pending)" if results[:pending] > 0
-          message << "\nin #{results[:duration]} seconds"
+          message << "\nin #{results[:duration].first} #{results[:duration].last}"
           message
         end
 

data/lib/guard/phpunit2/runner.rb

@@ -12,11 +12,11 @@ module Guard
 
         # The exittcode phpunit returns when the tests contain failures
         #
-        PHPUNIT_FAILURES_EXITCODE = 3
+        PHPUNIT_FAILURES_EXITCODE = 1
 
         # The exittcode phpunit returns when the tests contain errors
         #
-        PHPUNIT_ERRORS_EXITCODE   = 4
+        PHPUNIT_ERRORS_EXITCODE   = 2
 
         # Runs the PHPUnit tests and displays notifications
         # about the results.
@@ -30,8 +30,8 @@ module Guard
 
           return false if paths.empty?
 
-          unless phpunit_exists?
-            UI.error('phpunit is not installed on your machine.', :reset => true)
+          unless phpunit_exists?(options)
+            UI.error('the provided php unit command is invalid or phpunit is not installed on your machine.', :reset => true)
             return false
           end
 
@@ -45,8 +45,11 @@ module Guard
         #
         # @return [Boolean] The status of phpunit
         #
-        def phpunit_exists?
-          `phpunit --version`
+        def phpunit_exists?(options)
+          command = "phpunit"
+          command = options[:command] if options[:command]
+
+          `#{command} --version`
           true
         rescue Errno::ENOENT
           false
@@ -70,20 +73,23 @@ module Guard
               output = execute_command phpunit_command(tests_folder, options)
             end
           end
-
+          
           # print the output to the terminal
           puts output
-
+          
           # return false in case the system call fails with no status!
           return false if $?.nil?
 
-          if $?.success? or tests_contain_failures? or tests_contain_errors?
+          # capture success so that if notifications alter the status stored in $? we still return the correct value
+          success = $?.success?
+
+          if success or tests_contain_failures? or tests_contain_errors?
             notify_results(output, options)
           else
             notify_failure(options)
           end
 
-          $?.success?
+          success
         end
 
         # Displays the start testing notification.
@@ -169,8 +175,15 @@ module Guard
         # @see #run_tests
         #
         def phpunit_command(path, options)
+          formatter_path = File.expand_path( File.join( File.dirname(__FILE__), '..', 'phpunit', 'formatters', 'PHPUnit-Progress') )
+          
+          command = "phpunit"
+          command = options[:command] if options[:command]
+
           cmd_parts = []
-          cmd_parts << "phpunit"
+          cmd_parts << command
+          cmd_parts << "--include-path #{formatter_path}"
+          cmd_parts << "--printer PHPUnit_Extensions_Progress_ResultPrinter"
           cmd_parts << options[:cli] if options[:cli]
           cmd_parts << path
 
@@ -188,4 +201,4 @@ module Guard
       end
     end
   end
-end
+end

data/lib/guard/phpunit2/version.rb

@@ -1,5 +1,5 @@
 module Guard
-  module PHPUnit2
-    VERSION = '0.2.3'
+  module PHPUnit2Version
+    VERSION = '0.2.6'
   end
 end

data/lib/guard/phpunit2.rb

@@ -1,5 +1,6 @@
 require 'guard'
 require 'guard/guard'
+require 'guard/phpunit2/version'
 
 module Guard
 

data/spec/guard/phpunit2/formatter_spec.rb

@@ -8,7 +8,7 @@ describe Guard::PHPUnit2::Formatter do
         subject.parse_output(output).should == {
           :tests  => 2, :failures => 0,
           :errors => 0, :pending  => 0,
-          :duration => 0
+          :duration => [0, "seconds"]
         }
       end
     end
@@ -19,7 +19,7 @@ describe Guard::PHPUnit2::Formatter do
         subject.parse_output(output).should == {
           :tests  => 2, :failures => 2,
           :errors => 0, :pending  => 0,
-          :duration => 0
+          :duration => [0, "seconds"]
         }
       end
     end
@@ -30,7 +30,7 @@ describe Guard::PHPUnit2::Formatter do
         subject.parse_output(output).should == {
           :tests  => 3, :failures => 0,
           :errors => 0, :pending  => 3,
-          :duration => 0
+          :duration => [0, "seconds"]
         }
       end
     end
@@ -41,7 +41,7 @@ describe Guard::PHPUnit2::Formatter do
         subject.parse_output(output).should == {
           :tests  => 13, :failures => 3,
           :errors => 1, :pending  => 3,
-          :duration => 2
+          :duration => [2, "seconds"]
         }
       end
     end

data/spec/guard/phpunit2/notifier_spec.rb

@@ -22,7 +22,7 @@ describe Guard::PHPUnit2::Notifier do
         subject.notify_results(
           :tests  => 10, :failures => 0,
           :errors => 0, :pending  => 0,
-          :duration => 5
+          :duration => [5, "seconds"]
         )
       end
     end
@@ -36,7 +36,7 @@ describe Guard::PHPUnit2::Notifier do
         subject.notify_results(
           :tests  => 10, :failures => 3,
           :errors => 4, :pending  => 0,
-          :duration => 6
+          :duration => [6, "seconds"]
         )
       end
     end
@@ -51,7 +51,7 @@ describe Guard::PHPUnit2::Notifier do
         subject.notify_results(
           :tests  => 10, :failures => 0,
           :errors => 0, :pending  => 2,
-          :duration => 4
+          :duration => [4, "seconds"]
         )
       end
 
@@ -64,7 +64,7 @@ describe Guard::PHPUnit2::Notifier do
         subject.notify_results(
           :tests  => 10, :failures => 0,
           :errors => 3, :pending  => 2,
-          :duration => 4
+          :duration => [4, "seconds"]
         )
       end
     end

data/spec/guard/phpunit2/runner_spec.rb

@@ -32,7 +32,7 @@ describe Guard::PHPUnit2::Runner do
 
       it 'displays an error when phpunit is not installed' do
         subject.stub(:phpunit_exists?).and_return(false)
-        ui.should_receive(:error).with('phpunit is not installed on your machine.', anything)
+        ui.should_receive(:error).with('the provided php unit command is invalid or phpunit is not installed on your machine.', anything)
 
         subject.run( ['tests'] )
       end
@@ -49,12 +49,20 @@ describe Guard::PHPUnit2::Runner do
         subject.run( ['tests'] )
       end
 
+      it 'runs phpunit tests with provided command' do
+        formatter_path = @project_path.join('lib', 'guard', 'phpunit', 'formatters', 'PHPUnit-Progress')
+        subject.should_receive(:execute_command).with(
+          %r{^/usr/local/bin/phpunit --include-path #{formatter_path} --printer PHPUnit_Extensions_Progress_ResultPrinter .+$}
+        ).and_return(true)
+        subject.run( ['tests'] , {:command => '/usr/local/bin/phpunit'} )
+      end
+
       it 'prints the tests output to the console' do
           output = load_phpunit_output('passing')
           subject.stub(:notify_start)
           subject.stub(:execute_command).and_return(output)
 
-          ui.should_receive(:info).with(output)
+          #ui.should_receive(:info).with(output)
 
           subject.run( ['tests'] )
       end
@@ -127,7 +135,7 @@ describe Guard::PHPUnit2::Runner do
           it 'runs with CLI options passed to PHPUnit' do
             cli_options = '--colors --verbose'
             subject.should_receive(:execute_command).with(
-              %r{^phpunit #{cli_options} .+$}
+              %r{^phpunit --include-path .* --printer .* #{cli_options} .+$}
             ).and_return(true)
             subject.run( ['tests'], :cli => cli_options )
           end

data/spec/guard/phpunit2_spec.rb

@@ -23,6 +23,10 @@ describe Guard::PHPUnit2 do
       it 'sets a default :tests_path option' do
         subject.options[:tests_path].should == @project_path.to_s
       end
+
+      it 'sets a default :notification option' do
+        subject.options[:notification].should be_true
+      end
     end
 
     context 'when other options are provided' do

metadata

@@ -1,112 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: guard-phpunit2
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - Maher Sallam
 - Ramon Soares
+- Marek Kalnik
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMQ4wDAYDVQQDDAVyYW1v
+  bjEbMBkGCgmSJomT8ixkARkWC2NvZGVjcmFmdDYzMRMwEQYKCZImiZPyLGQBGRYD
+  Y29tMB4XDTEzMDMyNzE3NDEyOVoXDTE0MDMyNzE3NDEyOVowQjEOMAwGA1UEAwwF
+  cmFtb24xGzAZBgoJkiaJk/IsZAEZFgtjb2RlY3JhZnQ2MzETMBEGCgmSJomT8ixk
+  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMe6/bxj0lU
+  QJBEAPZg6YDvjo/by2I62ww7wUgd9Yh5gOFe0uxhrr4bOCRADhhC4icYow1NZ8Ju
+  sGKhTGHRGg8G+btt4GjfuBKYylCyqwVc2okk4Ucqghn9ls2xMvchjGhQcz7cQWiZ
+  XBfffGikJEwclkpdr4mRgm4TaBzkZUF029axX6YM7G5AbBcYfbHwSss+fLsXB1t9
+  bU07BDLV6KSnFjn/6Gj9CrZpw3G0TCunTvB6UjcZIoBqXeWz6z9XJX+GhyaZGCjQ
+  R1rXqqEfSRwsG31ibcTTFrqtoyTkzmz33h5LbMZZdLoMpeEFggkY0cQBUY4sGYK/
+  jrbnzdwgwtsCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFIcHXF/pGBCu96efKVZ3eH10IgSxMCAGA1UdEQQZMBeBFXJhbW9uQGNvZGVj
+  cmFmdDYzLmNvbTAgBgNVHRIEGTAXgRVyYW1vbkBjb2RlY3JhZnQ2My5jb20wDQYJ
+  KoZIhvcNAQEFBQADggEBAJ1v3i31c1ADsx4eWX+RPYLbZK0y9je4EDbswsE7owWJ
+  gDmVZFa9LYzLTQf0ouR4yb3W5nwEkPl6VDGkSSwmGeGzAj+Z+MQgLRz3PP1IRKji
+  +UZWMqM5Mv3aIkTEmAGitRjSfi6RpQiBG0L24hJ66dw5KrQp2dUOdUf3tR+KWv90
+  Uoz3nIfPvMYkUOYxNWdC/uxQf7VNR3eXerjGLKskvrjBgP3kjytvmlEvido8OwKm
+  tfg0X0xrfUfUjJj8Ttd2n6fUss+S/H631xMHWA19shwEvey1SKOdCCvMjpV1rwup
+  7g4EOpFUXKG2E+5vow3VDEqcOhfQYvQ8UB3Of3FOp2o=
+  -----END CERTIFICATE-----
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pimpmychangelog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Guard::PHPUnit automatically run your unit-tests written with the PHPUnit
@@ -114,10 +143,33 @@ description: Guard::PHPUnit automatically run your unit-tests written with the P
 email:
 - maher@sallam.me
 - ramon@cc63.com
+- marekk@theodo.fr
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- lib/guard/phpunit/formatters/PHPUnit-Progress/PHPUnit/Extensions/Progress/ResultPrinter.php
+- lib/guard/phpunit/formatters/PHPUnit-Progress/README.markdown
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/_files/Number.php
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/_files/NumberTest.php
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/_files/emptyTest.php
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_basic.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_errors.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_errors_variation.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_failing.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_failing_variation.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_incomplete.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_incomplete_variation.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_passing.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_passing_variation.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_skipped.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/Tests/printer_skipped_variation.phpt
+- lib/guard/phpunit/formatters/PHPUnit-Progress/VERSION
+- lib/guard/phpunit/formatters/PHPUnit-Progress/phpunit.xml
+- lib/guard/phpunit/formatters/PHPUnit-Progress/screenshot.png
 - lib/guard/phpunit2.rb
 - lib/guard/phpunit2/formatter.rb
 - lib/guard/phpunit2/inspector.rb
@@ -125,9 +177,6 @@ files:
 - lib/guard/phpunit2/runner.rb
 - lib/guard/phpunit2/templates/Guardfile
 - lib/guard/phpunit2/version.rb
-- LICENSE
-- README.md
-- CHANGELOG.md
 - spec/fixtures/emptyTest.php
 - spec/fixtures/results/errors.txt
 - spec/fixtures/results/failing.txt
@@ -142,7 +191,8 @@ files:
 - spec/guard/phpunit2_spec.rb
 - spec/spec_helper.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -150,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-phpunit2
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Guard gem for PHPUnit