gaptool-client 0.8.0.pre.alpha → 0.8.0.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5743d37c651bcb733ed785ac5dd8789e2ac0dd32
-  data.tar.gz: 4d56c2af9863318ebbef9446db4426c734bd46f5
+  metadata.gz: b92e391320b96f17ba1b9358205ae193dde78207
+  data.tar.gz: e7a32dd8afaff543c265919d24ccf3dd97d74ffa
 SHA512:
-  metadata.gz: 9a647dfa2a183c3b5498d3ce67c14616bcb474d9ce2a81d91c77a897787732157a54cdbd5f6321f16c1e7e022f3a80b05d57e6e735bfcea1419c266b9fcfa94c
-  data.tar.gz: cd006d3c6c66a43df4841c1c73d3f4e30490a44c90a6f7a2c9e8ebcf16f55758019d03204eeab63fa14d7d4e41ed157bf381617148b447d4e6fc9206f90bd638
+  metadata.gz: 4f5294bade02406d836c50f88c01ee217eacad18e647d63a827135e31223b612e62fe53f135ec94619fab7c61a5c1160f0987e815c2b7ed0cd03a7b9429f73ae
+  data.tar.gz: db78cd64429cae2485801b922d005f241dcc10a6384c4052abd34f972f3292b4fb97296456441354d33b6dc250690870edcf8ab2e6e03bcea7230b1a71241f0f

data/VERSION

@@ -1 +1 @@
-0.8.0-alpha
+0.8.0-alpha1

data/lib/gaptool_client.rb

@@ -146,6 +146,26 @@ EOF
     end
   end
 
+  def self.query_nodes(opts)
+    instance = opts[:instance]
+    role = opts[:role]
+    environment = opts[:environment]
+    params = opts[:params]
+
+    if instance
+      puts Rainbow('Ignoring role and environment as instance is set').red if role || environment
+      [Gaptool.api.getonenode(instance)]
+    elsif role && environment
+      Gaptool.api.getenvroles(role, environment, params)
+    elsif role
+      Gaptool.api.getrolenodes(role, params)
+    elsif environment
+      Gaptool.api.getenvnodes(environment, params)
+    else
+      Gaptool.api.getallnodes(params)
+    end
+  end
+
   def self.remote_exec(nodes, commands, opts = {})
     serial = opts[:serial]
     group_size = opts[:group_size] || 10
@@ -260,15 +280,13 @@ EOF
     option ['-e', '--environment'], 'ENVIRONMENT', 'Instance environment'
     option ['-i', '--instance'], 'INSTANCE', 'Instance id (i-xxxxxxxx)'
     option ['-s', '--serial'], :flag, 'Run command serially. Order of execution is unknown.'
+    option ['-x', '--exclude-hidden'], :flag, 'Exclude hidden hosts'
     parameter 'COMMAND ...', 'Command to run', attribute_name: :commands
 
     def execute
-      Gaptool.error 'Missing instance, environment or role' if !instance && \
-                                                               !role && \
-                                                               !environment
-      Gaptool.error 'Missing role' if !role && !instance
-      Gaptool.error 'Missing environment' if !environment && !instance
-      nodes = instance ? [Gaptool.api.getonenode(instance)] : Gaptool.api.getenvroles(role, environment)
+      params = exclude_hidden? ? {} : { hidden: true }
+      nodes = Gaptool.query_nodes(params.merge(instance: instance,
+                                               role: role, environment: environment))
       Gaptool.remote_exec(nodes, [commands.join(' ')], serial: serial?)
     end
   end
@@ -311,12 +329,10 @@ EOF
 
     def execute
       puts Rainbow('tmux support has been removed').yellow if tmux?
-      Gaptool.error 'Missing instance, environment or role' if !instance && \
-                                                               !environment && \
-                                                               !role
-      Gaptool.error 'Missing role' if !role && !instance
-      Gaptool.error 'Missing environment' if !environment && !instance
-      nodes = instance ? [Gaptool.api.getonenode(instance)] : Gaptool.api.getenvroles(role, environment)
+      nodes = Gaptool.query_nodes(hidden: true,
+                                  instance: instance,
+                                  environment: environment,
+                                  role: role)
 
       if first? || (nodes.length == 1 && !instance)
         puts Rainbow('No instance specified, but only one instance in cluster or first forced').green
@@ -348,15 +364,9 @@ EOF
     def execute
       nodes = []
       params = hidden? ? { hidden: true } : {}
-      if instance
-        nodes = [Gaptool.api.getonenode(instance)]
-      elsif role && environment
-        nodes = Gaptool.api.getenvroles(role, environment, params)
-      elsif role && !environment
-        nodes = Gaptool.api.getrolenodes(role, params)
-      else
-        nodes = Gaptool.api.getallnodes(params)
-      end
+      nodes = Gaptool.query_nodes(params.merge(instance: instance,
+                                               role: role,
+                                               environment: environment))
       Gaptool.infohelper(nodes, parseable?, grepable?, short?)
     end
   end
@@ -392,6 +402,7 @@ EOF
     option ['-r', '--role'], 'ROLE', 'Role name to ssh to', required: true
     option ['-e', '--environment'], 'ENVIRONMENT', 'Which environment, e.g. production', required: true
     option ['-i', '--instance'], 'INSTANCE', 'Instance ID, e.g. i-12345678'
+    option ['-H', '--hidden'], :flag, 'Include hidden hosts'
     option(['-A', '--attribute'], 'ATTRIBUTE',
            'Pass one or more parameters to the deploy recipe in recipe.attr=value format',
            multivalued: true)
@@ -403,11 +414,10 @@ EOF
 
     def execute
       attrs = Gaptool.split_attrs(attribute_list)
-      if !instance.nil?
-        nodes = [Gaptool.api.getonenode(instance)]
-      else
-        nodes = Gaptool.api.getenvroles(role, environment)
-      end
+      nodes = Gaptool.query_nodes(hidden: hidden? ? true : nil,
+                                  role: role,
+                                  instance: instance,
+                                  environment: environment)
 
       nodes = nodes.map do |x|
         x['whyrun'] = whyrun?
@@ -482,10 +492,10 @@ EOS
       if instance
         n = Gaptool.api.getonenode(instance)
         if n['environment'] != environment
-          abort "Instance #{instance} is not in environment #{environment}"
+          Gaptool.error "Instance #{instance} is not in environment #{environment}"
         else
           app_list.each do |app|
-            abort "Instance #{instance} does not host #{app} in env #{environment}" \
+            Gaptool.error "Instance #{instance} does not host #{app} in env #{environment}" \
               unless n['apps'].include?(app)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.alpha
+  version: 0.8.0.pre.alpha1
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json