percheron 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60e75ad43ed6c18a865ea07d76f9fa2b1d893eed
-  data.tar.gz: 54207bfa168a15d727ba18bba758bf40d4d885f6
+  metadata.gz: ca4e159e1d216215067cbfa7373ae6dbda91fd85
+  data.tar.gz: c8ce94ce02c64514de86526cdc5447912b6acac0
 SHA512:
-  metadata.gz: af2d8a877d52f2a51b76c69b809b6773b26d7a22ac3e6acbb4dcce2673257d9302fc9d2079d5af7564f9e92ce8150d859ed16d4c512195f5832ca89bc7ba9afd
-  data.tar.gz: ad859eabacf9550306947c969dff212fb7aa9b2bb888ab87acc20bb6a4ed1e208f303a04a6cf55a27cc6d75f84df48a92d76e85ffa048e335e1569a3c0fb0a30
+  metadata.gz: 84e0e88ff4a08b0af7e009b1c67d2b2f19755d063be8e0b81308f4ae174a238d8ce3fb645d93b47215a688ae6121c3666a6b263e9d24976b26b22e1aae36ca59
+  data.tar.gz: ed372015a2a72aec541b29f5263e053eab8c3e00a0d8dbe69456e9e991d56ec16a84a0a265a49ee80cc8e0b2a06eb074b56f9eb1df7f2595ca27f52b68f3fca0

data/lib/percheron/docker_connection.rb

@@ -39,15 +39,16 @@ module Percheron
       end
 
       def extra_docker_opts
-        if cert_path
-          {
-            client_cert:  File.join(cert_path, 'cert.pem'),
-            client_key:   File.join(cert_path, 'key.pem'),
-            ssl_ca_file:  File.join(cert_path, 'ca.pem')
-          }
-        else
-          {}
-        end
+        return {} unless cert_path
+        {
+          client_cert:  cert_path_for('cert.pem'),
+          client_key:   cert_path_for('key.pem'),
+          ssl_ca_file:  cert_path_for('ca.pem')
+        }
+      end
+
+      def cert_path_for(file)
+        File.join(cert_path, file)
       end
 
   end

data/lib/percheron/formatters/stack/table.rb

@@ -35,24 +35,22 @@ module Percheron
           end
 
           def rows
-            resp = {}
-            queue_jobs(resp)
+            queue_jobs
             process_queue!
-            sort_rows(resp)
           end
 
-          def queue_jobs(resp)
-            stack.containers.map do |_, container|
-              queue << Thread.new { resp[Time.now.to_f] = row_for(container) }
-            end
+          def queue_jobs
+            stack.containers.map { |_, container| queue << row_for(container) }
           end
 
           def process_queue!
-            queue.length.times { queue.pop.join }
-          end
-
-          def sort_rows(resp)
-            resp.sort.map { |_, row| row.flatten }
+            resp = []
+            4.times.map do
+              Thread.new do
+                queue.size.times { resp << queue.pop(true) }
+              end
+            end.map(&:join)
+            resp
           end
 
           def row_for(container)

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Ash McKenzie