smith 0.6.5.1 → 0.6.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e19b548b13abaa3401c8f90ac764f02d55d0e3
-  data.tar.gz: dd521bbdd079d43906581c451eabc27b6734d0a2
+  metadata.gz: 28e4e29c427b83d0923d75bdf2789e01dfec90ff
+  data.tar.gz: ec4ecc625c7c52fc8079d9eb9e97bb5c56af40fb
 SHA512:
-  metadata.gz: 08947494f7f7c93c667a47b3649d9745fc92105441838950f3ca614becd7dfe53696ecc4623d573c93642e30a6005aa765308466727cfe90b299ea6419223454
-  data.tar.gz: a279693c851d0cbf971a656c967afff5ac65fce1b3657294a947a74df6c3c20aa20bef5aed4624426a3578dd6fffb2f574558a0127d3d0e5b113edc1b4ca8a35
+  metadata.gz: a8d70474e776f60812b052223c253790e4e29ef69b48dfda51dc52513bffa3798b2135db4759131ea9174fa10ec70895f9ffbc4b0aa5852ff2c26c0d869183d9
+  data.tar.gz: 4658f5f3d511ad13374cf4fc99cddd46a10aaa483f846acfacf5c61aeae5c170ef95002015d85a36d954b0cada657b84c4ab9145bc9d39566c52b81a1eeff592

data/lib/smith/commands/smithctl/push.rb

@@ -28,14 +28,24 @@ module Smith
               end
             else
               on_work = ->(message, iter) do
-                begin
-                  sender.publish(json_to_payload(message, options[:type])) do
-                    iter.next
+
+                error_handler = -> (e) do
+                  if options[:no_fail]
+                    logger.error { "#{e} #{message.strip}" }
+                    iter.call
+                  else
+                    blk.call(e.message)
                   end
+                end
+
+                sender.on_serialisation_error do |e, _|
+                  error_handler.call(e)
+                end
+
+                begin
+                  sender.publish(json_to_payload(message, options[:type]), &iter)
                 rescue MultiJson::DecodeError => e
-                  blk.call("Json error: #{e.message}")
-                rescue ACL::Error => e
-                  blk.call(e.message)
+                  error_handler.call(e)
                 end
               end
 
@@ -87,6 +97,7 @@ module Smith
         opt :reply,   "set a reply listener.", :short => :r
         opt :timeout, "timeout when waiting for a reply", :type => :integer, :depends => :reply, :default => Smith.config.smith.timeout
         opt :dynamic, "send message to a dynamic queue", :type => :boolean, :default => false, :short => :d
+        opt :no_fail, "continue to process input data if there is an error", :type => :boolean, :default => false
 
         conflicts :reply, :number, :file
         conflicts :message, :file

data/lib/smith/messaging/sender.rb

@@ -79,6 +79,13 @@ module Smith
         @timeout = Timeout.new(timeout || Smith.config.smith.timeout, &blk)
       end
 
+      # Called if there is a problem serialising an ACL.
+      # @yield [blk] block to run when there is an error.
+      # @yieldparam [Proc] the publish callback.
+      def on_serialisation_error(&blk)
+        @on_serialisation_error = blk
+      end
+
       # Set up a listener that will receive replies from the published
       # messages. You must publish with intent to reply -- tee he.
       #
@@ -179,7 +186,15 @@ module Smith
         type = @acl_type_cache.get_by_type(message.class)
 
         @exchange_completion.completion do |exchange|
-          exchange.publish(message.to_s, opts.merge(:type => type), &blk)
+          begin
+            exchange.publish(message.to_s, opts.merge(:type => type), &blk)
+          rescue Protobuf::SerializationError => e
+            if @on_serialisation_error
+              @on_serialisation_error.call(e, blk)
+            else
+              raise ACL::Error.new(e)
+            end
+          end
         end
       end
 

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.5.1"
+  VERSION = "0.6.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.5.1
+  version: 0.6.5.2
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: gdbm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: murmurhash3
   requirement: !ruby/object:Gem::Requirement