gush 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2be71d1a76f021091ae90270ea5f01a2413ae0
-  data.tar.gz: c4160594dd6ad163239548623a7e67b29aa1727c
+  metadata.gz: 684995dea63d846e4b58504b9d1fdf3b386ca2af
+  data.tar.gz: b52e1adc2ebb098de804028dc0d7d70ee38e548e
 SHA512:
-  metadata.gz: 271ac326d01d2dafd4c0092e3011a5d57206b988bfc7e5e62e375b913bcb2e8750440058e07a58d60663446fc7b7254f2b91a39ed6d038976995dccc3af0952b
-  data.tar.gz: a28e4ef3338b305523e7d7d275aa6d3e357ddfe5161aaef95e323b12268a301c8d59352f12c68c445392df613c29ae11f38079a6838006c3ca2920c32ce418ad
+  metadata.gz: 9ad6ed4b35110be871cdbb82d5e6058a2debdf416866d02fd4d93ecd3e7c782c5e5ad9c93823341aa0f1a68ade9b3af8cb6d9bf39c20f7211e8b75ebb1ae8c97
+  data.tar.gz: 8bd0060a367a3e4b27787add32210ac27fe75fe982f958043d053f2bde5dcc190a276fecc1d8f26cbe11cfa5a412112bbbd539cf662fb92a30eb9c2ce51a5e14

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Piotrek Okoński
+Copyright (c) 2015 Chaps sp. z o.o.
 
 MIT License
 

data/README.md

@@ -63,7 +63,7 @@ For the Workflow above, the graph will look like this:
 You can pass any primitive arguments into jobs while defining your workflow:
 
 ```ruby
-# workflows/sample_workflow.rb
+# app/workflows/sample_workflow.rb
 class SampleWorkflow < Gush::Workflow
   def configure
     run FetchJob1, params: { url: "http://some.com/url" }
@@ -78,7 +78,8 @@ See below to learn how to access those params inside your job.
 Jobs are classes inheriting from `Gush::Job`:
 
 ```ruby
-class FetchJob1 < Gush::Job
+# app/jobs/fetch_job.rb
+class FetchJob < Gush::Job
   def work
     # do some fetching from remote APIs
 
@@ -97,7 +98,7 @@ Workflows can accept any primitive arguments in their constructor, which then wi
 Here's an example of a workflow responsible for publishing a book:
 
 ```ruby
-# workflows/sample_workflow.rb
+# app/workflows/sample_workflow.rb
 class PublishBookWorkflow < Gush::Workflow
   def configure(url, isbn)
     run FetchBook, params: { url: url }
@@ -182,7 +183,7 @@ end
 `payloads` is a hash containing outputs from all parent jobs, where job class names are the keys.
 
 **Note:** `payloads` will only contain outputs of the job's ancestors. So if job `A` depends on `B` and `C`,
-the `paylods` hash will look like this:
+the `payloads` hash will look like this:
 
 ```ruby
 {
@@ -199,7 +200,7 @@ the `paylods` hash will look like this:
 ```ruby
 flow.reload
 flow.status
-#=> :running|:pending|:finished|:failed
+#=> :running|:finished|:failed
 ```
 
 `reload` is needed to see the latest status, since workflows are updated asynchronously.
@@ -239,7 +240,7 @@ end
 
 ## Contributing
 
-1. Fork it ( http://github.com/pokonski/gush/fork )
+1. Fork it ( http://github.com/chaps-io/gush/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

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.1.2"
+  spec.version       = "0.2.0"
   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

@@ -126,7 +126,7 @@ module Gush
     end
 
     def gushfile
-      Pathname.pwd.join(options[:gushfile])
+      Gush.configuration.gushfile
     end
 
     def load_gushfile

data/lib/gush/cli/overview.rb

@@ -21,7 +21,7 @@ module Gush
         elsif workflow.stopped?
           "stopped".red
         else
-          "pending".light_white
+          running_status
         end
       end
 

data/lib/gush/job.rb

@@ -60,23 +60,27 @@ module Gush
     end
 
     def enqueued?
-      !!enqueued_at
+      !enqueued_at.nil?
     end
 
     def finished?
-      !!finished_at
+      !finished_at.nil?
     end
 
     def failed?
-      !!failed_at
+      !failed_at.nil?
     end
 
     def succeeded?
       finished? && !failed?
     end
 
+    def started?
+      !started_at.nil?
+    end
+
     def running?
-      !!started_at && !finished?
+      started? && !finished?
     end
 
     def ready_to_start?

data/lib/gush/workflow.rb

@@ -70,8 +70,12 @@ module Gush
       jobs.all?(&:finished?)
     end
 
+    def started?
+      @stopped == false
+    end
+
     def running?
-      !stopped? && jobs.any? {|j| j.enqueued? || j.running? }
+      !finished?
     end
 
     def failed?
@@ -122,7 +126,7 @@ module Gush
         when stopped?
           :stopped
         else
-          :pending
+          :running
       end
     end
 
@@ -174,7 +178,7 @@ module Gush
     end
 
     def last_job
-      jobs.max_by{ |n| n.finished_at || 0 } if jobs.all?(&:finished?)
+      jobs.max_by{ |n| n.finished_at || 0 } if finished?
     end
   end
 end

data/spec/features/integration_spec.rb

@@ -1,7 +1,20 @@
 require 'spec_helper'
 
-
 describe "Workflows" do
+  context "when all jobs finish successfuly" do
+    it "marks workflow as completed" do
+      flow = TestWorkflow.create
+      flow.start!
+      expect(flow.reload).to be_running
+
+      Gush::Worker.drain
+
+      flow = flow.reload
+      expect(flow).to be_finished
+      expect(flow).to_not be_failed
+    end
+  end
+
   it "runs the whole workflow in proper order" do
     flow = TestWorkflow.create
     flow.start!
@@ -23,10 +36,6 @@ describe "Workflows" do
     Gush::Worker.perform_one
 
     expect(Gush::Worker.jobs).to be_empty
-
-    flow = flow.reload
-    expect(flow).to be_finished
-    expect(flow).to_not be_failed
   end
 
   it "passes payloads down the workflow" do

data/spec/lib/gush/workflow_spec.rb

@@ -73,7 +73,7 @@ describe Gush::Workflow do
         "id" => an_instance_of(String),
         "name" => klass.to_s,
         "klass" => klass.to_s,
-        "status" => "pending",
+        "status" => "running",
         "total" => 2,
         "finished" => 0,
         "started_at" => nil,
@@ -203,13 +203,6 @@ describe Gush::Workflow do
   describe "#running?" do
     context "when no enqueued or running jobs" do
       it "returns false" do
-        expect(subject.running?).to be_falsy
-      end
-    end
-
-    context "when some jobs are enqueued" do
-      it "returns true" do
-        subject.find_job('Prepare').enqueue!
         expect(subject.running?).to be_truthy
       end
     end

metadata

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