zillabyte 0.9.6 → 0.9.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDgzZWY4MDg3YjI5MDg1YzQwZjNiNWNmYWM0M2E4Nzc2MTdkYzFlMg==
-  data.tar.gz: !binary |-
-    YzdhM2IwMzRjYmFjZTdiOGJjOTMxYmExZmJkNTMwODU3OTc1M2Q1MA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTIwNTgyYjZkNGVkNGIyNDVjMjNlYTlhMTI3MGMyYWFjNjFjMjdkZjNmYjY2
-    OWFjNGRhZWE1ODg5NDdjNTgyOTc5MjY1MmExY2Q5NGJmYzI1NjBjOWFhODVj
-    MDI3YjkwNDJjZTQxMDg0NmIyNTM5NzAxNjg2MmY3NTVlMjYwYTg=
-  data.tar.gz: !binary |-
-    ZDYyZTFjM2M5MmNmNzY1NDU0ZDIwNmI2YmQwMmJiNmQ0ODZhZDMxNGQwNTM5
-    ZjFiYmNlYzBlODUzYzRmNTEzZmRjMTE5ZDUxMzg5NGVhODA3NDc1OTUxMTQy
-    MjUwN2Q2MGVhNTc4Yjg4NmQ2Njg1NDI2MjQyODQwNDI1ZDA4ZGY=
+SHA1:
+  metadata.gz: 8974f32fc265b24fccba0241176b2504994bc752
+  data.tar.gz: d8180962b759df939f680b9066bdd76a65d46314
+SHA512:
+  metadata.gz: da0718446a35dedbfe9d9d4a594bf6d2f5351a0f939f300473cdfc3dc43ab5560cf0b24ed45d1b8e608c3ccef5e93cf3bc5390e0d9178b8e08d578300228b156
+  data.tar.gz: 4611fcb7c8c98e60cf01c14ca7ce61bf9d8858c45ad92dd1f50b99aed145090d96c700ed4fd85179b0a89ab16caeff32cd506e1a2da507e5557343eb1484aa5e

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

@@ -390,27 +390,33 @@ class Zillabyte::Harness::Helper
     end
   end
 
-  def self.check_loop_back(stream, node_name, nodes)
+  def self.check_loop_back(stream, node_name, max_iterations, nodes)
     ee = "Error in \"loop_back\" to \"#{node_name}\": \n\t "
+    pp = @@_print_loop_back
+    if max_iterations and !max_iterations.is_a?(Integer)
+      msg = "#{ee}Max iterations must be an integer. #{pp}"
+      Zillabyte::Harness::Helper.print_error(msg)
+    end
+
     previous_node_name = stream._previous_node_name
     found = false
     nodes.each do |node|
       if node._name == node_name
         found = true
         if node._type == "source"
-          msg = "#{ee}Cannot loop back to source node \"#{node_name}\"!"
+          msg = "#{ee}Cannot loop back to source node \"#{node_name}\"! #{pp}"
           Zillabyte::Harness::Helper.print_error(msg)
         end
       end
       if node._name == previous_node_name
         if node._emits.size < 2
-          msg = "#{ee}The preceding operation does not emit multiple streams. Please make sure that it emits one stream for the loop back and another stream for downstream operations."
+          msg = "#{ee}The preceding operation does not emit multiple streams. Please make sure that it emits one stream for the loop back and another stream for downstream operations. #{pp}"
           Zillabyte::Harness::Helper.print_error(msg)
         end
       end
     end
     if !found
-      msg = "#{ee}The specified loop-back node \"#{node_name}\" was not found in the operations preceding it."
+      msg = "#{ee}The specified loop-back node \"#{node_name}\" was not found in the operations preceding it. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
     end
   end
@@ -617,7 +623,6 @@ OUTPUT
       * The number of input and output streams specified must match the number listed for the component.
 OUTPUT
 
-
   @@_print_check_clump = <<-OUTPUT
 \n\n"Clump" Syntax:
   Simplified syntax:
@@ -645,4 +650,9 @@ OUTPUT
       * the "execute" block is where the tuples are actually processed. It must take in a single argument (the "tuple").
 OUTPUT
 
+  @@_print_loop_back = <<-OUTPUT
+\n\n"Loop_back" Syntax:
+  stream.loop_back(operation_name[String], max_iterations[Integer])
+OUTPUT
+
 end

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

@@ -81,11 +81,14 @@ class Zillabyte::Harness::Stream
   alias_method :execute, :call_component
 
   def loop_back(*args, &block)
-    # This is not a real operation, just telling the stream to loop back to the previous operation
+    # This is not a real operation, just telling the stream to loop back to a previous operation
     @_vector_options, @_options = Zillabyte::Harness::Helper.get_vector_and_hashes(args)
     loop_back_node = @_vector_options[0]
-    Zillabyte::Harness::Helper.check_loop_back(self, loop_back_node, @_app._nodes)
-    Zillabyte::Harness::Helper.write_arc_to_file({"name" => (@_options[:name] || self._name), "origin" => self._previous_node_name, "dest" => loop_back_node, "loop_back" => 1}, @_app._socket)
+    max_iterations = @_vector_options[1]
+    Zillabyte::Harness::Helper.check_loop_back(self, loop_back_node, max_iterations, @_app._nodes)
+    arc_hash = {"name" => (@_options[:name] || self._name), "origin" => self._previous_node_name, "dest" => loop_back_node, "loop_back" => 1}
+    arc_hash["max_iterations"] = max_iterations if max_iterations
+    Zillabyte::Harness::Helper.write_arc_to_file(arc_hash, @_app._socket)
   end
 
   def sink(*args, &block)

data/ruby/lib/zillabyte/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - zillabyte
@@ -14,30 +14,30 @@ dependencies:
   name: rake
   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: zillabyte-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.7
 description: The Official Zillabyte Gem
 email:
 - gem@zillabyte.com
@@ -45,7 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ruby/lib/zillabyte.rb
 - ruby/lib/zillabyte/common/progress.rb
+- ruby/lib/zillabyte/harness.rb
 - ruby/lib/zillabyte/harness/app.rb
 - ruby/lib/zillabyte/harness/base.rb
 - ruby/lib/zillabyte/harness/clump.rb
@@ -69,9 +71,7 @@ files:
 - ruby/lib/zillabyte/harness/stream.rb
 - ruby/lib/zillabyte/harness/stream_builder.rb
 - ruby/lib/zillabyte/harness/tuple.rb
-- ruby/lib/zillabyte/harness.rb
 - ruby/lib/zillabyte/version.rb
-- ruby/lib/zillabyte.rb
 homepage: http://www.zillabyte.com
 licenses:
 - MIT
@@ -82,17 +82,17 @@ require_paths:
 - ruby/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: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Official Zillabyte Gem