gaptool-client 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608c2613b46db592bb9a82751766202e2910de78
-  data.tar.gz: a60442bdb7c46051498b0d087e35cc907d814df7
+  metadata.gz: 983e7534410d558b995cd4b04dbfdf5d1e8a70de
+  data.tar.gz: 9dd849f4d95fe5ee23dd659a4d39437815abd82b
 SHA512:
-  metadata.gz: 246fda59b54dca5a2b88881f00a28f89d32b01c561b71b936d5636c8e9d182eb35cd6e706c3318d1beb2a6ba9d7c5fc4a8f1ea14ce62c81df0d75e2819fc108d
-  data.tar.gz: 5ff68d290e765c70a619600559b0f64675ec83a352c1fd7989f25d153e8ff61b51d60bf50b90cf42da6e658b989f6eb80af9dda678f68f805621a519a361d5dd
+  metadata.gz: 3e005e45f247c949e9bb47dcdf7f73ade739b5f08d7358f9b57752bc5b9e817eb723391e1d9eb4d688d1a022f72b5cb300696a705ff3aeeb67f351f16ff03bde
+  data.tar.gz: 42a72d4765e4f368c54b4e74dbfcc7e3937679e6c8f861ab83e333234cd144f56e0c3063c39a1d61be248d92f0a8778803006cd62ee8f29e1fd7e007d11b429a

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/gaptool-client.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'clamp'
 require 'net/ssh'
 require 'net/scp'
+require 'set'
 
 def infohelper(nodes, parseable, grepable)
   if parseable
@@ -314,12 +315,12 @@ module Gaptool
   end
 
   class DeployCommand < Clamp::Command
-    option ["-a", "--app"], "APP", "Application to deploy", :required => true
+    option ["-a", "--app"], "APP", "Application(s) to deploy (can be set multiple times)", :required => true, :multivalued => true
     option ["-m", "--migrate"], :flag, "Toggle running migrations"
     option ["-e", "--environment"], "ENVIRONMENT", "Which environment, e.g. production", :required => true
     option ["-b", "--branch"], "BRANCH", "Git branch to deploy, default is master", :required => false
     option ["-r", "--rollback"], :flag, "Toggle this to rollback last deploy"
-    option ["-i", "--instance"], "INSTANCE", "Instance ID, e.g. i-12345678", :required => false
+    option ["-i", "--instance"], "INSTANCE", "Instance ID, e.g. i-12345678. If set, all applications MUST be hosted on this node.", :required => false
     option ["-A", "--attribute"], "ATTRIBUTE", "Pass one or more parameters to the deploy recipe in recipe.attr=value format", :multivalued => true
     option ['-H', '--hidden'], :flag, 'Display hidden hosts'
 
@@ -329,15 +330,43 @@ module Gaptool
         n = $api.getonenode(instance)
         if n['environment'] != environment
           abort "Instance #{instance} is not in environment #{environment}"
-        elsif !n['apps'].include?(app)
-          abort "Instance #{instance} does not host #{app} in env #{environment}"
+        else
+          app_list.each do |app|
+            if !n['apps'].include?(app)
+              abort "Instance #{instance} does not host #{app} in env #{environment}"
+            end
+          end
         end
         nodes = [n]
+
       else
         params = hidden? ? {hidden: true} : {}
-        nodes = $api.getappnodes(app, environment, params)
+        nodes = []
+        app_list.each do |app|
+          nodes.concat($api.getappnodes(app, environment, params))
+        end
+      end
+
+      # dedup nodes
+      seen = Set.new
+      app_set = Set.new(app_list)
+      nodes = nodes.select do |x|
+        res = !seen.include?(x['instance']);
+        seen << x['instance'];
+        res
+      end.map do |x|
+        x['apps'] = eval(x['apps'])
+        x['apps_to_deploy'] = (Set.new(x['apps']) & app_set).to_a
+        x
       end
+
       nodes.peach do |node|
+        host = "#{node['role']}:#{node['environment']}:#{node['instance']}"
+        puts "#{Rainbow("Deploying apps").cyan} '" + \
+              Rainbow(node['apps_to_deploy'].join(" ")).green + \
+              "' #{Rainbow("on").cyan} " + \
+              Rainbow(host).green
+
         if node['chef_runlist'].nil?
           runlist = ['recipe[deploy]']
         elsif node['chef_runlist'].is_a? Array
@@ -355,9 +384,8 @@ module Gaptool
           'instance' => node['instance'],
           'zone' => node['zone'],
           'itype' => node['itype'],
-          'apps' => eval(node['apps']),
-          'app_name' => app,
-          'app' => app,
+          'apps' => node['apps'],
+          'deploy_apps' => node['apps_to_deploy'],
           'rollback' => rollback?,
           'branch' => branch || 'master',
           'migrate' => migrate?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json