gush 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6742c4a3bbcd13c0045c12c8733dae7e7b2fd2a2
-  data.tar.gz: 43293c3a05639fc46e3d39b87e750358a3ed4c60
+  metadata.gz: d6bc6665af4376d837c94695ebcd5d2076abd0a5
+  data.tar.gz: 2aaf48dc13f289a1a61d3d1afbd231dcc511cb16
 SHA512:
-  metadata.gz: 36263afadc504f4051a93613b27ab18f77b79b24c7e25927d11fc92322b5c42c4054fcd3d8dc2335843dc59224a1aab699a848459ce879b31920b5393d16c0f4
-  data.tar.gz: b4447f6c90b7ef427624eb6bdd3f2b1eb36a954b92f1c578dec3a446cbe7e7ea909d02957050e3779902db88e9cb4a12695bc5dc0f08432813d8925d37b7f92a
+  metadata.gz: 3ae3dafb868d3c48ee2468f0fbf88d94dcc25dcbb83827ce5c855832118dfb256db5ee7c05d8eee21930f46b04c20e775aa5057a0739212417f11d03d9666865
+  data.tar.gz: dcc89596cf05c6d5f96e6b4ec54879a774a6c1e476acd51ae159872494f180840f92757f58d5b1801117c6b1d3864a41132a60e9a3563ce92a780ce2570a0d6d

data/CHANGELOG.md

@@ -1,3 +1,3 @@
-# 0.5
+# 0.4
 
 - remove hard dependency on Yajl, so Gush can work with non-MRI Rubies ([#31](https://github.com/chaps-io/gush/pull/31) by [Nick Rakochy](https://github.com/chaps-io/gush/pull/31))

data/Gemfile

@@ -4,4 +4,3 @@ gemspec
 platforms :mri, :ruby do
   gem 'yajl-ruby'
 end
-

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.4"
+  spec.version       = "0.4.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/client.rb

@@ -1,17 +1,15 @@
 module Gush
   class Client
-    attr_reader :configuration
+    attr_reader :configuration, :sidekiq
 
     def initialize(config = Gush.configuration)
       @configuration = config
       @sidekiq = build_sidekiq
-      @redis = build_redis
     end
 
     def configure
       yield configuration
       @sidekiq = build_sidekiq
-      @redis = build_redis
     end
 
     def create_workflow(name)
@@ -49,7 +47,11 @@ module Gush
       loop do
         id = SecureRandom.uuid
         job_identifier = "#{job_klass}-#{id}"
-        break if !redis.exists("gush.jobs.#{workflow_id}.#{job_identifier}")
+        available = connection_pool.with do |redis|
+          !redis.exists("gush.jobs.#{workflow_id}.#{job_identifier}")
+        end
+
+        break if available
       end
 
       job_identifier
@@ -59,40 +61,54 @@ module Gush
       id = nil
       loop do
         id = SecureRandom.uuid
-        break if !redis.exists("gush.workflow.#{id}")
+        available = connection_pool.with do |redis|
+          !redis.exists("gush.workflow.#{id}")
+        end
+
+        break if available
       end
 
       id
     end
 
     def all_workflows
-      redis.keys("gush.workflows.*").map do |key|
-        id = key.sub("gush.workflows.", "")
-        find_workflow(id)
+      connection_pool.with do |redis|
+        redis.keys("gush.workflows.*").map do |key|
+          id = key.sub("gush.workflows.", "")
+          find_workflow(id)
+        end
       end
     end
 
     def find_workflow(id)
-      data = redis.get("gush.workflows.#{id}")
-      unless data.nil?
-        hash = Gush::JSON.decode(data, symbolize_keys: true)
-        keys = redis.keys("gush.jobs.#{id}.*")
-        nodes = redis.mget(*keys).map { |json| Gush::JSON.decode(json, symbolize_keys: true) }
-        workflow_from_hash(hash, nodes)
-      else
-        raise WorkflowNotFound.new("Workflow with given id doesn't exist")
+      connection_pool.with do |redis|
+        data = redis.get("gush.workflows.#{id}")
+
+        unless data.nil?
+          hash = Gush::JSON.decode(data, symbolize_keys: true)
+          keys = redis.keys("gush.jobs.#{id}.*")
+          nodes = redis.mget(*keys).map { |json| Gush::JSON.decode(json, symbolize_keys: true) }
+          workflow_from_hash(hash, nodes)
+        else
+          raise WorkflowNotFound.new("Workflow with given id doesn't exist")
+        end
       end
     end
 
     def persist_workflow(workflow)
-      redis.set("gush.workflows.#{workflow.id}", workflow.to_json)
+      connection_pool.with do |redis|
+        redis.set("gush.workflows.#{workflow.id}", workflow.to_json)
+      end
+
       workflow.jobs.each {|job| persist_job(workflow.id, job) }
       workflow.mark_as_persisted
       true
     end
 
     def persist_job(workflow_id, job)
-      redis.set("gush.jobs.#{workflow_id}.#{job.name}", job.to_json)
+      connection_pool.with do |redis|
+        redis.set("gush.jobs.#{workflow_id}.#{job.name}", job.to_json)
+      end
     end
 
     def load_job(workflow_id, job_id)
@@ -100,10 +116,16 @@ module Gush
       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}*")
+      keys = connection_pool.with do |redis|
+        redis.keys("gush.jobs.#{workflow_id}.#{job_id}#{hypen}*")
+      end
+
       return nil if keys.nil?
 
-      data = redis.get(keys.first)
+      data = connection_pool.with do |redis|
+        redis.get(keys.first)
+      end
+
       return nil if data.nil?
 
       data = Gush::JSON.decode(data, symbolize_keys: true)
@@ -111,12 +133,16 @@ module Gush
     end
 
     def destroy_workflow(workflow)
-      redis.del("gush.workflows.#{workflow.id}")
+      connection_pool.with do |redis|
+        redis.del("gush.workflows.#{workflow.id}")
+      end
       workflow.jobs.each {|job| destroy_job(workflow.id, job) }
     end
 
     def destroy_job(workflow_id, job)
-      redis.del("gush.jobs.#{workflow_id}.#{job.name}")
+      connection_pool.with do |redis|
+        redis.del("gush.jobs.#{workflow_id}.#{job.name}")
+      end
     end
 
     def worker_report(message)
@@ -140,8 +166,6 @@ module Gush
 
     private
 
-    attr_reader :sidekiq, :redis
-
     def workflow_from_hash(hash, nodes = nil)
       flow = hash[:klass].constantize.new *hash[:arguments]
       flow.jobs = []
@@ -156,7 +180,9 @@ module Gush
     end
 
     def report(key, message)
-      redis.publish(key, Gush::JSON.encode(message))
+      connection_pool.with do |redis|
+        redis.publish(key, Gush::JSON.encode(message))
+      end
     end
 
 
@@ -169,7 +195,7 @@ module Gush
     end
 
     def connection_pool
-      ConnectionPool.new(size: configuration.concurrency, timeout: 1) { build_redis }
+      @connection_pool ||= ConnectionPool.new(size: configuration.concurrency, timeout: 1) { build_redis }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gush
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Fast and distributed workflow runner using only Sidekiq and Redis