hiptest-publisher 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dafc5dfdf0de42de34e5dba12de8ac5d2b3463e1
-  data.tar.gz: 600001c5fc8d3cf9a398e54d76a18527bc5b25a5
+  metadata.gz: a733baff130f78a8a1695ca9e8e15380dda70da0
+  data.tar.gz: 9fc7f0cdbac553dd37ca9f726f98731c18ac0646
 SHA512:
-  metadata.gz: e30f8008bfcf48ad8c14d2d96df8b6a942808ad4c5289d7639be1717aec9c48154856e1bf47db5ebaf415d0fec2bfe66ed1328929569fe34b8cb25c38afe4025
-  data.tar.gz: 4918aab98a0caa979804da35d431da6e7f74f4edfb4f68a72f9ddd25ee1835233215eb0ed271c712824ede6fc81251b9fec7065a55c5ebcb0e6c52f566ec24fe
+  metadata.gz: 2355912ebe0c855c052a0964ebf6d2a4a0f015522bf46a609943e1c586a5110f20f5eb285dfc2a46b4a2c7081741c181d6c9a134448e05e41cc797c35a635bf2
+  data.tar.gz: a4f75d9273d04286526362fe1de6709b6cbac851d132102184958c86cd3ccb275e012a0095d5160aa30152740e2f80754dab97f8064c8bc4663f01bc57120a53

data/README.md

@@ -71,7 +71,6 @@ You could obtain for example:
 
 ```shell
 Exports tests from Hiptest for automation.
-
 Specific options:
     -t, --token=TOKEN                Secret token (available in your project settings)
     -l, --language=LANG              Target language (default: ruby)
@@ -80,9 +79,8 @@ Specific options:
     -c, --config-file=PATH           Configuration file
         --overriden-templates=PATH   Folder for overriden templates
         --test-run-id=ID             Export data from a test run
-        --scenario-ids=IDS           Filter scenarios by ids
-        --scenario-tags=TAGS         Filter scenarios by tags
         --only=CATEGORIES            Restrict export to given file categories (--only=list to list them)
+    -x, --xml-file=PROJECT_XML       XML file to use instead of fetching it from Hiptest
         --tests-only                 (deprecated) alias for --only=tests (default: false)
         --actionwords-only           (deprecated) alias for --only=actionwords (default: false)
         --actionwords-signature      Export actionwords signature (default: false)
@@ -92,12 +90,13 @@ Specific options:
         --show-actionwords-renamed   Output signatures of renamed action words (default: false)
         --show-actionwords-signature-changed
                                      Output signatures of action words for which signature changed (default: false)
-        --with-folders               Use folders hierarchy to export files in respective directories, to be used with --split-scenarios (default: false)
+        --with-folders               Use folders hierarchy to export files in respective directories (default: false)
         --split-scenarios            Export each scenario in a single file (default: false)
         --leafless-export            Use only last level action word (default: false)
     -s, --site=SITE                  Site to fetch from (default: https://hiptest.net)
     -p, --push=FILE.TAP              Push a results file to the server
         --push-format=tap            Format of the test results (tap, junit, robot) (default: tap)
+        --sort=[id,order,alpha]      Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest (only with --with-folders option, will fallback to id otherwise), alpha will sort them by name (default: order)
     -v, --verbose                    Run verbosely (default: false)
     -H, --languages-help             Show languages and framework options
     -F, --filters-help               Show help about scenario filtering

data/lib/hiptest-publisher/options_parser.rb

@@ -6,16 +6,26 @@ require 'hiptest-publisher/formatters/console_formatter'
 require 'hiptest-publisher/utils'
 
 class FileConfigParser
+  FALSY_VALUE_PATTERN = /\A(false|no|0)\Z/i
+
   def self.update_options(options, reporter)
     config = ParseConfig.new(options.config)
     config.get_params.each do |param|
       next if options.__cli_args && options.__cli_args.include?(param.to_sym)
-      options[param] = config[param]
+      if falsy?(config[param])
+        options[param] = false
+      else
+        options[param] = config[param]
+      end
       options.__config_args << param.to_sym if options.__config_args
     end
   rescue => err
     reporter.dump_error(err)
   end
+
+  def self.falsy?(value)
+    FALSY_VALUE_PATTERN.match(value)
+  end
 end
 
 class Option
@@ -138,8 +148,6 @@ class OptionsParser
       Option.new('c', 'config-file=PATH', nil, String, "Configuration file", :config),
       Option.new(nil, 'overriden-templates=PATH', '', String, "Folder for overriden templates", :overriden_templates),
       Option.new(nil, 'test-run-id=ID', '', String, "Export data from a test run", :test_run_id),
-      Option.new(nil, 'scenario-ids=IDS', '', String, "Filter scenarios by ids", :filter_ids),
-      Option.new(nil, 'scenario-tags=TAGS', '', String, "Filter scenarios by tags", :filter_tags),
       Option.new(nil, 'only=CATEGORIES', nil, String, "Restrict export to given file categories (--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),
@@ -150,13 +158,13 @@ class OptionsParser
       Option.new(nil, 'show-actionwords-created', false, nil, "Output code for new action words", :aw_created),
       Option.new(nil, 'show-actionwords-renamed', false, nil, "Output signatures of renamed action words", :aw_renamed),
       Option.new(nil, 'show-actionwords-signature-changed', false, nil, "Output signatures of action words for which signature changed", :aw_signature_changed),
-      Option.new(nil, 'with-folders', false, nil, "Use folders hierarchy to export files in respective directories, to be used with --split-scenarios", :with_folders),
+      Option.new(nil, 'with-folders', false, nil, "Use folders hierarchy to export files in respective directories", :with_folders),
       Option.new(nil, 'split-scenarios', false, nil, "Export each scenario in a single file", :split_scenarios),
       Option.new(nil, 'leafless-export', false, nil, "Use only last level action word", :leafless_export),
       Option.new('s', 'site=SITE', 'https://hiptest.net', String, "Site to fetch from", :site),
       Option.new('p', 'push=FILE.TAP', '', String, "Push a results file to the server", :push),
       Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (tap, junit, robot)", :push_format),
-      Option.new(nil, 'sort=[id,order,alpha]', 'order', String, "Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest, alpha will sort them by name", :sort),
+      Option.new(nil, 'sort=[id,order,alpha]', 'order', String, "Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest (only with --with-folders option, will fallback to id otherwise), alpha will sort them by name", :sort),
       Option.new('v', 'verbose', false, nil, "Run verbosely", :verbose)
     ]
   end

data/lib/hiptest-publisher/utils.rb

@@ -35,21 +35,13 @@ def singularize(name)
   name.to_s.chomp("s")
 end
 
-def make_filter(options)
-  ids = options.filter_ids.split(',').map {|id| "filter[]=id:#{id}"}
-  tags = options.filter_tags.split(',').map {|tag| "filter[]=tag:#{tag}"}
-
-  filter = (ids + tags).join("&")
-  filter.empty? ? '' : "?#{filter}"
-end
-
 def make_url(options)
   if push?(options)
     "#{options.site}/import_test_results/#{options.token}/#{options.push_format}"
   else
     base_url = "#{options.site}/publication/#{options.token}"
     if options.test_run_id.nil? || options.test_run_id.empty?
-      "#{base_url}/#{options.leafless_export ? 'leafless_tests' : 'project'}#{make_filter(options)}"
+      "#{base_url}/#{options.leafless_export ? 'leafless_tests' : 'project'}"
     else
       "#{base_url}/test_run/#{options.test_run_id}"
     end

data/lib/templates/robotframework/_keyword.hbs

@@ -1,4 +1 @@
-{{{ underscore rendered_children.name }}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}{{#indent}}
-{{#if has_parameters?}}[Arguments]{{{ tab }}}{{{ join rendered_children.parameters "\t"}}}
-{{/if}}{{#each rendered_children.body}}{{{ this }}}
-{{/each}}{{/indent}}
+{{{ underscore rendered_children.name }}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}{{> keyword_body}}

data/lib/templates/robotframework/_keyword_body.hbs

@@ -0,0 +1,4 @@
+{{#indent}}
+{{#if has_parameters?}}[Arguments]{{{ tab }}}{{{ join rendered_children.parameters "\t"}}}
+{{/if}}{{#each rendered_children.body}}{{{ this }}}
+{{/each}}{{/indent}}

data/lib/templates/robotframework/actionword.hbs

@@ -1 +1 @@
-{{> keyword}}
+{{{ underscore rendered_children.name }}}{{> keyword_body}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -488,6 +488,7 @@ files:
 - lib/templates/python/unaryexpression.hbs
 - lib/templates/python/while.hbs
 - lib/templates/robotframework/_keyword.hbs
+- lib/templates/robotframework/_keyword_body.hbs
 - lib/templates/robotframework/_scenario.hbs
 - lib/templates/robotframework/actionword.hbs
 - lib/templates/robotframework/actionwords.hbs