cascadence 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b447380f815a88f8454bb8e0ddf133d3223cd2e4
-  data.tar.gz: 5f94c4d40174afa740f16579cc1bb9d4df3643a5
+  metadata.gz: b0bc78d89b385d60870d89319dee48898086f1cf
+  data.tar.gz: 814cef642a4d51ff4a11ca92a9c5587ef69246cb
 SHA512:
-  metadata.gz: 0cce970ba61daa5c8c41edbd9641374e97f2c5a8613e8a666dccb90263938ea08225d448e14cd05a0fb286769a84647ae21fc78c5e7da166ae4f89588bf8a3a8
-  data.tar.gz: 1de7d11eaf1f635c7005c27105d50c4ec88933da0cc69351113d16075506b8c458f0d5809af8c4bec73c60d540f983b7f7745b171eeddd34d20e5e60c3614c77
+  metadata.gz: 4deaee7535eabba1d35e3fbe759eaceb7da54c8821f76b71b612de4e3034daa4312dff443d7d33d4dc012582b228ba40fa99bcd472793ab1dec4d07295349533
+  data.tar.gz: 736b1ad9ceb4e779fa993a648595c7f66d3d607815e1ea51bcceab9cf632fe3cf8edb24009c2053b744d1a8b78462e9803ca1cf3d9fc5f2003e85e99fb87563b

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "thor"
 gem "activesupport"
+
 group :development do
   gem "jeweler"
   gem "rdoc"

data/Gemfile.lock

@@ -1,30 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     git (1.2.5)
-    i18n (0.6.4)
+    i18n (0.6.1)
     jeweler (1.8.4)
-      bundler (~> 1.0)
+      bundler (~> 1.3.0.pre)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.6)
-    multi_json (1.5.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    multi_json (1.7.2)
+    rake (10.0.4)
+    rdoc (4.0.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/cascadence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cascadence"
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Chen"]
-  s.date = "2013-03-25"
+  s.date = "2013-05-06"
   s.description = "Organizational helper for writing serializations for use with threading. The biggest use case of this would be in selenium / capybara based integration testing as this allows you to run flows in parallel."
   s.email = "foxnewsnetwork@gmail.com"
   s.executables = ["cascadence"]
@@ -27,49 +27,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/cascadence",
     "cascadence.gemspec",
-    "coverage/.last_run.json",
-    "coverage/.resultset.json",
-    "coverage/assets/0.7.1/application.css",
-    "coverage/assets/0.7.1/application.js",
-    "coverage/assets/0.7.1/fancybox/blank.gif",
-    "coverage/assets/0.7.1/fancybox/fancy_close.png",
-    "coverage/assets/0.7.1/fancybox/fancy_loading.png",
-    "coverage/assets/0.7.1/fancybox/fancy_nav_left.png",
-    "coverage/assets/0.7.1/fancybox/fancy_nav_right.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_e.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_n.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_s.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_se.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png",
-    "coverage/assets/0.7.1/fancybox/fancy_shadow_w.png",
-    "coverage/assets/0.7.1/fancybox/fancy_title_left.png",
-    "coverage/assets/0.7.1/fancybox/fancy_title_main.png",
-    "coverage/assets/0.7.1/fancybox/fancy_title_over.png",
-    "coverage/assets/0.7.1/fancybox/fancy_title_right.png",
-    "coverage/assets/0.7.1/fancybox/fancybox-x.png",
-    "coverage/assets/0.7.1/fancybox/fancybox-y.png",
-    "coverage/assets/0.7.1/fancybox/fancybox.png",
-    "coverage/assets/0.7.1/favicon_green.png",
-    "coverage/assets/0.7.1/favicon_red.png",
-    "coverage/assets/0.7.1/favicon_yellow.png",
-    "coverage/assets/0.7.1/loading.gif",
-    "coverage/assets/0.7.1/magnify.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png",
-    "coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png",
-    "coverage/index.html",
     "fixtures/README.md",
     "fixtures/amazon/madeira_flow.rb",
     "fixtures/amazon/rio_negro_flow.rb",
@@ -89,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/cascadence/commander/generate.rb",
     "lib/cascadence/commander/version.rb",
     "lib/cascadence/config.rb",
+    "lib/cascadence/confluence.rb",
     "lib/cascadence/flow.rb",
     "lib/cascadence/helper.rb",
     "lib/cascadence/runner.rb",
@@ -103,6 +61,7 @@ Gem::Specification.new do |s|
     "spec/cascadence/commander/generate_spec.rb",
     "spec/cascadence/commander/version_spec.rb",
     "spec/cascadence/commander_spec.rb",
+    "spec/cascadence/flow_merge_spec.rb",
     "spec/cascadence/flow_spec.rb",
     "spec/cascadence/fork_merge_spec.rb",
     "spec/cascadence/helper_spec.rb",

data/lib/cascadence/class_methods.rb

@@ -34,6 +34,16 @@ module Cascadence
       @merge_position << (index - 1)
     end
 
+    def flows_into( another_stream )
+      Cascadence::Confluence.merge_streams( self, another_stream ) do |estate|
+        if block_given?
+          yield estate
+        else
+          [estate]
+        end
+      end
+    end
+
   end
 
 end

data/lib/cascadence/commander.rb

@@ -11,11 +11,6 @@ module Cascadence
       Cascadence::Commander::Flow.instance.run(filepath)
     end
 
-    desc "generate [FLOWNAME]", "generates the flow project as specified by the name with respect to your current directory."
-    def generate(flowname)
-      Cascadence::Commander::Generate.start ["dosomeshit", flowname, Dir.pwd]
-    end
-
   end
 end
 

data/lib/cascadence/confluence.rb

@@ -0,0 +1,25 @@
+module Cascadence
+  module Confluence
+    class << self
+      def merge_streams(flowa, flowb, &block)
+        flow = Class.new(::Cascadence::Flow) do 
+          class << self; attr_accessor :pipe_merger, :state_converter end
+          cascading_order :pipe_merge
+          def initialize(*args)
+            self.state = args
+          end
+          def pipe_merge
+            self.state = self.class.pipe_merger.call(self).run_states.state
+          end
+          
+          def _convert_state(post_a_state)
+            self.class.state_converter.call post_a_state
+          end
+        end
+        flow.pipe_merger = lambda { |f| flowb.new *f._convert_state(flowa.new(*f.state).run_states.state) }
+        flow.state_converter = lambda { |s| yield s }
+        return flow
+      end
+    end
+  end
+end

data/lib/cascadence/runner.rb

@@ -12,23 +12,6 @@ module Cascadence
 
     private
 
-    # def _run_parallel(tasks)
-    #   threads = []
-    #   puts "Attempting to run with #{tasks.count} tasks"
-    #   tasks.each do |task|
-    #     thread = Thread.new do
-    #       puts "Spinning up thread number #{threads.count}"
-    #       task.call
-    #     end
-    #     puts "Pushing thread number #{threads.count} to thread pool"
-    #     threads << thread
-    #     sleep 0.5
-    #   end
-    #   while threads.inject(false) { |finished, thread| finished || thread.alive? }
-    #     sleep 0.5
-    #   end
-    # end
-
     def _run_parallel(tasks, threads=[])
       return if tasks.empty? && threads.empty?
       package = _maybe_spin_up_thread(tasks, threads)
@@ -37,22 +20,23 @@ module Cascadence
       _run_parallel new_tasks, new_threads 
     end
 
-    def _maybe_spin_up_thread(tasks, threads=[])
-      if threads.count > Cascadence.config.max_thread_count
-        new_threads = threads
-        new_tasks = tasks
-      else
-        new_threads = _spin_up_task(tasks.pop, threads)
-        new_tasks = tasks
-      end
-      sleep 0.5
-      return [new_tasks, new_threads.select(&:alive?)]
+    def _maybe_spin_up_thread(tasks, threads=nil)
+      threads ||= []
+      threads = _spin_up_task(tasks.pop, threads) if _still_have_room_for_more_threads?(threads)
+      return [tasks, threads.select(&:alive?)]
     end
 
-    def _spin_up_task(task, threads=[])
+    def _still_have_room_for_more_threads?(threads)
+      threads.count < Cascadence.config.max_thread_count
+    end
+
+    def _spin_up_task(task, threads=nil)
+      sleep 0.5
+      threads ||= []
       puts "Spinning up thread no.#{threads.count} out of #{Cascadence.config.max_thread_count}"
       thread = Thread.new { task.call } unless task.nil?
       threads.push thread unless thread.nil?
+      return threads
     end
 
     def _run_sequential(tasks)

data/lib/cascadence.rb

@@ -8,6 +8,7 @@ module Cascadence
   autoload :Flow, File.join( File.dirname(__FILE__), "cascadence", "flow" )
   autoload :Helper, File.join( File.dirname(__FILE__), "cascadence", "helper")
   autoload :Commander, File.join( File.dirname(__FILE__), "cascadence", "commander")
+  autoload :Confluence, File.join( File.dirname(__FILE__), "cascadence", "confluence")
   autoload :Runner, File.join( File.dirname(__FILE__), "cascadence", "runner")
   autoload :Config, File.join( File.dirname(__FILE__), "cascadence", "config")
   autoload :Task, File.join( File.dirname(__FILE__), "cascadence", "task")

data/spec/cascadence/flow_merge_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe Cascadence::Flow do
+  describe "::flow_into" do
+    let(:stream1) do
+      Class.new(Cascadence::Flow) do
+        cascading_order :step1, :step2
+        def initialize(seed_state=nil)
+          self.state = seed_state || 0
+        end
+
+        def step1
+          self.state += 1
+        end
+
+        def step2
+          self.state += 2
+        end
+      end
+    end
+    context "one-to-one" do
+      before :each do
+        @stream2 = stream1.flows_into(stream1)
+        @stream3 = stream1.flows_into(stream1).flows_into(stream1)
+      end
+      context "basics" do
+        it "should still be a cascadence flow" do
+          @stream2.superclass.should eq Cascadence::Flow
+          @stream3.superclass.should eq Cascadence::Flow
+        end
+        describe "#run_states" do
+          let(:state) { @stream2.new(0).run_states.state }
+          let(:state3) { @stream3.new(0).run_states.state }
+          it "should pipe the first stream into the second stream and transfer the states as such" do
+            state.should eq (0 + 1 + 2 + 1 + 2)
+            state3.should eq (0 + 1 + 2 + 1 + 2 + 1 + 2)
+          end
+        end
+      end
+    end
+
+    context "one-to-many" do
+      let(:parent) do
+        Class.new(Cascadence::Flow) do
+          cascading_order :step1, :step2
+          def initialize
+            self.state = [0,0]
+          end
+
+          def step1
+            _inc_first 1
+            _inc_second -1
+          end
+
+          def step2
+            _inc_first 2
+            _inc_second -2
+          end
+          
+          private
+          def _inc_first(a)
+            self.state[0] += a
+          end
+
+          def _inc_second(a)
+            self.state[1] += a
+          end
+        end
+      end
+      before :each do
+        @stream = parent.flows_into(stream1) { |pstate| pstate[0] }
+        @alt_stream = parent.flows_into(stream1) { |pstate| pstate[1] }
+      end
+      it "should still be a flow" do
+        @stream.superclass.should eq Cascadence::Flow
+        @alt_stream.superclass.should eq Cascadence::Flow
+      end
+      describe "#run_states" do
+        let(:first_state) { @stream.new.run_states.state }
+        let(:alt_state) { @alt_stream.new.run_states.state }
+        it "should produce the terminal state" do
+          first_state.should eq 6
+          alt_state.should eq 0
+        end
+      end
+    end
+  end
+end

data/spec/cascadence/runner_spec.rb

@@ -2,10 +2,17 @@ require 'spec_helper'
 
 describe Cascadence::Runner do
   let(:runner) { Cascadence::Runner.instance }
-  let(:task) { Class.new }
+  let(:task) do
+    Class.new do
+      def call
+        sleep 2
+        puts "thread exiting"
+        return 13
+      end
+    end
+  end
   before :each do
-    task.any_instance.should_receive(:call)
-    @tasks = 1.upto(5).map { |a| task.new }
+    @tasks = 1.upto(7).map { |a| task.new }
   end
   context "public api" do
     describe "#run_tasks" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cascadence
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Thomas Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,49 +114,6 @@ files:
 - VERSION
 - bin/cascadence
 - cascadence.gemspec
-- coverage/.last_run.json
-- coverage/.resultset.json
-- coverage/assets/0.7.1/application.css
-- coverage/assets/0.7.1/application.js
-- coverage/assets/0.7.1/fancybox/blank.gif
-- coverage/assets/0.7.1/fancybox/fancy_close.png
-- coverage/assets/0.7.1/fancybox/fancy_loading.png
-- coverage/assets/0.7.1/fancybox/fancy_nav_left.png
-- coverage/assets/0.7.1/fancybox/fancy_nav_right.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_e.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_n.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_s.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_se.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_w.png
-- coverage/assets/0.7.1/fancybox/fancy_title_left.png
-- coverage/assets/0.7.1/fancybox/fancy_title_main.png
-- coverage/assets/0.7.1/fancybox/fancy_title_over.png
-- coverage/assets/0.7.1/fancybox/fancy_title_right.png
-- coverage/assets/0.7.1/fancybox/fancybox-x.png
-- coverage/assets/0.7.1/fancybox/fancybox-y.png
-- coverage/assets/0.7.1/fancybox/fancybox.png
-- coverage/assets/0.7.1/favicon_green.png
-- coverage/assets/0.7.1/favicon_red.png
-- coverage/assets/0.7.1/favicon_yellow.png
-- coverage/assets/0.7.1/loading.gif
-- coverage/assets/0.7.1/magnify.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
-- coverage/index.html
 - fixtures/README.md
 - fixtures/amazon/madeira_flow.rb
 - fixtures/amazon/rio_negro_flow.rb
@@ -176,6 +133,7 @@ files:
 - lib/cascadence/commander/generate.rb
 - lib/cascadence/commander/version.rb
 - lib/cascadence/config.rb
+- lib/cascadence/confluence.rb
 - lib/cascadence/flow.rb
 - lib/cascadence/helper.rb
 - lib/cascadence/runner.rb
@@ -190,6 +148,7 @@ files:
 - spec/cascadence/commander/generate_spec.rb
 - spec/cascadence/commander/version_spec.rb
 - spec/cascadence/commander_spec.rb
+- spec/cascadence/flow_merge_spec.rb
 - spec/cascadence/flow_spec.rb
 - spec/cascadence/fork_merge_spec.rb
 - spec/cascadence/helper_spec.rb

data/coverage/.last_run.json

@@ -1,5 +0,0 @@
-{
-  "result": {
-    "covered_percent": 99.55
-  }
-}