resque-cluster 0.1.1.1 → 0.2.0

data/spec/unit/member_spec.rb

@@ -20,47 +20,19 @@ RSpec.describe Resque::Cluster::Member do
     Resque::Cluster.member = nil
   end
 
-  context '#cluster_member_settings' do
-    before :all do
-      @settings_hash = {
-        :cluster_maximums => {'foo' => 2, 'bar' => 50, "foo,bar,baz" => 1},
-        :host_maximums => {'foo' => 1, 'bar' => 9, "foo,bar,baz" => 1},
-        :client_settings => @redis.client.options,
-        :rebalance_flag => false,
-        :presume_host_dead_after => 120,
-        :max_workers_per_host => nil,
-        :cluster_name => "unit-test-cluster",
-        :environment_name => "unit-test",
-        :manage_worker_heartbeats => true
-      }
-    end
-
-    it 'returns a correct cluster settings hash' do
-      expect(Resque::Cluster.member.send(:cluster_member_settings)).to eq(@settings_hash)
-      Resque::Cluster.member
-    end
-
-    it 'returns a correct cluster settings hash with global_config with a rebalance param' do
-      Resque::Cluster.config[:global_config_path] = File.expand_path(File.dirname(__FILE__) + '/../global_rebalance_config.yml')
-      @settings_hash[:rebalance_flag] = true
-      @member = Resque::Cluster.init(@pool)
-      expect(Resque::Cluster.member.send(:cluster_member_settings)).to eq(@settings_hash)
-    end
-  end
-
   context '#check_for_worker_count_adjustment' do
     before :all do
       @redis.hset("GRU:unit-test:unit-test-cluster:global:max_workers","bar",2)
-      @redis.hset("GRU:unit-test:unit-test-cluster:#{@@hostname}:max_workers","bar",2)
+      @redis.hset("GRU:unit-test:unit-test-cluster:#{HOSTNAME}:max_workers","bar",2)
       @redis.hset("GRU:unit-test:unit-test-cluster:global:workers_running","bar",0)
-      @redis.hset("GRU:unit-test:unit-test-cluster:#{@@hostname}:workers_running","bar",0)
+      @redis.hset("GRU:unit-test:unit-test-cluster:#{HOSTNAME}:workers_running","bar",0)
     end
 
     it 'adjust worker counts if an adjustment exists on the local command queue' do
       2.times do
         @member.check_for_worker_count_adjustment
-        expect(@redis.hget("GRU:unit-test:unit-test-cluster:#{@@hostname}:workers_running", 'foo')).to eq '1'
-        expect(@redis.hget("GRU:unit-test:unit-test-cluster:#{@@hostname}:workers_running", 'bar')).to eq '2'
+        expect(@redis.hget("GRU:unit-test:unit-test-cluster:#{HOSTNAME}:workers_running", 'foo')).to eq '1'
+        expect(@redis.hget("GRU:unit-test:unit-test-cluster:#{HOSTNAME}:workers_running", 'bar')).to eq '2'
         expect(@member.pool.config['foo']).to eq(1)
         expect(@member.pool.config['bar']).to eq(2)
       end
@@ -68,6 +40,7 @@ RSpec.describe Resque::Cluster::Member do
   end
 
   after :all do
+    @member.unregister
     @redis.del("GRU:unit-test:unit-test-cluster:global:max_workers")
     @redis.del("GRU:unit-test:unit-test-cluster:global:workers_running")
     @redis.del("GRU:unit-test:unit-test-cluster:heartbeats")

data/spec/unit/resque_pool_patches_spec.rb

@@ -59,9 +59,9 @@ RSpec.describe Resque::Pool do
 
   after :all do
     @redis = Redis.new
-    @redis.del("resque:cluster:unit-test-cluster:unit-test:#{@@hostname}:running_workers")
-    @redis.del("GRU:unit-test:unit-test-cluster:#{@@hostname}:max_workers")
-    @redis.del("GRU:unit-test:unit-test-cluster:#{@@hostname}:workers_running")
+    @redis.del("resque:cluster:unit-test-cluster:unit-test:#{HOSTNAME}:running_workers")
+    @redis.del("GRU:unit-test:unit-test-cluster:#{HOSTNAME}:max_workers")
+    @redis.del("GRU:unit-test:unit-test-cluster:#{HOSTNAME}:workers_running")
     @redis.del("GRU:unit-test:unit-test-cluster:global:max_workers")
     @redis.del("GRU:unit-test:unit-test-cluster:global:workers_running")
     @redis.del("resque:cluster:unit-test-cluster:unit-test")

data/spec/unit/spec_helper.rb

@@ -10,4 +10,8 @@ $LOAD_PATH << File.expand_path('lib/resque/pool/*', File.dirname(__FILE__))
 require 'resque/cluster'
 require 'resque/pool/patches'
 
-@@hostname = Socket.gethostname
+HOSTNAME = Socket.gethostname
+
+def support_dir
+  @support_dir ||= Pathname.new(File.dirname(__FILE__)) + 'support'
+end

data/spec/unit/support/broken_yaml_config.yml

@@ -0,0 +1 @@
+> 2

data/spec/unit/support/empty_config.yml

@@ -0,0 +1 @@
+{}

data/spec/unit/support/missing_global_maximum.yml

@@ -0,0 +1,3 @@
+workers:
+  foo:
+    local: 1

data/spec/unit/support/missing_local_maximum.yml

@@ -0,0 +1,3 @@
+workers:
+  foo:
+    global: 1

data/spec/unit/support/separate_missing_global.yml

@@ -0,0 +1,2 @@
+bar: 50
+"foo,bar,baz": 1

data/spec/unit/support/separate_missing_local.yml

@@ -0,0 +1,2 @@
+bar: 9
+"foo,bar,baz": 1

data/spec/unit/support/single_old_missing_global.yml

@@ -0,0 +1,9 @@
+foo: 1
+bar: 9
+"foo,bar,baz": 1
+rebalance_cluster: true
+max_workers_per_host: 10
+presume_dead_after: 60
+global_maximums:
+  bar: 50
+  "foo,bar,baz": 1

data/spec/unit/support/single_old_missing_local.yml

@@ -0,0 +1,9 @@
+bar: 9
+"foo,bar,baz": 1
+rebalance_cluster: true
+max_workers_per_host: 10
+presume_dead_after: 60
+global_maximums:
+  foo: 2
+  bar: 50
+  "foo,bar,baz": 1

data/spec/unit/support/valid_config.yml

@@ -0,0 +1,13 @@
+rebalance_cluster: true
+max_workers_per_host: 10
+presume_dead_after: 60
+workers:
+  foo:
+    local: 1
+    global: 2
+  bar:
+    local: 9
+    global: 50
+  "foo,bar,baz":
+    local: 1
+    global: 1

data/spec/unit/support/valid_global_config.yml

@@ -0,0 +1 @@
+foo: bar

data/spec/unit/support/valid_local_config.yml

@@ -0,0 +1 @@
+foo: bar

data/spec/unit/support/valid_single_new_config.yml

@@ -0,0 +1,13 @@
+rebalance_cluster: true
+max_workers_per_host: 10
+presume_dead_after: 60
+workers:
+  foo:
+    local: 1
+    global: 2
+  bar:
+    local: 9
+    global: 50
+  "foo,bar,baz":
+    local: 1
+    global: 1

data/spec/unit/support/valid_single_old_config.yml

@@ -0,0 +1,10 @@
+foo: 1
+bar: 9
+"foo,bar,baz": 1
+rebalance_cluster: true
+max_workers_per_host: 10
+presume_dead_after: 60
+global_maximums:
+  foo: 2
+  bar: 50
+  "foo,bar,baz": 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-cluster
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.2.0
 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
@@ -30,138 +30,138 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
 description: A management tool for resque workers. Allows spinning up and managing
@@ -172,10 +172,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
+- .document
+- .gitignore
+- .rspec
+- .rubocop.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -183,6 +183,9 @@ files:
 - Rakefile
 - bin/resque-cluster_member
 - lib/resque/cluster.rb
+- lib/resque/cluster/config.rb
+- lib/resque/cluster/config/file.rb
+- lib/resque/cluster/config/verifier.rb
 - lib/resque/cluster/member.rb
 - lib/resque/cluster/version.rb
 - lib/resque/pool/cli_patches.rb
@@ -192,21 +195,40 @@ files:
 - spec/global_rebalance_config.yml
 - spec/integration/bin/resque-cluster_member_test
 - spec/integration/cluster_spec.rb
+- spec/integration/config/bad_global_config.yml
 - spec/integration/config/global_config.yml
 - spec/integration/config/global_config2.yml
 - spec/integration/config/global_config3.yml
 - spec/integration/config/global_config4.yml
 - spec/integration/config/global_rebalance_config2.yml
+- spec/integration/config/global_rebalance_config3.yml
 - spec/integration/config/local_config.yml
 - spec/integration/config/local_config2.yml
+- spec/integration/config/rebalance_config.yml
 - spec/integration/spec_helper.rb
 - spec/integration/standalone_spec.rb
 - spec/integration/test_member_manager.rb
 - spec/local_config.yml
+- spec/unit/config/verifier_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/member_spec.rb
 - spec/unit/resque_pool_cli_patches_spec.rb
 - spec/unit/resque_pool_patches_spec.rb
 - spec/unit/spec_helper.rb
+- spec/unit/support/broken_yaml_config.yml
+- spec/unit/support/empty_config.yml
+- spec/unit/support/missing_global_maximum.yml
+- spec/unit/support/missing_local_maximum.yml
+- spec/unit/support/non_hash_config.yml
+- spec/unit/support/separate_missing_global.yml
+- spec/unit/support/separate_missing_local.yml
+- spec/unit/support/single_old_missing_global.yml
+- spec/unit/support/single_old_missing_local.yml
+- spec/unit/support/valid_config.yml
+- spec/unit/support/valid_global_config.yml
+- spec/unit/support/valid_local_config.yml
+- spec/unit/support/valid_single_new_config.yml
+- spec/unit/support/valid_single_old_config.yml
 homepage: https://github.com/yportnoy/resque-cluster
 licenses:
 - MIT
@@ -217,17 +239,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.7.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Creates and manages resque worker in a distributed cluster
@@ -236,18 +258,38 @@ test_files:
 - spec/global_rebalance_config.yml
 - spec/integration/bin/resque-cluster_member_test
 - spec/integration/cluster_spec.rb
+- spec/integration/config/bad_global_config.yml
 - spec/integration/config/global_config.yml
 - spec/integration/config/global_config2.yml
 - spec/integration/config/global_config3.yml
 - spec/integration/config/global_config4.yml
 - spec/integration/config/global_rebalance_config2.yml
+- spec/integration/config/global_rebalance_config3.yml
 - spec/integration/config/local_config.yml
 - spec/integration/config/local_config2.yml
+- spec/integration/config/rebalance_config.yml
 - spec/integration/spec_helper.rb
 - spec/integration/standalone_spec.rb
 - spec/integration/test_member_manager.rb
 - spec/local_config.yml
+- spec/unit/config/verifier_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/member_spec.rb
 - spec/unit/resque_pool_cli_patches_spec.rb
 - spec/unit/resque_pool_patches_spec.rb
 - spec/unit/spec_helper.rb
+- spec/unit/support/broken_yaml_config.yml
+- spec/unit/support/empty_config.yml
+- spec/unit/support/missing_global_maximum.yml
+- spec/unit/support/missing_local_maximum.yml
+- spec/unit/support/non_hash_config.yml
+- spec/unit/support/separate_missing_global.yml
+- spec/unit/support/separate_missing_local.yml
+- spec/unit/support/single_old_missing_global.yml
+- spec/unit/support/single_old_missing_local.yml
+- spec/unit/support/valid_config.yml
+- spec/unit/support/valid_global_config.yml
+- spec/unit/support/valid_local_config.yml
+- spec/unit/support/valid_single_new_config.yml
+- spec/unit/support/valid_single_old_config.yml
+has_rdoc: