hiptest-publisher 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79e8d0d83102a88f5c6ecbd646ca307fb148c27
-  data.tar.gz: 8bbe4dfa77dd911f94b723032b7657aca5d6c508
+  metadata.gz: 1dd144d9f192a260569659d26360bf10a0c34992
+  data.tar.gz: 30d6081b77bd1226a55eff65398ea20a48ceeafd
 SHA512:
-  metadata.gz: 936669461199b8722a7e24009bf1a4d83a180414ec89b3169a18785905e316987a7b93871fbb8f095424efcabf2bb345c309b482f6eb000ee5af179fcb99d3a4
-  data.tar.gz: 75a41f2401a574648d59e978dbf8ba3f9e3ddc643c94a66af9c9ef1e3b206fb067c7f7181096b7d5615573af3c269a27b8087b41885883c2e67708ddb1a3c5eb
+  metadata.gz: 4cf3971eea3f78f5ac5eee01e6c8faf6963e658374f84ab65f674e9f7aabaea9167b99b8e0b6506ee8e0e21929eaab054510d5c426dd8d5e3f2b11427e6828ce
+  data.tar.gz: d77ea86b848d94276ecc5bc37313755a1206acca9464b02ae2a087ffba9f12f75e64a17a4d1e3c9c10489e53325c7c5a28a17d5343f9c32ee47e1fd1325b3b56

data/lib/config/groovy-spock.conf

@@ -4,7 +4,7 @@ indentation = '  '
 dirname_convention = 'underscore'
 filename_convention = 'camelize'
 naming_convention = 'camelize_lower'
-custom_renderer = 'groovy/spock/renderer'
+renderer_addons = 'GroovySpockAddon'
 
 [tests]
 filename = 'ProjectSpec.groovy'

data/lib/hiptest-publisher.rb

@@ -3,22 +3,23 @@ require 'fileutils'
 require 'json'
 require 'yaml'
 
-require 'hiptest-publisher/formatters/reporter'
+require 'hiptest-publisher/call_arguments_adder'
 require 'hiptest-publisher/cli_options_checker'
 require 'hiptest-publisher/client'
-require 'hiptest-publisher/string'
-require 'hiptest-publisher/utils'
-require 'hiptest-publisher/options_parser'
-require 'hiptest-publisher/xml_parser'
-require 'hiptest-publisher/parent_adder'
 require 'hiptest-publisher/datatable_fixer'
-require 'hiptest-publisher/parameter_type_adder'
-require 'hiptest-publisher/call_arguments_adder'
-require 'hiptest-publisher/signature_exporter'
-require 'hiptest-publisher/signature_differ'
-require 'hiptest-publisher/items_orderer'
+require 'hiptest-publisher/formatters/reporter'
 require 'hiptest-publisher/gherkin_adder'
 require 'hiptest-publisher/handlebars_helper'
+require 'hiptest-publisher/items_orderer'
+require 'hiptest-publisher/options_parser'
+require 'hiptest-publisher/parameter_type_adder'
+require 'hiptest-publisher/parent_adder'
+require 'hiptest-publisher/renderer'
+require 'hiptest-publisher/signature_differ'
+require 'hiptest-publisher/signature_exporter'
+require 'hiptest-publisher/string'
+require 'hiptest-publisher/utils'
+require 'hiptest-publisher/xml_parser'
 
 
 module Hiptest
@@ -126,7 +127,7 @@ module Hiptest
       return true if @cli_options.force_overwrite
 
       if $stdout.isatty
-        puts ""
+        STDOUT.print "\n"
         STDOUT.print "[#{"?".yellow}] File #{path} exists, do you want to overwrite it? [y/N] "
         answer = $stdin.gets.chomp.downcase.strip
         return ['y', 'yes'].include?(answer)
@@ -148,7 +149,7 @@ module Hiptest
 
     def write_node_to_file(path, node, context, message, ask_overwrite: false)
       write_to_file(path, message, ask_overwrite: ask_overwrite) do
-        context.get_renderer.render(node, context)
+        Hiptest::Renderer.render(node, context)
       end
     end
 

data/lib/hiptest-publisher/nodes.rb

@@ -2,6 +2,7 @@ require 'set'
 
 require 'hiptest-publisher/string'
 require 'hiptest-publisher/utils'
+require 'hiptest-publisher/renderer'
 
 module Hiptest
   module Nodes
@@ -14,7 +15,7 @@ module Hiptest
       end
 
       def render(rendering_context)
-        return rendering_context.get_renderer.render(self, rendering_context)
+        return Hiptest::Renderer.render(self, rendering_context)
       end
 
       def each_sub_nodes(*types, deep: false)

data/lib/hiptest-publisher/options_parser.rb

@@ -5,6 +5,7 @@ require 'digest/md5'
 require 'pathname'
 
 require 'hiptest-publisher/formatters/console_formatter'
+require 'hiptest-publisher/renderer_addons'
 require 'hiptest-publisher/utils'
 
 class FileConfigParser
@@ -341,14 +342,11 @@ class NodeRenderingContext
     File.dirname(@properties.relative_path)
   end
 
-  def get_renderer
-    if @properties.renderer_path.nil?
-      require 'hiptest-publisher/renderer'
-    else
-      require "hiptest-publisher/language_specifics/#{@properties.renderer_path}"
+  def renderer_addons
+    addons = @properties.renderer_addons || ""
+    addons.split.map do |addon_name|
+      Hiptest.const_get(addon_name)
     end
-
-    Hiptest::Renderer
   end
 end
 
@@ -559,7 +557,7 @@ class LanguageGroupConfig
       package: @language_group_params[:package],
       namespace: @language_group_params[:namespace],
       uids: @user_params[:uids],
-      renderer_path: @language_group_params[:custom_renderer]
+      renderer_addons: @language_group_params[:renderer_addons],
     )
   end
 

data/lib/hiptest-publisher/renderer.rb

@@ -1,6 +1,111 @@
-require 'hiptest-publisher/base_renderer'
+require 'ruby-handlebars'
+
+require 'hiptest-publisher/nodes_walker'
+require 'hiptest-publisher/render_context_maker'
 
 module Hiptest
-  class Renderer < Hiptest::BaseRenderer
+  class Renderer < Hiptest::Nodes::Walker
+    attr_reader :rendered
+    include RenderContextMaker
+
+    def self.render(node, context)
+      renderer = self.new(context)
+      context.renderer_addons.each do |addon|
+        renderer.singleton_class.include(addon)
+      end
+      renderer.walk_node(node)
+      renderer.rendered[node]
+    end
+
+    def initialize(context)
+      @rendered = {}
+      @context = context
+      @template_finder = context.template_finder
+    end
+
+    def walk_call(call)
+      # For Gherkin, we need the special arguments rendered.
+      if call.free_text_arg
+        @rendered_children[:free_text_arg] = @rendered[call.free_text_arg.children[:value]]
+      end
+
+      if call.datatable_arg
+        @rendered_children[:datatable_arg] = @rendered[call.datatable_arg.children[:value]]
+      end
+
+      super(call)
+    end
+
+    def walk_scenarios(scs)
+      walk_scenario_container(scs)
+      super(scs)
+    end
+
+    def walk_actionword(aw)
+      add_splitted_tags(aw)
+      super(aw)
+    end
+
+    def walk_folder(folder)
+      ancestor_tags = folder.ancestors.map {|f| f.children[:tags]}.flatten.uniq
+      @rendered_children[:ancestor_tags] = ancestor_tags.map {|t| Hiptest::Renderer.render(t, @context)}
+
+      walk_scenario_container(folder)
+      super(folder)
+    end
+
+    def call_node_walker(node)
+      if node.is_a? Hiptest::Nodes::Node
+        @rendered_children = {}
+
+        node.children.each {|name, child| @rendered_children[name] = @rendered[child]}
+        @rendered[node] = render_node(node, super(node))
+      elsif node.is_a? Array
+        @rendered[node] = node.map {|item| @rendered[item]}
+      else
+        @rendered[node] = node
+      end
+    end
+
+    def render_node(node, render_context)
+      render_context ||= {}
+      render_context[:node] = node
+      render_context[:rendered_children] = @rendered_children
+      render_context[:context] = @context
+
+      @template_finder.get_compiled_handlebars(node.kind).call(render_context)
+    end
+
+    private
+
+    def add_splitted_tags(context)
+      @rendered_children[:splitted_tags] = context.children[:tags].map do |tag|
+        @rendered[tag]
+      end
+    end
+
+    def walk_scenario_container(container)
+     # For Robot framework, we need direct access to every scenario
+     # datatables and body rendered.
+
+      @rendered_children[:splitted_scenarios] = container.children[:scenarios].map {|sc|
+        {
+          name: @rendered[sc.children[:name]],
+          tags: sc.children[:tags].map {|tag| @rendered[tag]},
+          uid: @rendered[sc.children[:uid]],
+          datatable: @rendered[sc.children[:datatable]],
+          datasets: sc.children[:datatable].children[:datasets].map {|dataset|
+            {
+              scenario_name: @rendered[sc.children[:name]],
+              name: @rendered[dataset.children[:name]],
+              uid: @rendered[dataset.children[:uid]],
+              arguments: @rendered[dataset.children[:arguments]]
+            }
+          },
+          parameters:  @rendered[sc.children[:parameters]],
+          body: @rendered[sc.children[:body]]
+        }
+      }
+    end
   end
 end

data/lib/hiptest-publisher/renderer_addons.rb

@@ -0,0 +1 @@
+require 'hiptest-publisher/renderer_addons/groovy_spock_addon'

data/lib/hiptest-publisher/{language_specifics/groovy/spock/renderer.rb → renderer_addons/groovy_spock_addon.rb}

@@ -1,8 +1,7 @@
 require 'hiptest-publisher/nodes'
-require 'hiptest-publisher/base_renderer'
 
 module Hiptest
-  class Renderer < Hiptest::BaseRenderer
+  module GroovySpockAddon
 
     def walk_call(call)
       base = super(call)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -248,7 +248,6 @@ files:
 - lib/config/specflow.conf
 - lib/hiptest-publisher.rb
 - lib/hiptest-publisher/actionword_indexer.rb
-- lib/hiptest-publisher/base_renderer.rb
 - lib/hiptest-publisher/call_arguments_adder.rb
 - lib/hiptest-publisher/cli_options_checker.rb
 - lib/hiptest-publisher/client.rb
@@ -258,7 +257,6 @@ files:
 - lib/hiptest-publisher/gherkin_adder.rb
 - lib/hiptest-publisher/handlebars_helper.rb
 - lib/hiptest-publisher/items_orderer.rb
-- lib/hiptest-publisher/language_specifics/groovy/spock/renderer.rb
 - lib/hiptest-publisher/nodes.rb
 - lib/hiptest-publisher/nodes_walker.rb
 - lib/hiptest-publisher/options_parser.rb
@@ -267,6 +265,8 @@ files:
 - lib/hiptest-publisher/project_grapher.rb
 - lib/hiptest-publisher/render_context_maker.rb
 - lib/hiptest-publisher/renderer.rb
+- lib/hiptest-publisher/renderer_addons.rb
+- lib/hiptest-publisher/renderer_addons/groovy_spock_addon.rb
 - lib/hiptest-publisher/signature_differ.rb
 - lib/hiptest-publisher/signature_exporter.rb
 - lib/hiptest-publisher/string.rb
@@ -626,7 +626,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.

data/lib/hiptest-publisher/base_renderer.rb

@@ -1,108 +0,0 @@
-require 'ruby-handlebars'
-
-require 'hiptest-publisher/nodes_walker'
-require 'hiptest-publisher/render_context_maker'
-
-module Hiptest
-  class BaseRenderer < Hiptest::Nodes::Walker
-    attr_reader :rendered
-    include RenderContextMaker
-
-    def self.render(node, context)
-      renderer = self.new(context)
-      renderer.walk_node(node)
-      renderer.rendered[node]
-    end
-
-    def initialize(context)
-      @rendered = {}
-      @context = context
-      @template_finder = context.template_finder
-    end
-
-    def walk_call(call)
-      # For Gherkin, we need the special arguments rendered.
-      if call.free_text_arg
-        @rendered_children[:free_text_arg] = @rendered[call.free_text_arg.children[:value]]
-      end
-
-      if call.datatable_arg
-        @rendered_children[:datatable_arg] = @rendered[call.datatable_arg.children[:value]]
-      end
-
-      super(call)
-    end
-
-    def walk_scenarios(scs)
-      walk_scenario_container(scs)
-      super(scs)
-    end
-
-    def walk_actionword(aw)
-      add_splitted_tags(aw)
-      super(aw)
-    end
-
-    def walk_folder(folder)
-      ancestor_tags = folder.ancestors.map {|f| f.children[:tags]}.flatten.uniq
-      @rendered_children[:ancestor_tags] = ancestor_tags.map {|t| Hiptest::Renderer.render(t, @context)}
-
-      walk_scenario_container(folder)
-      super(folder)
-    end
-
-    def call_node_walker(node)
-      if node.is_a? Hiptest::Nodes::Node
-        @rendered_children = {}
-
-        node.children.each {|name, child| @rendered_children[name] = @rendered[child]}
-        @rendered[node] = render_node(node, super(node))
-      elsif node.is_a? Array
-        @rendered[node] = node.map {|item| @rendered[item]}
-      else
-        @rendered[node] = node
-      end
-    end
-
-    def render_node(node, render_context)
-      render_context ||= {}
-      render_context[:node] = node
-      render_context[:rendered_children] = @rendered_children
-      render_context[:context] = @context
-
-      @template_finder.get_compiled_handlebars(node.kind).call(render_context)
-    end
-
-    private
-
-    def add_splitted_tags(context)
-      @rendered_children[:splitted_tags] = context.children[:tags].map do |tag|
-        @rendered[tag]
-      end
-    end
-
-    def walk_scenario_container(container)
-     # For Robot framework, we need direct access to every scenario
-     # datatables and body rendered.
-
-      @rendered_children[:splitted_scenarios] = container.children[:scenarios].map {|sc|
-        {
-          name: @rendered[sc.children[:name]],
-          tags: sc.children[:tags].map {|tag| @rendered[tag]},
-          uid: @rendered[sc.children[:uid]],
-          datatable: @rendered[sc.children[:datatable]],
-          datasets: sc.children[:datatable].children[:datasets].map {|dataset|
-            {
-              scenario_name: @rendered[sc.children[:name]],
-              name: @rendered[dataset.children[:name]],
-              uid: @rendered[dataset.children[:uid]],
-              arguments: @rendered[dataset.children[:arguments]]
-            }
-          },
-          parameters:  @rendered[sc.children[:parameters]],
-          body: @rendered[sc.children[:body]]
-        }
-      }
-    end
-  end
-end