taskinator 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f06333f9729441692c47b0eecc144080b2711ff
-  data.tar.gz: 4b6db6e7787af743783a45dea8070813d9d2df9e
+  metadata.gz: f38da174c5aa2c6925369594efb9a6bd2c9f7f92
+  data.tar.gz: f5f868792f18674fcaf36eb1f810979d573a00dc
 SHA512:
-  metadata.gz: 4d352409fcbfce51f8591779c291cee6a2fcecd2513a33d07657c8e85045654af4af639908704e3e9f7fda3c72859781bf36d96c7e4dfdbb48decd3e2a38e161
-  data.tar.gz: c849ec329437762c590e2858c794729cf08264343907692ba564a9a7cd5858da7109452c88bb9777299a36726008feea3dfb4201706913be011ad4996c7e0621
+  metadata.gz: 456f4e59f0be95f9e75cf077d75c1c839ddca9c11d983e675acd9ed54b1a64f957a19d35885ed07033c31b0f8e4f435f414e5847966376de28282529448e1884
+  data.tar.gz: cc736074a6f21baa49cfa76ab05566c17d48f653c54f25f00759f0ecf89ed9de0fbf77296e8071f3cdd6f487bccae256b35eddf94183f0f774eb4011f9cad729

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false  # See http://docs.travis-ci.com/user/migrating-from-legacy
 cache: bundler
 
 services:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.3.2 - 18 Sep 2015
+---
+Bug fix to argument handling when using `create_process_remotely` method.
+
 v0.3.1 - 16 Sep 2015
 ---
 Added redis-semaphore gem, for fix to concurrent processes completion logic.

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/mperham/sidekiq.git
-  revision: 50fc8ee7c3f7c5e4049db598c0e14465a67a877c
+  revision: cf5933ab67eefb86e64d99a6aee4eaf18aada08f
   specs:
     sidekiq (3.5.0)
       celluloid (~> 0.17.0)
@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    taskinator (0.3.1)
+    taskinator (0.3.2)
       connection_pool (>= 2.2.0)
       json (>= 1.8.2)
       redis (>= 3.2.1)

data/lib/taskinator/create_process_worker.rb

@@ -19,7 +19,20 @@ module Taskinator
     end
 
     def perform
-      @definition._create_process_(false, *@args, :uuid => @uuid).enqueue!
+
+      # args may contain an options hash at the end
+      # so merge in the uuid into it, or add
+
+      process_args = args || []
+
+      if process_args.last.is_a?(Hash)
+        process_args.last.merge!(:uuid => uuid)
+      else
+        process_args << { :uuid => uuid }
+      end
+
+      @definition._create_process_(false, *process_args).enqueue!
+
     end
 
     private

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/taskinator/workflow.rb

@@ -28,7 +28,7 @@ module Taskinator
     ).each do |state|
 
       define_method :"#{state}?" do
-        @current_state == state
+        current_state == state
       end
 
     end

data/spec/taskinator/create_process_worker_spec.rb

@@ -4,9 +4,9 @@ describe Taskinator::CreateProcessWorker do
 
   let(:definition) { MockDefinition.create }
   let(:uuid) { SecureRandom.uuid }
-  let(:args) { {:foo => :bar} }
+  let(:args) { [{:foo => :bar}] }
 
-  subject { Taskinator::CreateProcessWorker.new(definition.name, uuid, Taskinator::Persistence.serialize(:foo => :bar)) }
+  subject { Taskinator::CreateProcessWorker.new(definition.name, uuid, Taskinator::Persistence.serialize(args)) }
 
   describe "#initialize" do
     it {
@@ -14,19 +14,19 @@ describe Taskinator::CreateProcessWorker do
     }
 
     it {
-      Taskinator::CreateProcessWorker.new(definition.name, uuid, Taskinator::Persistence.serialize(:foo => :bar))
+      Taskinator::CreateProcessWorker.new(definition.name, uuid, Taskinator::Persistence.serialize(args))
       expect(subject.definition).to eq(definition)
     }
 
     it {
       MockDefinition.const_set(definition.name, definition)
-      Taskinator::CreateProcessWorker.new("MockDefinition::#{definition.name}", uuid, Taskinator::Persistence.serialize(:foo => :bar))
+      Taskinator::CreateProcessWorker.new("MockDefinition::#{definition.name}", uuid, Taskinator::Persistence.serialize(args))
       expect(subject.definition).to eq(definition)
     }
 
     it {
       expect {
-        Taskinator::CreateProcessWorker.new("NonExistent", uuid, Taskinator::Persistence.serialize(:foo => :bar))
+        Taskinator::CreateProcessWorker.new("NonExistent", uuid, Taskinator::Persistence.serialize(args))
       }.to raise_error(NameError)
     }
 
@@ -40,9 +40,42 @@ describe Taskinator::CreateProcessWorker do
   end
 
   describe "#perform" do
-    it "should create the process" do
-      expect(definition).to receive(:_create_process_).with(false, *args, :uuid => uuid).and_return(double('process', :enqueue! => nil))
-      subject.perform
+    describe "create the process" do
+      it "with no arguments" do
+        process_args = [{:uuid => uuid}]
+        args = Taskinator::Persistence.serialize([])
+
+        expect(definition).to receive(:_create_process_).with(false, *process_args).and_return(double('process', :enqueue! => nil))
+
+        Taskinator::CreateProcessWorker.new(definition.name, uuid, args).perform
+      end
+
+      it "with arguments" do
+        process_args = [:foo, :bar, {:uuid => uuid}]
+        serialized_args = Taskinator::Persistence.serialize([:foo, :bar])
+
+        expect(definition).to receive(:_create_process_).with(false, *process_args).and_return(double('process', :enqueue! => nil))
+
+        Taskinator::CreateProcessWorker.new(definition.name, uuid, serialized_args).perform
+      end
+
+      it "with options" do
+        process_args = [{:foo => :bar, :uuid => uuid}]
+        serialized_args = Taskinator::Persistence.serialize([{:foo => :bar}])
+
+        expect(definition).to receive(:_create_process_).with(false, *process_args).and_return(double('process', :enqueue! => nil))
+
+        Taskinator::CreateProcessWorker.new(definition.name, uuid, serialized_args).perform
+      end
+
+      it "with arguments and options" do
+        process_args = [:foo, {:bar => :baz, :uuid => uuid}]
+        serialized_args = Taskinator::Persistence.serialize([:foo, {:bar => :baz}])
+
+        expect(definition).to receive(:_create_process_).with(false, *process_args).and_return(double('process', :enqueue! => nil))
+
+        Taskinator::CreateProcessWorker.new(definition.name, uuid, serialized_args).perform
+      end
     end
 
     it "should enqueue the process" do

data/spec/taskinator/task_spec.rb

@@ -156,6 +156,8 @@ describe Taskinator::Task do
 
     describe "#tasks_count" do
       it {
+        process_uuid = SecureRandom.hex
+        allow(subject).to receive(:process_uuid) { process_uuid }
         expect(subject.tasks_count).to eq(0)
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis