hiptest-publisher 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ff41b7c9dc93dcb8b49350c24f3136a85f894f
-  data.tar.gz: bc289f734743edfc2f747b70228e2d91e8a55101
+  metadata.gz: bb180aab27561c616c4d10b1593c31e5765fb97b
+  data.tar.gz: 586b13fb3e4c2a5de599898600704cfafa8779da
 SHA512:
-  metadata.gz: ca7ebf3223fea589aff7178c6ca1d4c9ac82ae774f5e4d0265a7e5f13f8af7cd5f9b41915a6cc5e2ec2f3b26a8bebb8e93fbcc20a805e984927e19f5908287a3
-  data.tar.gz: 455b088226407bce83772840057b52b7472a19b1ca5d6db27e234e0e6ed5f9705374b0436b8eb99650a9dd7b8996cd5e03301beaf0a054c2de0ff2280398df10
+  metadata.gz: e835abd1107cc0b1b54d8bc402359e4b56fe4251950c4cef4c80494d480fa3cb90683e66cfe1a50c3177d27aa31a773d2bb55a7c1606fb8d24dd297603783fa7
+  data.tar.gz: 70a1ce1c7bc5484856c59a14ae5bb7d8abfe596af718624c6efcf4b18fa897b91b03300459c9378ae70a9803d2ad8e2c2b8ddf072318ad2a6c15208adea7d983

data/lib/hiptest-publisher.rb

@@ -1,6 +1,7 @@
 require 'colorize'
 require 'yaml'
 
+require 'hiptest-publisher/formatters/reporter'
 require 'hiptest-publisher/string'
 require 'hiptest-publisher/utils'
 require 'hiptest-publisher/options_parser'
@@ -13,8 +14,11 @@ require 'hiptest-publisher/signature_differ'
 
 module Hiptest
   class Publisher
+    attr_reader :reporter
+
     def initialize(args)
-      @options = OptionsParser.parse(args)
+      @reporter = Reporter.new
+      @options = OptionsParser.parse(args, reporter)
     end
 
     def run
@@ -50,12 +54,12 @@ module Hiptest
     rescue Exception => err
       show_status_message "Fetching data from Hiptest", :failure
       puts "Unable to open the file, please check that the token is correct".red
-      trace_exception(err) if @options.verbose
+      reporter.dump_error(err)
     end
 
     def get_project(xml)
       show_status_message "Extracting data"
-      parser = Hiptest::XMLParser.new(xml, @options)
+      parser = Hiptest::XMLParser.new(xml, reporter)
       show_status_message "Extracting data", :success
 
       return parser.build_project
@@ -72,10 +76,14 @@ module Hiptest
         show_status_message status_message, :success
       rescue Exception => err
         show_status_message status_message, :failure
-        trace_exception(err) if @options.verbose
+        reporter.dump_error(err)
       end
     end
 
+    def add_listener(listener)
+      reporter.add_listener(listener)
+    end
+
     def write_node_to_file(path, node, context, message)
       write_to_file(path, message) do
         Hiptest::Renderer.render(node, @options.language, context)
@@ -148,7 +156,7 @@ module Hiptest
         show_status_message("Loading previous definition", :success)
       rescue Exception => err
         show_status_message("Loading previous definition", :failure)
-        trace_exception(err) if @options.verbose
+        reporter.dump_error(err)
       end
 
       @language_config = LanguageConfigParser.new(@options)
@@ -251,7 +259,7 @@ module Hiptest
         show_status_message(status_message, :success)
       rescue Exception => err
         show_status_message(status_message, :failure)
-        trace_exception(err) if @options.verbose
+        reporter.dump_error(err)
       end
     end
   end

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

@@ -0,0 +1,25 @@
+require 'hiptest-publisher/utils'
+
+class ConsoleFormatter
+  attr_reader :verbose
+
+  def initialize(verbose)
+    @verbose = verbose
+  end
+
+  def dump_error(error, message = nil)
+    return unless verbose
+    puts message.blue if message
+    line = "-" * 80
+    puts line.yellow
+    puts "#{error.class.name}: #{error.message}".red
+    puts "#{error.backtrace.map {|l| "  #{l}\n"}.join}".yellow
+    puts line.yellow
+  end
+
+  def show_options(options)
+    return unless verbose
+    puts "Running Hiptest-publisher #{hiptest_publisher_version} with:".yellow
+    options.each { |k, v| puts " - #{k}: #{v}".white }
+  end
+end

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

@@ -0,0 +1,28 @@
+
+
+class Reporter
+  def initialize
+    @listeners = []
+  end
+
+  def add_listener(listener)
+    @listeners << listener
+  end
+
+  def dump_error(error, message = nil)
+    @listeners.each do |listener|
+      listener.dump_error(error, message)
+    end
+  end
+
+  def show_options(options)
+    @listeners.each do |listener|
+      listener.show_options(options)
+    end
+  end
+end
+
+class NullReporter
+  def method_missing(*args)
+  end
+end

data/lib/hiptest-publisher/options_parser.rb

@@ -2,10 +2,11 @@ require 'optparse'
 require 'parseconfig'
 require 'ostruct'
 
+require 'hiptest-publisher/formatters/console_formatter'
 require 'hiptest-publisher/utils'
 
 class FileConfigParser
-  def self.update_options(options)
+  def self.update_options(options, reporter)
     config = ParseConfig.new(options.config)
     config.get_params.each do |param|
       options.send("#{param}=", config[param])
@@ -13,7 +14,7 @@ class FileConfigParser
     options
 
   rescue Exception => err
-    trace_exception(err) if options.verbose
+    reporter.dump_error(err)
     options
   end
 end
@@ -98,7 +99,7 @@ class OptionsParser
     ]
   end
 
-  def self.parse(args)
+  def self.parse(args, reporter)
     options = OpenStruct.new
     opt_parser = OptionParser.new do |opts|
       opts.version = hiptest_publisher_version if hiptest_publisher_version
@@ -138,17 +139,13 @@ class OptionsParser
     end
 
     opt_parser.parse!(args)
-    FileConfigParser.update_options options
+    reporter.add_listener(ConsoleFormatter.new(options.verbose))
+    FileConfigParser.update_options(options, reporter)
 
-    show_options(options) if options.verbose
+    reporter.show_options(options.marshal_dump)
     options
   end
 
-  def self.show_options(options)
-    puts "Running Hiptest-publisher with:".yellow
-    options.marshal_dump.each { |k, v| puts " - #{k}: #{v}".white }
-  end
-
   def self.make_language_option(lang, framework = '')
     lang_opt = "--language=#{lang.downcase.gsub(' ', '')}"
     framework_opt = "--framework=#{framework.downcase.gsub(' ', '')}"

data/lib/hiptest-publisher/utils.rb

@@ -12,7 +12,7 @@ end
 def hiptest_publisher_version
   Gem.loaded_specs['hiptest-publisher'].version.to_s
 rescue
-  File.read("#{hiptest_publisher_path}/VERSION") if File.exists?("#{hiptest_publisher_path}/VERSION")
+  File.read("#{hiptest_publisher_path}/VERSION").strip if File.exists?("#{hiptest_publisher_path}/VERSION")
 end
 
 def pluralize(count, singular)
@@ -44,14 +44,6 @@ def fetch_project_export(options)
   open(url, :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
 end
 
-def trace_exception(exception)
-  line = "-" * 80
-  puts line.yellow
-  puts "#{exception.class.name}: #{exception.message}".red
-  puts "#{exception.backtrace.map {|l| "  #{l}\n"}.join}".yellow
-  puts line.yellow
-end
-
 def show_status_message(message, status=nil)
   status_icon = " "
   line_end = status.nil? ? "" : "\n"

data/lib/hiptest-publisher/xml_parser.rb

@@ -3,15 +3,16 @@ require 'colorize'
 
 require_relative 'nodes'
 require_relative 'utils'
+require_relative 'formatters/reporter'
 
 module Hiptest
   class XMLParser
     attr_reader :project
 
-    def initialize(source, options = nil)
+    def initialize(source, reporter = nil)
       @source = source
       @xml = Nokogiri::XML(source)
-      @options = options
+      @reporter = reporter || NullReporter.new
     end
 
     def build_nullliteral(value = nil)
@@ -317,11 +318,9 @@ module Hiptest
         return default_node.new
       end
       self.send("build_#{node.name}", node)
-    rescue Exception => exception
-      if @options && @options.verbose
-        puts "Unable to build: \n#{node}".blue
-        trace_exception(exception)
-      end
+    rescue => error
+      @reporter.dump_error(error, "Unable to build: \n#{node}")
+      nil
     end
 
     def build_node_list(l, container_class=nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -260,6 +260,8 @@ files:
 - lib/hiptest-publisher.rb
 - lib/hiptest-publisher/actionword_indexer.rb
 - lib/hiptest-publisher/call_arguments_adder.rb
+- lib/hiptest-publisher/formatters/console_formatter.rb
+- lib/hiptest-publisher/formatters/reporter.rb
 - lib/hiptest-publisher/gherkin_adder.rb
 - lib/hiptest-publisher/handlebars_helper.rb
 - lib/hiptest-publisher/nodes.rb
@@ -514,7 +516,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.