gaptool-client 0.8.0.pre.beta → 0.8.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68a9d97413a05181ebcdd93e39faa46e946e50dd
-  data.tar.gz: ba3b4cd9f6fa62331d5bd6c2904f3d514a93cc6e
+  metadata.gz: 002150433708bb563757f2ef3cc21fc87e0388e2
+  data.tar.gz: 64857892d8fbc611a72331e90a911239f808a562
 SHA512:
-  metadata.gz: f5d78cf78d710d30f1af5dee705354058c4a64d8fcf86c8baa2c288040ed6595ce368388e8a9263a07d57cd748435d51ab827701d4429773041907193f77df67
-  data.tar.gz: b4c9059eb0d8007b959637cf5ad56e40f5c92301590fd953fb07891c48c2819ace4a0df49763fb458ba0b769ba9ba92d9abd329d1aba5d968230637624e81e9e
+  metadata.gz: 5a756b321848f7c1bdaafcf41da7573a9d67b0398e44f684d6d591c0639f2edc3798b3dea1155af4f90819e3632fb3569474c75c12fb1bc34a46bbb9ecf88af7
+  data.tar.gz: a80fccd7831292c544a86f3e1e5545daad80294f4a6e1ac51e541766f139909ee7086117724185cf20ead681622c96b286ef1f3011ec1333bfb933dc91bd1be3

data/VERSION

@@ -1 +1 @@
-0.8.0-beta
+0.8.0-beta1

data/lib/gaptool_client/commands.rb

@@ -28,15 +28,13 @@ module Gaptool
       res = Gaptool::API.client.addnode(zone, type, role, environment, nil, security_group,
                                         ami, chef_repo, chef_branch, chef_runlist,
                                         no_terminate)
-      if res['result'] == 'error'
-        puts Rainbow(res['message']).red
-        exit 1
-      end
-
-      puts "#{Rainbow('Successfully init instance').green} #{Rainbow(res['instance']).blue}:"
-      res.select { |k, _| k != 'instance' && k != 'secret' }.sort.each do |k, v|
-        puts "- #{k}: #{Rainbow(v).blue}"
-      end
+      Gaptool::Helpers.error(res['message']) if res['result'] == 'error'
+      res.merge(
+        'role' => role,
+        'environment' => environment
+      )
+      res.delete('secret')
+      Gaptool::Helpers.info([res], false, false)
     end
   end
 
@@ -52,22 +50,28 @@ module Gaptool
       Gaptool::Helpers.info(nodes, false, false)
       zone = node['zone'][0..-2]
       if node['environment'] != environment || node['role'] != role
-        puts Rainbow("'#{node['role']}-#{node['environment']}' do not match provided value (#{role}-#{environment})").red
-        exit 1
+        Gaptool::Helpers.error("'#{node['role']}-#{node['environment']}' do not match provided value (#{role}-#{environment})")
       end
-      if node['terminate'] == 'false'
-        puts Rainbow('"terminate" command is disabled for this instance').red
-        exit 2
+      if node['terminable'] == false
+        puts Rainbow('"terminate" command is disabled for this instance').yellow
+        puts 'To terminate the instance, set it as terminable first running:'
+        puts Rainbow("gt set -k terminable -v true -i #{instance}").cyan
+        puts
+        Gaptool::Helpers.error("Cannot terminate instance #{instance}",
+                               code: 2)
       end
       print Rainbow('Terminate instance? [type yes to confirm]: ').green
       res = $stdin.gets.chomp
       return 0 unless res.downcase == 'yes'
       puts "Terminating instance #{node['role']}:#{node['environment']}:#{node['instance']} in region #{zone}"
       begin
-        Gaptool::API.client.terminatenode(instance, zone)
-      rescue
-        puts Rainbow('Cannot terminate instance').red
+        res = Gaptool::API.client.terminatenode(instance, zone)
+      rescue => e
+        Gaptool::Helpers.error("Cannot terminate instance: #{e}")
       end
+      Gaptool::Helpers.error("Cannot terminate instance: #{res['message']}") \
+        if res['result'] == 'error'
+      puts Rainbow("Successfully terminated instance #{instance}").green
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.beta
+  version: 0.8.0.pre.beta1
 platform: ruby
 authors:
 - Francesco Laurita