hiptest-publisher 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1056cc45510dac48067122241a68934a61085bda
-  data.tar.gz: 4f3138eeb3df795a6ac4dd5b45187657b35e80ee
+  metadata.gz: 2a877b09d5680c92090947262c403126a97a83d8
+  data.tar.gz: cd24230a8f4c7222ab715fa7c39ad39c7043e728
 SHA512:
-  metadata.gz: ae34a4ca108dcd3c0bfabd34f6369ef1ff52766e2f60d8c9479dbcad15dba913881638f2b5408ccb3fffc1d4b3566c81e530ca2b222b625182a15c1b1db43e9d
-  data.tar.gz: 7df5447feb46498086727bdbc5cec26358b3da6fc3644f72cc52b2a10f1483f16e6ee8c5bf8f144755a099fb1b0b2bddb782fff8275976540b9414258a11525b
+  metadata.gz: d92b261bc905cd83133a3c5beb70a4d8a79a0af30b2bb6561b71a09370663cbd51bd0055095f689d480c7251acb26976c99afe4d9c593d75ac675d76e4d88faf
+  data.tar.gz: 9871151e896f7900e13f968495235b21d80cacb9a5d67a9f4ef0181738c48b60f4c54f930c428cbab9252f0136303b911ed45b8140634855d91722e27ec618eb

data/lib/hiptest-publisher.rb

@@ -1,5 +1,4 @@
 require 'colorize'
-require 'fileutils'
 require 'json'
 require 'yaml'
 
@@ -9,6 +8,7 @@ require 'hiptest-publisher/client'
 require 'hiptest-publisher/datatable_fixer'
 require 'hiptest-publisher/diff_displayer'
 require 'hiptest-publisher/formatters/reporter'
+require 'hiptest-publisher/file_writer'
 require 'hiptest-publisher/gherkin_adder'
 require 'hiptest-publisher/handlebars_helper'
 require 'hiptest-publisher/items_orderer'
@@ -30,6 +30,8 @@ module Hiptest
       @reporter = Reporter.new(listeners)
       @cli_options = OptionsParser.parse(args, reporter)
       @client = Hiptest::Client.new(@cli_options, reporter)
+      @file_writer = Hiptest::FileWriter.new(@reporter)
+
       # pass false to prevent hiptest-publisher from exiting, useful when used embedded
       @exit_on_bad_arguments = exit_on_bad_arguments
     end
@@ -94,7 +96,7 @@ module Hiptest
       if @exit_on_bad_arguments == false # means we are embedded in hiptest-publisher
         raise
       end
-    rescue Exception => err
+    rescue => err
       puts ("An error has occured, sorry for the inconvenience.\n" +
         "Try running the command again with --verbose for detailed output").red
       reporter.dump_error(err)
@@ -105,21 +107,13 @@ module Hiptest
         parser = Hiptest::XMLParser.new(xml, reporter)
         return parser.build_project
       end
-    rescue Exception => err
+    rescue => err
       reporter.dump_error(err)
     end
 
     def write_to_file(path, message, ask_overwrite: false)
       return if ask_overwrite && !overwrite_file?(path)
-
-      reporter.with_status_message "#{message}: #{path}" do
-        mkdirs_for(path)
-        File.open(path, 'w') do |file|
-          file.write(yield)
-        end
-      end
-    rescue Exception => err
-      reporter.dump_error(err)
+      @file_writer.write_to_file(path, message) { yield }
     end
 
     def overwrite_file?(path)
@@ -137,12 +131,6 @@ module Hiptest
       end
     end
 
-    def mkdirs_for(path)
-      unless Dir.exists?(File.dirname(path))
-        FileUtils.mkpath(File.dirname(path))
-      end
-    end
-
     def add_listener(listener)
       reporter.add_listener(listener)
     end
@@ -192,8 +180,8 @@ module Hiptest
     end
 
     def show_actionwords_diff
-      Hiptest::DiffDisplayer.new(compute_actionwords_diff, @cli_options, @language_config).display
-    rescue Exception => err
+      Hiptest::DiffDisplayer.new(compute_actionwords_diff, @cli_options, @language_config, @file_writer).display
+    rescue => err
       reporter.dump_error(err)
     end
 
@@ -281,7 +269,7 @@ module Hiptest
       end
 
       display_empty_push_help if passed_count == 0
-    rescue Exception => err
+    rescue => err
       reporter.dump_error(err)
     end
 

data/lib/hiptest-publisher/client.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'json'
 require 'net/http'
 require 'uri'
@@ -43,15 +44,17 @@ module Hiptest
       options = []
 
       mapping.each do |key, filter_name|
-        value = @cli_options.send(key)
+        value = @cli_options[key]
         next if value.nil? || value.empty?
 
         if [:filter_on_scenario_ids, :filter_on_folder_ids, :filter_on_tags].include?(key)
-          value = value.split(',').map(&:strip).join(',')
+          value = value.split(',').map(&:strip).map{ |s| ERB::Util.url_encode(s) }.join(',')
+        else
+          value = ERB::Util.url_encode(value)
         end
 
         options << "#{filter_name}=#{value}"
-        if [:filter_on_folder_ids, :filter_on_folder_name].include?(key) && @cli_options.send(:not_recursive)
+        if [:filter_on_folder_ids, :filter_on_folder_name].include?(key) && @cli_options[:not_recursive]
           options << "not_recursive=true"
         end
       end

data/lib/hiptest-publisher/diff_displayer.rb

@@ -1,12 +1,14 @@
 module Hiptest
   class DiffDisplayer
-    def initialize(diff, cli_options, language_config)
+    def initialize(diff, cli_options, language_config, file_writer)
       @diff = diff
       @cli_options = cli_options
       @language_config = language_config
+      @file_writer = file_writer
     end
 
     def display
+      return export_as_json if @cli_options.actionwords_diff_json && @cli_options.output_directory
       return display_as_json if @cli_options.actionwords_diff_json
       return display_deleted if @cli_options.aw_deleted
       return display_created if @cli_options.aw_created
@@ -45,6 +47,14 @@ module Hiptest
       })
     end
 
+    def export_as_json
+      @file_writer.write_to_file(
+        "#{@cli_options.output_directory}/actionwords-diff.json",
+        "Exporting actionwords diff") {
+        JSON.pretty_generate(as_api)
+      }
+    end
+
     def display_as_json
       output(JSON.pretty_generate(as_api))
     end

data/lib/hiptest-publisher/file_writer.rb

@@ -0,0 +1,30 @@
+require 'fileutils'
+
+module Hiptest
+  class FileWriter
+    def initialize(reporter)
+      @reporter = reporter
+    end
+
+    def write_to_file(path, message)
+      @reporter.with_status_message "#{message}: #{path}" do
+        mkdirs_for(path)
+        content = yield
+
+        File.open(path, 'w') do |file|
+          file.write(content)
+        end
+      end
+    rescue => err
+      reporter.dump_error(err)
+    end
+
+    private
+
+    def mkdirs_for(path)
+      unless Dir.exists?(File.dirname(path))
+        FileUtils.mkpath(File.dirname(path))
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -253,6 +253,7 @@ files:
 - lib/hiptest-publisher/client.rb
 - lib/hiptest-publisher/datatable_fixer.rb
 - lib/hiptest-publisher/diff_displayer.rb
+- lib/hiptest-publisher/file_writer.rb
 - lib/hiptest-publisher/formatters/console_formatter.rb
 - lib/hiptest-publisher/formatters/reporter.rb
 - lib/hiptest-publisher/gherkin_adder.rb