hiptest-publisher 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a019b7a966bc8e817af252b26d62b85e8cf580
-  data.tar.gz: e5315516c9b1bfc5811f1aed60916a454c8ea9ff
+  metadata.gz: f9e228fe6ad2d7d881b36f26840b36913e85ea67
+  data.tar.gz: ad6e0391043d4151aca6baa465c866f1b11cd391
 SHA512:
-  metadata.gz: 2152d5efb59c969192fedb859d2103654e7a6ae149e29fdac635c285b7f9b02ce726d3fa1498bf8e96b03926aca2d05cda910da6211c013f478da732960142b7
-  data.tar.gz: f7a86d49243f8705be44f725143f895c55c93a772e24d95ff5afbab03a8bb579930dfe9512cf0fca3ba5866a550a6b1d1f90503f85dea9f37ec86e994001708c
+  metadata.gz: fdc24c2b0d4d1ea01805a449da06baa669baa3255b1ac3264a46e4473d5dccbbf77d2ffdb3b1c89f4dcb44f29fdb7f6fa8ac1ec7672f3418197a7abf7791ee87
+  data.tar.gz: 94126113d32073c041da4d95258af402efd57b741850cf2ef9ff7d8d7929c706cb3b2f2b6ee4d1ef233c24e589eae34ec9b7968f41fd6b1086572c98308fb18d

data/lib/hiptest-publisher/cli_options_checker.rb

@@ -12,22 +12,34 @@ module Hiptest
     end
 
     def check!
-      # ensure config file was readable if specified
-      begin
-        ParseConfig.new(cli_options.config) if present?(cli_options.config)
-      rescue Errno::EACCES => err
-        raise CliOptionError, "Error with --config: the file \"#{cli_options.config}\" does not exist or is not readable"
-      end
+      check_config_file
 
       if cli_options.only == 'list'
         return
       end
 
+      check_secret_token
+
       if push?(cli_options)
-        return
+        check_push_file
+      else
+        check_output_directory
+        check_actionwords_signature_file
+        check_xml_file
+        check_test_run_id
+        check_language_and_only
       end
+    end
 
-      # secret token
+    def check_config_file
+      begin
+        ParseConfig.new(cli_options.config) if present?(cli_options.config)
+      rescue Errno::EACCES => err
+        raise CliOptionError, "Error with --config: the file \"#{cli_options.config}\" does not exist or is not readable"
+      end
+    end
+
+    def check_secret_token
       if absent?(cli_options.xml_file)
         if absent?(cli_options.token)
           raise CliOptionError, [
@@ -45,8 +57,24 @@ module Hiptest
           raise CliOptionError, "Invalid format --token=\"#{@cli_options.token}\": the project secret token must be numeric"
         end
       end
+    end
 
-      # output directory
+    def check_push_file
+      if cli_options.push
+        globbed_files = Dir.glob(cli_options.push)
+        if globbed_files.length == 0
+          raise CliOptionError, "Error with --push: the file \"#{cli_options.push}\" does not exist or is not readable"
+        elsif globbed_files.length == 1 && globbed_files == [cli_options.push]
+          if !File.readable?(cli_options.push)
+            raise CliOptionError, "Error with --push: the file \"#{cli_options.push}\" does not exist or is not readable"
+          elsif !File.file?(cli_options.push)
+            raise CliOptionError, "Error with --push: the file \"#{cli_options.push}\" is not a regular file"
+          end
+        end
+      end
+    end
+
+    def check_output_directory
       parent = first_existing_parent(cli_options.output_directory)
       if !parent.writable?
         if parent.realpath === Pathname.new(cli_options.output_directory).cleanpath
@@ -57,8 +85,10 @@ module Hiptest
       elsif !parent.directory?
         raise CliOptionError, "Error with --output-directory: the file \"#{@cli_options.output_directory}\" is not a directory"
       end
+    end
+
 
-      # actionwords signature file
+    def check_actionwords_signature_file
       if cli_options.actionwords_diff?
         actionwords_signature_file = Pathname.new(cli_options.output_directory).join("actionwords_signature.yaml")
         if actionwords_signature_file.directory?
@@ -71,8 +101,9 @@ module Hiptest
           ].join("\n")
         end
       end
+    end
 
-      # xml file
+    def check_xml_file
       if cli_options.xml_file
         if !File.readable?(cli_options.xml_file)
           raise CliOptionError, "Error with --xml-file: the file \"#{cli_options.xml_file}\" does not exist or is not readable"
@@ -80,13 +111,15 @@ module Hiptest
           raise CliOptionError, "Error with --xml-file: the file \"#{cli_options.xml_file}\" is not a regular file"
         end
       end
+    end
 
-      # test run id
+    def check_test_run_id
       if present?(cli_options.test_run_id) && !numeric?(cli_options.test_run_id)
         raise CliOptionError, "Invalid format --test-run-id=\"#{@cli_options.test_run_id}\": the test run id must be numeric"
       end
+    end
 
-      # language and --only
+    def check_language_and_only
       if present?(cli_options.language)
         begin
           language_config_parser = LanguageConfigParser.new(cli_options)

data/lib/hiptest-publisher/utils.rb

@@ -75,6 +75,7 @@ def show_status_message(message, status=nil)
   else
     return unless $stdout.tty?
     rows, columns = IO.console.winsize
+    return if columns == 0
     vertical_offset = (4 + message.length) / columns
     cursor_offset = "\r\e[#{vertical_offset + 1}A"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize