ocunit2junit 1.3 → 1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWI4ZTViOWIwMGRkZTk5ODVhMGVkMDFjNmU3OWJiNTExYTMyZjZmMw==
-  data.tar.gz: !binary |-
-    NTZkNTcxMDViZGI3ODQ3NDE2YTRhN2IwYjAyNjUwMWM2YWFhNjExNw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OGMwZGM1OThlMTFhNTlmZTYxOGEyNzJiYjE3ZDVhMGRkZjU2YmExYzdlNzAz
-    MWEyMDM4ODRmMTU0YzNjYmI5ZjE1NjU3ZGYzMDkzNTRmMzdjNjhhZWExZmNh
-    OWE4OWM5OTI2M2U1NDgwZDVmYjY2OTc1NjQ0N2VmODdkYmNjMjU=
-  data.tar.gz: !binary |-
-    MjI3MGUxYWE4ZjdmODdmMmExODM2NmJmOWZiNzFjNDgwODU5Njc0OWY2NjBi
-    NWNlYjliYjEwMGRkNjY4YmNlMDU0ZjQ5OTgyNGNmNWFkZmNjNmQ0OTMzMGQ5
-    MDQ5MDZkNTJmZTlhOThhYmVjNmJiNjExOWNkZTcxM2M1MTk3M2E=
+SHA1:
+  metadata.gz: 787d3da20d2f47b028216ff35dc90984f6bad839
+  data.tar.gz: ac93827a865ed1cc42f28523619da4649badc5b1
+SHA512:
+  metadata.gz: 7d1410c5a999f9c930ada4bef9e121acd7758d8fc2d575a4872be4e11946003aee81d2bba3ad7b41a699cdf077a871ea9ea4d51eeb9e1d2dce22483449e33552
+  data.tar.gz: 4bc41ad9991bd2521dce9165ff7345df3ad92bfc364685ac22eb4124a3e3839ed9293a9116a6fbb62473848e99859345de3e272aac26f1ee12e1c4c98975792d

data/bin/ocunit2junit

@@ -19,8 +19,8 @@
 #
 #
 # Where to put the XML-files from your unit tests
-TEST_REPORTS_FOLDER = "test-reports"
-SUPPORT_KIWI = true
+TEST_REPORTS_FOLDER = ENV.has_key?('TEST_REPORTS_FOLDER') ? ENV['TEST_REPORTS_FOLDER'] : "test-reports"
+SUPPORT_KIWI = ENV.has_key?('SUPPORT_KIWI') ? ENV['SUPPORT_KIWI'] : true
 #
 #
 # Don't edit below this line
@@ -39,20 +39,29 @@ class ReportParser
     @exit_code = 0
     
     FileUtils.rm_rf(TEST_REPORTS_FOLDER)
-    FileUtils.mkdir(TEST_REPORTS_FOLDER)
+    FileUtils.mkdir_p(TEST_REPORTS_FOLDER)
     parse_input
   end
 
   private
   
   def parse_input
-    @piped_input.each do |piped_row|
-      piped_row.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
-      piped_row.encode!('UTF-8', 'UTF-16')
+    if @piped_input.respond_to?(:each)
+        line_enumerator = @piped_input.each
+    elsif @piped_input.respond_to?(:each_line)
+        line_enumerator = @piped_input.each_line
+    end
+
+    line_enumerator.each do |piped_row|
+      if piped_row.respond_to?("encode!")
+        temporary_encoding = (RUBY_VERSION == '1.9.2') ? 'UTF-8' : 'UTF-16'
+        piped_row.encode!(temporary_encoding, 'UTF-8', :invalid => :replace, :replace => '')
+        piped_row.encode!('UTF-8', temporary_encoding)
+      end
       puts piped_row
       
       description_results = piped_row.scan(/\s\'(.+)\'\s/)
-      if description_results and description_results[0] and description_results[0]
+      if description_results && description_results[0] && description_results[0]
         description = description_results[0][0]
       end
       
@@ -66,7 +75,15 @@ class ReportParser
         when /Test Suite '(\S+)'.*finished at\s+(.*)./
           t = Time.parse($2.to_s)
           handle_end_test_suite($1,t)     
-
+        
+        when /Test Suite '(\S+)'.*passed at\s+(.*)./
+          t = Time.parse($2.to_s)
+          handle_end_test_suite($1,t) 
+        
+        when /Test Suite '(\S+)'.*failed at\s+(.*)./
+          t = Time.parse($2.to_s)
+          handle_end_test_suite($1,t) 
+        
         when /Test Case '-\[\S+\s+(\S+)\]' started./
           test_case = $1
           @last_description = nil
@@ -96,7 +113,7 @@ class ReportParser
           @exit_code = -1;
       end
       
-      unless description.nil?
+      if description
         @last_description = description
       end
     end
@@ -157,8 +174,10 @@ class ReportParser
   end
 
   def handle_test_error(test_suite,test_case,error_message,error_location)
-#    error_message.tr!('<','').tr!('>','')
-    @errors[test_case] = [ error_message, error_location ]
+    # Only record the first error for a test_case
+    if @errors[test_case].nil?
+      @errors[test_case] = [ error_message, error_location ]
+    end
   end
 
   def handle_test_failed(test_case,test_case_duration) 
@@ -167,8 +186,18 @@ class ReportParser
   end
 
   def get_test_case_name(test_case, description)
-    if SUPPORT_KIWI and test_case == "example" and !description.nil?
+    # Kiwi 1.x
+    if SUPPORT_KIWI && test_case == "example" && description
       description
+    # Kiwi 2.x
+    elsif SUPPORT_KIWI && test_case =~ /(.+_)+(Should.+)(_.+)*/
+      test_case.gsub(/([A-Z])([A-Z][a-z]+)/, ' \1 \2')
+               .gsub(/([A-Z][a-z]+)/, ' \1')
+               .gsub(/([A-Z][A-Z]+)/, ' \1')
+               .gsub(/([^A-Za-z ]+)/, ' \1')
+               .gsub(/\s+/, ' ')
+               .split(" _ ")[1..-1].join(", ")
+               .downcase.capitalize
     else
       test_case
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ocunit2junit
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Christian Hedin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Simply pipe your xcodebuild output through ocunit2junit: xcodebuild
+description: 'Simply pipe your xcodebuild output through ocunit2junit: xcodebuild
   ... | ocunit2junit.rb'
 email: 
 executables:
@@ -28,18 +28,19 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A script that converts OCUnit (and Kiwi) output to JUnit style XML output.
 test_files: []
+has_rdoc: