gush 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9e61295e87f5c707a6f93a3cce7238c0650876be7ff76c4cba0c60133832217
-  data.tar.gz: 7df67c0134bc1e7bd036da850287191463557a764279790072f3f0a3887bf44b
+  metadata.gz: ffcdce12d2f530e27afdd048328d8942e60efcddfbe20a18426b8d245589c759
+  data.tar.gz: 3c95194d44f446a694af83b06b06eac55a3e5ed1f8555fe86958fa110b357647
 SHA512:
-  metadata.gz: 133913d52aaef1d470ca8be41c865c26949577df06935b034e83bb0ee616f5cd812d0c49730bbfc504342a46a6f0c6b813df19705f0a6c4448ba18969172e418
-  data.tar.gz: b08039f50aba1ab24fbe957669f16d51258913353ffba98b168a9df74782b46459c79f083c7e54b1dfa717a5878e85bb72ba07397993f833e83f9733ec5089dd
+  metadata.gz: e75e7f0ae5c5c83302d0507bb502a30a860f276e0706edd5a4119bb9c50bf88c73c9839ac1f141f4569017301ebb61fe943317d214c0c9a10f49309e674bd183
+  data.tar.gz: 38f3baaa43a4d512d5d5ec6c476d21965d27116e7dc8bc1ae3cc3fa4a4fac13e6d18272ed236fd413aba0c304f0e79aee59f3c06cdad19db7fa02e41305fe491

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.0.1
+
+### Fixed
+
+- Fix bug when retried jobs didn't correctly reset their failed flag when ran again (Thanks to @theo-delaune-argus and @mickael-palma-argus! [See issue](https://github.com/chaps-io/gush/issues/61))
+
 ## 2.0.0
 
 ## Changed

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       = "2.0.0"
+  spec.version       = "2.0.1"
   spec.authors       = ["Piotrek Okoński"]
   spec.email         = ["piotrek@okonski.org"]
   spec.summary       = "Fast and distributed workflow runner based on ActiveJob and Redis"

data/lib/gush/job.rb

@@ -47,6 +47,7 @@ module Gush
 
     def start!
       @started_at = current_timestamp
+      @failed_at = nil
     end
 
     def enqueue!

data/spec/features/integration_spec.rb

@@ -15,6 +15,53 @@ describe "Workflows" do
     end
   end
 
+  context 'when one of the jobs fails initally' do
+    it 'succeeds when the job retries' do
+      FAIL_THEN_SUCCEED_SPY = double()
+      allow(FAIL_THEN_SUCCEED_SPY).to receive(:foo).and_return('failure', 'success')
+
+      class FailsThenSucceeds < Gush::Job
+        def perform
+          if FAIL_THEN_SUCCEED_SPY.foo == 'failure'
+            raise NameError
+          end
+        end
+      end
+
+      class SecondChanceWorkflow < Gush::Workflow
+        def configure
+          run Prepare
+          run FailsThenSucceeds, after: Prepare
+          run NormalizeJob, after: FailsThenSucceeds
+        end
+      end
+
+      flow = SecondChanceWorkflow.create
+      flow.start!
+
+      expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(['Prepare']))
+      perform_one
+
+      expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(['FailsThenSucceeds']))
+      expect do
+        perform_one
+      end.to raise_error(NameError)
+
+      expect(flow.reload).to be_failed
+      expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(['FailsThenSucceeds']))
+
+      # Retry the same job again, but this time succeeds
+      perform_one
+
+      expect(Gush::Worker).to have_jobs(flow.id, jobs_with_id(['NormalizeJob']))
+      perform_one
+
+      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!
@@ -77,8 +124,6 @@ describe "Workflows" do
 
     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

data/spec/gush/job_spec.rb

@@ -52,10 +52,18 @@ describe Gush::Job do
   describe "#start!" do
     it "resets flags and marks as running" do
       job = described_class.new(name: "a-job")
+
+      job.enqueue!
+      job.fail!
+
+      now = Time.now.to_i
+      expect(job.started_at).to eq(nil)
+      expect(job.failed_at).to eq(now)
+
       job.start!
+
       expect(job.started_at).to eq(Time.now.to_i)
-      expect(job.enqueued?).to eq(false)
-      expect(job.running?).to eq(true)
+      expect(job.failed_at).to eq(nil)
     end
   end
 

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ class PersistSecondJob < Gush::Job; end
 class NormalizeJob < Gush::Job; end
 class BobJob < Gush::Job; end
 
-GUSHFILE  = Pathname.new(__FILE__).parent.join("Gushfile")
+GUSHFILE = Pathname.new(__FILE__).parent.join("Gushfile")
 
 class TestWorkflow < Gush::Workflow
   def configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gush
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob