rcomp 0.1.1 → 0.2.0

data/lib/rcomp/reporter.rb

@@ -19,30 +19,26 @@ module RComp
       case test.result
       # success
       when :success
-        case @type
-        when :test
-          puts "\t passed : #{test.relative_path}"
-        when :generate
+        if @type == :test
+          puts "\tpassed : #{test.relative_path}"
+        else
           puts "\tgenerated : #{test.relative_path}"
         end
         @success += 1
 
       # skipped
       when :skipped
-        case @type
-        when :test
-          puts "\tskipped : #{test.relative_path}"
-        when :generate
-          puts "\t  skipped : #{test.relative_path}"
-        end
+        puts "\tskipped : #{test.relative_path}"
         @skipped += 1
 
       # failed
       when :failed
-        case @type
-        when :test
-          puts "\t failed : #{test.relative_path}"
-        end
+        puts "\tfailed : #{test.relative_path}"
+        @failed += 1
+
+      # timedout
+      when :timedout
+        puts "\ttimeout : #{test.relative_path}"
         @failed += 1
       end
     end
@@ -71,7 +67,8 @@ module RComp
 
     def print_generate_summary
       desc = []
-      summary = "#{plural((@skipped + @success), 'file')} ("
+      summary = "#{plural((@failed + @skipped + @success), 'file')} ("
+      desc << "#{@failed} failed" unless @failed == 0
       desc << "#{@skipped} skipped" unless @skipped == 0
       desc << "#{@success} generated" unless @success == 0
       summary += desc.join(", ") + ")"

data/lib/rcomp/runner.rb

@@ -19,15 +19,13 @@ module RComp
       suite.each do |test|
         case type
         when :test
-          if expected_exists?(test)
-            run_test(test)
-          end
+          run(test) if expected_exists?(test)
 
         when :generate
           if expected_exists?(test)
-            run_generate(test) if options[:overwrite]
+            run(test, true) if options[:overwrite]
           else
-            run_generate(test)
+            run(test, true)
           end
         end
 
@@ -50,28 +48,28 @@ module RComp
         File.exists?(test.expected_err_path)
     end
 
-    # Run a test storing it's result out and err
+    # Test or generate output for a specified test
     #
     # test - A Test object
+    # generate - Flag for running generate. Runs test otherwise.
     #
     # Returns nothing
-    def run_test(test)
-      mkpath_to test.result_out_path
-      mkpath_to test.result_err_path
-      system "#{@conf.command} #{test.test_path} > #{test.result_out_path} 2> #{test.result_err_path}"
-      test.result = compare_output(test) 
-    end
+    def run(test, generate=false)
+      generate ? mkpath_to(test.expected_out_path) :
+        mkpath_to(test.result_out_path)
 
-    # Generate expected output for a test
-    #
-    # test - A Test object
-    #
-    # Returns nothing
-    def run_generate(test)
-      mkpath_to test.expected_out_path
-      mkpath_to test.expected_err_path
-      system "#{@conf.command} #{test.test_path} > #{test.expected_out_path} 2> #{test.expected_err_path}"
-      test.result = :success
+      # Create process and run
+      cmd = [@conf.command, test.test_path]
+      out = generate ? test.expected_out_path : test.result_out_path
+      err = generate ? test.expected_err_path : test.result_err_path
+      process = Process.new(cmd, @conf.timeout, out, err)
+      process.run
+
+      if process.timedout?
+        test.result = :timedout
+      else
+        test.result = generate ? :success : compare_output(test) 
+      end
     end
 
     # Compare the result and expected output of a test that has been run

data/lib/rcomp/suite.rb

@@ -5,6 +5,8 @@ module RComp
 
     include RComp::Path
 
+    @@conf = Conf.instance
+
     # Create a test suite
     #
     # pattern - A pattern to filter the tests that are added to the suite
@@ -14,7 +16,7 @@ module RComp
       tests = []
 
       # Find all tests in the tests directory
-      Find.find Conf.instance.test_root do |path|
+      Find.find @@conf.test_root do |path|
         # recurse into all subdirectories
         next if File.directory? path
 
@@ -26,10 +28,25 @@ module RComp
         # ignore dotfiles
         next if File.basename(path).match(/^\..*/)
 
+        # ignore files in ignore filter
+        next if ignored?(path)
+
         tests << Test.new(path)
       end
 
-      tests
+      return tests
+    end
+
+    # Checks all ignore patterns against a given relative path
+    #
+    # path - A relative path of a test
+    #
+    # Returns true if any patterns match the path, false otherwise
+    def ignored?(path)
+      @@conf.ignore.each do |ignore|
+        return true if rel_path(path).match(ignore)
+      end
+      return false
     end
   end
 end

data/lib/rcomp/version.rb

@@ -1,3 +1,3 @@
 module RComp
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/rcomp.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("thor", "~> 0.16.0")
-  
-  s.add_development_dependency("rake")
-  s.add_development_dependency("cucumber", "~> 1.2.1")
-  s.add_development_dependency("aruba", "~> 0.5.0")
+  s.add_runtime_dependency "thor", "~> 0.16.0"
+  s.add_runtime_dependency "childprocess", "~> 0.3.6"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "cucumber", "~> 1.2.1"
+  s.add_development_dependency "aruba", "~> 0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcomp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,8 +112,8 @@ files:
 - contributing.md
 - features/generate.feature
 - features/init.feature
-- features/set_command.feature
-- features/set_directory.feature
+- features/step_definitions/test_steps.rb
+- features/step_definitions/version_steps.rb
 - features/support/env.rb
 - features/test.feature
 - features/version.feature
@@ -106,7 +122,9 @@ files:
 - lib/rcomp/cli.rb
 - lib/rcomp/conf.rb
 - lib/rcomp/helper.rb
+- lib/rcomp/initializer.rb
 - lib/rcomp/path.rb
+- lib/rcomp/process.rb
 - lib/rcomp/reporter.rb
 - lib/rcomp/runner.rb
 - lib/rcomp/suite.rb
@@ -141,8 +159,8 @@ summary: A simple framework for testing command line application output.
 test_files:
 - features/generate.feature
 - features/init.feature
-- features/set_command.feature
-- features/set_directory.feature
+- features/step_definitions/test_steps.rb
+- features/step_definitions/version_steps.rb
 - features/support/env.rb
 - features/test.feature
 - features/version.feature

data/features/set_command.feature

@@ -1,24 +0,0 @@
-Feature: Set Command
-  A user should be able to set the command RComp tests with from the CLI
-
-  @announce
-  Scenario: Set command
-    When I run `rcomp set-command ./test_exec`
-    Then a file named ".rcomp" should exist
-    And the file ".rcomp" should contain "command: ./test_exec"
-    And the exit status should be 0
-
-  @announce
-  Scenario: Set command alias
-    When I run `rcomp c ./test_exec`
-    Then a file named ".rcomp" should exist
-    And the file ".rcomp" should contain "command: ./test_exec"
-    And the exit status should be 0
-
-  @announce
-  Scenario: Overwrite command
-    When I run `rcomp c ./first`
-    And I run `rcomp c ./second`
-    Then a file named ".rcomp" should exist
-    And the file ".rcomp" should contain "command: ./second"
-    And the exit status should be 0

data/features/set_directory.feature

@@ -1,22 +0,0 @@
-Feature: Set Directory
-  A user should be able to set the directory that RComp
-  stores tests in from the CLI
-
-  Scenario: Set directory
-    When I run `rcomp set-directory spec/rcomp`
-    Then a file named ".rcomp" should exist
-    And the file ".rcomp" should contain "directory: spec/rcomp"
-    And the exit status should be 0
-
-  Scenario: Set directory alias
-    When I run `rcomp d spec/rcomp`
-    Then a file named ".rcomp" should exist
-    And the file ".rcomp" should contain "directory: spec/rcomp"
-    And the exit status should be 0
-
-  Scenario: Overwrite directory
-    When I run `rcomp d first`
-    And I run `rcomp d second`
-    Then a file named ".rcomp" should exist
-    And the file ".rcomp" should contain "directory: second"
-    And the exit status should be 0