gush 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7835f38c3775eb5e27af05891b1338fb5e8db18b
-  data.tar.gz: d0e9dd4c0ccca28baa7ddc9517d0a40f17c34182
+  metadata.gz: 392530c8fb8c72de66d30d0e2dff156f7bd5981e
+  data.tar.gz: 96a4eb1b335d4b1927d6b10b09659197b5518bc4
 SHA512:
-  metadata.gz: d529e5db55f76be518d6d33f528935eae41b3b4b7deb5a710792a8829186e5f21c9c6e9f43dcdcaebac7f61eaa3eb5cebafd8f84e3b0486069ff1b285ebf3f94
-  data.tar.gz: 5b7e7a88e0db80efd590df7f8e6d8b0e407512f29bed6ee5b11728de622e28b5e46fb9c83b3fa80f325fa2511d763a305633825e2ce3c98783ccc76cbbb17412
+  metadata.gz: dd3deccd8c220426b730d417883cddc18a0fbf1ffac6aaa9e2406fd98b969e48a349fb2eb687769f03ae60a62aa3792f4f951b84a92bdd0c804bedc4f265a44d
+  data.tar.gz: 0bf46f8276ad9c1cc59104c329aa7f41e621aa0bb9ddb21ce1d0b5e0efcb76f4dcd7d0ec5c1c05363cd6868483c88b18175774881ef8004091950d929ad76eba

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.2.2"
+  spec.version       = "0.2.3"
   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

@@ -35,7 +35,8 @@ module Gush
     desc "start [workflow_id]", "Starts Workflow with given ID"
     def start(*args)
       id = args.shift
-      client.start_workflow(id, args)
+      workflow = client.find_workflow(id)
+      client.start_workflow(workflow, args)
     end
 
     desc "create_and_start [WorkflowClass]", "Create and instantly start the new workflow"

data/lib/gush/cli/overview.rb

@@ -21,7 +21,7 @@ module Gush
         elsif workflow.stopped?
           "stopped".red
         else
-          running_status
+          "ready to start".blue
         end
       end
 
@@ -53,6 +53,7 @@ module Gush
           "Enqueued jobs" => enqueued_jobs_count.yellow,
           "Running jobs" => running_jobs_count.blue,
           "Remaining jobs" => remaining_jobs_count,
+          "Started at" => started_at,
           "Status" => status
         }
       end
@@ -63,6 +64,10 @@ module Gush
         status += "\n#{finished}/#{total_jobs_count} [#{(finished*100)/total_jobs_count}%]"
       end
 
+      def started_at
+        workflow.started_at.inspect
+      end
+
       def failed_status
         status = "failed".light_red
         status += "\n#{failed_job} failed"
@@ -131,7 +136,7 @@ module Gush
       end
 
       def remaining_jobs_count
-        workflow.jobs.count{|j| [j.finished, j.failed, j.enqueued].none? }.to_s
+        workflow.jobs.count{|j| [j.finished?, j.failed?, j.enqueued?].none? }.to_s
       end
     end
   end

data/lib/gush/client.rb

@@ -87,10 +87,11 @@ module Gush
     end
 
     def load_job(workflow_id, job_id)
+      workflow = find_workflow(workflow_id)
       data = redis.get("gush.jobs.#{workflow_id}.#{job_id}")
       return nil if data.nil?
       data = Gush::JSON.decode(data, symbolize_keys: true)
-      Gush::Job.from_hash(nil, data)
+      Gush::Job.from_hash(workflow, data)
     end
 
     def destroy_workflow(workflow)

data/lib/gush/job.rb

@@ -84,7 +84,13 @@ module Gush
     end
 
     def ready_to_start?
-      !running? && !enqueued? && !finished? && !failed?
+      !running? && !enqueued? && !finished? && !failed? && parents_succeeded?
+    end
+
+    def parents_succeeded?
+      incoming.all? do |name|
+        @workflow.find_job(name).succeeded?
+      end
     end
 
     def has_no_dependencies?

data/lib/gush/workflow.rb

@@ -71,11 +71,11 @@ module Gush
     end
 
     def started?
-      @stopped == false
+      !!started_at
     end
 
     def running?
-      !finished?
+      started? && !finished?
     end
 
     def failed?

data/spec/features/integration_spec.rb

@@ -5,7 +5,6 @@ describe "Workflows" do
     it "marks workflow as completed" do
       flow = TestWorkflow.create
       flow.start!
-      expect(flow.reload).to be_running
 
       Gush::Worker.drain
 
@@ -28,7 +27,7 @@ describe "Workflows" do
     expect(Gush::Worker).to have_jobs(flow.id, ["FetchSecondJob", "PersistFirstJob"])
 
     Gush::Worker.perform_one
-    expect(Gush::Worker).to have_jobs(flow.id, ["PersistFirstJob", "NormalizeJob"])
+    expect(Gush::Worker).to have_jobs(flow.id, ["PersistFirstJob"])
 
     Gush::Worker.perform_one
     expect(Gush::Worker).to have_jobs(flow.id, ["NormalizeJob"])

data/spec/lib/gush/workflow_spec.rb

@@ -203,7 +203,7 @@ describe Gush::Workflow do
   describe "#running?" do
     context "when no enqueued or running jobs" do
       it "returns false" do
-        expect(subject.running?).to be_truthy
+        expect(subject.running?).to be_falsy
       end
     end
 

data/spec/spec_helper.rb

@@ -21,9 +21,10 @@ class TestWorkflow < Gush::Workflow
     run NormalizeJob
 
     run FetchFirstJob,   after: Prepare
+    run FetchSecondJob,  after: Prepare, before: NormalizeJob
+
     run PersistFirstJob, after: FetchFirstJob, before: NormalizeJob
 
-    run FetchSecondJob,  after: Prepare, before: NormalizeJob
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gush
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq