hiptest-publisher 0.21.2 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d70051b9ee31eb07c62e4b4ee9c4bbaeff4fb5
-  data.tar.gz: 822e1a2c1a0dd0eec767dfcf1041a31dd6d32b82
+  metadata.gz: ed83eeec6f0fb188ad678f7da395f4b6df95f919
+  data.tar.gz: 77e075084c0c8d74b179a3f52b6dac4d6167aebc
 SHA512:
-  metadata.gz: 0fb7cca9e673ad882baf35b3df9d99262b4059bdd7c2515db2c805121bb53222c022425fca909aedc28b425f53cc71785b6c1680844d71c142d23051deac8115
-  data.tar.gz: 643a62476439fa765cf00c82127ff115b863013e917947cb2526cea8b4019b00eb5b677f712d5e8bc6e084b5128ded23103e60f737ca8b7e2e896ab6a778c73b
+  metadata.gz: 24ee8b3f9751cabb32cbaeb1fb137b3019c86ae28ecd9bf46c96956ac9a128c1c3174e34fc9780f06dbe63f5f2f5d5d55b35f8072bd8401fcc4b2e050a270631
+  data.tar.gz: 1792067fd0259691fe2124cf3c61f916e7d4dbf14021c0b12e0cc5bc5ffa604cc3ba7a74f569ee5508cbaab5c9d4cd9a3561ea755c4ba0cf2641685dc8a6664a

data/lib/hiptest-publisher.rb

@@ -194,32 +194,40 @@ module Hiptest
         return
       end
 
+      command_line = @cli_options.command_line_used(exclude: [:actionwords_diff])
+
       unless diff[:deleted].nil?
-        puts "#{pluralize(diff[:deleted].length, "action word")} deleted:"
+        puts "#{pluralize(diff[:deleted].length, "action word")} deleted,"
+        puts "run '#{command_line} --show-actionwords-deleted' to list the #{pluralize_word(diff[:deleted].length, "name")} in the code"
         puts diff[:deleted].map {|d| "- #{d[:name]}"}.join("\n")
         puts ""
       end
 
       unless diff[:created].nil?
-        puts "#{pluralize(diff[:created].length, "action word")} created:"
+        puts "#{pluralize(diff[:created].length, "action word")} created,"
+        puts "run '#{command_line} --show-actionwords-created' to get the #{pluralize_word(diff[:created].length, "definition")}"
+
         puts diff[:created].map {|c| "- #{c[:name]}"}.join("\n")
         puts ""
       end
 
       unless diff[:renamed].nil?
-        puts "#{pluralize(diff[:renamed].length, "action word")} renamed:"
+        puts "#{pluralize(diff[:renamed].length, "action word")} renamed,"
+        puts "run '#{command_line} --show-actionwords-renamed' to get the new #{pluralize_word(diff[:renamed].length, "name")}"
         puts diff[:renamed].map {|r| "- #{r[:name]} => #{r[:new_name]}"}.join("\n")
         puts ""
       end
 
       unless diff[:signature_changed].nil?
-        puts "#{pluralize(diff[:signature_changed].length, "action word")} which signature changed:"
+        puts "#{pluralize(diff[:signature_changed].length, "action word")} which signature changed,"
+        puts "run '#{command_line} --show-actionwords-signature-changed' to get the new #{pluralize_word(diff[:signature_changed].length, "signature")}"
         puts diff[:signature_changed].map {|c| "- #{c[:name]}"}.join("\n")
         puts ""
       end
 
       unless diff[:definition_changed].nil?
         puts "#{pluralize(diff[:definition_changed].length, "action word")} which definition changed:"
+        puts "run '#{command_line} --show-actionwords-definition-changed' to get the new #{pluralize_word(diff[:definition_changed].length, "definition")}"
         puts diff[:definition_changed].map {|c| "- #{c[:name]}"}.join("\n")
         puts ""
       end
@@ -301,8 +309,30 @@ module Hiptest
           end
         end
       end
+
+      display_empty_push_help if passed_count == 0
     rescue Exception => err
       reporter.dump_error(err)
     end
+
+    def display_empty_push_help
+      command = @cli_options.command_line_used(exclude: [:push, :push_format])
+      enhanced_command = "#{command} --without=actionwords"
+      if @cli_options.test_run_id.nil? || @cli_options.test_run_id.empty?
+        enhanced_command += " --test-run-id=<the ID of the test run you want to push the results to>"
+      end
+
+      puts [
+        "Possible causes for the lack of imported tests:",
+        "",
+        "  * Did you run the following command before executing your tests ?",
+        "    #{enhanced_command}",
+        "",
+        "  * Did you specify the correct push format ?",
+        "    Use push_format=<format> in your config file or option --push-format=<format> in the command line",
+        "    Available formats are: tap, junit, robot, nunit",
+        ""
+      ].join("\n")
+    end
   end
 end

data/lib/hiptest-publisher/options_parser.rb

@@ -106,6 +106,15 @@ class CliOptions < OpenStruct
     only.split(",") if only
   end
 
+  def command_line_used(exclude: [])
+    args = self.__cli_args.map do |key|
+      next if exclude.include?(key)
+      "--#{key.to_s.gsub('_', '-')}=#{self[key]}"
+    end.compact
+
+    return "hiptest-publisher #{args.join(' ')}".strip
+  end
+
   def normalize!(reporter = nil)
     self.no_uids = !uids  # silent normalization
     modified_options = self.clone
@@ -127,6 +136,15 @@ class CliOptions < OpenStruct
       end
     end
 
+    if without
+      begin
+        available_groups = LanguageConfigParser.new(modified_options).filtered_group_names
+        modified_options.only = (available_groups - without.split(',')).join(',')
+      rescue ArgumentError
+        # Ok, that will be handled by cli_options_checkers later on
+      end
+    end
+
     if self != modified_options
       delta = modified_options.table.select do |key, value|
         modified_options[key] != self[key]
@@ -178,6 +196,7 @@ class OptionsParser
       Option.new(nil, 'test-run-id=ID', '', String, "Export data from a test run identified by its id", :test_run_id),
       Option.new(nil, 'test-run-name=NAME', '', String, "Export data from a test run identified by its name", :test_run_name),
       Option.new(nil, 'only=CATEGORIES', nil, String, "Restrict export to given file categories (--only=list to list them)", :only),
+      Option.new(nil, 'without=CATEGORIES', nil, String, "Exclude file categories from import (--only=list to list them)", :only),
       Option.new('x', 'xml-file=PROJECT_XML', nil, String, "XML file to use instead of fetching it from Hiptest", :xml_file),
       Option.new(nil, 'tests-only', false, nil, "(deprecated) alias for --only=tests", :tests_only),
       Option.new(nil, 'actionwords-only', false, nil, "(deprecated) alias for --only=actionwords", :actionwords_only),

data/lib/hiptest-publisher/signature_differ.rb

@@ -15,9 +15,10 @@ module Hiptest
 
       compute_created
       compute_deleted
-      compute_renamed
-      compute_signature_changed
+
       compute_definition_changed
+      compute_signature_changed
+      compute_renamed
 
       diff = {}
       diff[:created] = @created unless @created.empty?
@@ -42,8 +43,15 @@ module Hiptest
     end
 
     def compute_renamed
+      excluded = [
+        @created_uids,
+        @deleted_uids,
+        @definition_changed_uids,
+        @signature_changed_uids
+      ].flatten.uniq
+
       @renamed = @current_uid.map do |uid, aw|
-        next if @created_uids.include?(uid) || @deleted_uids.include?(uid)
+        next if excluded.include?(uid)
         next if @old_uid[uid]['name'] == aw['name']
 
         {name: @old_uid[uid]['name'], new_name: aw['name'], node: aw['node']}
@@ -51,20 +59,31 @@ module Hiptest
     end
 
     def compute_signature_changed
+      excluded = [
+        @created_uids,
+        @deleted_uids,
+        @definition_changed_uids
+      ].flatten.uniq
+
+      @signature_changed_uids = []
       @signature_changed = @current_uid.map do |uid, aw|
-        next if @created_uids.include?(uid) || @deleted_uids.include?(uid)
+        next if excluded.include?(uid)
         next if @old_uid[uid]['parameters'] == aw['parameters']
 
+        @signature_changed_uids << uid
         {name: aw['name'], node: aw['node']}
       end.compact
     end
 
     def compute_definition_changed
+      @definition_changed_uids = []
+
       @definition_changed = @current_uid.map do |uid, aw|
         next if @old_uid[uid].nil?
         next unless @old_uid[uid].has_key?('body_hash')
         next if aw['body_hash'] == @old_uid[uid]['body_hash']
 
+        @definition_changed_uids << uid
         {name: aw['name'], node: aw['node']}
       end.compact
     end
@@ -73,4 +92,4 @@ module Hiptest
       Hash[actionwords.collect { |aw| [aw['uid'], aw] }]
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.22.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize