sbm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e18a93f50941dd24fa6348a0ca45ed4c7648dad
-  data.tar.gz: 2653657223ff6fc5ae1862839e8906e233f8fc14
+  metadata.gz: 682920a2da1dd9c3efc634ee2070c9a0b9dcedb7
+  data.tar.gz: f47948d0f6449f9961894d378d2819493dd17be6
 SHA512:
-  metadata.gz: 21485914dab3bed5742d63d813c8dbf2b8de47dce842bb3c562426f8bf0e5a6956c586884aba8dcc33f93c06552d4302d11d24a8ddb51a8efbc9994d5c2840d2
-  data.tar.gz: c24c64c4c4a463572d23154f1c1b6ffb9613cf2100af5576312ee843a1384e5932397ffe46d95ae5b0c1e2001e63e374041f4a8427f1f047407fac8f0bf14455
+  metadata.gz: f3e2224cd13f3c8e8d2dcfcd91424ae62d22c93ef53c8a4e387bd3b1449344279092b6e4b7c62e1e626718537420b389c774b3108d4ad0e415667019cad1bf3e
+  data.tar.gz: 45493771a9c013b235d933a4763cdd79dd435b6cb6ae91682ca9171981f4e5a50544febb922f2962bf92024f2ae725b21454a5c9269218e1120f5cc829adc7f9

data/README.md

@@ -46,6 +46,17 @@ Wait for simply checks the number of items in the completed set have the correct
 
 Please note that by default it uses redis for this, so to change your default redis use `REDIS_URI`.
 
+### Commands
+
+* `sbm status` - Show status of all batches.
+* `sbm start-batch batch-name` - Current worker starts the specified batch.
+* `sbm complete-batch batch-name` - Current worker starts the specified batch.
+* `sbm wait-for batch-name count` - Wait until `count` workers have completed `batch-name`.
+* `sbm clear-batch batch-name` - Clear information for the given batch.
+* `sbm clear-batches` - Clear all batch info.
+* `sbm clear-workers` - Clear all worker info.
+
+
 ## Contributing
 
 1. Fork it

data/lib/sbm/coordinator.rb

@@ -64,6 +64,21 @@ module SBM
       end
     end
 
+    def clear(batch)
+      redis.srem key(:batches), batch.to_s
+      redis.del key(:batches, batch, :completed)
+      redis.del key(:batches, batch, :started)
+    end
+
+    def clear_batches
+      batches.each { |b| clear b }
+      redis.del key(:batches)
+    end
+
+    def clear_workers
+      redis.del key(:workers)
+    end
+
     private
 
     def prepare(worker, batch)

data/lib/sbm/runner.rb

@@ -5,7 +5,10 @@ module SBM
       'status'         => '',
       'wait-for'       => 'batch-name worker-count',
       'start-batch'    => 'batch-name',
-      'complete-batch' => 'batch-name'
+      'complete-batch' => 'batch-name',
+      'clear-batch'    => 'batch-name',
+      'clear-batches'  => '',
+      'clear-workers'  => ''
     }
 
     attr_reader :command, :args, :coordinator, :worker, :output, :error
@@ -68,6 +71,19 @@ module SBM
       coordinator.complete batch, worker
     end
 
+    def clear_batch
+      batch = extract_batch!
+      coordinator.clear batch
+    end
+
+    def clear_batches
+      coordinator.clear_batches
+    end
+
+    def clear_workers
+      coordinator.clear_workers
+    end
+
     def usage(invalid_command = false)
       if invalid_command
         error.puts "Invalid / unknown command - must be one of #{USAGES.keys.join(", ")}"

data/lib/sbm/version.rb

@@ -1,3 +1,3 @@
 module SBM
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/coordinator_spec.rb

@@ -117,4 +117,54 @@ describe SBM::Coordinator do
     subject.wait_for batch_a, 3
   end
 
+  it 'should support clearing a batch' do
+    subject.start batch_a, worker_a
+    subject.start batch_a, worker_b
+    subject.start batch_b, worker_c
+    subject.complete batch_b, worker_c
+    subject.batches.should =~ [batch_a, batch_b]
+    subject.started_workers_for_batch(batch_a).should =~ [worker_a, worker_b]
+    subject.started_workers_for_batch(batch_b).should =~ [worker_c]
+    subject.completed_workers_for_batch(batch_a).should =~ []
+    subject.completed_workers_for_batch(batch_b).should =~ [worker_c]
+    subject.clear batch_b
+    subject.batches.should =~ [batch_a]
+    subject.started_workers_for_batch(batch_a).should =~ [worker_a, worker_b]
+    subject.started_workers_for_batch(batch_b).should =~ []
+    subject.completed_workers_for_batch(batch_a).should =~ []
+    subject.completed_workers_for_batch(batch_b).should =~ []
+    subject.clear batch_a
+    subject.batches.should =~ []
+    subject.started_workers_for_batch(batch_a).should =~ []
+    subject.started_workers_for_batch(batch_b).should =~ []
+    subject.completed_workers_for_batch(batch_a).should =~ []
+    subject.completed_workers_for_batch(batch_b).should =~ []
+  end
+
+  it 'should support clearing all batches' do
+    subject.start batch_a, worker_a
+    subject.start batch_a, worker_b
+    subject.start batch_b, worker_c
+    subject.complete batch_b, worker_c
+    subject.batches.should =~ [batch_a, batch_b]
+    subject.started_workers_for_batch(batch_a).should =~ [worker_a, worker_b]
+    subject.started_workers_for_batch(batch_b).should =~ [worker_c]
+    subject.completed_workers_for_batch(batch_a).should =~ []
+    subject.completed_workers_for_batch(batch_b).should =~ [worker_c]
+    subject.clear_batches
+    subject.batches.should =~ []
+    subject.started_workers_for_batch(batch_a).should =~ []
+    subject.started_workers_for_batch(batch_b).should =~ []
+    subject.completed_workers_for_batch(batch_a).should =~ []
+    subject.completed_workers_for_batch(batch_b).should =~ []
+  end
+
+  it 'should support clear all workers' do
+    subject.start batch_a, worker_a
+    subject.start batch_a, worker_b
+    subject.workers.should =~ [worker_a, worker_b]
+    subject.clear_workers
+    subject.workers.should =~ []
+  end
+
 end

data/spec/runner_spec.rb

@@ -60,7 +60,7 @@ describe SBM::Runner do
     context 'with a runner' do
 
       it 'should let you validate the command' do
-        ['status', 'start-batch', 'complete-batch', 'wait-for'].each do |command|
+        ['status', 'start-batch', 'complete-batch', 'wait-for', 'clear-batch', 'clear-batches', 'clear-workers'].each do |command|
           instance = described_class.new [command], output, error
           dont_allow(instance).exit.with_any_args
           instance.validate_command!
@@ -158,6 +158,36 @@ describe SBM::Runner do
 
     end
 
+    context 'clearing a batch' do
+
+      it 'should be an error without a batch name' do
+        subject.args.should == []
+        mock(subject).exit 1
+        subject.clear_batch
+      end
+
+      it 'should work with the coordinator' do
+        subject.args.replace %w(xyz)
+        mock(subject.coordinator).clear SBM::Coordinator::Batch.new('xyz')
+        dont_allow(subject).exit
+        subject.clear_batch
+      end
+    end
+
+    it 'should let you clear all batches' do
+      subject.args.replace []
+      mock(subject.coordinator).clear_batches
+      dont_allow(subject).exit
+      subject.clear_batches
+    end
+
+    it 'should let you clear all workers' do
+      subject.args.replace []
+      mock(subject.coordinator).clear_workers
+      dont_allow(subject).exit
+      subject.clear_workers
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Darcy Laycock