hiptest-publisher 1.15.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c7c858fbf0ec7499ca9a13ca5f4ebb9ea5cd2754811d57aaf47a8f2667a803'
-  data.tar.gz: 301b30459a64f5fd4e98e7c395e4709177f5863bad7e2f6c9706ccaa6fb2cfbc
+  metadata.gz: 89f6b298fc2d84d8a98247f82b9234d5e7cdf30204ef8bcee60ef6f62deaf9df
+  data.tar.gz: 2b27dceed97bec88d11bbc85f852c83974b058725e290eacdab94f8f49c9c623
 SHA512:
-  metadata.gz: c3cfe825b36ff482f5fe516f49e3406232a06c2cdddef20c6556c64ec1c1d64babfd3da823eb37425ae307eb19143c08ed55d7c461c68ae5923fcbe5dfd61ffc
-  data.tar.gz: b60c17d5e69d9f676d7f14447a82d3a0c9db3759528166b715f4cd067b489f8453216f86700fa8028b709027058d599e1ff142a034512d445afb6403a22480a7
+  metadata.gz: a9849c9ecbcd570b3a3d156425d2e8131ed6d01f496cca56480bad6c6cace27ebf5648759a18644d337feb1db57ef59ea4f013cdb595f2dce32b636e0f900000
+  data.tar.gz: 382309325649dbdb96422cc15d937709dcbbc7073563ba3052e383727d762fe24d6c17900be681f0e67677e2b3369165f8f7814e618a2d7386f9eb1a677e97c5

data/lib/config/behat.conf

@@ -23,3 +23,22 @@ template_dirs = behat/actionwords, php, common
 filename = 'Actionwords.php'
 naming_convention = 'camel_case'
 call_prefix = '$this'
+
+[step_definitions_library]
+node_name = libraries
+call_prefix = 'actionwords'
+template_dirs = behat, php, common
+named_filename = '%sFeatureContext.php'
+renderer_addons = 'GherkinAddon'
+filename_convention = 'camelize'
+
+
+[library]
+template_dirs =  php, common
+filename = 'ActionwordLibrary.php'
+
+[libraries]
+template_dirs = php, common
+named_filename = '%sLibrary.php'
+filename_convention = 'camelize'
+

data/lib/hiptest-publisher/options_parser.rb

@@ -44,7 +44,7 @@ class FileConfigParser
   def self.update_path!(param, config, options)
     path = Pathname.new(config[param])
     return unless path.relative?
-    config_path =  Pathname.new(options.config)
+    config_path = Pathname.new(options.config)
     config_absolute_path = config_path.relative? ? Pathname.pwd + config_path : config_path
     resolved_path = config_absolute_path.cleanpath.dirname + path
     options[param] = resolved_path.cleanpath.to_path
@@ -88,7 +88,7 @@ class Option
 end
 
 class CliOptions < OpenStruct
-  def initialize(hash=nil)
+  def initialize(hash = nil)
     hash ||= {}
     hash[:language] ||= ""
     hash[:framework] ||= ""
@@ -134,7 +134,7 @@ class CliOptions < OpenStruct
   end
 
   def normalize!(reporter = nil)
-    self.no_uids = !uids  # silent normalization
+    self.no_uids = !uids # silent normalization
     modified_options = self.clone
     if actionwords_only
       modified_options.only = 'actionwords'
@@ -362,12 +362,12 @@ class TemplateFinder
   attr_reader :template_dirs, :overriden_templates, :forced_templates, :fallback_template
 
   def initialize(
-      template_dirs: nil,
-      overriden_templates: nil,
-      indentation: '  ',
-      forced_templates: nil,
-      fallback_template: nil,
-      **)
+    template_dirs: nil,
+    overriden_templates: nil,
+    indentation: '  ',
+    forced_templates: nil,
+    fallback_template: nil,
+    **)
     @template_dirs = template_dirs || []
     @overriden_templates = overriden_templates
     @compiled_handlebars = {}
@@ -382,7 +382,7 @@ class TemplateFinder
       search_dirs = []
       # search in overriden template base dir first
       search_dirs << overriden_templates if overriden_templates
-      template_dirs.each { |template_dir|
+      template_dirs.each {|template_dir|
         # search template paths in overriden_templates
         search_dirs << "#{overriden_templates}/#{template_dir}" if overriden_templates
         # search template paths in hiptest_publisher
@@ -656,10 +656,10 @@ class LanguageConfigParser
 
   def self.config_path_for(cli_options)
     config_name = if cli_options.framework.empty?
-      "#{cli_options.language}.conf"
-    else
-      "#{cli_options.language}-#{cli_options.framework}.conf"
-    end
+                    "#{cli_options.language}.conf"
+                  else
+                    "#{cli_options.language}-#{cli_options.framework}.conf"
+                  end
     config_path = File.expand_path("#{hiptest_publisher_path}/lib/config/#{config_name.downcase}")
     if !File.file?(config_path)
       message = "cannot find configuration file in \"#{hiptest_publisher_path}/lib/config\""
@@ -689,7 +689,7 @@ class LanguageConfigParser
   end
 
   def language_group_configs
-    filtered_group_names.map { |group_name| make_language_group_config(group_name) }
+    filtered_group_names.map {|group_name| make_language_group_config(group_name)}
   end
 
   def name_action_word(name)
@@ -704,7 +704,7 @@ class LanguageConfigParser
 
   def group_config(group_name)
     if @config[group_name]
-      key_values = @config[group_name].map { |key, value| [key.to_sym, value] }
+      key_values = @config[group_name].map {|key, value| [key.to_sym, value]}
       Hash[key_values]
     else
       {}
@@ -720,6 +720,9 @@ class LanguageConfigParser
       tests_ouput_dir: @cli_options.tests_ouput_dir,
       features_output_directory: @cli_options.features_output_directory,
       step_definitions_output_directory: @cli_options.step_definitions_output_directory,
+      step_definitions_library_output_directory: @cli_options.step_definitions_output_directory,
+      libraries_output_directory: @cli_options.actionwords_output_directory,
+      library_output_directory: @cli_options.actionwords_output_directory,
       actionwords_output_directory: @cli_options.actionwords_output_directory
     }
 
@@ -735,6 +738,15 @@ class LanguageConfigParser
       language_group_params[:overriden_templates] = @cli_options.overriden_templates
     end
 
+    if @cli_options.step_definitions_output_directory
+      @cli_options.step_definitions_library_output_directory = @cli_options.step_definitions_output_directory
+    end
+
+    if @cli_options.actionwords_output_directory
+      @cli_options.libraries_output_directory = @cli_options.actionwords_output_directory
+      @cli_options.library_output_directory = @cli_options.actionwords_output_directory
+    end
+
     LanguageGroupConfig.new(@cli_options, language_group_params)
   end
 end

data/lib/templates/behat/actionword.hbs

@@ -3,6 +3,6 @@
  * @{{{ rendered_children.gherkin_annotation }}} /{{> gherkin_pattern}}/
  */
 public function {{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}){{#curly}}{{#indent}}
-$this->actionwords->{{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}${{{underscore this}}}{{/join}}{{/if}});
+$this->actionwords->{{#if has_library?}}get{{{camelize library_name}}}Library()->{{/if}}{{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}${{{underscore this}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}}{{/if}}

data/lib/templates/behat/library.hbs

@@ -0,0 +1,16 @@
+<?php
+use Behat\Behat\Tester\Exception\PendingException;
+use Behat\Behat\Context\SnippetAcceptingContext;
+use Behat\Gherkin\Node\PyStringNode;
+use Behat\Gherkin\Node\TableNode;
+
+require_once('Actionwords.php');
+
+class {{camelize rendered_children.name}}FeatureContext implements SnippetAcceptingContext {{#curly}}{{#indent}}
+public function __construct() {{#curly}}{{#indent}}
+$this->actionwords = new Actionwords();{{/indent}}
+{{/curly}}
+{{#each rendered_children.actionwords}}
+{{{this}}}{{/each}}{{/indent}}
+{{/curly}}
+?>

data/lib/templates/php/actionwords.hbs

@@ -1,5 +1,7 @@
 <?php
-class Actionwords {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+{{#if uses_library?}}require_once('ActionwordLibrary.php');{{/if}}
+
+class Actionwords {{#if uses_library?}}extends ActionwordLibrary {{/if}}{{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
 {{{this}}}
 {{/each}}
 {{/indent}}

data/lib/templates/php/libraries.hbs

@@ -0,0 +1,11 @@
+<?php
+{{#each library_names}}require_once('{{camelize this}}Library.php');
+{{/each}}
+class ActionwordLibrary {{#curly}}{{#indent}}{{#each library_names}}
+public function get{{camelize this}}Library() {{#curly}}{{#indent}}
+return {{camelize this}}Library::getInstance();
+{{/indent}}
+{{/curly}}
+{{/each}}{{/indent}}
+{{/curly}}
+?>

data/lib/templates/php/library.hbs

@@ -0,0 +1,17 @@
+<?php
+class {{camelize rendered_children.name}}Library {{#curly}}{{#indent}}
+private static $_instance = null;
+
+private function __construct(){{#curly}}{{/curly}}
+
+public static function getInstance(){{#curly}}{{#indent}}
+if (is_null(self::$_instance)) {{#curly}}{{#indent}}
+self::$_instance = new {{camelize rendered_children.name}}Library();
+{{/indent}}
+{{/curly}}
+return self::$_instance;
+{{/indent}}
+{{/curly}}
+{{/indent}}
+{{/curly}}
+?>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -287,6 +287,7 @@ files:
 - lib/templates/behat/actionword.hbs
 - lib/templates/behat/actionwords.hbs
 - lib/templates/behat/actionwords/parameter.hbs
+- lib/templates/behat/library.hbs
 - lib/templates/behat/parameter.hbs
 - lib/templates/behave/actionword.hbs
 - lib/templates/behave/actionwords.hbs
@@ -515,6 +516,8 @@ files:
 - lib/templates/php/folder.hbs
 - lib/templates/php/ifthen.hbs
 - lib/templates/php/index.hbs
+- lib/templates/php/libraries.hbs
+- lib/templates/php/library.hbs
 - lib/templates/php/list.hbs
 - lib/templates/php/nullliteral.hbs
 - lib/templates/php/parameter.hbs