magellan-gcs-proxy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbfdc826b779db7cec5c24192988e35247c56e33
-  data.tar.gz: 56879281961eebe651ac777a034505bb8cb060b7
+  metadata.gz: 8b318e66fc008a5c8b62110610219509a0b32edf
+  data.tar.gz: 15d802d7b358ea6f8a6be0802c038372ea7eda28
 SHA512:
-  metadata.gz: 67dccc48b4ab362d2090cf1f82d2a2caa16201fbdf053e15e97ea89b94f03c6bd7deaeaec741321dfc92ce877aa2535a47dce84ba08e67cf2a252db94cbb0a5b
-  data.tar.gz: b5c10a2f63c1ed87498d92ad40d7a1882c49e8dae503f61b34d98c317b1abd6909cdea858dd48e13c105ad660c20674c33be8b8575d2ebe03fcf2cdd371ab84c
+  metadata.gz: c682dcf84498989de79b73208ac2481196e6900e303d7028bb8b385f5a165046769359ccf5b550d8209220c0d535286cd7611581b8de64e2229ebe8ff4411439
+  data.tar.gz: eb9f9661ce1afa3517f77c7abb76c8e52fa3e43a16da1157d17b5d9a9212a40546aec23feeda79cbbfb6ce6942737c3ea5dc0b6500b1a71d067d2a2f3a3452ae

data/.rubocop.yml

@@ -1,6 +1,12 @@
+AllCops:
+  DisplayCopNames: true
+
 Style/Documentation:
   Enabled: false
 
+Style/GuardClause:
+  Enabled: false
+
 LineLength:
   Max: 130
 

data/example/Gemfile.lock

@@ -12,10 +12,10 @@ GEM
     coderay (1.1.1)
     debug_inspector (0.0.2)
     digest-crc (0.4.1)
-    dotenv (2.1.2)
+    dotenv (2.2.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.9.20)
+    google-api-client (0.9.28)
       addressable (~> 2.3)
       googleauth (~> 0.5)
       httpclient (~> 2.7)
@@ -66,7 +66,7 @@ GEM
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    magellan-gcs-proxy (0.3.1)
+    magellan-gcs-proxy (0.3.2)
       dotenv
       google-cloud-logging
       google-cloud-storage

data/lib/magellan/gcs/proxy/cli.rb

@@ -9,6 +9,9 @@ require 'logger_pipe'
 module Magellan
   module Gcs
     module Proxy
+      class BuildError < StandardError
+      end
+
       class Cli
         include Log
 
@@ -35,30 +38,67 @@ module Magellan
           verbose("Backtrace\n  " << e.backtrace.join("\n  "))
         end
 
-        TOTAL = 14
+        PROCESSING     =  1
+        DOWNLOADING    =  2
+        DOWNLOAD_OK    =  3
+        DOWNLOAD_ERROR =  4
+        EXECUTING      =  5
+        EXECUTE_OK     =  6
+        EXECUTE_ERROR  =  7
+        UPLOADING      =  8
+        UPLOAD_OK      =  9
+        UPLOAD_ERROR   = 10
+        ACKSENDING     = 11
+        ACKSEND_OK     = 12
+        ACKSEND_ERROR  = 13
+        CLEANUP        = 14
+
+        TOTAL = CLEANUP
+
         def process(msg)
           context = Context.new(msg)
-          context.notify(1, TOTAL, "Processing message: #{msg.inspect}")
+          context.notify(PROCESSING, TOTAL, "Processing message: #{msg.inspect}")
           context.setup do
-            context.process_with_notification([2, 3, 4], TOTAL, 'Download', &:download)
+            context.process_with_notification([DOWNLOADING, DOWNLOAD_OK, DOWNLOAD_ERROR], TOTAL, 'Download', &:download)
 
-            cmd = build_command(context)
+            cmd = build_command_with_error(context)
+            return unless cmd
 
             exec = ->(*) { LoggerPipe.run(logger, cmd, returns: :none, logging: :both, dry_run: Proxy.config[:dryrun]) }
-            context.process_with_notification([5, 6, 7], TOTAL, 'Command', exec) do
-              context.process_with_notification([8, 9, 10], TOTAL, 'Upload', &:upload)
+            context.process_with_notification([EXECUTING, EXECUTE_OK, EXECUTE_ERROR], TOTAL, 'Command', exec) do
+              context.process_with_notification([UPLOADING, UPLOAD_OK, UPLOAD_ERROR], TOTAL, 'Upload', &:upload)
 
-              context.process_with_notification([11, 12, 13], TOTAL, 'Acknowledge') do
+              context.process_with_notification([ACKSENDING, ACKSEND_OK, ACKSEND_ERROR], TOTAL, 'Acknowledge') do
                 msg.acknowledge!
               end
             end
           end
-          context.notify(14, TOTAL, 'Cleanup')
+          context.notify(CLEANUP, TOTAL, 'Cleanup')
+        end
+
+        def build_command_with_error(context)
+          return build_command(context)
+        rescue BuildError => e
+          err = "[#{e.class.name}] #{e.message} with message: #{context.message.inspect}, the message will be acknowledged"
+          context.notify(EXECUTE_ERROR, TOTAL, e.message)
+          logger.error(err)
+          context.message.acknowledge! # Send ACK not to process this message again
+          return nil
         end
 
         def build_command(context)
           msg_wrapper = MessageWrapper.new(context)
-          ExpandVariable.expand_variables(cmd_template, msg_wrapper)
+          r = ExpandVariable.expand_variables(cmd_template, msg_wrapper)
+          if commands = Proxy.config[:commands]
+            if template = commands[r]
+              msg_wrapper = MessageWrapper.new(context)
+              return ExpandVariable.expand_variables(template, msg_wrapper)
+            else
+              raise BuildError, "Invalid command key #{r.inspect} was given"
+            end
+          else
+            return r
+          end
         end
       end
     end

data/lib/magellan/gcs/proxy/expand_variable.rb

@@ -44,11 +44,19 @@ module Magellan
 
             case value
             when String then quote_string ? value.to_s : value
-            when Array then value.flatten.join(' ')
+            when Array, Hash then flatten(value).join(' ')
             else value.to_s
             end
           end
         end
+
+        def flatten(obj)
+          case obj
+          when Array then obj.map { |i| flatten(i) }
+          when Hash then flatten(obj.values)
+          else obj
+          end
+        end
       end
     end
   end

data/lib/magellan/gcs/proxy/version.rb

@@ -1,7 +1,7 @@
 module Magellan
   module Gcs
     module Proxy
-      VERSION = '0.3.1'.freeze
+      VERSION = '0.3.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-gcs-proxy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv