gush 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 530121f8210176d74b4ee481c929d123c227c247
-  data.tar.gz: 6c69a21fdba018faae42f33de3a506ac01c7b881
+  metadata.gz: d26693f019dfd49b57cb7828274bec009c96dfb4
+  data.tar.gz: 1666a4d1edc877d4ac597428ed56f73a5f625fa9
 SHA512:
-  metadata.gz: 353836d226553352646b590ca924df5f6b64f1dcfb1c07e1a677fbf93bd3875fe9f569db3c4f6b9a3817aff4907eaa827178fcdefcaca234668585682b8f36e7
-  data.tar.gz: 6d8613db3477f98f9e66ff72f873f126fec5fee0a5262aaa37adc163a9bebc785698967fc17764b3ce0393a5ab98d4c4aa6117d689bc4496233ae846d050d0c0
+  metadata.gz: b1f55d88bbe1719395103c6eeeda6a9d140d9cd7b6d35296f1ab97b1d381a7f69bbbe83e21faa660a05fe6183d7d5443c006244cbbcc99ebbc58edf554d2adbf
+  data.tar.gz: c2d6e5aa2a0613dae3e893ca368e527cac28fe1b9d6df66793de83bfe73dcad7940ee9d0cfd0663e8fd1fcc30eb313c0e465f98da1a350f5958d82beef9faa61

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 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

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in gush.gemspec
 gemspec
 
-gem 'pry'
-gem 'yajl-ruby'
-gem "fakeredis", require: false
+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.3.2"
+  spec.version       = "0.3.3"
   spec.authors       = ["Piotrek Okoński"]
   spec.email         = ["piotrek@okonski.org"]
   spec.summary       = "Fast and distributed workflow runner using only Sidekiq and Redis"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sidekiq", "~> 4.0"
-  spec.add_dependency "yajl-ruby", "~> 1.2"
+  spec.add_dependency "multi_json", "~> 1.11"
   spec.add_dependency "redis", "~> 3.2"
   spec.add_dependency "hiredis", "~> 0.6"
   spec.add_dependency "ruby-graphviz", "~> 1.2"
@@ -29,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency "pry", '~> 0.10'
+  spec.add_development_dependency 'fakeredis', '~> 0.5'
 end

data/lib/gush.rb

@@ -6,6 +6,7 @@ require "pathname"
 require "redis"
 require "securerandom"
 require "sidekiq"
+require "multi_json"
 
 require "gush/json"
 require "gush/cli"

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

data/lib/gush/configuration.rb

@@ -1,5 +1,3 @@
-require 'yajl'
-
 module Gush
   class Configuration
     attr_accessor :concurrency, :namespace, :redis_url, :environment

data/lib/gush/json.rb

@@ -1,11 +1,11 @@
 module Gush
   class JSON
     def self.encode(data)
-      Yajl::Encoder.new.encode(data)
+      MultiJson.dump(data)
     end
 
     def self.decode(data, options = {})
-      Yajl::Parser.parse(data, options)
+      MultiJson.load(data, options)
     end
   end
 end

data/lib/gush/worker.rb

@@ -1,5 +1,4 @@
 require 'sidekiq'
-require 'yajl'
 
 module Gush
   class Worker

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'gush'
-require 'pry'
+require 'fakeredis'
 require 'sidekiq/testing'
 
 Sidekiq::Testing.fake!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gush
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Gush is a parallel workflow runner using only Redis as its message broker
   and Sidekiq for workers.
 email:
@@ -190,6 +218,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -256,4 +285,3 @@ test_files:
 - spec/gush/workflow_spec.rb
 - spec/gush_spec.rb
 - spec/spec_helper.rb
-has_rdoc: