zillabyte 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15d53f27ef23f801a1ed3d8df5bdb3b396563d2
-  data.tar.gz: fca12c613dc41e0871211a1ccfc0584506e790bc
+  metadata.gz: a1c3f711f2335104c92ae34197b9a4875f77b8c4
+  data.tar.gz: d968fdd0541084622825e66b6b72e1f210dfe77e
 SHA512:
-  metadata.gz: 85c838f6aa80db5a149ecd11076d084d747d2e2752052a5a916707031fb0b5e19b04e46d99b3a7b1ee5bb6af325a74772aefed128d3351c3f1cb24e0dc71da72
-  data.tar.gz: 1f8b1d150590ed7bc3e4614229598219133ca325059e85859383c35dedc2dccca562d54e42490674b400015e49d1387ffbc14c0b12697c075f531b86d12325e2
+  metadata.gz: daa7cef41dadd69a037d170aef8f4e593a0c85c1753748bc08ee10695fa85ede52fd67c791035a17db161bebd60f0453c3729e7ba60f2a4186fab3b11acd5c0e
+  data.tar.gz: c3822486731d90c2237ce428901e4606d65cf9f15ae393d6c3fcb83db0c03f689478fd80b6be945630e5d2ad4b03b77d5aaae72fdb2432568cb72f289d439096

data/ruby/lib/zillabyte/harness/app.rb

@@ -9,7 +9,11 @@ class Zillabyte::Harness::App < Zillabyte::Harness::Base
     Zillabyte::Harness::Helper.check_name("app", h._name, {})
     h._options = Zillabyte::Harness::Helper.opt_parser()
     if(h._options[:command] == :info)
-      h._socket = TCPSocket.new(h._options[:host], h._options[:port])
+      if h._options[:host]
+        h._socket = TCPSocket.new(h._options[:host], h._options[:port])
+      elsif h._options[:unix_socket]
+        h._socket = UNIXSocket.new(h._options[:unix_socket])
+      end
       info_hash = {"language" => "ruby", "name" => h._name, "flow_type" => "app", "multilang_version" => Zillabyte::VERSION}
       Zillabyte::Harness::Helper.write_hash_to_file(info_hash, h._socket)
     end
@@ -18,10 +22,11 @@ class Zillabyte::Harness::App < Zillabyte::Harness::Base
 
   def source(*args, &block)
     op = Zillabyte::Harness::OperationHandler.new(self, Zillabyte::Harness::Stream)
-    op.build_multilang_operation("source", *args, &block)
+    stream = op.build_multilang_operation("source", *args, &block)
       .add_operation_properties_to_info(:name, :type)
       .add_optional_operation_properties_to_info(:relation, :matches, :end_cycle_policy)
       .handle_operation
       .get_output_streams
+    return Zillabyte::Harness::StreamBuilder.new(stream)
   end 
 end

data/ruby/lib/zillabyte/harness/component.rb

@@ -8,7 +8,11 @@ class Zillabyte::Harness::Component < Zillabyte::Harness::Base
     Zillabyte::Harness::Helper.check_name("component", h._name, {})
     h._options = Zillabyte::Harness::Helper.opt_parser()
     if(h._options[:command] == :info)
-      h._socket = TCPSocket.new(h._options[:host], h._options[:port])
+      if h._options[:host]
+        h._socket = TCPSocket.new(h._options[:host], h._options[:port])
+      elsif h._options[:unix_socket]
+        h._socket = UNIXSocket.new(h._options[:unix_socket])
+      end
       info_hash = {"language" => "ruby", "name" => h._name, "flow_type" => "component", "multilang_version" => Zillabyte::VERSION}
       Zillabyte::Harness::Helper.write_hash_to_file(info_hash, h._socket)
     end
@@ -17,9 +21,10 @@ class Zillabyte::Harness::Component < Zillabyte::Harness::Base
 
   def inputs(*args, &block)
     op = Zillabyte::Harness::OperationHandler.new(self, Zillabyte::Harness::ComponentStream)
-    op.build_multilang_operation("component_input", *args, &block)
+    stream = op.build_multilang_operation("component_input", *args, &block)
       .add_operation_properties_to_info(:name, :type, :fields)
       .handle_operation
       .get_output_streams
+    return Zillabyte::Harness::StreamBuilder.new(stream)
   end
 end

data/ruby/lib/zillabyte/harness/each.rb

@@ -54,8 +54,8 @@ class Zillabyte::Harness::Each
   class Node < Zillabyte::Harness::CommonNode
     attr_accessor :_output_format, :_execute
 
-    def initialize()
-      @_name = "each_"+Zillabyte::Harness::Counter.get()
+    def initialize(*args)
+      @_name = args[0] || "each_"+Zillabyte::Harness::Counter.get()
       @_type = "each"
       @_output_format = :replace
     end
@@ -71,11 +71,11 @@ class Zillabyte::Harness::Each
 
   def initialize(app, *args)
     @_app = app
-    @_options = Zillabyte::Harness::Helper.get_options(args)
+    @_vector_options, @_options = Zillabyte::Harness::Helper.get_vector_and_hashes(args)
   end
 
   def build_node(&block)
-    @_node = Node.new
+    @_node = Node.new(*@_vector_options)
     # Does the block take 0 arguments? If so it's not just an execute block.
     if(block.arity == 0)
       @_node.instance_eval(&block)
@@ -95,9 +95,7 @@ class Zillabyte::Harness::Each
   end
 
   def run_operation
-    host = @_app._options[:host]
-    port = @_app._options[:port]
     c = Zillabyte::Harness::EachController.new(@_node, Zillabyte::Common::Progress.new)
-    c.run(host, port)
+    c.run(@_app._options)
   end
 end

data/ruby/lib/zillabyte/harness/filter.rb

@@ -51,7 +51,7 @@ class Zillabyte::Harness::Filter
 
   def initialize(app, *args)
     @_app = app
-    @_options = Zillabyte::Harness::Helper.get_options(args)
+    @_vector_options, @_options = Zillabyte::Harness::Helper.get_vector_and_hashes(args)
   end
 
   def build_node(&block)
@@ -75,10 +75,8 @@ class Zillabyte::Harness::Filter
   end
 
   def run_operation
-    host = @_app._options[:host]
-    port = @_app._options[:port]
     c = Zillabyte::Harness::FilterController.new(@_node, Zillabyte::Common::Progress.new)
-    c.run(host, port)
+    c.run(@_app._options)
   end
 
 end

data/ruby/lib/zillabyte/harness/group_by.rb

@@ -65,7 +65,7 @@ class Zillabyte::Harness::GroupBy
   def initialize(app, *args)
     @_app = app
     @_fields = Zillabyte::Harness::Helper.get_non_option_args(args)
-    @_options = Zillabyte::Harness::Helper.get_options(args)
+    @_vector_options, @_options = Zillabyte::Harness::Helper.get_vector_and_hashes(args)
   end
 
   def build_node(&block)
@@ -86,9 +86,7 @@ class Zillabyte::Harness::GroupBy
   end
 
   def run_operation
-    host = @_app._options[:host]
-    port = @_app._options[:port]
     c = Zillabyte::Harness::GroupByController.new(@_node, Zillabyte::Common::Progress.new)
-    c.run(host, port)
+    c.run(@_app._options)
   end
 end

data/ruby/lib/zillabyte/harness/helper.rb

@@ -27,6 +27,9 @@ class Zillabyte::Harness::Helper
       opts.on("--port PORT") do |v|
         options[:port] = v
       end
+      opts.on("--unix_socket PATH") do |v|
+        options[:unix_socket] = v
+      end
       opts.on("--file FNAME") do |v|
         options[:file] = v
       end
@@ -421,12 +424,30 @@ class Zillabyte::Harness::Helper
       return args
     end
   end
-  
-  def self.get_options(args)
+
+
+  # This is meant to consume an variable list of args, and return the vector part, as 
+  # well as the options part. For example, consider these methods:
+  # 
+  #  foo1('bar', 'baz', :owner => 'bam')
+  #  foo2(:name => 'bar', :type => 'baz', :owner => 'bam')  
+  # 
+  # Taking the *args of the former (foo1) and giving it to `get_vector_and_hashes`
+  # will result in: 
+  #
+  #   [ ['bar', 'baz'], {:type => 'baz}]
+  #
+  # The latter (foo2) will yield: 
+  #
+  #   [ [], {:type => 'baz', :owner => 'bam', :name => 'bar'}]
+  #   
+  # i.e. this method makes it easier to deal with vector-based params, as well as hash
+  # params.  
+  def self.get_vector_and_hashes(args)
     if args.last.is_a?(Hash)
-      return args.last
+      return [args[0..-2], args.last]
     else
-      return {}
+      return [args, {}]
     end
   end
   

data/ruby/lib/zillabyte/harness/live_delegator.rb

@@ -18,13 +18,17 @@ module Zillabyte
       DEATH_TIMEOUT = READ_SOFT_TIMEOUT * 6  # If no activity from the parent (even response to a ping) time before we kill ourself.
 
       class << self
-        attr_accessor :mode, :emits, :end_cycle_policy, :pending_commands, :host, :port, :socket
+        attr_accessor :mode, :emits, :end_cycle_policy, :pending_commands, :host, :port, :unix_socket, :socket
       end
 
       self.pending_commands = []
 
       def setup_pipes
-        Storm::Protocol.socket = TCPSocket.open(Storm::Protocol.host || "0.0.0.0", Storm::Protocol.port)
+        if Storm::Protocol.unix_socket
+          Storm::Protocol.socket = UNIXSocket.open(Storm::Protocol.unix_socket)
+        else
+          Storm::Protocol.socket = TCPSocket.open(Storm::Protocol.host || "0.0.0.0", Storm::Protocol.port)
+        end
       end
 
       def read_message
@@ -207,10 +211,14 @@ module Zillabyte
 
       def ack(id); end
 
-      def run(host, port)
+      def run(options)
         Storm::Protocol.mode = 'source'
-        Storm::Protocol.host = host
-        Storm::Protocol.port = port
+        if (options[:host])
+          Storm::Protocol.host = options[:host]
+          Storm::Protocol.port = options[:port]
+        elsif (options[:unix_socket])
+          Storm::Protocol.unix_socket = options[:unix_socket]
+        end
         setup_pipes
         handshake
 
@@ -251,10 +259,14 @@ module Zillabyte
 
       def execute(tuple); end
 
-      def run(host, port)
+      def run(options)
         Storm::Protocol.mode = 'each'
-        Storm::Protocol.host = host
-        Storm::Protocol.port = port
+        if (options[:host])
+          Storm::Protocol.host = options[:host]
+          Storm::Protocol.port = options[:port]
+        elsif (options[:unix_socket])
+          Storm::Protocol.unix_socket = options[:unix_socket]
+        end
         setup_pipes
         handshake
 
@@ -291,10 +303,14 @@ module Zillabyte
 
       def keep(tuple); end
 
-      def run(host, port)
+      def run(options)
         Storm::Protocol.mode = 'filter'
-        Storm::Protocol.host = host
-        Storm::Protocol.port = port
+        if (options[:host])
+          Storm::Protocol.host = options[:host]
+          Storm::Protocol.port = options[:port]
+        elsif (options[:unix_socket])
+          Storm::Protocol.unix_socket = options[:unix_socket]
+        end
         setup_pipes
         handshake
 
@@ -325,10 +341,14 @@ module Zillabyte
     class GroupBy
       include Storm::Protocol
 
-      def run(host, port )
+      def run(options)
         Storm::Protocol.mode = 'group_by'
-        Storm::Protocol.host = host
-        Storm::Protocol.port = port
+        if (options[:host])
+          Storm::Protocol.host = options[:host]
+          Storm::Protocol.port = options[:port]
+        elsif (options[:unix_socket])
+          Storm::Protocol.unix_socket = options[:unix_socket]
+        end
         setup_pipes
         handshake
 

data/ruby/lib/zillabyte/harness/sink.rb

@@ -52,7 +52,7 @@ class Zillabyte::Harness::Sink
 
   def initialize(app, *args)
     @_app = app
-    @_options = Zillabyte::Harness::Helper.get_options(args)
+    @_vector_options, @_options = Zillabyte::Harness::Helper.get_vector_and_hashes(args)
   end
 
   def build_node(&block)

data/ruby/lib/zillabyte/harness/source.rb

@@ -120,9 +120,7 @@ class Zillabyte::Harness::Source
   end
 
   def run_operation
-    host = @_app._options[:host]
-    port = @_app._options[:port]
     c = Zillabyte::Harness::SourceController.new(@_node, Zillabyte::Common::Progress.new)
-    c.run(host, port)
+    c.run(@_app._options)
   end
 end

data/ruby/lib/zillabyte/harness/stream_builder.rb

@@ -0,0 +1,26 @@
+class Zillabyte::Harness::StreamBuilder < Array
+  attr_accessor :_name, :_app, :_previous_node_name
+
+  def initialize(first_stream)
+    @_streams = [first_stream]
+    self.clear()
+  end
+
+
+  # Ruby magic to automatically call 'method_name' on the last stream we collected
+  def method_missing(method_name, *args, &block)
+    results = @_streams.last.send method_name, *args, &block
+    if results.is_a?(Array)
+      # Split stream... 
+      results.each_with_index do |v, i|
+        self[i] = v
+      end
+    else
+      # Continue this stream... 
+      @_streams << results
+      self.clear()
+    end
+    return self
+  end
+  
+end

data/ruby/lib/zillabyte/version.rb

@@ -1,3 +1,3 @@
 module Zillabyte
-  VERSION = "0.9.2" unless defined?(VERSION)
+  VERSION = "0.9.3" unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 description: The Official Zillabyte Gem
 email:
 - gem@zillabyte.com
@@ -69,6 +69,7 @@ files:
 - ruby/lib/zillabyte/harness/sink.rb
 - ruby/lib/zillabyte/harness/source.rb
 - ruby/lib/zillabyte/harness/stream.rb
+- ruby/lib/zillabyte/harness/stream_builder.rb
 - ruby/lib/zillabyte/harness/tuple.rb
 - ruby/lib/zillabyte/version.rb
 homepage: http://www.zillabyte.com