hiptest-publisher 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d780a2450344faff3d34871c3dcfd6642d559e11
-  data.tar.gz: 4dbef5ddc2f955394aa60e52c18bd2a1c6ad720e
+  metadata.gz: da8ec8699aae12338c795fa1fb399a78ecd748ff
+  data.tar.gz: 7d73cb2f8c7d16f650af43472c07f4f5308a4d78
 SHA512:
-  metadata.gz: 76543eaa94f4571a693c1194fab697168c2ca4dc2fd903751a201679a419ee6eb9e25368cdc7798d7427012c84ef0568ba9ea6e0eee6447b634786eda2d32d27
-  data.tar.gz: 8f9f224fd839066b87d59aa1be5f07eaeabc8771e0002c79af977a7ea0399b7f7c930f8f4c7ac6c30d9ac1a5a1f15333dc3e8ee176b8f911314d25f2ea01f144
+  metadata.gz: 4fbebc2dddcc47b090219432ff98adebe85182947db14086450153b86779af7db619d60040046f230e4751c693c992e2a8f2fa5f3403f19e361523d878f2a661
+  data.tar.gz: 409ffd0c3c4e37196e6d3e74d2f40a966442ae60f6ae6faacf0e4820eebf90a0adbf113ef98ea7f1b43755830abbdc994bbfa40e3d2821bc9c611257992dcecb

data/lib/hiptest-publisher.rb

@@ -39,6 +39,7 @@ module Hiptest
 
     def run
       normalize_cli_options!
+      puts "URL: #{make_url(@cli_options)}".white if @cli_options.verbose
       begin
         CliOptionsChecker.new(@cli_options, reporter).check!
       rescue CliOptionError => e
@@ -52,12 +53,16 @@ module Hiptest
         return
       end
 
-      unless @cli_options.push.nil? || @cli_options.push.empty?
+      if push?(@cli_options)
         post_results
         return
       end
 
-      xml = fetch_xml_file
+      if @cli_options.xml_file
+        xml = IO.read(@cli_options.xml_file)
+      else
+        xml = fetch_xml_file
+      end
       return if xml.nil?
 
       @project = get_project(xml)
@@ -76,39 +81,32 @@ module Hiptest
     end
 
     def fetch_xml_file
-      show_status_message "Fetching data from Hiptest"
-      xml = fetch_project_export(@cli_options)
-      show_status_message "Fetching data from Hiptest", :success
-
-      return xml
+      with_status_message "Fetching data from Hiptest" do
+        fetch_project_export(@cli_options)
+      end
     rescue Exception => err
-      show_status_message "Fetching data from Hiptest", :failure
       puts "Unable to open the file, please check that the token is correct".red
       reporter.dump_error(err)
     end
 
     def get_project(xml)
-      show_status_message "Extracting data"
-      parser = Hiptest::XMLParser.new(xml, reporter)
-      show_status_message "Extracting data", :success
-
-      return parser.build_project
+      with_status_message "Extracting data" do
+        parser = Hiptest::XMLParser.new(xml, reporter)
+        return parser.build_project
+      end
+    rescue Exception => err
+      reporter.dump_error(err)
     end
 
     def write_to_file(path, message)
-      status_message = "#{message}: #{path}"
-      begin
-        show_status_message status_message
+      with_status_message "#{message}: #{path}" do
         mkdirs_for(path)
         File.open(path, 'w') do |file|
           file.write(yield)
         end
-
-        show_status_message status_message, :success
-      rescue Exception => err
-        show_status_message status_message, :failure
-        reporter.dump_error(err)
       end
+    rescue Exception => err
+      reporter.dump_error(err)
     end
 
     def mkdirs_for(path)
@@ -148,13 +146,9 @@ module Hiptest
     end
 
     def show_actionwords_diff
-      begin
-        show_status_message("Loading previous definition")
+      old = nil
+      with_status_message "Loading previous definition" do
         old = YAML.load_file("#{@cli_options.output_directory}/actionwords_signature.yaml")
-        show_status_message("Loading previous definition", :success)
-      rescue Exception => err
-        show_status_message("Loading previous definition", :failure)
-        reporter.dump_error(err)
       end
 
       @language_config = LanguageConfigParser.new(@cli_options)
@@ -242,16 +236,20 @@ module Hiptest
         puts "No action words changed"
         puts ""
       end
+    rescue Exception => err
+      reporter.dump_error(err)
     end
 
     def export
       return if @project.nil?
 
-      @language_config = LanguageConfigParser.new(@cli_options)
-      Hiptest::Nodes::ParentAdder.add(@project)
-      Hiptest::Nodes::ParameterTypeAdder.add(@project)
-      Hiptest::DefaultArgumentAdder.add(@project)
-      Hiptest::GherkinAdder.add(@project)
+      with_status_message "Analyzing data" do
+        @language_config = LanguageConfigParser.new(@cli_options)
+        Hiptest::Nodes::ParentAdder.add(@project)
+        Hiptest::Nodes::ParameterTypeAdder.add(@project)
+        Hiptest::DefaultArgumentAdder.add(@project)
+        Hiptest::GherkinAdder.add(@project)
+      end
 
       export_files
       export_actionword_signature if @language_config.include_group?("actionwords")
@@ -277,16 +275,11 @@ module Hiptest
     end
 
     def post_results
-      status_message = "Posting #{@cli_options.push} to #{@cli_options.site}"
-      show_status_message(status_message)
-
-      begin
+      with_status_message "Posting #{@cli_options.push} to #{@cli_options.site}" do
         push_results(@cli_options)
-        show_status_message(status_message, :success)
-      rescue Exception => err
-        show_status_message(status_message, :failure)
-        reporter.dump_error(err)
       end
+    rescue Exception => err
+      reporter.dump_error(err)
     end
   end
 end

data/lib/hiptest-publisher/actionword_indexer.rb

@@ -7,7 +7,7 @@ module Hiptest
     end
 
     def index_actionwords
-      @project.find_sub_nodes(Hiptest::Nodes::Actionword).each do |aw|
+      @project.each_sub_nodes(Hiptest::Nodes::Actionword) do |aw|
         aw_name = aw.children[:name]
         indexed_parameters = {}
 

data/lib/hiptest-publisher/call_arguments_adder.rb

@@ -13,7 +13,7 @@ module Hiptest
     end
 
     def update_calls
-      @project.find_sub_nodes(Hiptest::Nodes::Call).each do |call|
+      @project.each_sub_nodes(Hiptest::Nodes::Call) do |call|
         aw_data = @indexer.get_index(call.children[:actionword])
         next if aw_data.nil?
 

data/lib/hiptest-publisher/cli_options_checker.rb

@@ -23,25 +23,27 @@ module Hiptest
         return
       end
 
-      unless cli_options.push.nil? || cli_options.push.empty?
+      if push?(cli_options)
         return
       end
 
       # secret token
-      if missing?(cli_options.token) || empty?(cli_options.token)
-        raise CliOptionError, [
-          "Missing argument --token: you must specify project secret token with --token=<project-token>",
-          "",
-          "The project secret token can be found on Hiptest in the settings section, under",
-          "'Publication settings'. It is a sequence of numbers uniquely identifying your",
-          "project.",
-          "",
-          "Note that settings section is available only to administrators of the project.",
-        ].join("\n")
-      end
+      if absent?(cli_options.xml_file)
+        if absent?(cli_options.token)
+          raise CliOptionError, [
+            "Missing argument --token: you must specify project secret token with --token=<project-token>",
+            "",
+            "The project secret token can be found on Hiptest in the settings section, under",
+            "'Publication settings'. It is a sequence of numbers uniquely identifying your",
+            "project.",
+            "",
+            "Note that settings section is available only to administrators of the project.",
+          ].join("\n")
+        end
 
-      unless numeric?(cli_options.token)
-        raise CliOptionError, "Invalid format --token=\"#{@cli_options.token}\": the project secret token must be numeric"
+        unless numeric?(cli_options.token)
+          raise CliOptionError, "Invalid format --token=\"#{@cli_options.token}\": the project secret token must be numeric"
+        end
       end
 
       # output directory
@@ -70,6 +72,15 @@ module Hiptest
         end
       end
 
+      # xml file
+      if cli_options.xml_file
+        if !File.readable?(cli_options.xml_file)
+          raise CliOptionError, "Error with --xml-file: the file \"#{cli_options.xml_file}\" does not exist or is not readable"
+        elsif !File.file?(cli_options.xml_file)
+          raise CliOptionError, "Error with --xml-file: the file \"#{cli_options.xml_file}\" is not a regular file"
+        end
+      end
+
       # test run id
       if present?(cli_options.test_run_id) && !numeric?(cli_options.test_run_id)
         raise CliOptionError, "Invalid format --test-run-id=\"#{@cli_options.test_run_id}\": the test run id must be numeric"
@@ -90,8 +101,12 @@ module Hiptest
       arg.strip.empty?
     end
 
+    def absent?(arg)
+      missing?(arg) || empty?(arg)
+    end
+
     def present?(arg)
-      arg && !arg.strip.empty?
+      !absent?(arg)
     end
 
     def first_existing_parent(path)

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -13,7 +13,7 @@ module Hiptest
     end
 
     def update_calls
-      @project.find_sub_nodes(Hiptest::Nodes::Call).each do |call|
+      @project.each_sub_nodes(Hiptest::Nodes::Call) do |call|
         call.children[:gherkin_text] ||= "#{text_annotation(call)} #{prettified(call)}"
         if actionword = get_actionword(call)
           actionword.children[:gherkin_annotation] ||= code_annotation(call)

data/lib/hiptest-publisher/nodes.rb

@@ -18,31 +18,36 @@ module Hiptest
         return Hiptest::Renderer.render(self, rendering_context)
       end
 
-      def find_sub_nodes(types = [])
-        sub_nodes = all_sub_nodes
-        types = [types] unless types.is_a?(Array)
+      def each_sub_nodes(*types)
+        return to_enum(:each_sub_nodes, *types) unless block_given?
+        path = [self]
+        parsed_nodes_id = Set.new
 
-        if types.empty?
-          sub_nodes
-        else
-          sub_nodes.keep_if do |node|
-            types.map {|type| node.is_a?(type)}.include?(true)
+        until path.empty?
+          current_node = path.shift
+
+          if current_node.is_a?(Node)
+            next if parsed_nodes_id.include? current_node.object_id
+
+            if types.empty? || types.any? {|type| current_node.is_a?(type)}
+              yield current_node
+            end
+            parsed_nodes_id << current_node.object_id
+            current_node.children.each_value {|item| path << item}
+          elsif current_node.is_a?(Array)
+            current_node.each {|item| path << item}
           end
         end
       end
 
-      def direct_children
-        direct = []
-
-        children.each do |key, child|
+      def each_direct_children
+        children.each_value do |child|
           if child.is_a? Hiptest::Nodes::Node
-            direct << child
+            yield child
           elsif child.is_a? Array
-            child.each {|c| direct << c if c.is_a? Hiptest::Nodes::Node }
+            child.each {|c| yield c if c.is_a? Hiptest::Nodes::Node }
           end
         end
-
-        direct
       end
 
       def ==(other)
@@ -57,27 +62,16 @@ module Hiptest
         project
       end
 
-      private
-
-      def all_sub_nodes
-        path = [self]
-        children = []
-        parsed_nodes_id = Set.new
-
-        until path.empty?
-          current_node = path.pop
+      def kind
+        node_kinds[self.class] ||= begin
+          self.class.name.split('::').last.downcase
+        end
+      end
 
-          if current_node.is_a?(Node)
-            next if parsed_nodes_id.include? current_node.object_id
+      private
 
-            children << current_node
-            parsed_nodes_id << current_node.object_id
-            current_node.children.values.reverse.each {|item| path << item}
-          elsif current_node.is_a?(Array)
-            current_node.reverse.each {|item| path << item}
-          end
-        end
-        children
+      def node_kinds
+        @@node_kinds ||= {}
       end
     end
 
@@ -254,7 +248,7 @@ module Hiptest
 
       def declared_variables_names
         p_names = children[:parameters].map {|p| p.children[:name]}
-        find_sub_nodes([Hiptest::Nodes::Variable]).map do |var|
+        each_sub_nodes(Hiptest::Nodes::Variable).map do |var|
           v_name = var.children[:name]
           p_names.include?(v_name) ? nil : v_name
         end.uniq.compact

data/lib/hiptest-publisher/nodes_walker.rb

@@ -1,40 +1,41 @@
 module Hiptest
   module Nodes
     class Walker
-      def initialize(order = :parent_first)
-        @order = order
-      end
-
-      def walk_node(node)
-        self.send(@order, node)
-      end
-
       private
 
       def walk_children(node)
         return unless node.is_a? Hiptest::Nodes::Node
-        node.children.values.each {|child| walk_node(child)}
+        node.children.each_value {|child| walk_node(child)}
       end
 
       def call_node_walker(node)
         return unless node.is_a? Hiptest::Nodes::Node
 
-        node_class = node.class.name.split('::').last.downcase
-        walk_method_name = "walk_#{node_class}".to_sym
-
-        if respond_to? walk_method_name
-          self.send(walk_method_name, node)
+        if respond_to? walk_method_name(node)
+          self.send(walk_method_name(node), node)
         end
       end
 
-      def parent_first(node)
+      def walk_method_name(node)
+        walk_method_names[node.class] ||= "walk_#{node.kind}".to_sym
+      end
+
+      def walk_method_names
+        @walk_method_names ||= {}
+      end
+    end
+
+    class ParentFirstWalker < Walker
+      def walk_node(node)
         call_node_walker(node)
         node.each {|item| walk_node(item)} if node.is_a? Array
 
         walk_children(node)
       end
+    end
 
-      def children_first(node)
+    class ChildrenFirstWalker < Walker
+      def walk_node(node)
         walk_children(node)
 
         node.each {|item| walk_node(item)} if node.is_a? Array

data/lib/hiptest-publisher/options_parser.rb

@@ -81,6 +81,7 @@ class OptionsParser
       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),
       Option.new(nil, 'actionwords-only', false, nil, "(deprecated) alias for --only=actionwords", :actionwords_only),
       Option.new(nil, 'actionwords-signature', false, nil, "Export actionwords signature", :actionwords_signature),
@@ -177,7 +178,7 @@ end
 class NodeRenderingContext
 
   def initialize(properties)
-    # should contain  :node, :path, :template_dirs, :description, :indentation
+    # should contain  :node, :path, :description, :indentation
     @properties = OpenStruct.new(properties)
   end
 
@@ -218,49 +219,49 @@ class TemplateFinder
     @framework = framework
     @overriden_templates = overriden_templates
     @compiled_handlebars = {}
+    @template_path_by_name = {}
     @forced_templates = forced_templates || {}
     @fallback_template = fallback_template
     @context = {indentation: indentation}
   end
 
   def dirs
-    dirs = []
-    dirs << "#{language}/#{framework}" if framework
-    dirs << language
-    dirs << "common"
-    dirs.map! { |path| "#{hiptest_publisher_path}/lib/templates/#{path}" }
-
-    dirs.unshift(overriden_templates) if overriden_templates
-    dirs
+    @dirs ||= begin
+      search_dirs = []
+      search_dirs << "#{language}/#{framework}" if framework
+      search_dirs << language
+      search_dirs << "common"
+      search_dirs.map! { |path| "#{hiptest_publisher_path}/lib/templates/#{path}" }
+
+      search_dirs.unshift(overriden_templates) if overriden_templates
+      search_dirs
+    end
   end
 
-  def get_compiled_handlebars(template)
-    @compiled_handlebars[template] ||= handlebars.compile(File.read(template))
+  def get_compiled_handlebars(template_name)
+    template_path = get_template_path(template_name)
+    @compiled_handlebars[template_path] ||= handlebars.compile(File.read(template_path))
   end
 
-  def get_template_by_name(name, extension)
+  def get_template_by_name(name)
     return if name.nil?
-    dirs.map do |path|
-      template_path = File.join(path, "#{name}.#{extension}")
-      template_path if File.file?(template_path)
-    end.compact.first
-  end
-
-  def get_template_path(template_name, extension = 'hbs')
-    get_template_by_name(template_name, extension) || get_template_by_name(@fallback_template, extension)
+    name = forced_templates.fetch(name, name)
+    dirs.each do |path|
+      template_path = File.join(path, "#{name}.hbs")
+      return template_path if File.file?(template_path)
+    end
+    nil
   end
 
-  def get_template(template_name, extension = 'hbs')
-    template_file = get_template_path(template_name, extension = 'hbs')
-    if template_file
-      get_compiled_handlebars(template).call(render_context)
-    else
-      raise ArgumentError.new("no template with name #{template_name}")
+  def get_template_path(template_name)
+    unless @template_path_by_name.has_key?(template_name)
+      @template_path_by_name[template_name] = get_template_by_name(template_name) || get_template_by_name(@fallback_template)
     end
+    @template_path_by_name[template_name] or raise ArgumentError.new("no template with name #{template_name}")
   end
 
   def register_partials
-    dirs.reverse.each do |path|
+    dirs.reverse_each do |path|
       next unless File.directory?(path)
       Dir.entries(path).select do |file_name|
         file_path = File.join(path, file_name)
@@ -345,10 +346,6 @@ class LanguageGroupConfig
     )
   end
 
-  def template_dirs
-    template_finder.dirs
-  end
-
   def each_node_rendering_context(project)
     return to_enum(:each_node_rendering_context, project) unless block_given?
     nodes(project).each do |node|
@@ -372,12 +369,9 @@ class LanguageGroupConfig
     NodeRenderingContext.new(
       path: path,
       indentation: indentation,
-      template_dirs: template_dirs,
       template_finder: template_finder,
-      forced_templates: forced_templates,
       description: description,
       node: node,
-      fallback_template: @language_group_params[:fallback_template],
       call_prefix: @language_group_params[:call_prefix],
       package: @language_group_params[:package],
     )

data/lib/hiptest-publisher/parameter_type_adder.rb

@@ -2,7 +2,7 @@ require 'hiptest-publisher/nodes_walker'
 
 module Hiptest
   module Nodes
-    class ParameterTypeAdder < Hiptest::Nodes::Walker
+    class ParameterTypeAdder < ParentFirstWalker
       attr_reader :call_types
 
       def self.add(project)
@@ -12,10 +12,6 @@ module Hiptest
         Hiptest::Nodes::TypeWriter.new(walker.call_types).walk_node(project)
       end
 
-      def initialize
-        super(:parent_first)
-      end
-
       def walk_project(project)
         @call_types = CallTypes.new
       end
@@ -41,16 +37,17 @@ module Hiptest
       private
 
       def get_literal_values(node)
-        literals = node.find_sub_nodes([StringLiteral, NumericLiteral, BooleanLiteral])
-
-        return [[NullLiteral, nil]] if literals.empty?
-        literals.map {|literal| [literal.class, literal.children[:value]]}
+        values = []
+        node.each_sub_nodes(StringLiteral, NumericLiteral, BooleanLiteral) do |literal|
+          values << [literal.class, literal.children[:value]]
+        end
+        values << [NullLiteral, nil] if values.empty?
+        values
       end
     end
 
-    class TypeWriter < Hiptest::Nodes::Walker
+    class TypeWriter < ParentFirstWalker
       def initialize(call_types)
-        super(:parent_first)
         @call_types = call_types
         @callable_item_name = nil
       end
@@ -79,7 +76,7 @@ module Hiptest
       end
 
       def add_callable_item(name)
-        @callable_items[name] = {} unless @callable_items.keys.include?(name)
+        @callable_items[name] = {} unless @callable_items.has_key?(name)
         select_callable_item(name)
       end
 
@@ -94,7 +91,7 @@ module Hiptest
       end
 
       def type_of(item_name, parameter_name)
-        return unless @callable_items.keys.include?(item_name)
+        return unless @callable_items.has_key?(item_name)
         parameter =  @callable_items[item_name][parameter_name]
 
         return :String if parameter.nil? || parameter[:values].empty?
@@ -104,7 +101,7 @@ module Hiptest
       private
 
       def add_parameter(name)
-        return if @current.keys.include?(name)
+        return if @current.has_key?(name)
         @current[name] = {default: nil, values: []}
       end
 
@@ -136,4 +133,4 @@ module Hiptest
       end
     end
   end
-end
+end

data/lib/hiptest-publisher/parent_adder.rb

@@ -1,15 +1,15 @@
 module Hiptest
   module Nodes
-    class ParentAdder < Walker
+    class ParentAdder < ParentFirstWalker
       def self.add(project)
-        Hiptest::Nodes::ParentAdder.new().walk_node(project)
+        Hiptest::Nodes::ParentAdder.new.walk_node(project)
       end
 
       def walk_node(node)
         super(node)
         return unless node.is_a? Hiptest::Nodes::Node
 
-        node.direct_children.each {|child|
+        node.each_direct_children {|child|
           child.parent ||= node
         }
       end

data/lib/hiptest-publisher/render_context_maker.rb

@@ -4,7 +4,7 @@ module Hiptest
       {
         :has_parameters? => !item.children[:parameters].empty?,
         :has_tags? => !item.children[:tags].empty?,
-        :has_step? => !item.find_sub_nodes(Hiptest::Nodes::Step).empty?,
+        :has_step? => has_step?(item),
         :is_empty? => item.children[:body].empty?,
         :declared_variables => item.declared_variables_names
       }
@@ -38,7 +38,7 @@ module Hiptest
       {
         :has_parameters? => false,
         :has_tags? => !test.children[:tags].empty?,
-        :has_step? => !test.find_sub_nodes(Hiptest::Nodes::Step).empty?,
+        :has_step? => has_step?(test),
         :is_empty? => test.children[:body].empty?,
         :has_datasets? => false,
         :project_name => test.parent.parent.children[:name],
@@ -89,5 +89,14 @@ module Hiptest
         :variable_names => variable_names
       }
     end
+
+    private
+
+    def has_step?(item)
+      item.each_sub_nodes do |node|
+        return true if node.is_a?(Hiptest::Nodes::Step)
+      end
+      false
+    end
   end
-end
+end

data/lib/hiptest-publisher/renderer.rb

@@ -6,7 +6,7 @@ require 'hiptest-publisher/handlebars_helper'
 require 'hiptest-publisher/render_context_maker'
 
 module Hiptest
-  class Renderer < Hiptest::Nodes::Walker
+  class Renderer < Hiptest::Nodes::ChildrenFirstWalker
     attr_reader :rendered
     include RenderContextMaker
 
@@ -17,7 +17,6 @@ module Hiptest
     end
 
     def initialize(context)
-      super(:children_first)
       @rendered = {}
       @context = context
       @template_finder = context.template_finder
@@ -41,20 +40,7 @@ module Hiptest
       render_context[:rendered_children] = @rendered_children
       render_context[:context] = @context
 
-      template = @template_finder.get_template_path(normalized_name(node))
-      if template
-        @template_finder.get_compiled_handlebars(template).call(render_context)
-      else
-        raise ArgumentError.new("no template for node #{node.class}")
-      end
-    end
-
-    def normalized_name(node)
-      normalized_name = node.class.name.split('::').last.downcase
-      unless @context[:forced_templates][normalized_name].nil?
-        normalized_name = @context[:forced_templates][normalized_name]
-      end
-      normalized_name
+      @template_finder.get_compiled_handlebars(node.kind).call(render_context)
     end
   end
 end

data/lib/hiptest-publisher/utils.rb

@@ -33,18 +33,25 @@ def make_filter(options)
   tags = options.filter_tags.split(',').map {|tag| "filter[]=tag:#{tag}"}
 
   filter = (ids + tags).join("&")
-  filter.empty? ? '' : "&#{filter}"
+  filter.empty? ? '' : "?#{filter}"
 end
 
-def fetch_project_export(options)
-  url = "#{options.site}/publication/#{options.token}"
-  if options.test_run_id.nil? || options.test_run_id.empty?
-    url = "#{url}/#{options.leafless_export ? 'leafless_tests' : 'project'}?future=1#{make_filter(options)}"
+def make_url(options)
+  if push?(options)
+    "#{options.site}/import_test_results/#{options.token}/#{options.push_format}"
   else
-    url = "#{url}/test_run/#{options.test_run_id}"
+    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)}"
+    else
+      "#{base_url}/test_run/#{options.test_run_id}"
+    end
   end
+end
+
+def fetch_project_export(options)
+  url = make_url(options)
 
-  puts "URL: #{url}".white if options.verbose
   open(url, "User-Agent" => 'Ruby/hiptest-publisher', :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
 end
 
@@ -63,14 +70,25 @@ def show_status_message(message, status=nil)
   output.print "[#{status_icon}] #{message}\r#{line_end}"
 end
 
-def make_push_url(options)
-  "#{options.site}/import_test_results/#{options.token}/#{options.push_format}"
+def with_status_message(message, &blk)
+  show_status_message message
+  status = :success
+  yield
+rescue
+  status = :failure
+  raise
+ensure
+  show_status_message message, status
+end
+
+def push?(options)
+  options.push && !options.push.empty?
 end
 
 def push_results(options)
   # Code from: https://github.com/nicksieger/multipart-post
-  url = URI.parse(make_push_url(options))
-  use_ssl = make_push_url(options).start_with?('https://')
+  url = URI.parse(make_url(options))
+  use_ssl = (url.scheme == 'https')
 
   File.open(options.push) do |results|
     req = Net::HTTP::Post::Multipart.new(url.path, "file" => UploadIO.new(results, "text", "results.tap"))

data/lib/hiptest-publisher/xml_parser.rb

@@ -213,7 +213,7 @@ module Hiptest
 
     def build_scenarioSnapshot(scs)
       scenario = build_scenario(scs)
-      datasets = scenario.find_sub_nodes(Hiptest::Nodes::Dataset)
+      datasets = scenario.each_sub_nodes(Hiptest::Nodes::Dataset).to_a
 
       if datasets.empty?
         scenario.set_uid(css_first_content(scs, 'testSnapshot > uid'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize