guard-cunit 0.0.2 → 0.0.3

data/.travis.yml

@@ -1,11 +1,13 @@
+before_install:
+  - gem update bundle
+  - gem --version
+  - bundle --version
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
+  - "2.0.0-p247"
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
+  - jruby-20mode # JRuby in 2.0 mode
   - rbx-19mode
+  - rbx-20mode
 # uncomment this line if your project needs to run something other than `rake`:
-script: bundle exec rspec spec
+script: bundle exec rspec 

data/CHANGELOG.md

@@ -1,4 +1,28 @@
-# Chagelog
+ # Chagelog
+
+##  version 0.0.2 
+### more bugfixes
+commit fc72fdc5b23ea146d37554151eb7681bb0f615ee
+Date:   Sun Dec 2 20:25:26 2012 +0200
+
+    add fixes for running rspec in cleaner environment and increased version
+    where platform indpendant gem should be used
+
+commit a24dc9f1458a7e200b825c62c9ecd96836fa378e
+Date:   Sun Dec 2 17:08:17 2012 +0200
+
+    reworked popen usage for legacy runy versions and win/mac
+    incompatabilities
+
+commit f4c578a2974b19e594e6180ca2ad5a27e4edc5ba
+Date:   Thu Nov 29 17:07:27 2012 +0200
+
+    fix problem with pipes on windows
+
+commit 94d611475656105b72680dca8aebac6ca7ab3344
+Date:   Wed Nov 28 10:46:16 2012 +0200
+
+    rework adding library to search path for win and mac
 
 ### Bug fix
 commit fd83634f375f76fb7ef5af72516f6afe6f07946c

data/Gemfile

@@ -6,4 +6,7 @@ if RUBY_VERSION.match("1.8")
    gem 'rake', :require=>true
 end
 gem 'guard', :require=>true
+gem 'guard-compat', :require=>true
 gem 'rspec-core', :require=> true
+gem 'pry', :require=> true
+gem 'pry_debug', :require=> true

data/README.md

@@ -1,8 +1,9 @@
+
 # Guard CUnit  [![Build Status](https://secure.travis-ci.org/teacup-on-rockingchair/guard-cunit.png?branch=master)](http://travis-ci.org/teacup-on-rockingchair/guard-cunit)
 
 CUnit Guard allows you to run/watch Unit test for C modules, or anything other that works with Makefile
 
-Soon will add parser for CUnit tests, and probably other UT libs
+Has basic parser for CUnit tests. Current TODO is to add also for CppUtest and Unity
 
 ## Install
 
@@ -10,10 +11,10 @@ Need to have guard and also some of the notifiers that guard uses
 
 otherwise, get the gemfile and install it:
 ```
-$ gem install ./guard-cunit-*.gem
+$ gem install guard-cunit
 ```
 
-will put that in rubygems soon
+Already can be found on http://rubygems.org/
 
 # Guardfile
 
@@ -36,9 +37,9 @@ guard 'cunit' do
       watch(%r{((.+)\.c$)|((.+)\.h$)|((M|m)akefile$)} )	
 end
 
-set_builder "make 2>&1"
+set_builder "make"
 set_cleaner "make clean"
-cunit_runner "#{File.basename(Dir.getwd)}_unit"
+cunit_runner "./#{File.basename(Dir.getwd)}_unit"
 libdir "#{Dir.getwd}"
 
 ```
@@ -60,11 +61,12 @@ Run rspec in top directory of the project or guard-rspec
 Todo
 -----------
 - fix all bugs :)
-- add parser for CUNIT tests
+- add parser for more Unit tests frameworks
 - add hook for coverage
+- something about automatic mock generation ???
 - ... whatever wind blows ...
 
 Author
 ----------
-[A tea cup on a rocking chair](https://github.com/strandjata)
+[A tea cup on a rocking chair](https://github.com/teacup-on-rockingchair)
 

data/Rakefile

@@ -8,13 +8,14 @@ task :default => [ :spec, :doc, :gem]
 
 desc "Run RSpec"
 RSpec::Core::RakeTask.new do |t|
-    t.rcov = ENV['RCOV']
-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+#    t.rcov = ENV['RCOV']
+#    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
     t.verbose = true
 end
 
 
 task :doc do
+  system 'rm -fr doc'
   system 'rdoc -a -U'
 end
 

data/guard-cunit.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   
   # specify any dependencies here; for example:
   s.add_dependency 'guard', '>= 1.1'		
+  s.add_dependency 'guard-compat', '~> 1.1'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rspec'  
 

data/lib/guard/cunit.rb

@@ -1,69 +1,70 @@
 require 'guard'
-require 'guard/guard'
-
+require 'guard/compat/plugin'
+require_relative 'cunit/runner'
 
 module Guard
-# main child class of Guard to nherit guard's behaviour
-  class Cunit < Guard 
-    autoload :Runner,    'guard/cunit/runner'
-# new method that also creates the runner class
-    def initialize(watchers = [], options = {})
+  # main child class of Guard to nherit guard's behaviour
+  class Cunit < Plugin
+    # new method that also creates the runner class
+    def initialize(options = {})
       super
       @options = {
-        :all_on_start   => true,
+        all_on_start: true
       }.update(options)
-      @runner    = Runner.new()
+      @runner = Runner.new
     end
+
     # Called when just `enter` is pressed
-    # This method should be principally used for long action like running all specs/tests/...
+    # This method should be principally used for long action
+    # like running all specs/tests/...
     # @raise [:task_has_failed] when run_all has failed
     def run_all
       passed = @runner.run
       throw :task_has_failed unless passed
     end
+
     def run_on_change(paths)
       UI.info("Process changes in #{paths}")
-      passed = run_all
+      run_all
     end
   end
 
-#
-# add more behaviour to Guard's DSL to be able to configure executors 
-# of all the CUnit's Guard tasks
-#
+  #
+  # add more behaviour to Guard's DSL to be able to configure executors
+  # of all the CUnit's Guard tasks
+  #
   class Dsl
-#
-# put default values to task executors
-#
+    #
+    # put default values to task executors
+    #
     def initialize
       super
-      set_cleaner("make clean")
+      set_cleaner('make clean')
       cunit_runner("./#{File.basename(Dir.getwd)}_unit")
-      set_builder("make 2>&1")
+      set_builder('make 2>&1')
       libdir("#{Dir.getwd}")
       @runner = Cunit::Runner.new
     end
 
     # dsl call to set cunit test executable
-    def cunit_runner (name)
-      Cunit::Runner.set_runner(name)
+    def cunit_runner(name)
+      Cunit::Runner.cfg_runner(name)
     end
-    
+
     # dsl call to set cunit build command/script, by default make
-    def set_builder (name)
-      Cunit::Runner.set_builder(name)
+    def set_builder(name)
+      Cunit::Runner.cfg_builder(name)
     end
-    
-    #dsl call to set cunit clean command/script, by default 'make clean'
-    def set_cleaner (name)
-      Cunit::Runner.set_cleaner(name)
+
+    # dsl call to set cunit clean command/script, by default 'make clean'
+    def set_cleaner(name)
+      Cunit::Runner.cfg_cleaner(name)
     end
-    
-    # dsl call to set dir, where library under test is generated, by default current dir
+
+    # dsl call to set dir, where library under test is generated,
+    # by default current dir
     def libdir(name)
-      Cunit::Runner.set_libdir(File.expand_path(name))
+      Cunit::Runner.cfg_libdir(File.expand_path(name))
     end
-
   end
-  
 end

data/lib/guard/cunit/cunit_parser.rb

@@ -1,79 +1,78 @@
+# couple of methods I need for String objects
 class TestOutput < String
   # limit the output to given nr rows
   def limit_to_rows(number_of_rows)
-    output = TestOutput.new("")
-    raws_count = 1;
-    self.lines.each do |current_line|
+    output = TestOutput.new('')
+    raws_count = 1
+    lines.each do |current_line|
       output += current_line
-      break if(raws_count == number_of_rows)
-      raws_count+=1
+      break if raws_count == number_of_rows
+      raws_count += 1
     end
-    output=output+"..." if ( number_of_rows < self.lines.count )
+    output += '...' if number_of_rows < lines.count
     output
   end
-  
+
   # bang version
   def limit_to_rows!(number_of_rows)
-    self.replace(limit_to_rows(number_of_rows))
+    replace(limit_to_rows(number_of_rows))
   end
-
 end
 
-
 module Guard
-  class Cunit
-   class CunitParser
-     @output
-     @summary_output
-     @failures
+  class Cunit < Plugin
+    # Parse CUNIT test harness output
+    class CunitParser
+      # constructor
+      def initialize(task_output = nil)
+        parse_output(task_output) unless task_output.nil?
+      end
 
-     #constructor
-     def initialize (task_output = nil)
-       parse_output( task_output ) unless task_output == nil
-     end
-     
-     #get cunit output
-     def parse_output( task_output )
-       task_output = "" unless task_output != nil
-       @output = TestOutput.new(task_output.dup)
-       get_summary
-       get_failures
-     end
-     
-     # find summary of the cunit test reprot
-     def get_summary
-       begin
-         @summary_output = TestOutput.new(@output[/Run Summary:[\w\W]*/])
-       rescue
-         @summary_output = TestOutput.new("")
-       end
-     end
+      # get cunit output
+      def parse_output(task_output)
+        task_output = '' if task_output.nil?
+        @output = TestOutput.new(task_output.dup)
+        read_summary
+        read_failures
+      end
 
-     #find failures from Cunit test report
-     def get_failures
-       begin
-         @failures = TestOutput.new(@output[/[\r\n]*[ \t\f]*1. [\w\W]*:[\d]* [\w\W]*/].sub(@summary_output,"").strip)
-       rescue
-         @failures = TestOutput.new("Failed")
-       end
-       @failures.limit_to_rows!(3)
-     end
+      # find summary of the cunit test reprot
+      def read_summary
+        summary_txt = ''
+        begin
+          summary_txt = @output[/Run Summary:[\w\W]*/] || ''
+        rescue
+          summary_txt = ''
+        end
+        @summary_output = TestOutput.new(summary_txt)
+      end
 
-     #display summary of the suites/tests/asserts
-     def cunit_output
-       @summary_output
-     end
+      # find failures from Cunit test report
+      def read_failures
+        begin
+          failures_rex = /[\r\n]*[ \t\f]*1. [\w\W]*:[\d]* [\w\W]*/
+          outp = @output[failures_rex].sub(@summary_output, '').strip
+          @failures = TestOutput.new(outp)
+        rescue
+          @failures = TestOutput.new('Failed')
+        end
+        @failures.limit_to_rows!(3)
+      end
 
-     #copy of the cunit output
-     def full_output
-       @output
-     end
+      # display summary of the suites/tests/asserts
+      def cunit_output
+        @summary_output
+      end
 
-     #display failures output
-     def failures_output
-       @failures
-     end
+      # copy of the cunit output
+      def full_output
+        @output
+      end
 
-   end
- end
+      # display failures output
+      def failures_output
+        @failures
+      end
+    end
+  end
 end

data/lib/guard/cunit/runner.rb

@@ -1,128 +1,142 @@
 require 'guard/cunit/cunit_parser'
 
-
 module Guard
-  class Cunit
-#
-# the class implements running and handling of results of the tasks that made up the cunit guard
-# 
-   class Runner
-     @@cunit_runner=''
-     @@project_builder=''
-     @@project_cleaner=''
-     @@project_libdir=''
-     
-     
-     def initialize
-       @parser = CunitParser.new()
-       @current_output = String.new("")
-     end
-     # set the executable file name to run CUNIT tests
-     def self.set_runner(name)
-       @@cunit_runner=name
-     end
-     
-     # set command to run to prepare build
-     def self.set_builder(name)
-       @@project_builder=name
-     end
-     
+  class Cunit < Plugin
+    # the class implements running and handling results
+    # of the tasks that made up the cunit guard
+    class Runner
+      @@cunit_runner = ''
+      @@project_builder = ''
+      @@project_cleaner = ''
+      @@project_libdir = ''
+
+      def initialize
+        @parser = CunitParser.new
+        @current_output = String.new('')
+      end
+
+      # set the executable file name to run CUNIT tests
+      def self.cfg_runner(name)
+        @@cunit_runner = name
+      end
+
+      # set command to run to prepare build
+      def self.cfg_builder(name)
+        @@project_builder = name
+      end
+
       # set cleaner script/exe/command
-     def self.set_cleaner(name)
-       @@project_cleaner=name
-     end
-     
-     
+      def self.cfg_cleaner(name)
+        @@project_cleaner = name
+      end
+
       # set directory where library under test is generated
-     def self.set_libdir(name)
-       @@project_libdir=name
-     end
- 	
-	 #
-	 # make wrapper for piping so we can use different approaches on win and *nix
-	 #
-	 def piper(exe)
-           if( RUBY_PLATFORM.match(/mingw/)||RUBY_PLATFORM.match(/mswin/)||RUBY_VERSION.match("1.8"))
-             IO.popen(exe) {|io|
-               yield io
-             }	
-           else
-             IO.popen(exe.split << {:err=>[:child, :out]}) {|io|
-               yield io
-             }	
-           end
-		
-	 end
-     #
-     # run one phase of the guard via a system command/executable
-     #
-     def run_task(task_executable)
-       success = true
-	   piper(task_executable) {|myio|
-		@current_output = myio.read
-	   }
-       success = false unless $?.exitstatus == 0
-       UI.info @current_output
-       success
-     end
-     
-     # run clean before each run all start with clean
-     def run_clean
-       raise "Clean failed" unless  run_task(@@project_cleaner) == true
-     end
-     def export_libdir(libdir)
-	 	case RUBY_PLATFORM	
-		when /mingw/,/mswin/
-			ENV["PATH"]="#{ENV["PATH"]};#{libdir}"
-		when /darwin/
-			ENV["DYLD_LIBRARY_PATH"]="#{ENV["DYLD_LIBRARY_PATH"]}:#{libdir}"
-		else
-			ENV["LD_LIBRARY_PATH"]="#{ENV["LD_LIBRARY_PATH"]}:#{libdir}"
-		end
-	 end
-     # run unit tests via cunit executable
-     def run_tests
-       # setup environment so it should include lib dir for ld path
-       export_libdir(@@project_libdir)
-       
-       if( !File.exists? (@@cunit_runner) )
-         Notifier.notify("Pending", :title => "Test Not Defined", :image => :pending, :priority => 2)
-         success = false
-       else
-         success = run_task(@@cunit_runner)
-          @parser.parse_output(@current_output)
-         if success == true
-           Notifier.notify("Success", :title => "Test Passed", :image => :passed, :priority => 2)
-         else
-           Notifier.notify(@parser.failures_output, :title => "Test Failed", :image => :failed, :priority => 2 )
-         end
-       end
-       raise "Test failed" unless success == true
-     end
-     
-     
-     # run make command to build the project
-     def run_make
-       success = run_task(@@project_builder)
-       Notifier.notify("Failed", :title => "Build Failed", :image => :failed, :priority => 2) unless success == true
-       raise "Build failed" unless success == true
-     end
-     # run them all
-     def run 
-       UI.info "Test runner: #{@@cunit_runner}"
-       UI.info "Builder:  #{@@project_builder}"
-       UI.info "Cleaner: #{@@project_cleaner}"
-       UI.info "Libdir: #{@@project_libdir}"
-       begin
-         run_clean
-         run_make 
-         run_tests
-       rescue
-         return false
-       end
-       true
-     end
-     
-   end
- end
+      def self.cfg_libdir(name)
+        @@project_libdir = name
+      end
+
+      # make wrapper for piping so we can use different
+      # approaches on win and *nix
+      def piper(exe)
+        if RUBY_PLATFORM.match(/mingw/) || \
+           RUBY_PLATFORM.match(/mswin/) || RUBY_VERSION.match('1.8')
+          IO.popen(exe) do |io|
+            yield io
+          end
+        else
+          IO.popen(exe.split << { err: [:child, :out] }) do |io|
+            yield io
+          end
+        end
+      end
+
+      # run one phase of the guard via a system command/executable
+      def run_task(task_executable)
+        success = true
+        piper(task_executable) do |myio|
+          @current_output = myio.read
+        end
+        success = false unless $CHILD_STATUS.exitstatus == 0
+        UI.info @current_output
+        success
+      end
+
+      # run clean before each run all start with clean
+      def run_clean
+        fail 'Clean failed' unless run_task(@@project_cleaner) == true
+      end
+
+      def export_libdir(libdir)
+        case RUBY_PLATFORM
+        when /mingw/, /mswin/
+          ENV['PATH'] = "#{ENV['PATH']};#{libdir}"
+        when /darwin/
+          ENV['DYLD_LIBRARY_PATH'] = "#{ENV['DYLD_LIBRARY_PATH']}:#{libdir}"
+        else
+          ENV['LD_LIBRARY_PATH'] = "#{ENV['LD_LIBRARY_PATH']}:#{libdir}"
+        end
+      end
+
+      def parse_test_output(result)
+        @parser.parse_output(@current_output)
+        if result == true
+          Guard::Compat::UI.notify('Success', title: 'Test Passed',
+                                     image: :success, priority: 2)
+        else
+          Guard::Compat::UI.notify(@parser.failures_output, title: 'Test Failed',
+                                                   image: :failed, priority: 2)
+        end
+      end
+
+      def run_cunit
+        if !File.exist?(@@cunit_runner)
+          Guard::Compat::UI.notify('Pending', title: 'Test Not Defined',
+                                     image: :pending, priority: 2)
+          return false
+        else
+          success = run_task(@@cunit_runner)
+          parse_test_output(success)
+          return success
+        end
+      end
+
+      # run unit tests via cunit executable
+      def run_tests
+        # setup environment so it should include lib dir for ld path
+        export_libdir(@@project_libdir)
+        success = run_cunit
+        fail 'Test failed' unless success == true
+      end
+
+      # run make command to build the project
+      def run_make
+        success = run_task(@@project_builder)
+        unless success == true
+        Guard::Compat::UI.notify('Failed', title: 'Build Failed',
+                                    image: :failed, priority: 2)
+        end
+        fail 'Build failed' unless success == true
+      end
+
+      def print_test_info
+        UI.info "Test runner: #{@@cunit_runner}"
+        UI.info "Builder:  #{@@project_builder}"
+        UI.info "Cleaner: #{@@project_cleaner}"
+        UI.info "Libdir: #{@@project_libdir}"
+      end
+
+      # run them all
+      def run
+        print_test_info
+        begin
+          run_clean
+          run_make
+          run_tests
+        rescue
+          return false
+        end
+        true
+      end
+    end
+  end
 end

data/lib/guard/cunit/templates/Guardfile

@@ -5,7 +5,7 @@ guard 'cunit' do
       watch(%r{((.+)\.c$)|((.+)\.h$)|((M|m)akefile$)} )	
 end
 
-set_builder "make 2>&1"
+set_builder "make"
 set_cleaner "make clean"
 cunit_runner "#{File.basename(Dir.getwd)}_unit"
 libdir "#{Dir.getwd}"

data/lib/guard/cunit/version.rb

@@ -1,7 +1,6 @@
-#version
 module Guard
+  # version of the gem
   module CunitGuard
-# version of the gem
-    VERSION="0.0.2"
+    VERSION = '0.0.3'
   end
 end

data/spec/guard_cunit_parser_spec.rb

@@ -60,24 +60,24 @@ Elapsed time =    0.000 seconds")
 
   it "should generate a UI summary and full output from given text input" do
     parser = Guard::Cunit::CunitParser.new(@fake_output)
-    parser.full_output.should == @fake_output
-    parser.cunit_output.should == (@fake_summary)
-    parser.failures_output.should == (@fake_fail_summary)
+    expect(parser.full_output).to eq @fake_output
+    expect(parser.cunit_output).to eq (@fake_summary)
+    expect(parser.failures_output).to eq (@fake_fail_summary)
   end
 
   it "failure summary should be maximum a 3 row output" do
     parser = Guard::Cunit::CunitParser.new(@long_fake_output)
-    parser.failures_output.should == (@shortened_fail_summary)
+    expect(parser.failures_output).to eq (@shortened_fail_summary)
   end
 
   it "should be able to init with no output and later trigger process" do
     parser = Guard::Cunit::CunitParser.new()
     parser.parse_output(@long_fake_output)
-    parser.failures_output.should == (@shortened_fail_summary)
+    expect(parser.failures_output).to eq (@shortened_fail_summary)
   end
   it "should be able to handle test exe with no output and put just failed as failure message" do
     parser = Guard::Cunit::CunitParser.new()
     parser.parse_output(nil)
-    parser.failures_output.should == ("Failed")
+    expect(parser.failures_output).to eq ("Failed")
   end
 end

data/spec/guard_cunit_spec.rb

@@ -25,7 +25,9 @@ describe Guard::Cunit do
       Guard::setup({:no_interactions => true})
       @@first = false
     else
-      Guard::reload({})
+      options = ::Guard.state.session.evaluator_options
+      evaluator = ::Guard::Guardfile::Evaluator.new(options)
+      evaluator.evaluate
     end
   end
 
@@ -33,8 +35,8 @@ describe Guard::Cunit do
     Dir.chdir(@work_dir)
     tmp_work_dir=@tmp_env.create_tmp_prj_dir
     Dir.chdir((tmp_work_dir))
-    Guard::UI.stub(:info)
-    IO.stub(:popen)
+    allow(Guard::UI).to receive(:info)
+    allow(IO).to receive(:popen)
   end
 
   after(:each) do
@@ -43,7 +45,7 @@ describe Guard::Cunit do
   end
 
   it "should inherit Guard class" do
-    subject.class.ancestors.should include(Guard::Guard)
+    expect(Guard::Cunit.ancestors).to include(Guard::Plugin)
   end
 
   context "Run guard" do
@@ -64,9 +66,8 @@ describe Guard::Cunit do
     it "should run build on changes " do
       
       cguard = Guard::Cunit.new
-      cguard.stub(:run_all).and_return(true)
-      Guard::UI.should_receive(:info).with("Process changes in #{File.basename(Dir.getwd)}")
-      
+      expect(cguard).to receive(:run_all).and_return(true)
+      expect(Guard::UI).to receive(:info).with("Process changes in #{File.basename(Dir.getwd)}")
       cguard.run_on_change("#{File.basename(Dir.getwd)}")
       
     end
@@ -78,13 +79,12 @@ describe Guard::Cunit do
       popen_successfull_fake("make clean")
       popen_successfull_fake("make 2>&1")
       fake_test_exe("./jiji",:pass)
-      
       cguard = Guard::Cunit::Runner.new
       setup_guard
       cguard.run
       newenv =get_ld_path
-      newenv.should include("#{oldenv}")
-	  newenv.should include("#{Dir.getwd}")
+      expect(newenv).to include("#{oldenv}")
+      expect(newenv).to include("#{Dir.getwd}")
       get_ld_path=oldenv
     end
 
@@ -101,8 +101,8 @@ describe Guard::Cunit do
       setup_guard
       cguard.run
       newenv =get_ld_path
-      newenv.should include("#{oldenv}")
-	  newenv.should include("#{File.join(Dir.getwd,"lib")}")
+      expect(newenv).to include("#{oldenv}")
+      expect(newenv).to include("#{File.join(Dir.getwd,"lib")}")
       get_ld_path=oldenv     
     end
 
@@ -141,7 +141,7 @@ describe Guard::Cunit do
       popen_successfull_fake("./make_all.sh")
       popen_successfull_fake("./clean_all.sh")
       cguard = Guard::Cunit::Runner.new
-    setup_guard
+      setup_guard
       cguard.run
 
     end
@@ -156,7 +156,7 @@ describe Guard::Cunit do
       popen_failing_fake("make 2>&1")
       cguard = Guard::Cunit::Runner.new
       setup_guard
-      cguard.run.should == false
+      expect(cguard.run).to eq false
     end
 
     it "should block further tasks on build failed" do
@@ -165,11 +165,11 @@ describe Guard::Cunit do
       popen_failing_fake("make 2>&1")
       f = File.new("./jiji", "w+", 0666)
       f.close
-      IO.stub(:popen).with("jiji".split << {:err=>[:child, :out]})
-      IO.should_not_receive(:popen).with("jiji".split << {:err=>[:child, :out]}) 
+      allow(IO).to receive(:popen).with("jiji".split << {:err=>[:child, :out]})
+      expect(IO).not_to receive(:popen).with("jiji".split << {:err=>[:child, :out]}) 
       cguard = Guard::Cunit::Runner.new
       setup_guard
-      cguard.run.should == false
+      expect(cguard.run).to eq false
     end
 
 
@@ -180,7 +180,7 @@ describe Guard::Cunit do
       fake_test_exe("./jiji",:fail)
       cguard = Guard::Cunit::Runner.new
       setup_guard
-      cguard.run.should == false
+      expect(cguard.run).to eq  false
     end
 
   end
@@ -189,9 +189,9 @@ describe Guard::Cunit do
   context "Displaying notifications" do
 
     it "should display failure if build fails" do
-      Guard::Notifier.stub(:notify) 
+      allow(Guard::Notifier).to receive(:notify) 
       guardfile_has_unit_test_exe()
-      Guard::Notifier.should_receive(:notify).with("Failed", :title => "Build Failed", :image => :failed, :priority => 2)
+      allow(Guard::Notifier).to receive(:notify).with("Failed", :title => "Build Failed", :image => :failed, :priority => 2)
       popen_successfull_fake("make clean")
       popen_failing_fake("make 2>&1")
       cguard = Guard::Cunit::Runner.new
@@ -200,10 +200,10 @@ describe Guard::Cunit do
     end
 
     it "should display failure if test fails" do
-      IO.stub(:popen)
-      Guard::Notifier.stub(:notify) 
+      allow(IO).to receive(:popen)
+      allow(Guard::Notifier).to receive(:notify) 
       guardfile_has_unit_test_exe(:test_exe=>"jiji")
-      Guard::Notifier.should_receive(:notify).with( anything(), :title => "Test Failed", :image => :failed, :priority => 2 )
+      allow(Guard::Notifier).to receive(:notify).with( anything(), :title => "Test Failed", :image => :failed, :priority => 2 )
       popen_successfull_fake("make clean")
       popen_successfull_fake("make 2>&1")
       fake_test_exe("./jiji",:fail)
@@ -213,9 +213,9 @@ describe Guard::Cunit do
     end
 
     it "should display pending if test is absent" do
-      Guard::Notifier.stub(:notify) 
+      allow(Guard::Notifier).to receive(:notify) 
       guardfile_has_unit_test_exe()
-      Guard::Notifier.should_receive(:notify).with("Pending", :title => "Test Not Defined", :image => :pending, :priority => 2)
+      allow(Guard::Notifier).to receive(:notify).with("Pending", :title => "Test Not Defined", :image => :pending, :priority => 2)
       popen_successfull_fake("make clean")
       popen_successfull_fake("make 2>&1")
       cguard = Guard::Cunit::Runner.new
@@ -224,14 +224,14 @@ describe Guard::Cunit do
     end
 
     it "should display success if build and test succeeded" do
-      Guard::Notifier.stub(:notify) 
+      allow(Guard::Notifier).to receive(:notify) 
       guardfile_has_unit_test_exe()
-      Guard::Notifier.should_receive(:notify).with("Success", :title => "Test Passed", :image => :passed, :priority => 2)
+      allow(Guard::Notifier).to receive(:notify).with("Success", :title => "Test Passed", :image => :success, :priority => 2)
       popen_successfull_fake("make clean")
       popen_successfull_fake("make 2>&1")
       fake_test_exe(nil,:pass)
       cguard = Guard::Cunit::Runner.new
-      Guard.add_guard('cunit')
+      Guard.state.session.plugins.add('cunit', Hash.new)
       cguard.run
     end
   end

data/spec/spec_helper.rb

@@ -2,10 +2,12 @@ require 'rubygems'
 require 'fileutils'
 require 'pathname'
 require 'guard'
+require 'guard/commander'
 require 'guard/cunit'
 require 'guard/cunit/runner'
 require 'guard/cunit/cunit_parser'
 require 'rspec'
+require 'pry_debug'
 
 # a class to set/cleanup environment for fake project
 class TempPrjEnv
@@ -59,11 +61,11 @@ def popen_fake(fakename,exp_result)
 		pipe_args = fakename.split << {:err=>[:child, :out]}
 	end
 	
-	IO.stub(:popen).with(pipe_args)	
+	allow(IO).to receive(:popen).with(pipe_args)	
 	if exp_result == false
-		IO.should_receive(:popen).with(pipe_args) { fake_script(1) }
+		expect(IO).to receive(:popen).with(pipe_args) { fake_script(1) }
 	else	
-		IO.should_receive(:popen).with(pipe_args) { fake_script(0) }
+		expect(IO).to receive(:popen).with(pipe_args) { fake_script(0) }
 	end
 end
 

metadata

@@ -1,75 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-cunit
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Tea Cup On Rocking Chair
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2015-12-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
   prerelease: false
-  name: guard
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id003
-description: Guard Cunit should automatically build your C project and run CUnit based tests
-email: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Guard Cunit should automatically build your C project and run CUnit based
+  tests
+email:
 - strandjata@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -87,36 +100,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://teacup-on-rockingchair.github.com/guard-cunit/
 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 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: guard-cunit
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Guard gem for CUnit-driven projects
-test_files: []
-
+test_files:
+- spec/guard_cunit_parser_spec.rb
+- spec/guard_cunit_spec.rb
+- spec/spec_helper.rb