hiptest-publisher 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb1a50665df54a622fde7b9fd3346c714364aeb
-  data.tar.gz: 05cbd2bd37e3bf55dd3496855c4037d2d58bf495
+  metadata.gz: 6956de73d91820080c96b9f0644db1560b493fb2
+  data.tar.gz: efe6707a3bb007912bb41220deda4efedf219afe
 SHA512:
-  metadata.gz: 13138b46b4bfe81fc63ff5d73630ae45c21cbafc22d90121f8004ccc2f8a3c5c9476def166b805dedfb27b15f92382377d3a9174cc3d62f18141b28d70e21d2d
-  data.tar.gz: 8d886d7e9194a0796e400cacff02ad5327ea4f2f57435053f4bf188c939cb0b1b475f858b37daa6463931ca14d04dc5f2aa67baa9043fcf641c1baaea93dbee1
+  metadata.gz: 6219d7d9a5e9d51bdecc035e8cdfbeb1fb1c8b4b162fdacd19b668da190760717539a5304d3c6f2aaefd497ba010e81016259a0df09c113b4b430f05136e8c35
+  data.tar.gz: 9da9349efbeba2972fc3622e3288ba05c309687aded27cbbf53dbac716c68d5fd58b74c356260a0186f8c0995e54e9dbac0ecca0ed8070eed5d2528c2c4a9ac8

data/lib/config/cucumber-folders_as_features.conf

@@ -1,18 +1,19 @@
 [_common]
-language = cucumber
 indentation = '  '
 fallback_template = 'empty'
 
 [features]
 node_name = folders
+template_dirs = gherkin/folders_as_features, gherkin, common
 scenario_filename = '%s.feature'
 
 [step_definitions]
 node_name = actionwords
+template_dirs = cucumber, common
 filename = 'step_definitions.rb'
 naming_convention = 'underscore'
 
 [actionwords]
-language = ruby
+template_dirs = ruby, common
 filename = 'actionwords.rb'
 naming_convention = 'underscore'

data/lib/config/cucumber.conf

@@ -1,18 +1,19 @@
 [_common]
-language = cucumber
 indentation = '  '
 fallback_template = 'empty'
 
 [features]
 node_name = tests
+template_dirs = gherkin, common
 scenario_filename = '%s.feature'
 
 [step_definitions]
 node_name = actionwords
+template_dirs = cucumber, common
 filename = 'step_definitions.rb'
 naming_convention = 'underscore'
 
 [actionwords]
-language = ruby
+template_dirs = ruby, common
 filename = 'actionwords.rb'
 naming_convention = 'underscore'

data/lib/config/java-testng.conf

@@ -0,0 +1,14 @@
+[_common]
+template_dirs = java/testng, java, common
+package = 'com.example'
+indentation = '    '
+filename_convention = 'camelize'
+naming_convention = 'camelize_lower'
+
+[tests]
+filename = 'ProjectTest.java'
+scenario_filename = '%sTest.java'
+call_prefix = 'actionwords'
+
+[actionwords]
+filename = 'Actionwords.java'

data/lib/config/java.conf

@@ -1,4 +1,5 @@
 [_common]
+template_dirs = java, common
 package = 'com.example'
 indentation = '    '
 filename_convention = 'camelize'

data/lib/config/javascript-jasmine.conf

@@ -1,3 +1,6 @@
+[_common]
+template_dirs = javascript/jasmine, javascript, common
+
 [tests]
 filename = 'project_test.js'
 scenario_filename = '%s_test.js'

data/lib/config/javascript.conf

@@ -1,3 +1,6 @@
+[_common]
+template_dirs = javascript, common
+
 [tests]
 filename = 'project_test.js'
 scenario_filename = '%s_test.js'

data/lib/config/python.conf

@@ -1,4 +1,5 @@
 [_common]
+template_dirs = python, common
 indentation = "    "
 
 [tests]

data/lib/config/robotframework.conf

@@ -1,4 +1,5 @@
 [_common]
+template_dirs = robotframework, python, common
 indentation = "\t"
 
 [tests]

data/lib/config/ruby-minitest.conf

@@ -1,3 +1,6 @@
+[_common]
+template_dirs = ruby/minitest, ruby, common
+
 [tests]
 filename = 'project_test.rb'
 scenario_filename = '%s_test.rb'

data/lib/config/ruby.conf

@@ -1,3 +1,6 @@
+[_common]
+template_dirs = ruby, common
+
 [tests]
 filename = 'project_spec.rb'
 scenario_filename = '%s_spec.rb'

data/lib/config/seleniumide.conf

@@ -1,4 +1,5 @@
 [_common]
+template_dirs = seleniumide, common
 indentation = "  "
 fallback_template = 'empty'
 

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -81,11 +81,11 @@ module Hiptest
     end
 
     def hh_remove_quotes (context, s, block)
-      "#{s.gsub('"', '')}"
+      s ? s.gsub('"', '') : ""
     end
 
     def hh_escape_quotes (context, s, block)
-      "#{s.gsub(/"/) {|_| '\\"' }}"
+      s ? s.gsub(/"/, '\\"') : ""
     end
 
     def hh_comment (context, commenter, block)

data/lib/hiptest-publisher/options_parser.rb

@@ -205,18 +205,16 @@ end
 
 
 class TemplateFinder
-  attr_reader :language, :framework, :overriden_templates, :forced_templates, :fallback_template
+  attr_reader :template_dirs, :overriden_templates, :forced_templates, :fallback_template
 
   def initialize(
-      language: "ruby",
-      framework: nil,
+      template_dirs: nil,
       overriden_templates: nil,
       indentation: '  ',
       forced_templates: nil,
       fallback_template: nil,
       **)
-    @language = language
-    @framework = framework
+    @template_dirs = template_dirs || []
     @overriden_templates = overriden_templates
     @compiled_handlebars = {}
     @template_path_by_name = {}
@@ -227,12 +225,9 @@ class TemplateFinder
 
   def 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 = template_dirs.map { |path|
+        "#{hiptest_publisher_path}/lib/templates/#{path}"
+      }
       search_dirs.unshift(overriden_templates) if overriden_templates
       search_dirs
     end
@@ -257,7 +252,7 @@ class TemplateFinder
     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}")
+    @template_path_by_name[template_name] or raise ArgumentError.new("no template with name #{template_name} in dirs #{dirs}")
   end
 
   def register_partials
@@ -289,8 +284,6 @@ class LanguageGroupConfig
     @split_scenarios = user_params.split_scenarios
     @with_folders = user_params.with_folders
     @leafless_export = user_params.leafless_export
-    @user_language = user_params.language
-    @user_framework = user_params.framework
     @language_group_params = language_group_params || {}
   end
 
@@ -335,10 +328,17 @@ class LanguageGroupConfig
     forced
   end
 
+  def template_dirs
+    if @language_group_params[:template_dirs]
+      @language_group_params[:template_dirs].split(',').map(&:strip)
+    else
+      []
+    end
+  end
+
   def template_finder
     @template_finder ||= TemplateFinder.new(
-      language: @language_group_params[:language] || @user_language,
-      framework: @language_group_params[:framework] || @user_framework,
+      template_dirs: template_dirs,
       overriden_templates: @language_group_params[:overriden_templates],
       indentation: indentation,
       forced_templates: forced_templates,
@@ -492,7 +492,6 @@ class LanguageConfigParser
     language_group_params.merge!(group_config(group_name))
     language_group_params[:group_name] = group_name
     language_group_params[:package] = @cli_options.package if @cli_options.package
-    language_group_params[:framework] = @cli_options.framework if @cli_options.framework
 
     unless @cli_options.overriden_templates.nil? || @cli_options.overriden_templates.empty?
       language_group_params[:overriden_templates] = @cli_options.overriden_templates

data/lib/templates/gherkin/parameter.hbs

@@ -0,0 +1 @@
+{{{ underscore rendered_children.name }}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -241,6 +241,7 @@ files:
 - bin/hiptest-publisher
 - lib/config/cucumber-folders_as_features.conf
 - lib/config/cucumber.conf
+- lib/config/java-testng.conf
 - lib/config/java.conf
 - lib/config/javascript-jasmine.conf
 - lib/config/javascript.conf
@@ -278,20 +279,22 @@ files:
 - lib/templates/common/variable.hbs
 - lib/templates/cucumber/actionword.hbs
 - lib/templates/cucumber/actionwords.hbs
-- lib/templates/cucumber/argument.hbs
-- lib/templates/cucumber/call.hbs
-- lib/templates/cucumber/dataset.hbs
-- lib/templates/cucumber/datatable.hbs
 - lib/templates/cucumber/empty.hbs
-- lib/templates/cucumber/folders_as_features/folder.hbs
-- lib/templates/cucumber/folders_as_features/single_scenario.hbs
 - lib/templates/cucumber/parameter.hbs
-- lib/templates/cucumber/scenarios.hbs
-- lib/templates/cucumber/single_scenario.hbs
-- lib/templates/cucumber/single_test.hbs
-- lib/templates/cucumber/step.hbs
-- lib/templates/cucumber/stringliteral.hbs
-- lib/templates/cucumber/template.hbs
+- lib/templates/gherkin/argument.hbs
+- lib/templates/gherkin/call.hbs
+- lib/templates/gherkin/dataset.hbs
+- lib/templates/gherkin/datatable.hbs
+- lib/templates/gherkin/empty.hbs
+- lib/templates/gherkin/folders_as_features/folder.hbs
+- lib/templates/gherkin/folders_as_features/single_scenario.hbs
+- lib/templates/gherkin/parameter.hbs
+- lib/templates/gherkin/scenarios.hbs
+- lib/templates/gherkin/single_scenario.hbs
+- lib/templates/gherkin/single_test.hbs
+- lib/templates/gherkin/step.hbs
+- lib/templates/gherkin/stringliteral.hbs
+- lib/templates/gherkin/template.hbs
 - lib/templates/java/_body.hbs
 - lib/templates/java/_item_as_function.hbs
 - lib/templates/java/_scenario.hbs
@@ -407,32 +410,17 @@ files:
 - lib/templates/robotframework/actionword.hbs
 - lib/templates/robotframework/actionwords.hbs
 - lib/templates/robotframework/argument.hbs
-- lib/templates/robotframework/assign.hbs
-- lib/templates/robotframework/binaryexpression.hbs
 - lib/templates/robotframework/call.hbs
 - lib/templates/robotframework/dataset.hbs
 - lib/templates/robotframework/datatable.hbs
-- lib/templates/robotframework/dict.hbs
-- lib/templates/robotframework/field.hbs
 - lib/templates/robotframework/ifthen.hbs
-- lib/templates/robotframework/index.hbs
-- lib/templates/robotframework/list.hbs
-- lib/templates/robotframework/nullliteral.hbs
 - lib/templates/robotframework/parameter.hbs
-- lib/templates/robotframework/parenthesis.hbs
-- lib/templates/robotframework/project.hbs
-- lib/templates/robotframework/property.hbs
-- lib/templates/robotframework/scenario.hbs
 - lib/templates/robotframework/scenarios.hbs
 - lib/templates/robotframework/single_scenario.hbs
 - lib/templates/robotframework/single_test.hbs
-- lib/templates/robotframework/step.hbs
 - lib/templates/robotframework/stringliteral.hbs
-- lib/templates/robotframework/tag.hbs
 - lib/templates/robotframework/template.hbs
-- lib/templates/robotframework/test.hbs
 - lib/templates/robotframework/tests.hbs
-- lib/templates/robotframework/unaryexpression.hbs
 - lib/templates/robotframework/variable.hbs
 - lib/templates/robotframework/while.hbs
 - lib/templates/ruby/_body.hbs

data/lib/templates/robotframework/assign.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.to }}} = {{{ rendered_children.value }}}

data/lib/templates/robotframework/binaryexpression.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.left }}} {{{ rendered_children.operator }}} {{{ rendered_children.right }}}

data/lib/templates/robotframework/dict.hbs

@@ -1 +0,0 @@
-{{#curly}}{{{ join rendered_children.items ', '}}}{{/curly}}

data/lib/templates/robotframework/field.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.base }}}.{{{ rendered_children.name }}}

data/lib/templates/robotframework/index.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.base }}}[{{{ rendered_children.expression }}}]

data/lib/templates/robotframework/list.hbs

@@ -1 +0,0 @@
-[{{{ join rendered_children.items ', '}}}]

data/lib/templates/robotframework/nullliteral.hbs

@@ -1 +0,0 @@
-None

data/lib/templates/robotframework/parenthesis.hbs

@@ -1 +0,0 @@
-({{{ rendered_children.content }}})

data/lib/templates/robotframework/project.hbs

@@ -1,2 +0,0 @@
-name: {{{ rendered_children.name }}}
-description: {{{ rendered_children.description }}}

data/lib/templates/robotframework/property.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.key }}}: {{{ rendered_children.value }}}

data/lib/templates/robotframework/scenario.hbs

@@ -1 +0,0 @@
-{{> scenario}}

data/lib/templates/robotframework/step.hbs

@@ -1 +0,0 @@
-{{#comment '#'}}TODO: Implement {{{ rendered_children.key }}}: {{{ rendered_children.value }}}{{/comment}}

data/lib/templates/robotframework/tag.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.key }}}{{#if has_value?}}:{{{rendered_children.value}}}{{/if}}

data/lib/templates/robotframework/test.hbs

@@ -1 +0,0 @@
-{{> scenario}}

data/lib/templates/robotframework/unaryexpression.hbs

@@ -1 +0,0 @@
-{{{ rendered_children.operator }}}{{{ rendered_children.expression }}}