ploy 0.0.23 → 0.0.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWFlZjlhYzU5NjBjMGNhYWMzMDA3NmU5YmZhZTYzYmYyMGU3MmM5Yg==
+    ODFkNjIwYmIzMWNjZThlMzMxOTM4MWMzNDA3ZTUyZjJkYmQ0MjFlMA==
   data.tar.gz: !binary |-
-    M2NiNmMxNzE3NzVhZjJhMGE4MTc3OGVmZmY4MmRmYWU0ODFhMDcxNA==
+    NWZkMTEzMjFhMTE0NjY2MTk0MWY2Y2MwNmIxZmRhN2E2YTQwYmYwOA==
 SHA512:
   metadata.gz: !binary |-
-    Mzc0YTQyNzQ4NTJjYzM0MzE4NDZiMDQyNDM3OWNlMGZjYTdiMzViN2JkZmY1
-    ODU2YWU4NjNmMTQwMWYwNjRiZTVlMTRkZWU1NTkyNWIyZjVkMmQwNjE4YjA1
-    NDE5Y2MyZTZlNThkMmExYzg3YzEwZTE2NzE3ZmEzZmNhM2FlOTY=
+    MGFlMjAzYmQwYjQ1Y2UwYWJlM2Q4NjJhMjliZjA2YTFmMzhjYWYyMzU3YWI0
+    OWE2YWZhOTE2YjEwMGJiYjI5MWZmMGEyNmRiODY1MWZiOGYwZDExMDYxNDEw
+    ZDBlMDgwZGY5MmM2Mjk1Yzc4OTE3NWNlYzY2NWFjODNkYTg5MTY=
   data.tar.gz: !binary |-
-    ZDYyYzJkZDI2ZTcyMTA1YTIxYmY0NjJiMjNkZjVkOWFiNGFjNWVjYmExMzIz
-    MmQ1N2U2YWQxYzczZDZlNDg0NDk5MWMzMTNlMTU5NTlmZmMxYjFiNTI0ZDQ3
-    YjMxYTBmZDM4ZDRkZTA0NTMyMzZjYmIwN2ZjMTZkY2QyYThjMGU=
+    NWYwODUyY2UzZDBiMjMwNzdlOGY3MmY0NjQyZTYzNThmZTAxYWI3Y2I2NDVj
+    MDZiMmU4YWM3OTJjODdkNDhlMzM3MWY2YWI0NGZjZDkyYWYwODgwZWZlMjVh
+    NWZkNmZlYjdlODNhMDQ1NDQ5MGFiN2M2MzRiNzlmODU4NDJmMzc=

data/lib/ploy/command/list.rb

@@ -6,42 +6,44 @@ require 'yaml'
 module Ploy
   module Command
     class List < Base
+
       def run(argv)
         o = {:branch => 'master', :all => false, :json => false, :deploy => nil, :variant => 'blessed'}
         optparser(o).parse!(argv)
-        #puts o.to_yaml
-
-        bucket = o[:bucket]
-        branch = o[:branch]
 
-        packages = []
-        if o[:deploy].nil?
-          store = Ploy::S3Storage.new(bucket)
-          packages = store.list
-        else
-          packages = [o[:deploy]]
+        packages = o[:deploy].nil? ? Ploy::S3Storage.new(o[:bucket]).list : [o[:deploy]]
+        
+        generate_list(o[:bucket], packages, o[:branch], o[:variant], o[:json], o[:all]).each do |package|
+          puts package
         end
-
-        packages.each do |name|
+      end
+      
+      def generate_list(bucket, packages, branch, variant, json, all)
+        packages.each_with_object([]) do |name, collection|
           current = Ploy::Package.new(bucket, name, branch, 'current').remote_version
-          blessed_current = Ploy::Package.new(bucket, name, branch, 'current', o[:variant]).remote_version
+          blessed_current = Ploy::Package.new(bucket, name, branch, 'current', variant).remote_version
+
+          next unless all || current != blessed_current
 
-          if o[:all] || current != blessed_current
-            if o[:json]
-              h = { name => {
-                'name'        => name,
-                'sha'         => current,
-                'branch'      => branch,
-                'blessed_sha' => blessed_current
-              } }
-              puts h.to_json
-            else
-              puts "#{name} #{branch} #{current} #{blessed_current}"
-            end 
+          if json
+            collection << json_package(name, branch, current, blessed_current)
+          else
+            collection << "#{name} #{branch} #{current} #{blessed_current}"
           end
         end
       end
 
+      def json_package(package, branch, current, blessed_current)
+        {
+          package => {
+            'name'        => package,
+            'sha'         => current,
+            'branch'      => branch,
+            'blessed_sha' => blessed_current
+          }
+        }.to_json
+      end
+      
       def help
         return <<helptext
 usage: ploy -b BUCKET [-d DEPLOYMENT -B BRANCH]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ploy
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Michael Bruce
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Multi-phase deployment tool