percheron 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 351631398d6695f7c3f4ff15567e095bbea8cc0c
-  data.tar.gz: bf3a8b1f2ab2582027dce70a300be3c7c7044665
+  metadata.gz: 60e75ad43ed6c18a865ea07d76f9fa2b1d893eed
+  data.tar.gz: 54207bfa168a15d727ba18bba758bf40d4d885f6
 SHA512:
-  metadata.gz: df85d70b9c88b68ae7822cc3ed35e7eb88b72772256e60e3cb9e3b46d04e56c786119705151e9b3aaf666530b0cc173142253a9d3f6cd5cb7abe7a2bf6edc1fe
-  data.tar.gz: 8fcc500b642f047838c430f2089852054d300cf34040749fd87a4616f859aa159016e312ab3f2f0beda7205798f735cd2bfd2edb7dc82b5d5a2b633a4c1c9694
+  metadata.gz: af2d8a877d52f2a51b76c69b809b6773b26d7a22ac3e6acbb4dcce2673257d9302fc9d2079d5af7564f9e92ce8150d859ed16d4c512195f5832ca89bc7ba9afd
+  data.tar.gz: ad859eabacf9550306947c969dff212fb7aa9b2bb888ab87acc20bb6a4ed1e208f303a04a6cf55a27cc6d75f84df48a92d76e85ffa048e335e1569a3c0fb0a30

data/README.md

@@ -53,6 +53,10 @@ $ gem install percheron
 
 TODO
 
+## Demo
+
+[![asciicast](https://asciinema.org/a/19216.png)](https://asciinema.org/a/19216)
+
 ## Debugging
 
 To debug Percheron, set the `DEBUG=true` environment variable.

data/lib/percheron/actions/shell.rb

@@ -3,29 +3,34 @@ module Percheron
     class Shell
       include Base
 
-      DEFAULT_SHELL = '/bin/sh'
+      DEFAULT_COMMAND = '/bin/sh'
       DOCKER_CLIENT = 'docker'
 
-      def initialize(container, shell: DEFAULT_SHELL)
+      def initialize(container, command: DEFAULT_COMMAND)
         @container = container
-        @shell = shell
+        @command = command
       end
 
       def execute!
-        $logger.debug "Executing #{shell} on '#{container.name}' container"
         exec! if valid?
       end
 
       private
 
-        attr_reader :container, :shell
+        attr_reader :container
 
         def valid?
           Validators::DockerClient.new.valid?
         end
 
+        def command
+          "sh -c '%s'" % @command
+        end
+
         def exec!
-          system('%s exec -ti %s %s' % [ DOCKER_CLIENT, container.full_name, shell ])
+          cmd = '%s exec -ti %s %s' % [ DOCKER_CLIENT, container.full_name, command ]
+          $logger.debug "Executing '#{cmd}' on '#{container.name}' container"
+          system(cmd)
         end
     end
   end

data/lib/percheron/commands/console.rb

@@ -12,6 +12,7 @@ module Percheron
 
       private
 
+        # FIXME: Dupe?
         def list
           Stack.get(config, stack_name).each do |_, stack|
             puts("\n", Percheron::Formatters::Stack::Table.new(stack).generate)
@@ -58,6 +59,8 @@ module Percheron
           stack.restart!(container_names: [ *container_names ])
           nil
         end
+
+        alias_method :status, :list
     end
   end
 end

data/lib/percheron/commands/shell.rb

@@ -4,11 +4,11 @@ module Percheron
 
       parameter('STACK_NAME', 'stack name', required: true)
       parameter('CONTAINER_NAME', 'container name', required: true)
-      option('--shell', 'SHELL', 'Shell to use', default: Percheron::Actions::Shell::DEFAULT_SHELL)
+      option('--command', 'COMMAND', 'command', default: Percheron::Actions::Shell::DEFAULT_COMMAND)
 
       def execute
         super
-        stack.shell!(container_name, shell: shell)
+        stack.shell!(container_name, command: command)
       rescue Errors::DockerClientInvalid => e
         signal_usage_error(e.message)
       end

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

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Percheron
   module Formatters
     module Stack
@@ -5,6 +7,7 @@ module Percheron
 
         def initialize(stack)
           @stack = stack
+          @queue = Queue.new
         end
 
         def generate
@@ -13,7 +16,7 @@ module Percheron
 
         private
 
-          attr_reader :stack
+          attr_reader :stack, :queue
 
           def title
             stack.name
@@ -31,21 +34,42 @@ module Percheron
             ]
           end
 
-          # rubocop:disable Metrics/MethodLength
           def rows
+            resp = {}
+            queue_jobs(resp)
+            process_queue!
+            sort_rows(resp)
+          end
+
+          def queue_jobs(resp)
             stack.containers.map do |_, container|
-              [
-                container.name,
-                container.id,
-                startable(container),
-                container.ip,
-                container.ports.join(', '),
-                container.volumes.join(', '),
-                (container.built_version == '0.0.0') ? '' : container.built_version
-              ]
+              queue << Thread.new { resp[Time.now.to_f] = row_for(container) }
             end
           end
-          # rubocop:enable Metrics/MethodLength
+
+          def process_queue!
+            queue.length.times { queue.pop.join }
+          end
+
+          def sort_rows(resp)
+            resp.sort.map { |_, row| row.flatten }
+          end
+
+          def row_for(container)
+            [
+              container.name,
+              container.id,
+              startable(container),
+              container.ip,
+              container.ports.join(', '),
+              container.volumes.join(', '),
+              version(container)
+            ]
+          end
+
+          def version(container)
+            (container.built_version == '0.0.0') ? '' : container.built_version
+          end
 
           def startable(container)
             if container.startable?

data/lib/percheron/stack.rb

@@ -32,8 +32,8 @@ module Percheron
       end
     end
 
-    def shell!(container_name, shell: Percheron::Actions::Shell::DEFAULT_SHELL)
-      Actions::Shell.new(container_from_name(container_name), shell: shell).execute!
+    def shell!(container_name, command: Percheron::Actions::Shell::DEFAULT_COMMAND)
+      Actions::Shell.new(container_from_name(container_name), command: command).execute!
     end
 
     def logs!(container_name, follow: false)

data/lib/percheron/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp