hiptest-publisher 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8049f09f41133f11370cfd75ae4db12158427869
-  data.tar.gz: 538b61a5050e9fecb13b4887a89ada543c7bc632
+  metadata.gz: 2c3138437a3c18c0d3e956c485f2f085d1fd383b
+  data.tar.gz: dedf8903cf303e473351f27c0f69b07bf1d9f415
 SHA512:
-  metadata.gz: 21554b0949d973c98299609b2636ea7bdfe7702ff53a72b073bc6764d5677d1a2d55037138729127cf08123ca53b38520f5b1ffe4e4d7493ae8f68ed25fb15e1
-  data.tar.gz: b68c6cab3d17e151d1aaa988ec893a3cc1a5584d11d60b054c408a662dde9f79c6a0e2ea2cc99e5d691e6e9206ca5f05c95828a308068e832f542b81f5576504
+  metadata.gz: 14ff2e2432c753bf6cd200a0e32e5e9f66f2d307d51eb29fe35a6fb1a250524257c354a7b5d7d806ec7b3a6a152c9c0a7b2e0b6a8e71b903123b0a4e34f44a68
+  data.tar.gz: 4cef4b9b90fbc1a85543531ae28a75ec80a0e052a71eeed24162f46cd0073d1cd2c225bf271ce5e3f24197f4c5b502e9bdda1d0a12dec0c6da6a67293f01364f

data/lib/hiptest-publisher.rb

@@ -24,21 +24,7 @@ module Hiptest
       @exit_on_bad_arguments = exit_on_bad_arguments
     end
 
-    def normalize_cli_options!
-      modified_cli_options = @cli_options.clone
-      if @cli_options.actionwords_only
-        modified_cli_options.only = 'actionwords'
-      elsif @cli_options.tests_only
-        modified_cli_options.only = 'tests'
-      end
-      if @cli_options.with_folders && @cli_options.language == 'cucumber'
-        modified_cli_options.framework = 'folders_as_features'
-      end
-      @cli_options = modified_cli_options
-    end
-
     def run
-      normalize_cli_options!
       puts "URL: #{make_url(@cli_options)}".white if @cli_options.verbose
       begin
         CliOptionsChecker.new(@cli_options, reporter).check!

data/lib/hiptest-publisher/formatters/console_formatter.rb

@@ -17,9 +17,10 @@ class ConsoleFormatter
     puts line.yellow
   end
 
-  def show_options(options)
+  def show_options(options, message = nil)
     return unless verbose
-    puts "Running Hiptest-publisher #{hiptest_publisher_version} with:".yellow
+    message ||= "Running Hiptest-publisher #{hiptest_publisher_version} with:"
+    puts message.yellow
     options.each { |k, v| puts " - #{k}: #{v.inspect}".white }
   end
 end

data/lib/hiptest-publisher/formatters/reporter.rb

@@ -13,8 +13,8 @@ class Reporter
     notify(:dump_error, error, message)
   end
 
-  def show_options(options)
-    notify(:show_options, options)
+  def show_options(options, message = nil)
+    notify(:show_options, options, message)
   end
 
   def notify(message, *args)

data/lib/hiptest-publisher/nodes.rb

@@ -335,6 +335,11 @@ module Hiptest
         super()
         @children = {:actionwords => actionwords}
         mark_actionwords_for_implementation
+        index_actionwords
+      end
+
+      def find_actionword(name)
+        return @actionwords_index[name]
       end
 
       private
@@ -350,6 +355,14 @@ module Hiptest
           end
         end
       end
+
+      def index_actionwords
+        @actionwords_index = {}
+
+        @children[:actionwords].each do |aw|
+          @actionwords_index[aw.children[:name]] = aw
+        end
+      end
     end
 
     class Scenarios < Node

data/lib/hiptest-publisher/options_parser.rb

@@ -54,6 +54,47 @@ class Option
   end
 end
 
+class CliOptions < OpenStruct
+  def initialize(hash=nil)
+    hash ||= {}
+    hash[:language] ||= ""
+    hash[:framework] ||= ""
+    super(__cli_args: Set.new, __config_args: Set.new, **hash)
+  end
+
+  def normalize!(reporter = nil)
+    modified_options = self.clone
+    if actionwords_only
+      modified_options.only = 'actionwords'
+    elsif tests_only
+      modified_options.only = 'tests'
+    end
+
+    if language.include?('-')
+      modified_options.language, modified_options.framework = language.split("-", 2)
+    elsif framework.empty?
+      # pick first framework for the language
+      _, frameworks = OptionsParser.languages.find do |language, frameworks|
+        language.downcase.gsub(' ', '') == self.language.downcase.gsub(' ', '')
+      end
+      if frameworks
+        modified_options.framework = frameworks.first.downcase
+      end
+    end
+
+    if self != modified_options
+      delta = modified_options.table.select do |key, value|
+        modified_options[key] != self[key]
+      end
+      marshal_load(modified_options.marshal_dump)
+      if reporter
+        reporter.show_options(delta, 'Options have been normalized. Values updated:')
+      end
+      return delta
+    end
+  end
+end
+
 class OptionsParser
   def self.languages
     # First framework is default framework
@@ -103,7 +144,7 @@ class OptionsParser
   end
 
   def self.parse(args, reporter)
-    options = OpenStruct.new(__cli_args: Set.new, __config_args: Set.new)
+    options = CliOptions.new
     opt_parser = OptionParser.new do |opts|
       opts.version = hiptest_publisher_version if hiptest_publisher_version
       opts.banner = "Usage: ruby publisher.rb [options]"
@@ -147,6 +188,7 @@ class OptionsParser
     FileConfigParser.update_options(options, reporter)
 
     reporter.show_options(options.marshal_dump)
+    options.normalize!(reporter)
     options
   end
 
@@ -438,18 +480,19 @@ class LanguageConfigParser
   end
 
   def self.config_path_for(cli_options)
-    config_path = [
-      "#{hiptest_publisher_path}/lib/config/#{cli_options.language}-#{cli_options.framework}.conf",
-      "#{hiptest_publisher_path}/lib/config/#{cli_options.language}.conf",
-    ].map do |path|
-      File.expand_path(path) if File.file?(path)
-    end.compact.first
-    if config_path.nil?
-      message = "cannot find configuration file in \"#{hiptest_publisher_path}/config\" for language #{cli_options.language.inspect}"
+    config_name = if cli_options.framework.empty?
+      "#{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\""
+      message << " for language #{cli_options.language.inspect}"
       message << " and framework #{cli_options.framework.inspect}" unless cli_options.framework.to_s.empty?
       raise ArgumentError.new(message)
     end
-    config_path
+    File.expand_path(config_path)
   end
 
   def group_names

data/lib/hiptest-publisher/parameter_type_adder.rb

@@ -21,14 +21,14 @@ module Hiptest
 
       def gather_scenarios_argument_types(project)
         project.children[:scenarios].children[:scenarios].each do |scenario|
-          @call_types.add_callable_item(scenario.children[:name])
+          @call_types.add_callable_item(scenario.children[:name], Scenario)
           add_arguments_from(scenario.children[:datatable])
         end
       end
 
       def gather_call_argument_types(project)
         project.each_sub_nodes(Call) do |call|
-          @call_types.add_callable_item(call.children[:actionword])
+          @call_types.add_callable_item(call.children[:actionword], Actionword)
           add_arguments_from(call)
         end
       end
@@ -36,7 +36,7 @@ module Hiptest
       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])
+            parameter.children[:type] = @call_types.type_of(callable_item.children[:name], parameter.children[:name], callable_item.class)
           end
         end
       end
@@ -66,7 +66,8 @@ module Hiptest
         @current_callable_item = nil
       end
 
-      def add_callable_item(name)
+      def add_callable_item(item_name, item_type)
+        name = "#{item_type}-#{item_name}"
         @callable_items[name] ||= {}
         @current_callable_item = @callable_items[name]
       end
@@ -76,8 +77,9 @@ module Hiptest
         @current_callable_item[name][:types] << type
       end
 
-      def type_of(item_name, parameter_name)
-        callable_item =  @callable_items[item_name]
+      def type_of(item_name, parameter_name, item_type)
+        name = "#{item_type}-#{item_name}"
+        callable_item =  @callable_items[name]
         return :String if callable_item.nil?
         parameter = callable_item[parameter_name]
 

data/lib/hiptest-publisher/project_grapher.rb

@@ -0,0 +1,85 @@
+require 'hiptest-publisher/nodes'
+
+module Hiptest
+  # Builds a graph based on calls and computes
+  # longest path from the root.
+
+  class ProjectGrapher
+    attr_reader :graph, :distance_index
+
+    def initialize(project)
+      @project = project
+      @graph = {}
+    end
+
+    def compute_graph
+      add_nodes
+      add_root
+    end
+
+    def add_distances
+      add_node_weight(@graph[:root], [:root])
+    end
+
+    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?
+      end
+    end
+
+    private
+
+    def add_nodes
+      @project.each_sub_nodes(Hiptest::Nodes::Scenario, Hiptest::Nodes::Actionword) do |item|
+        name = node_name(item)
+        @graph[name] = {
+          name: name,
+          item: item,
+          calls: [],
+          from_root: -1
+        }
+
+        item.each_sub_nodes(Hiptest::Nodes::Call) do |call|
+          aw_name = node_name(call.children[:actionword], Hiptest::Nodes::Actionword)
+          @graph[name][:calls] << aw_name
+        end
+      end
+    end
+
+    def add_root
+      @graph[:root] = {
+        calls: [],
+        from_root: 0
+      }
+
+      @project.each_sub_nodes(Hiptest::Nodes::Scenario) do |scenario|
+        @graph[:root][:calls] << node_name(scenario)
+      end
+    end
+
+    def add_node_weight(node, path)
+      path << node[:name]
+
+      node[:calls].map 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
+          add_node_weight(called, path)
+        end
+      end
+
+      path.pop
+    end
+
+    def node_name(node, cls = nil)
+      cls ||= node.class
+      name = node.is_a?(Hiptest::Nodes::Node) ? node.children[:name] : node
+      "#{cls}-#{name}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -239,17 +239,17 @@ extra_rdoc_files:
 files:
 - README.md
 - bin/hiptest-publisher
-- lib/config/csharp.conf
+- lib/config/csharp-nunit.conf
 - lib/config/cucumber-java.conf
-- lib/config/cucumber.conf
+- lib/config/cucumber-ruby.conf
+- lib/config/java-junit.conf
 - lib/config/java-testng.conf
-- lib/config/java.conf
 - lib/config/javascript-jasmine.conf
-- lib/config/javascript.conf
-- lib/config/python.conf
+- lib/config/javascript-qunit.conf
+- lib/config/python-unittest.conf
 - lib/config/robotframework.conf
 - lib/config/ruby-minitest.conf
-- lib/config/ruby.conf
+- lib/config/ruby-rspec.conf
 - lib/config/seleniumide.conf
 - lib/config/specflow.conf
 - lib/hiptest-publisher.rb
@@ -265,6 +265,7 @@ files:
 - lib/hiptest-publisher/options_parser.rb
 - lib/hiptest-publisher/parameter_type_adder.rb
 - lib/hiptest-publisher/parent_adder.rb
+- lib/hiptest-publisher/project_grapher.rb
 - lib/hiptest-publisher/render_context_maker.rb
 - lib/hiptest-publisher/renderer.rb
 - lib/hiptest-publisher/signature_differ.rb
@@ -527,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.