resque-cluster 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 028add6454ab766f7e58fa251823eff190559194
-  data.tar.gz: 0e01b90462174035b216102d769cbd1a55b24073
+  metadata.gz: 7c483198ba655c6b6a01d9e5bf12bc94c78d7b97
+  data.tar.gz: 2ba5e136b052f24b10e034caa4b6dbb25faafb54
 SHA512:
-  metadata.gz: 75c0431398c6c47ae6cbeb9daca36eb80b2741fbc3c32cb1b5b06d515754a783548f9e481f9dc17b79b5a1f2b942ecf8ec3f2bfc00b5d4b115e5de94a96bac7c
-  data.tar.gz: 81f6a17b89b6112037592908d1bfd3139c7130e36509ec4f211cdd348ee86838fd74e0ae72b7a50136e0092a8359056ad3cfdf2bd1dfddb91f9df79827bf904d
+  metadata.gz: e179193ae5214b87436aef62b1af2193153894f6f9e9d39980d3b110d8d364635771c8e925d8db12886432e1790986d6b6bbf1cb515e3a4eac67eed87996e590
+  data.tar.gz: 9c5502109e773a4869e565f11d5d28bc279bebb8a425de6f6ddd907e3d98c7e96dbfa6693ef2ae97ecce21f3995813268f959934520c007d6684b164b344fbcd

data/Gemfile

@@ -1,18 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'resque-pool', '~> 0.5.0'
-gem 'gru'
-
-group :development do
-  gem 'sys-proctable'
-  gem 'ffi'
-  gem 'pry'
-  gem 'awesome_print'
-  gem 'rspec', '~> 3.1.0'
-  gem 'rdoc', '~> 3.12'
-  gem 'bundler', '~> 1.0'
-  gem 'jeweler', '~> 2.0.1'
-  gem 'simplecov', '>= 0'
-  gem 'rubocop', '~> 0.31'
-  gem 'mock_redis', '~> 0.15.0'
-end
+gemspec

data/Gemfile.lock

@@ -1,3 +1,10 @@
+PATH
+  remote: .
+  specs:
+    resque-cluster (0.2.3)
+      gru (= 0.1.3)
+      resque-pool (~> 0.5.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -37,7 +44,6 @@ GEM
     jwt (1.5.4)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
-    mock_redis (0.15.4)
     mono_logger (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.5.5)
@@ -120,15 +126,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print
-  bundler (~> 1.0)
+  awesome_print (> 0.0)
+  bundler (~> 1.7)
   ffi
-  gru
   jeweler (~> 2.0.1)
-  mock_redis (~> 0.15.0)
-  pry
+  pry (> 0.0)
   rdoc (~> 3.12)
-  resque-pool (~> 0.5.0)
+  resque-cluster!
   rspec (~> 3.1.0)
   rubocop (~> 0.31)
   simplecov

data/lib/resque/cluster/config.rb

@@ -7,7 +7,7 @@ module Resque
     class Config
       extend Forwardable
 
-      attr_reader :configs, :config, :global_config, :verifier, :version_git_hash
+      attr_reader :configs, :config, :global_config, :verifier
 
       def initialize(config_path, global_config_path = nil)
         @config = Config::File.new(config_path)
@@ -26,7 +26,6 @@ module Resque
 
         @errors           = Set.new
         @verifier         = Verifier.new(configs)
-        @version_git_hash = config_version
       end
 
       def verified?
@@ -45,8 +44,7 @@ module Resque
           cluster_maximums:         cluster_maximums,
           rebalance_flag:           rebalance_flag || false,
           max_workers_per_host:     max_workers_per_host || nil,
-          presume_host_dead_after:  presume_dead_after || 120,
-          version_hash:             version_git_hash
+          presume_host_dead_after:  presume_dead_after || 120
         }
       end
 
@@ -148,22 +146,6 @@ module Resque
             :old
           end
       end
-
-      def config_version
-        return unless verified?
-
-        directory_name = config.dirname
-
-        if directory_name.exist?
-          output = Dir.chdir(directory_name) { `git rev-parse --verify HEAD`.chomp }
-
-          if $?.success?
-            @version_git_hash = output
-          else
-            @warnings << "Your config directory: #{directory_name} is not a git repo. Your configuration will not be versioned"
-          end
-        end
-      end
     end
   end
 end

data/lib/resque/cluster/member.rb

@@ -15,7 +15,7 @@ module Resque
           @worker_count_manager = initialize_gru
         else
           @config.log_errors
-          @pool.quit
+          @pool.premature_quit
         end
       end
 
@@ -37,7 +37,7 @@ module Resque
       private
 
       def global_prefix
-        "cluster:#{Cluster.config[:cluster_name]}:#{Cluster.config[:environment]}:#{@config.version_git_hash}"
+        "cluster:#{Cluster.config[:cluster_name]}:#{Cluster.config[:environment]}"
       end
 
       def member_prefix

data/lib/resque/cluster/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Cluster
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/lib/resque/pool/patches.rb

@@ -22,9 +22,9 @@ module Resque
       original_maintain_worker_count.bind(self).call
     end
 
-    def quit
+    def premature_quit
       log "Quiting ..."
-      Process.kill(:TERM, Process.pid)
+      Process.kill(:QUIT, Process.pid)
     end
 
     def cluster_update

data/resque-cluster.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'jeweler', '~> 2.0.1'
   s.add_development_dependency 'simplecov', '>= 0'
   s.add_development_dependency 'rubocop', '~> 0.31'
-  s.add_development_dependency 'mock_redis', '~> 0.15.0'
+  s.add_development_dependency 'sys-proctable'
+  s.add_development_dependency 'ffi'
 end

data/spec/integration/cluster_spec.rb

@@ -157,8 +157,8 @@ RSpec.describe "Resque test-cluster" do
       sleep(8) # rebalance time
       expect(TestMemberManager.counts).to eq('par' => 3, 'tar' => 6, 'par,tar,var' => 2)
       expect(@a.counts).to eq('par' => 1, 'tar' => 2, 'par,tar,var' => 1)
-      expect(@b.counts).to eq('par' => 1, 'tar' => 2)
-      expect(@c.counts).to eq('par' => 1, 'tar' => 2, 'par,tar,var' => 1)
+      expect(@b.counts).to eq('par' => 1, 'tar' => 2, 'par,tar,var' => 1)
+      expect(@c.counts).to eq('par' => 1, 'tar' => 2)
     end
 
     after :all do

data/spec/unit/config_spec.rb

@@ -34,8 +34,7 @@ RSpec.describe Resque::Cluster::Config do
         max_workers_per_host:     10,
         cluster_name:             "unit-test-cluster",
         environment_name:         "unit-test",
-        manage_worker_heartbeats: true,
-        version_hash:             `git rev-parse --verify HEAD`.strip
+        manage_worker_heartbeats: true
       }
     end
 
@@ -120,8 +119,7 @@ RSpec.describe Resque::Cluster::Config do
           max_workers_per_host:     nil,
           cluster_name:             "unit-test-cluster",
           environment_name:         "unit-test",
-          manage_worker_heartbeats: true,
-          version_hash:             `git rev-parse --verify HEAD`.strip
+          manage_worker_heartbeats: true
         }
       end
 
@@ -131,10 +129,6 @@ RSpec.describe Resque::Cluster::Config do
         expect(config.errors.count).to eql(0)
         expect(config.warnings.count).to eql(0)
       end
-
-      it "git_version_hash should be set" do
-        expect(config.version_git_hash).to eql(`git rev-parse --verify HEAD`.strip)
-      end
     end
 
     context 'with a missing local maximum' do
@@ -185,10 +179,6 @@ RSpec.describe Resque::Cluster::Config do
       it "gru_format should return a an empty hash" do
         expect(config.gru_format).to eql(correct_hash)
       end
-
-      it "git_version_hash should not be set" do
-        expect(config.version_git_hash).to be_nil
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yasha Portnoy
@@ -14,14 +14,14 @@ dependencies:
   name: resque-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
@@ -42,128 +42,142 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
-  name: mock_redis
+  name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A management tool for resque workers. Allows spinning up and managing
   resque workers across multiple machines sharing the same Redis server
 email: yash.portnoy@gmail.com
@@ -172,10 +186,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
+- .document
+- .gitignore
+- .rspec
+- .rubocop.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -239,17 +253,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Creates and manages resque worker in a distributed cluster