gush 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e3da7035bd13a0f0d4dbf499e5f2d78dac77ec
-  data.tar.gz: 02b741c597ffda3ee14e196ee634990bc70f8173
+  metadata.gz: 5c0f45a09eb1260f6bcb00f1503181ddb4705735
+  data.tar.gz: 13eaec20c3b1165127b5cb7761c99cdd5abc1f41
 SHA512:
-  metadata.gz: 7f93715bccd0be2bdd89ebf19c5f83aca62c57d1166e388eaea3fa991b11846fd1f8f9406dad9835f48e377d032ef4ca6f303dcf08d8b56a7f5caeb5b6f4544e
-  data.tar.gz: e1f067418266f041a7eef3411fcb346b81e3cd851f9f73f0526b5a9f130aca21a196a90ca161f2387eb34ca2cd3ab5d98204aa3fff236924e1a09b48479e5eef
+  metadata.gz: 1d1060e1575b133245e78280f96818a83c599fbd7f9b08a93d14c54c212cf3d1f4ae0f75a81883fcb49758b059a1bc51063e46c9121405408280570c124906ef
+  data.tar.gz: 7bc51f1ad03adc625ebe497757c86fc588514d8a98d93e278ab961d1817653c21cf706858ad080d4e4fbc29e3d792b0a8d33598f67f126eccd0910d39f222843

data/README.md

@@ -210,13 +210,13 @@ flow.status
 - of a specific workflow:
 
   ```
-  bundle gush show <workflow_id>
+  bundle exec gush show <workflow_id>
   ```
 
 - of all created workflows:
 
   ```
-  bundle gush list
+  bundle exec gush list
   ```
 
 

data/gush.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "gush"
-  spec.version       = "0.3"
+  spec.version       = "0.3.1"
   spec.authors       = ["Piotrek Okoński"]
   spec.email         = ["piotrek@okonski.org"]
   spec.summary       = "Fast and distributed workflow runner using only Sidekiq and Redis"

data/lib/gush/cli.rb

@@ -99,8 +99,6 @@ module Gush
     def viz(name)
       client
       workflow = name.constantize.new
-      workflow.configure
-      workflow.resolve_dependencies
       graph = Graph.new(workflow)
       graph.viz
       Launchy.open graph.path

data/lib/gush/client.rb

@@ -16,12 +16,10 @@ module Gush
 
     def create_workflow(name)
       begin
-        flow = name.constantize.new
-        flow.save
+        name.constantize.create
       rescue NameError
         raise WorkflowNotFound.new("Workflow with given name doesn't exist")
       end
-
       flow
     end
 
@@ -46,7 +44,18 @@ module Gush
       persist_workflow(workflow)
     end
 
-    def next_free_id
+    def next_free_job_id(workflow_id,job_klass)
+      job_identifier = nil
+      loop do
+        id = SecureRandom.uuid
+        job_identifier = "#{job_klass}-#{id}"
+        break if !redis.exists("gush.jobs.#{workflow_id}.#{job_identifier}")
+      end
+
+      job_identifier
+    end
+
+    def next_free_workflow_id
       id = nil
       loop do
         id = SecureRandom.uuid
@@ -83,13 +92,20 @@ module Gush
     end
 
     def persist_job(workflow_id, job)
-      redis.set("gush.jobs.#{workflow_id}.#{job.class.to_s}", job.to_json)
+      redis.set("gush.jobs.#{workflow_id}.#{job.name}", job.to_json)
     end
 
     def load_job(workflow_id, job_id)
       workflow = find_workflow(workflow_id)
-      data = redis.get("gush.jobs.#{workflow_id}.#{job_id}")
+      job_name_match = /(?<klass>\w*[^-])-(?<identifier>.*)/.match(job_id)
+      hypen = '-' if job_name_match.nil?
+
+      keys = redis.keys("gush.jobs.#{workflow_id}.#{job_id}#{hypen}*")
+      return nil if keys.nil?
+
+      data = redis.get(keys.first)
       return nil if data.nil?
+
       data = Gush::JSON.decode(data, symbolize_keys: true)
       Gush::Job.from_hash(workflow, data)
     end
@@ -100,7 +116,7 @@ module Gush
     end
 
     def destroy_job(workflow_id, job)
-      redis.del("gush.jobs.#{workflow_id}.#{job.class.to_s}")
+      redis.del("gush.jobs.#{workflow_id}.#{job.name}")
     end
 
     def worker_report(message)
@@ -118,7 +134,7 @@ module Gush
       sidekiq.push(
         'class' => Gush::Worker,
         'queue' => configuration.namespace,
-        'args'  => [workflow_id, job.class.to_s]
+        'args'  => [workflow_id, job.name]
       )
     end
 
@@ -128,6 +144,7 @@ module Gush
 
     def workflow_from_hash(hash, nodes = nil)
       flow = hash[:klass].constantize.new
+      flow.jobs = []
       flow.stopped = hash.fetch(:stopped, false)
       flow.id = hash[:id]
 

data/lib/gush/graph.rb

@@ -2,7 +2,7 @@ module Gush
   class Graph
     attr_reader :workflow, :filename, :path, :start, :end_node
 
-    def initialize(workflow, options: {})
+    def initialize(workflow, options = {})
       @workflow = workflow
       @filename = options.fetch(:filename, "graph.png")
       @path = options.fetch(:path, Pathname.new(Dir.tmpdir).join(filename))
@@ -31,17 +31,17 @@ module Gush
     private
     def add_job(graph, job)
       name = job.class.to_s
-      graph.add_nodes(name)
+      graph.add_nodes(job.name, label: name)
 
       if job.incoming.empty?
-        graph.add_edges(start, name)
+        graph.add_edges(start, job.name)
       end
 
       if job.outgoing.empty?
-        graph.add_edges(name, end_node)
+        graph.add_edges(job.name, end_node)
       else
-        job.outgoing.each do |out|
-          graph.add_edges(name, out)
+        job.outgoing.each do |id|
+          graph.add_edges(job.name, id)
         end
       end
     end

data/lib/gush/job.rb

@@ -1,8 +1,8 @@
 module Gush
   class Job
     attr_accessor :workflow_id, :incoming, :outgoing, :params,
-      :finished_at, :failed_at, :started_at, :enqueued_at, :payloads
-    attr_reader :name, :output_payload, :params
+      :finished_at, :failed_at, :started_at, :enqueued_at, :payloads_hash, :klass
+    attr_reader :name, :output_payload, :params, :payloads
 
     def initialize(workflow, opts = {})
       @workflow = workflow
@@ -37,6 +37,12 @@ module Gush
       @output_payload = data
     end
 
+    def payloads
+      payload_h = {}
+      payloads_hash.each {|k,val| payload_h[k.to_s] = val.map {|h| h[:payload] }}
+      payload_h
+    end
+
     def work
     end
 
@@ -98,6 +104,10 @@ module Gush
     end
 
     private
+    def logger
+      Sidekiq.logger
+    end
+
     def current_timestamp
       Time.now.to_i
     end
@@ -111,6 +121,7 @@ module Gush
       @started_at     = opts[:started_at]
       @enqueued_at    = opts[:enqueued_at]
       @params         = opts[:params] || {}
+      @klass          = opts[:klass]
       @output_payload = opts[:output_payload]
     end
   end

data/lib/gush/json.rb

@@ -1,6 +1,5 @@
 module Gush
   class JSON
-
     def self.encode(data)
       Yajl::Encoder.new.encode(data)
     end
@@ -9,4 +8,4 @@ module Gush
       Yajl::Parser.parse(data, options)
     end
   end
-end
+end

data/lib/gush/worker.rb

@@ -9,7 +9,7 @@ module Gush
     def perform(workflow_id, job_id)
       setup_job(workflow_id, job_id)
 
-      job.payloads = incoming_payloads
+      job.payloads_hash = incoming_payloads
 
       start = Time.now
       report(:started, start)
@@ -20,19 +20,15 @@ module Gush
       mark_as_started
       begin
         job.work
-      rescue Exception => e
-        failed = true
-        error = e
-      end
-
-      unless failed
-        report(:finished, start)
+      rescue Exception => error
+        mark_as_failed
+        report(:failed, start, error.message)
+        raise error
+      else
         mark_as_finished
+        report(:finished, start)
 
         enqueue_outgoing_jobs
-      else
-        mark_as_failed
-        report(:failed, start, error.message)
       end
     end
 
@@ -51,9 +47,10 @@ module Gush
     def incoming_payloads
       payloads = {}
       job.incoming.each do |job_name|
-        payloads[job_name] = client.load_job(workflow.id, job_name).output_payload
+       job = client.load_job(workflow.id, job_name)
+       payloads[job.klass.to_s] ||= []
+       payloads[job.klass.to_s] << {:id => job.name, :payload => job.output_payload}
       end
-
       payloads
     end
 

data/lib/gush/workflow.rb

@@ -11,6 +11,8 @@ module Gush
       @persisted = false
       @stopped = false
       @arguments = args
+
+      setup
     end
 
     def self.find(id)
@@ -23,10 +25,17 @@ module Gush
       flow
     end
 
+    def continue
+      client = Gush::Client.new
+      failed_jobs = jobs.select(&:failed?)
+
+      failed_jobs.each do |job|
+        client.enqueue_job(id, job)
+      end
+    end
+
     def save
-      configure(*@arguments)
-      resolve_dependencies
-      client.persist_workflow(self)
+      persist!
     end
 
     def configure(*args)
@@ -63,7 +72,13 @@ module Gush
     end
 
     def find_job(name)
-      jobs.find { |node| node.name == name.to_s || node.class.to_s == name.to_s }
+      match_data = /(?<klass>\w*[^-])-(?<identifier>.*)/.match(name.to_s)
+      if match_data.nil?
+        job = jobs.find { |node| node.class.to_s == name.to_s }
+      else
+        job = jobs.find { |node| node.name.to_s == name.to_s }
+      end
+      job
     end
 
     def finished?
@@ -90,7 +105,7 @@ module Gush
       options =
 
       node = klass.new(self, {
-        name: klass.to_s,
+        name: client.next_free_job_id(id,klass.to_s),
         params: opts.fetch(:params, {})
       })
 
@@ -98,13 +113,15 @@ module Gush
 
       deps_after = [*opts[:after]]
       deps_after.each do |dep|
-        @dependencies << {from: dep.to_s, to: klass.to_s }
+        @dependencies << {from: dep.to_s, to: node.name.to_s }
       end
 
       deps_before = [*opts[:before]]
       deps_before.each do |dep|
-        @dependencies << {from: klass.to_s, to: dep.to_s }
+        @dependencies << {from: node.name.to_s, to: dep.to_s }
       end
+
+      node.name
     end
 
     def reload
@@ -164,11 +181,16 @@ module Gush
     end
 
     def id
-      @id ||= client.next_free_id
+      @id ||= client.next_free_workflow_id
     end
 
     private
 
+    def setup
+      configure(*@arguments)
+      resolve_dependencies
+    end
+
     def client
       @client ||= Client.new
     end

data/spec/features/integration_spec.rb

@@ -18,19 +18,19 @@ describe "Workflows" do
     flow = TestWorkflow.create
     flow.start!
 
-    expect(Gush::Worker).to have_jobs(flow.id, ["Prepare"])
+    expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(['Prepare']))
 
     Gush::Worker.perform_one
-    expect(Gush::Worker).to have_jobs(flow.id, ["FetchFirstJob", "FetchSecondJob"])
+    expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(["FetchFirstJob", "FetchSecondJob"]))
 
     Gush::Worker.perform_one
-    expect(Gush::Worker).to have_jobs(flow.id, ["FetchSecondJob", "PersistFirstJob"])
+    expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(["FetchSecondJob", "PersistFirstJob"]))
 
     Gush::Worker.perform_one
-    expect(Gush::Worker).to have_jobs(flow.id, ["PersistFirstJob"])
+    expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(["PersistFirstJob"]))
 
     Gush::Worker.perform_one
-    expect(Gush::Worker).to have_jobs(flow.id, ["NormalizeJob"])
+    expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(["NormalizeJob"]))
 
     Gush::Worker.perform_one
 
@@ -52,7 +52,7 @@ describe "Workflows" do
 
     class PrependJob < Gush::Job
       def work
-        string = "#{payloads["PrefixJob"]}: #{payloads["UpcaseJob"]}"
+        string = "#{payloads['PrefixJob'].first}: #{payloads['UpcaseJob'].first}"
         output string
       end
     end
@@ -76,5 +76,47 @@ describe "Workflows" do
 
     Gush::Worker.perform_one
     expect(flow.reload.find_job("PrependJob").output_payload).to eq("A prefix: SOME TEXT")
+
+
+  end
+
+  it "passes payloads from workflow that runs multiple same class jobs with nameized payloads" do
+    class RepetitiveJob < Gush::Job
+      def work
+        output params[:input]
+      end
+    end
+
+    class SummaryJob < Gush::Job
+      def work
+        output payloads['RepetitiveJob']
+      end
+    end
+
+    class PayloadWorkflow < Gush::Workflow
+      def configure
+        jobs = []
+        jobs << run(RepetitiveJob, params: {input: 'first'})
+        jobs << run(RepetitiveJob, params: {input: 'second'})
+        jobs << run(RepetitiveJob, params: {input: 'third'})
+        run SummaryJob, after: jobs
+      end
+    end
+
+    flow = PayloadWorkflow.create
+    flow.start!
+
+    Gush::Worker.perform_one
+    expect(flow.reload.find_job(flow.jobs[0].name).output_payload).to eq('first')
+
+    Gush::Worker.perform_one
+    expect(flow.reload.find_job(flow.jobs[1].name).output_payload).to eq('second')
+
+    Gush::Worker.perform_one
+    expect(flow.reload.find_job(flow.jobs[2].name).output_payload).to eq('third')
+
+    Gush::Worker.perform_one
+    expect(flow.reload.find_job(flow.jobs[3].name).output_payload).to eq(%w(first second third))
+
   end
 end

data/spec/gush/cli_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Gush::Graph do
+
+  describe "#create" do
+
+  end
+end

data/spec/{lib/gush → gush}/client_spec.rb

@@ -34,9 +34,9 @@ describe Gush::Client do
     end
 
     it "removes stopped flag when the workflow is started" do
-      workflow = TestWorkflow.new
+      workflow = TestWorkflow.create
       workflow.mark_as_stopped
-      workflow.save
+      workflow.persist!
       expect {
         client.start_workflow(workflow)
       }.to change{client.find_workflow(workflow.id).stopped?}.from(true).to(false)
@@ -85,7 +85,9 @@ describe Gush::Client do
 
   describe "#persist_job" do
     it "persists JSON dump of the job in Redis" do
-      job = double("job", to_json: 'json')
+
+      job = BobJob.new(name: 'bob')
+
       client.persist_job('deadbeef', job)
       expect(redis.keys("gush.jobs.deadbeef.*").length).to eq(1)
     end

data/spec/gush/graph_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Gush::Graph do
+  subject { described_class.new(TestWorkflow.create) }
+  let(:filename) { "graph.png" }
+
+  describe "#viz" do
+    it "runs GraphViz to render graph" do
+      node = double("node", :[]= => true)
+      edge = double("edge", :[]= => true)
+      graph = double("graph", node: node, edge: edge)
+      path = Pathname.new(Dir.tmpdir).join(filename)
+      expect(graph).to receive(:start).with(shape: 'diamond', fillcolor: '#CFF09E')
+      expect(graph).to receive(:end).with(shape: 'diamond', fillcolor: '#F56991')
+
+      expect(graph).to receive(:output).with(png: path.to_s)
+
+      expect(graph).to receive(:add_nodes).with(/Prepare/, label: "Prepare")
+      expect(graph).to receive(:add_nodes).with(/FetchFirstJob/, label: "FetchFirstJob")
+      expect(graph).to receive(:add_nodes).with(/FetchSecondJob/, label: "FetchSecondJob")
+      expect(graph).to receive(:add_nodes).with(/NormalizeJob/, label: "NormalizeJob")
+      expect(graph).to receive(:add_nodes).with(/PersistFirstJob/, label: "PersistFirstJob")
+
+      expect(graph).to receive(:add_edges).with(nil, /Prepare/)
+      expect(graph).to receive(:add_edges).with(/Prepare/, /FetchFirstJob/)
+      expect(graph).to receive(:add_edges).with(/Prepare/, /FetchSecondJob/)
+      expect(graph).to receive(:add_edges).with(/FetchFirstJob/, /PersistFirstJob/)
+      expect(graph).to receive(:add_edges).with(/FetchSecondJob/, /NormalizeJob/)
+      expect(graph).to receive(:add_edges).with(/PersistFirstJob/, /NormalizeJob/)
+      expect(graph).to receive(:add_edges).with(/NormalizeJob/, nil)
+
+      expect(GraphViz).to receive(:new).and_yield(graph)
+
+      subject.viz
+    end
+  end
+
+  describe "#path" do
+    it "returns string path to the rendered graph" do
+      expect(subject.path).to eq(Pathname.new(Dir.tmpdir).join(filename).to_s)
+    end
+  end
+end

data/spec/{lib/gush → gush}/job_spec.rb

@@ -98,6 +98,7 @@ describe Gush::Job do
 
       expect(job.name).to eq('gob')
       expect(job.class).to eq(Gush::Job)
+      expect(job.klass).to eq("Gush::Job")
       expect(job.finished?).to eq(true)
       expect(job.failed?).to eq(true)
       expect(job.enqueued?).to eq(true)

data/spec/gush/json_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Gush::JSON do
+  subject { described_class }
+
+  describe ".encode" do
+    it "encodes data to JSON" do
+      expect(subject.encode({a: 123})).to eq("{\"a\":123}")
+    end
+  end
+
+  describe ".decode" do
+    it "decodes JSON to data" do
+      expect(subject.decode("{\"a\":123}")).to eq({"a" => 123})
+    end
+
+    it "passes options to the internal parser" do
+      expect(subject.decode("{\"a\":123}", symbolize_keys: true)).to eq({a: 123})
+    end
+  end
+end

data/spec/{lib/gush → gush}/worker_spec.rb

@@ -23,7 +23,9 @@ describe Gush::Worker do
         allow(job).to receive(:work).and_raise(StandardError)
         expect(client).to receive(:worker_report).with(hash_including(status: :failed)).ordered
 
-        subject.perform(workflow.id, "Prepare")
+        expect do
+          subject.perform(workflow.id, "Prepare")
+        end.to raise_error(StandardError)
         expect(workflow.find_job("Prepare")).to be_failed
       end
 
@@ -31,7 +33,9 @@ describe Gush::Worker do
         allow(job).to receive(:work).and_raise(StandardError)
         expect(client).to receive(:worker_report).with(hash_including(status: :failed)).ordered
 
-        subject.perform(workflow.id, "Prepare")
+        expect do
+          subject.perform(workflow.id, "Prepare")
+        end.to raise_error(StandardError)
       end
     end
 

data/spec/{lib/gush → gush}/workflow_spec.rb

@@ -4,9 +4,6 @@ describe Gush::Workflow do
   subject { TestWorkflow.create }
 
   describe "#initialize" do
-  end
-
-  describe "#save" do
     it "passes constructor arguments to the method" do
       klass = Class.new(Gush::Workflow) do
         def configure(*args)
@@ -15,12 +12,24 @@ describe Gush::Workflow do
         end
       end
 
+      expect_any_instance_of(klass).to receive(:configure).with("arg1", "arg2")
       flow = klass.new("arg1", "arg2")
 
-      expect(flow).to receive(:configure).with("arg1", "arg2")
-      flow.save
     end
+  end
+
+  describe "#status" do
+    context "when failed" do
+      it "returns :failed" do
+        flow = TestWorkflow.create
+        flow.find_job("Prepare").fail!
+        flow.persist!
+        expect(flow.reload.status).to eq(:failed)
+      end
+    end
+  end
 
+  describe "#save" do
     context "workflow not persisted" do
       it "sets persisted to true" do
         flow = TestWorkflow.new
@@ -46,6 +55,20 @@ describe Gush::Workflow do
     end
   end
 
+  describe "#continue" do
+    it "enqueues failed jobs" do
+      flow = TestWorkflow.create
+      flow.find_job('Prepare').fail!
+
+      expect(flow.jobs.select(&:failed?)).not_to be_empty
+
+      flow.continue
+
+      expect(flow.jobs.select(&:failed?)).to be_empty
+      expect(flow.find_job('Prepare').failed_at).to be_nil
+    end
+  end
+
   describe "#mark_as_stopped" do
     it "marks workflow as stopped" do
       expect{ subject.mark_as_stopped }.to change{subject.stopped?}.from(false).to(true)
@@ -70,42 +93,42 @@ describe Gush::Workflow do
 
       result = JSON.parse(klass.create("arg1", "arg2").to_json)
       expected = {
-        "id" => an_instance_of(String),
-        "name" => klass.to_s,
-        "klass" => klass.to_s,
-        "status" => "running",
-        "total" => 2,
-        "finished" => 0,
-        "started_at" => nil,
-        "finished_at" => nil,
-        "stopped" => false,
-        "arguments" => ["arg1", "arg2"],
-        "jobs" => [
-          {
-            "name"=>"FetchFirstJob",
-            "klass"=>"FetchFirstJob",
-            "incoming"=>[],
-            "outgoing"=>["PersistFirstJob"],
-            "finished_at"=>nil,
-            "started_at"=>nil,
-            "enqueued_at"=>nil,
-            "failed_at"=>nil,
-            "params" => {},
-            "output_payload" => nil
-          },
-          {
-            "name"=>"PersistFirstJob",
-            "klass"=>"PersistFirstJob",
-            "incoming"=>["FetchFirstJob"],
-            "outgoing"=>[],
-            "finished_at"=>nil,
-            "started_at"=>nil,
-            "enqueued_at"=>nil,
-            "failed_at"=>nil,
-            "params" => {},
-            "output_payload" => nil
-          }
-        ]
+          "id" => an_instance_of(String),
+          "name" => klass.to_s,
+          "klass" => klass.to_s,
+          "status" => "running",
+          "total" => 2,
+          "finished" => 0,
+          "started_at" => nil,
+          "finished_at" => nil,
+          "stopped" => false,
+          "arguments" => ["arg1", "arg2"],
+          "jobs" => [
+              {
+                  "name"=>a_string_starting_with('FetchFirstJob'),
+                  "klass"=>"FetchFirstJob",
+                  "incoming"=>[],
+                  "outgoing"=>[a_string_starting_with('PersistFirstJob')],
+                  "finished_at"=>nil,
+                  "started_at"=>nil,
+                  "enqueued_at"=>nil,
+                  "failed_at"=>nil,
+                  "params" => {},
+                  "output_payload" => nil
+              },
+              {
+                  "name"=>a_string_starting_with('PersistFirstJob'),
+                  "klass"=>"PersistFirstJob",
+                  "incoming"=>["FetchFirstJob"],
+                  "outgoing"=>[],
+                  "finished_at"=>nil,
+                  "started_at"=>nil,
+                  "enqueued_at"=>nil,
+                  "failed_at"=>nil,
+                  "params" => {},
+                  "output_payload" => nil
+              }
+          ]
       }
       expect(result).to match(expected)
     end
@@ -145,7 +168,7 @@ describe Gush::Workflow do
 
       tree.resolve_dependencies
 
-      expect(tree.jobs.first.outgoing).to match_array([klass2.to_s])
+      expect(tree.jobs.first.outgoing).to match_array(jobs_with_id([klass2.to_s]))
     end
 
     it "allows `before` to accept an array of jobs" do
@@ -159,7 +182,7 @@ describe Gush::Workflow do
 
       tree.resolve_dependencies
 
-      expect(tree.jobs.first.incoming).to match_array([klass2.to_s])
+      expect(tree.jobs.first.incoming).to match_array(jobs_with_id([klass2.to_s]))
     end
 
     it "attaches job as a child of the job in `after` key" do
@@ -170,7 +193,7 @@ describe Gush::Workflow do
       tree.run(klass2, after: klass1)
       tree.resolve_dependencies
       job = tree.jobs.first
-      expect(job.outgoing).to match_array([klass2.to_s])
+      expect(job.outgoing).to match_array(jobs_with_id([klass2.to_s]))
     end
 
     it "attaches job as a parent of the job in `before` key" do
@@ -181,7 +204,7 @@ describe Gush::Workflow do
       tree.run(klass2, before: klass1)
       tree.resolve_dependencies
       job = tree.jobs.first
-      expect(job.incoming).to match_array([klass2.to_s])
+      expect(job.incoming).to match_array(jobs_with_id([klass2.to_s]))
     end
   end
 

data/spec/{lib/gush_spec.rb → gush_spec.rb}

@@ -25,7 +25,7 @@ describe Gush do
 
   describe ".root" do
     it "returns root directory of Gush" do
-      expected = Pathname.new(__FILE__).parent.parent.parent
+      expected = Pathname.new(__FILE__).parent.parent
       expect(Gush.root).to eq(expected)
     end
   end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ class FetchSecondJob < Gush::Job; end
 class PersistFirstJob < Gush::Job; end
 class PersistSecondJob < Gush::Job; end
 class NormalizeJob < Gush::Job; end
+class BobJob < Gush::Job; end
 
 GUSHFILE  = Pathname.new(__FILE__).parent.join("Gushfile.rb")
 
@@ -39,6 +40,14 @@ module GushHelpers
   def redis
     @redis ||= Redis.new(url: REDIS_URL)
   end
+
+  def jobs_with_id(jobs_array)
+    jobs_array.map {|job_name| job_with_id(job_name) }
+  end
+
+  def job_with_id(job_name)
+    /#{job_name}-(?<identifier>.*)/
+  end
 end
 
 RSpec::Matchers.define :have_jobs do |flow, jobs|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gush
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -209,12 +209,15 @@ files:
 - lib/gush/workflow.rb
 - spec/Gushfile.rb
 - spec/features/integration_spec.rb
-- spec/lib/gush/client_spec.rb
-- spec/lib/gush/configuration_spec.rb
-- spec/lib/gush/job_spec.rb
-- spec/lib/gush/worker_spec.rb
-- spec/lib/gush/workflow_spec.rb
-- spec/lib/gush_spec.rb
+- spec/gush/cli_spec.rb
+- spec/gush/client_spec.rb
+- spec/gush/configuration_spec.rb
+- spec/gush/graph_spec.rb
+- spec/gush/job_spec.rb
+- spec/gush/json_spec.rb
+- spec/gush/worker_spec.rb
+- spec/gush/workflow_spec.rb
+- spec/gush_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/pokonski/gush
 licenses:
@@ -236,18 +239,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Fast and distributed workflow runner using only Sidekiq and Redis
 test_files:
 - spec/Gushfile.rb
 - spec/features/integration_spec.rb
-- spec/lib/gush/client_spec.rb
-- spec/lib/gush/configuration_spec.rb
-- spec/lib/gush/job_spec.rb
-- spec/lib/gush/worker_spec.rb
-- spec/lib/gush/workflow_spec.rb
-- spec/lib/gush_spec.rb
+- spec/gush/cli_spec.rb
+- spec/gush/client_spec.rb
+- spec/gush/configuration_spec.rb
+- spec/gush/graph_spec.rb
+- spec/gush/job_spec.rb
+- spec/gush/json_spec.rb
+- spec/gush/worker_spec.rb
+- spec/gush/workflow_spec.rb
+- spec/gush_spec.rb
 - spec/spec_helper.rb
-has_rdoc: