hiptest-publisher 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3138437a3c18c0d3e956c485f2f085d1fd383b
-  data.tar.gz: dedf8903cf303e473351f27c0f69b07bf1d9f415
+  metadata.gz: 148f9a7098c7adfccab35b99273a86acefeb3a36
+  data.tar.gz: 45f5d9873598afb71725f32f36050acd76291951
 SHA512:
-  metadata.gz: 14ff2e2432c753bf6cd200a0e32e5e9f66f2d307d51eb29fe35a6fb1a250524257c354a7b5d7d806ec7b3a6a152c9c0a7b2e0b6a8e71b903123b0a4e34f44a68
-  data.tar.gz: 4cef4b9b90fbc1a85543531ae28a75ec80a0e052a71eeed24162f46cd0073d1cd2c225bf271ce5e3f24197f4c5b502e9bdda1d0a12dec0c6da6a67293f01364f
+  metadata.gz: 72a2707a042b4c31fef0569183d7c210a53515c343cf5135e3bdee54fc8e72bd102a37452afe82cb269e19a4f7a9e09166c8fec4397c2dcdcf9f69219bb29862
+  data.tar.gz: 76884068c660e72d97eca82d5f57b183667f28b484a199aa4c69cd35517cbec1d595b91fb6ff8cd80eddbab3a5672ba949e0e3bbe956ac033ce21b1fd5b046af

data/lib/hiptest-publisher.rb

@@ -58,7 +58,7 @@ module Hiptest
         return
       end
 
-      if @cli_options.actionwords_diff || @cli_options.aw_deleted|| @cli_options.aw_created|| @cli_options.aw_renamed|| @cli_options.aw_signature_changed
+      if @cli_options.actionwords_diff?
         show_actionwords_diff
         return
       end

data/lib/hiptest-publisher/cli_options_checker.rb

@@ -59,7 +59,7 @@ module Hiptest
       end
 
       # actionwords signature file
-      if cli_options.actionwords_diff || cli_options.aw_deleted || cli_options.aw_created || cli_options.aw_renamed || cli_options.aw_signature_changed
+      if cli_options.actionwords_diff?
         actionwords_signature_file = Pathname.new(cli_options.output_directory).join("actionwords_signature.yaml")
         if actionwords_signature_file.directory?
           raise CliOptionError, "Bad Action Words signature file: the file \"#{actionwords_signature_file.realpath}\" is a directory"
@@ -86,13 +86,26 @@ module Hiptest
         raise CliOptionError, "Invalid format --test-run-id=\"#{@cli_options.test_run_id}\": the test run id must be numeric"
       end
 
-      # language
+      # language and --only
       if present?(cli_options.language)
         begin
-          LanguageConfigParser.config_path_for(cli_options)
+          language_config_parser = LanguageConfigParser.new(cli_options)
         rescue ArgumentError => err
           raise CliOptionError, err.message
         end
+
+        if present?(cli_options.only)
+          if language_config_parser.filtered_group_names != cli_options.groups_to_keep
+            unknown_categories = cli_options.groups_to_keep - language_config_parser.group_names
+            if unknown_categories.length == 1
+              message = "the category #{formatted_categories(unknown_categories)} does not exist"
+            else
+              message = "the categories #{formatted_categories(unknown_categories)} do not exist"
+            end
+            raise CliOptionError, "Error with --only: #{message} for language #{cli_options.language_framework}. " +
+              "Available categories are #{formatted_categories(language_config_parser.group_names)}."
+          end
+        end
       end
     end
 
@@ -118,6 +131,15 @@ module Hiptest
       !absent?(arg)
     end
 
+    def formatted_categories(categories)
+      formatted_categories = categories.map(&:inspect)
+      if formatted_categories.length == 1
+        formatted_categories.first
+      else
+        formatted_categories[0...-1].join(", ") + " and " + formatted_categories.last
+      end
+    end
+
     def first_existing_parent(path)
       pathname = Pathname.new(path)
       while !pathname.exist?

data/lib/hiptest-publisher/options_parser.rb

@@ -62,6 +62,22 @@ class CliOptions < OpenStruct
     super(__cli_args: Set.new, __config_args: Set.new, **hash)
   end
 
+  def actionwords_diff?
+    actionwords_diff || aw_deleted || aw_created || aw_renamed || aw_signature_changed
+  end
+
+  def language_framework
+    if framework.empty?
+      language
+    else
+      "#{language}-#{framework}"
+    end
+  end
+
+  def groups_to_keep
+    only.split(",") if only
+  end
+
   def normalize!(reporter = nil)
     modified_options = self.clone
     if actionwords_only
@@ -329,6 +345,8 @@ class LanguageGroupConfig
     @with_folders = user_params.with_folders
     @leafless_export = user_params.leafless_export
     @language_group_params = language_group_params || {}
+
+    @user_params = user_params
   end
 
   def [](key)
@@ -402,7 +420,7 @@ class LanguageGroupConfig
   end
 
   def build_node_rendering_context(node)
-    path = File.join(@output_directory, output_file(node))
+    path = File.join(language_group_output_directory, output_file(node))
 
     if splitted_files?
       description = "#{singularize(node_name)} \"#{node.children[:name]}\""
@@ -422,6 +440,10 @@ class LanguageGroupConfig
     )
   end
 
+  def language_group_output_directory
+    @user_params["#{@language_group_params[:group_name]}_output_dir"] || @output_directory
+  end
+
   def output_directory(node)
     folder = node.folder
     hierarchy = []
@@ -502,9 +524,8 @@ class LanguageConfigParser
   end
 
   def filtered_group_names
-    if @cli_options.only
-      groups_to_keep = @cli_options.only.split(",")
-      group_names.select {|group_name| groups_to_keep.include?(group_name)}
+    if @cli_options.groups_to_keep
+      group_names.select {|group_name| @cli_options.groups_to_keep.include?(group_name)}
     else
       group_names
     end
@@ -534,12 +555,24 @@ class LanguageConfigParser
   end
 
   def make_language_group_config group_name
+    # List of options that can be set in the config file but not in command line
+    non_visible_options = {
+      :package => @cli_options.package,
+      :namespace => @cli_options.namespace,
+      :test_export_dir => @cli_options.test_export_dir,
+      :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,
+      :actionwords_output_directory => @cli_options.actionwords_output_directory
+    }
+
     language_group_params = group_config('_common')
     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[:namespace] = @cli_options.namespace if @cli_options.namespace
 
+    non_visible_options.each do |key, value|
+      language_group_params[key] = value if value
+    end
 
     unless @cli_options.overriden_templates.nil? || @cli_options.overriden_templates.empty?
       language_group_params[:overriden_templates] = @cli_options.overriden_templates

data/lib/hiptest-publisher/parameter_type_adder.rb

@@ -1,4 +1,6 @@
 require 'hiptest-publisher/nodes_walker'
+require 'hiptest-publisher/project_grapher'
+
 
 module Hiptest
   module Nodes
@@ -15,8 +17,17 @@ module Hiptest
 
       def process(project)
         gather_scenarios_argument_types(project)
-        gather_call_argument_types(project)
-        write_parameter_types(project)
+
+        # To have the most accurate type, the closest calls must be computed
+        # first, and deepest calls must be computed last (because they  depend
+        # on previous calls types).
+        distances_index = Hiptest::ProjectGrapher.distances_index(project)
+        distances_index.each_value do |items|  # distances_index items are sorted by distance, from closest to deepest
+          items.each do |item|
+            write_parameter_types_to_item(item)
+            gather_call_argument_types(item)
+          end
+        end
       end
 
       def gather_scenarios_argument_types(project)
@@ -26,38 +37,50 @@ module Hiptest
         end
       end
 
-      def gather_call_argument_types(project)
-        project.each_sub_nodes(Call) do |call|
+      def gather_call_argument_types(node)
+        node.each_sub_nodes(Call) do |call|
           @call_types.add_callable_item(call.children[:actionword], Actionword)
-          add_arguments_from(call)
+          add_arguments_from(call, node)
         end
       end
 
-      def write_parameter_types(project)
-        project.each_sub_nodes(Actionword, Scenario) do |callable_item|
-          callable_item.each_sub_nodes(Parameter) do |parameter|
-            parameter.children[:type] = @call_types.type_of(callable_item.children[:name], parameter.children[:name], callable_item.class)
-          end
+      def write_parameter_types_to_item(callable_item)
+        callable_item.each_sub_nodes(Parameter) do |parameter|
+          parameter.children[:type] = @call_types.type_of(callable_item.children[:name], parameter.children[:name], callable_item.class)
         end
       end
 
-      def add_arguments_from(node)
+      def add_arguments_from(node, context = nil)
         node.each_sub_nodes(Argument) do |argument|
-          @call_types.add_argument_type(argument.children[:name], get_type(argument))
+          @call_types.add_argument_type(argument.children[:name], get_type(argument, context))
         end
       end
 
       private
 
-      def get_type(node)
+      def get_type(node, context = nil)
         value = node.children[:value]
+
         case value
           when StringLiteral, Template then :String
           when NumericLiteral then value.children[:value].include?(".") ? :float : :int
           when BooleanLiteral then :bool
+          when Variable then get_var_value(value.children[:name], context)
           else :null
         end
       end
+
+      def get_var_value(name, context)
+        return :null if context.nil? || context.children[:parameters].nil?
+
+        context.children[:parameters].each do |param|
+          if param.children[:name] == name
+            return param.children[:type] || :null
+          end
+        end
+
+        return :null
+      end
     end
 
     class CallTypes
@@ -81,6 +104,7 @@ module Hiptest
         name = "#{item_type}-#{item_name}"
         callable_item =  @callable_items[name]
         return :String if callable_item.nil?
+
         parameter = callable_item[parameter_name]
 
         return :String if parameter.nil?

data/lib/hiptest-publisher/project_grapher.rb

@@ -7,6 +7,15 @@ module Hiptest
   class ProjectGrapher
     attr_reader :graph, :distance_index
 
+    def self.distances_index(project)
+      instance = ProjectGrapher.new(project)
+      instance.compute_graph
+      instance.add_distances
+      instance.index_by_distances
+
+      return instance.distance_index
+    end
+
     def initialize(project)
       @project = project
       @graph = {}
@@ -23,8 +32,8 @@ module Hiptest
 
     def index_by_distances
       @distance_index = Hash.new { |hash, key| hash[key] = [] }
-      @graph.values.each do |value|
-        @distance_index[value[:from_root]] << value[:item] unless value[:item].nil?
+      @graph.each_value do |value|
+        @distance_index[value[:distance_from_root]] << value[:item] if value[:item]
       end
     end
 
@@ -37,7 +46,7 @@ module Hiptest
           name: name,
           item: item,
           calls: [],
-          from_root: -1
+          distance_from_root: -1
         }
 
         item.each_sub_nodes(Hiptest::Nodes::Call) do |call|
@@ -50,7 +59,7 @@ module Hiptest
     def add_root
       @graph[:root] = {
         calls: [],
-        from_root: 0
+        distance_from_root: 0
       }
 
       @project.each_sub_nodes(Hiptest::Nodes::Scenario) do |scenario|
@@ -61,14 +70,14 @@ module Hiptest
     def add_node_weight(node, path)
       path << node[:name]
 
-      node[:calls].map do |item_name|
+      node[:calls].each do |item_name|
         next if path.include?(item_name)
 
         called = @graph[item_name]
         next if called.nil?
 
-        if called[:from_root] <= node[:from_root]
-          called[:from_root] = node[:from_root] + 1
+        if called[:distance_from_root] <= node[:distance_from_root]
+          called[:distance_from_root] = node[:distance_from_root] + 1
           add_node_weight(called, path)
         end
       end

data/lib/hiptest-publisher/utils.rb

@@ -15,12 +15,16 @@ rescue
   File.read("#{hiptest_publisher_path}/VERSION").strip if File.exists?("#{hiptest_publisher_path}/VERSION")
 end
 
-def pluralize(count, singular)
+def pluralize_word(count, singular, plural=nil)
   word = if count == 1
     singular
   else
     "#{singular}s"
   end
+end
+
+def pluralize(count, singular, plural=nil)
+  word = pluralize_word(count, singular, plural)
   "#{count} #{word}"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -528,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.