hiptest-publisher 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c659ed6c7baab2192ba69514234d35cc6d2fa6
-  data.tar.gz: e0432d55e1e259a19528eed653c663eb7cab02f5
+  metadata.gz: c89caa898045f5fe12f5d62fdd90248667548dec
+  data.tar.gz: a1f4bbdc1c0053c3fbbaf37f2a8be911ae8e9dac
 SHA512:
-  metadata.gz: 01b7be105f8cbb244c857bb228d73ffde0bf5940c0523230273fda27a5e417f368d634f8f221b3f0137629f6e5cb57f71333d96d89582c8a6acab8c033ec32a2
-  data.tar.gz: a74abcd50e40a6749985b9433eef6d3dd05bb5a8f9e7f1b361d659b52c85b5b2decb25a4b88cb5792d3e04f8c8219bce7cb345cbf21f2cbb094cc7b86685460a
+  metadata.gz: 80b2402c95318df0273640d5f15b8b0ca8701fc5582ab6dbd20e331f030be1056c3cc9c141b48f8bfbb5325c2f763af80b16b62a2c0bbd1af58accd13708a5a6
+  data.tar.gz: 6b7459c99444f98fee16f96fee1046734629b5b6dca8ef5540e0585483ecc2dea0f76f892ba55817e7ea4cbf3ab12c06af988941d792b02f5031d7035f390519

data/lib/hiptest-publisher/formatters/console_formatter.rb

@@ -20,6 +20,6 @@ class ConsoleFormatter
   def show_options(options)
     return unless verbose
     puts "Running Hiptest-publisher #{hiptest_publisher_version} with:".yellow
-    options.each { |k, v| puts " - #{k}: #{v}".white }
+    options.each { |k, v| puts " - #{k}: #{v.inspect}".white }
   end
 end

data/lib/hiptest-publisher/options_parser.rb

@@ -9,13 +9,12 @@ class FileConfigParser
   def self.update_options(options, reporter)
     config = ParseConfig.new(options.config)
     config.get_params.each do |param|
-      options.send("#{param}=", config[param])
+      next if options.__cli_args && options.__cli_args.include?(param.to_sym)
+      options[param] = config[param]
+      options.__config_args << param.to_sym if options.__config_args
     end
-    options
-
-  rescue Exception => err
+  rescue => err
     reporter.dump_error(err)
-    options
   end
 end
 
@@ -32,10 +31,8 @@ class Option
   end
 
   def help
-    return @help if default.nil?
-
-    if @default.is_a? String
-      @default.empty? ? @help : "#{@help} (default: #{@default})"
+    if default == nil || default == ""
+      @help
     else
       "#{@help} (default: #{@default})"
     end
@@ -52,6 +49,7 @@ class Option
 
     opts.on(*on_values) do |value|
       options[attribute] = value
+      options.__cli_args << attribute
     end
   end
 end
@@ -100,7 +98,7 @@ class OptionsParser
   end
 
   def self.parse(args, reporter)
-    options = OpenStruct.new
+    options = OpenStruct.new(__cli_args: Set.new, __config_args: Set.new)
     opt_parser = OptionParser.new do |opts|
       opts.version = hiptest_publisher_version if hiptest_publisher_version
       opts.banner = "Usage: ruby publisher.rb [options]"

data/lib/hiptest-publisher/xml_parser.rb

@@ -135,9 +135,11 @@ module Hiptest
 
     def build_step(step)
       first_prop = css_first(step)
+      step_value_node = css_first(first_prop)
+      step_value = step_value_node ? build_node(step_value_node) : first_prop.text
       Hiptest::Nodes::Step.new(
         first_prop.name,
-        build_node(css_first(first_prop)))
+        step_value)
     end
 
     def build_while(while_loop)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize