sshkit-chunky-runner 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49bf7cbfd1a2feb7a1420695a8b3be966ccf4287
-  data.tar.gz: a294221cde76f2c38de2c280fea367afb646b79c
+  metadata.gz: 965046b809835e032c4fe94190e8284c2aadec29
+  data.tar.gz: 7402accf87a241ff2b7a7d8280090121320491e1
 SHA512:
-  metadata.gz: 39cd8b01bdb72cf2906e8bf48c2b5aac05f5821ae2233b3d5b2c3816af829bb3324e52ac65ae606c352da288da6c7c3f01e0281ab23353d50438428ce5432e44
-  data.tar.gz: 0d7e8cbc5f933d9a201465c858275adfdea0d075c50b5e0c2aec3425307b59f85240fbed5c6606948174e344803734bfb94c00001b919ac131abe0da93748e46
+  metadata.gz: bbcb5db6c6971a21b558eac9639c12c2f5ba57a1790f5733257bad808183eaf06b3994d140bc54cceb971cf0d217bfb2c80a780457171caf7f80fc5a0454a488
+  data.tar.gz: 5a194a3d9fd24f4b04b27af49ae5356cab79c5c9f594751eb69f487a699f27aecfaa006ae14489c9ee6fa1331c72095ca075101d74142f25cd3150dd3f16c26d

data/lib/sshkit/chunky/runner/chunks.rb

@@ -1,13 +1,34 @@
 module SSHKit
   module Chunky
     module Runner
-      class Chunks < SSHKit::Runner::Group
+      class Chunks < SSHKit::Runner::Sequential
         attr_writer :chunks_count
 
+        def execute
+          each_chunk(hosts).map do |group_hosts|
+            SSHKit::Runner::Parallel.new(group_hosts, &block).execute
+            sleep wait_interval
+          end.flatten
+        end
+
         private
 
-        def group_size
-          (hosts.size.to_f / chunks_count).ceil
+        def each_chunk(array)
+          return array.map { |item| [item] } if array.size <= chunks_count
+
+          division = array.size.div chunks_count
+          modulo = array.size % chunks_count
+
+          groups = []
+          start = 0
+
+          chunks_count.times do |index|
+            length = division + (modulo > 0 && modulo > index ? 1 : 0)
+            groups << array.slice(start, length)
+            start += length
+          end
+
+          groups
         end
 
         def chunks_count

data/lib/sshkit/chunky/runner/version.rb

@@ -1,7 +1,7 @@
 module SSHKit
   module Chunky
     module Runner
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

data/spec/lib/sshkit/chunky/runner/chunks_spec.rb

@@ -1,36 +1,70 @@
 require 'sshkit/chunky/runner/chunks'
 
 describe SSHKit::Chunky::Runner::Chunks do
-  describe '#group_size' do
-    let(:options) { { count: 3 } }
+  describe '#each_chunk' do
+    let(:options) { { count: 4, sleep: 0 } }
     let(:block_to_run) { ->(host) { execute "echo #{Time.now.to_i}" } }
     let(:runner) do
       SSHKit::Chunky::Runner::Chunks.new(hosts, options, &block_to_run)
     end
 
-    subject(:group_size) { runner.send(:group_size) }
+    subject(:each_chunk) { runner.send(:each_chunk, hosts) }
 
     context 'with one host' do
       let(:hosts) { ['example.com'] }
 
-      it 'returns one' do
-        expect(group_size).to eq 1
+      it 'returns 1 group' do
+        expect(each_chunk.size).to eq 1
+      end
+
+      it 'returns 1 item in first group' do
+        expect(each_chunk.first.size).to eq 1
       end
     end
 
-    context 'with 6 hosts' do
-      let(:hosts) { ['example.com'] * 6 }
+    context 'with 3 hosts' do
+      let(:hosts) { ['example.com'] * 3 }
+
+      it 'returns 3 groups' do
+        expect(each_chunk.size).to eq 3
+      end
 
-      it 'returns 2' do
-        expect(group_size).to eq 2
+      it 'returns 1 item in each group' do
+        expect(each_chunk[0].size).to eq 1
+        expect(each_chunk[1].size).to eq 1
+        expect(each_chunk[2].size).to eq 1
       end
     end
 
-    context 'with 7 hosts' do
-      let(:hosts) { ['example.com'] * 7 }
+    context 'with 8 hosts' do
+      let(:hosts) { ['example.com'] * 8 }
+
+      it 'returns 4 groups' do
+        expect(each_chunk.size).to eq 4
+      end
+      it 'returns 2 items in each group' do
+        expect(each_chunk[0].size).to eq 2
+        expect(each_chunk[1].size).to eq 2
+        expect(each_chunk[2].size).to eq 2
+        expect(each_chunk[3].size).to eq 2
+      end
+    end
+
+    context 'with 9 hosts' do
+      let(:hosts) { ['example.com'] * 9 }
+
+      it 'returns 4 groups' do
+        expect(each_chunk.size).to eq 4
+      end
+
+      it 'returns 3 items in first group' do
+        expect(each_chunk[0].size).to eq 3
+      end
 
-      it 'returns 3' do
-        expect(group_size).to eq 3
+      it 'returns 2 items in other groups' do
+        expect(each_chunk[1].size).to eq 2
+        expect(each_chunk[2].size).to eq 2
+        expect(each_chunk[3].size).to eq 2
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-chunky-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomas Brazys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler