ffwd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDVjYzRkYTc0NTYwNTJmMTBlOWM1ZDU1YWRjODM2ODQ1ZjMxMGEzOA==
-  data.tar.gz: !binary |-
-    ZDFiNGFkOTM3NmZmZGYyMTEwZDc5YmI2NDNjYTMwNGMwNDg0ZDk4Yw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDY3YmI4NjJiMTRjZDAxZmNjMWYxZTg2NGUxM2VhYzhkOWI0OThiZDA1MTdm
-    NjBjNTk0YjZmZWFhMjI1ZmUwMjJmMDI0ZmExNmU0OTE3MjM2OWNkMWNiNzkz
-    ZWMyNWNmOWJkMjMzZDhkODllMjdmMzVhZjc4MWQ2NTE5YTIwNGY=
-  data.tar.gz: !binary |-
-    ZWQ1NDRjOTljNTE3ZWY0NzNjMTNjNTM2NmUzYTE2NjE5YmRiNWY3NjkxZWYx
-    MDczNmViZTBlYjVjNjA2Mjg5Y2VjZDNjNGFkODI2NDU4MjE5Yjk3NTBmNjMy
-    OWZjODA0NGQ5ZmQ1OTFkM2U4ZjEzZGMwYTcyYmMxOWI3ZWYyMWU=
+SHA1:
+  metadata.gz: 51775a59c73dd9be7d21c447c82b07114e9d8873
+  data.tar.gz: 0ea15ca035581520ede8c982abba0b91693b9faf
+SHA512:
+  metadata.gz: 0eed13b83347cf1bec2d5b31b1a3a91d453d7108dc04a1f7e86910ec1751fb31f9b82f92343a8a25728a0c8da63740e36bfb8b1a488d7d42d95d2762fa29b410
+  data.tar.gz: de52f3fa7891f164f457683cd5536f07c5ed9a1ffe098198605a3a8c51660966c19ddc0adb8037472d03ff645b0230fc97f132f2fe9c64b6c9acd88a7e6a699c

data/lib/em/protocols/frame_object_protocol.rb

@@ -0,0 +1,78 @@
+# $LICENSE
+# Copyright 2013-2014 Spotify AB. All rights reserved.
+#
+# The contents of this file are licensed under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module EventMachine
+  module Protocols
+    # FrameObjectProtocol is a reimplementation of ObjectProtocol suitable for UDP
+    #
+    #  module RubyServer
+    #    include EM::P::FrameObjectProtocol
+    #
+    #    def receive_object obj
+    #      send_object({'you said' => obj})
+    #    end
+    #  end
+    #
+    module FrameObjectProtocol
+      # By default returns Marshal, override to return JSON or YAML, or any
+      # other serializer/deserializer responding to #dump and #load.
+      def serializer
+        Marshal
+      end
+
+      # @private
+      def receive_data data
+        p data
+
+        begin
+          if data.size < 4
+            raise "Received invalid datagram, datagram way too small"
+          end
+
+          size=data.unpack('N').first
+
+          if data.size != 4+size
+            actual_size = data.size-4
+            raise "Received invalid datagram: expected size=#{size}, actual size=#{actual_size}"
+          end
+
+          obj = serializer.load data[4..-1]
+        rescue => e
+          handle_exception(data, e)
+          return
+        end
+
+        p obj
+        receive_object obj
+      end
+
+      # Invoked with ruby objects received over the network
+      def receive_object obj
+        # stub
+      end
+
+      # Sends a ruby object over the network
+      def send_object obj
+        data = serializer.dump(obj)
+        send_data [data.respond_to?(:bytesize) ? data.bytesize : data.size, data].pack('Na*')
+      end
+
+      # Invoked whenever FrameObjectProtocol fails to deserialize an object
+      def handle_exception datagram, e
+        # stub
+      end
+    end
+  end
+end

data/lib/ffwd.rb

@@ -209,7 +209,7 @@ module FFWD
     puts ""
     puts "  2) Are your plugins loaded?"
     puts "  Check with:"
-    puts "    ffwd -c .. --list-plugins"
+    puts "    ffwd -c .. --plugins"
     puts ""
     puts "  3) Did any errors happen when loading the plugins?"
     puts "  Check with:"

data/lib/ffwd/logging.rb

@@ -86,6 +86,10 @@ module FFWD
       @progname = klass.name
     end
 
+    def debug?
+      FFWD.log.debug?
+    end
+
     def debug message
       FFWD.log.debug(@progname){message}
     end

data/lib/ffwd/utils.rb

@@ -43,4 +43,8 @@ module FFWD
     stop = Time.now
     ((stop - start) * 1000).round(3)
   end
+
+  def self.dump2hex data
+    data.bytes.map { |byte| byte.to_s(16) }.join
+  end
 end

data/lib/ffwd/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module FFWD
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - John-John Tedro
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: autoversion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -79,63 +79,64 @@ extra_rdoc_files: []
 files:
 - bin/fwc
 - bin/ffwd
+- lib/fwc.rb
 - lib/ffwd.rb
-- lib/em/all.rb
-- lib/ffwd/processor/count.rb
-- lib/ffwd/processor/histogram.rb
-- lib/ffwd/processor/rate.rb
-- lib/ffwd/event.rb
-- lib/ffwd/plugin_channel.rb
-- lib/ffwd/core/reporter.rb
-- lib/ffwd/core/processor.rb
-- lib/ffwd/core/emitter.rb
-- lib/ffwd/core/interface.rb
-- lib/ffwd/debug/monitor_session.rb
-- lib/ffwd/debug/tcp.rb
-- lib/ffwd/debug/connection.rb
-- lib/ffwd/utils.rb
-- lib/ffwd/reporter.rb
-- lib/ffwd/producing_client.rb
+- lib/ffwd/statistics.rb
 - lib/ffwd/processor.rb
-- lib/ffwd/retrier.rb
-- lib/ffwd/debug.rb
+- lib/ffwd/producing_client.rb
+- lib/ffwd/tunnel.rb
 - lib/ffwd/protocol.rb
-- lib/ffwd/metric.rb
-- lib/ffwd/core.rb
-- lib/ffwd/statistics/collector.rb
-- lib/ffwd/statistics/system_statistics.rb
-- lib/ffwd/version.rb
-- lib/ffwd/circular_buffer.rb
 - lib/ffwd/lifecycle.rb
+- lib/ffwd/debug/tcp.rb
+- lib/ffwd/debug/connection.rb
+- lib/ffwd/debug/monitor_session.rb
+- lib/ffwd/channel.rb
 - lib/ffwd/plugin/json.rb
 - lib/ffwd/plugin/log/writer.rb
 - lib/ffwd/plugin/log.rb
 - lib/ffwd/plugin/json/connection.rb
-- lib/ffwd/logging.rb
-- lib/ffwd/schema.rb
+- lib/ffwd/circular_buffer.rb
+- lib/ffwd/event.rb
+- lib/ffwd/statistics/system_statistics.rb
+- lib/ffwd/statistics/collector.rb
+- lib/ffwd/connection.rb
+- lib/ffwd/utils.rb
+- lib/ffwd/protocol/tcp.rb
 - lib/ffwd/protocol/tcp/bind.rb
 - lib/ffwd/protocol/tcp/plain_connect.rb
 - lib/ffwd/protocol/tcp/flushing_connect.rb
 - lib/ffwd/protocol/tcp/connection.rb
-- lib/ffwd/protocol/udp.rb
-- lib/ffwd/protocol/udp/connect.rb
 - lib/ffwd/protocol/udp/bind.rb
-- lib/ffwd/protocol/tcp.rb
-- lib/ffwd/channel.rb
+- lib/ffwd/protocol/udp/connect.rb
+- lib/ffwd/protocol/udp.rb
+- lib/ffwd/reporter.rb
 - lib/ffwd/plugin_loader.rb
-- lib/ffwd/schema/default.rb
 - lib/ffwd/schema/spotify100.rb
-- lib/ffwd/plugin.rb
+- lib/ffwd/schema/default.rb
+- lib/ffwd/metric_emitter.rb
+- lib/ffwd/schema.rb
 - lib/ffwd/event_emitter.rb
+- lib/ffwd/core/processor.rb
+- lib/ffwd/core/interface.rb
+- lib/ffwd/core/reporter.rb
+- lib/ffwd/core/emitter.rb
 - lib/ffwd/handler.rb
-- lib/ffwd/tunnel.rb
-- lib/ffwd/metric_emitter.rb
-- lib/ffwd/statistics.rb
-- lib/ffwd/connection.rb
-- lib/ffwd/tunnel/udp.rb
+- lib/ffwd/version.rb
+- lib/ffwd/core.rb
+- lib/ffwd/processor/rate.rb
+- lib/ffwd/processor/count.rb
+- lib/ffwd/processor/histogram.rb
+- lib/ffwd/debug.rb
+- lib/ffwd/retrier.rb
+- lib/ffwd/logging.rb
+- lib/ffwd/plugin_channel.rb
 - lib/ffwd/tunnel/tcp.rb
+- lib/ffwd/tunnel/udp.rb
 - lib/ffwd/tunnel/plugin.rb
-- lib/fwc.rb
+- lib/ffwd/plugin.rb
+- lib/ffwd/metric.rb
+- lib/em/protocols/frame_object_protocol.rb
+- lib/em/all.rb
 homepage: https://github.com/spotify/ffwd
 licenses:
 - Apache 2.0
@@ -146,12 +147,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []