gaptool-client 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b4c3227e264f1cf2753136f4d185795823a116c
-  data.tar.gz: dc62f6bb3b7a150b522598026147da788d957e2c
+  metadata.gz: 9f2dbf8298421010e2dd67ae75167d8c04f72da4
+  data.tar.gz: 1f541cbbaf0433a4d8046a113690ad0ad9f25852
 SHA512:
-  metadata.gz: c437577e81da79143716bccc9ee5a635dc09a5436c5015fd23494424ff2379c2993623929d114a71298709ff02db59a8fe85df71cfd430e0a1b4f2b86777330a
-  data.tar.gz: b5fac408a2cfb5f4385d6e172b7c46a6ceacb67942752dba45b707af8a1632b2002e4bd5fa50a4b6fc5f99f353bbbcaff27d16fbd0f1aab5560ba788b3be2ca4
+  metadata.gz: dde55851d33ad1307787498b4ad975c5520432cdc9fd576b3d0955b7c51bb34d3c229ad5902732eec428ebf7b34f6d6f5f7381d755a4344f5f940bcc15f57472
+  data.tar.gz: e9ad6c6ac2ed2bfd9e284d75be10b6d9dedfd4c6f07aba44118fcfe01c4cc6eef16b972c4bfce26d264cd2e4f4ad14b1ac94cb6852a5e1ec1f71d1cdee7cc023

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.11

data/gaptool-client.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'clamp', "~> 0.6"
   s.add_runtime_dependency 'net-ssh', "~> 2.9"
   s.add_runtime_dependency 'net-scp', "~> 1.2"
-  s.add_runtime_dependency 'gaptool-api', "~> 0.6", ">= 0.6.3"
+  s.add_runtime_dependency 'gaptool-api', "~> 0.6", ">= 0.6.4"
   s.add_runtime_dependency 'builder', "~> 3"
 
   s.add_development_dependency 'shoulda', "~> 3"

data/lib/gaptool-client.rb

@@ -104,25 +104,43 @@ module Gaptool
     option ["-C", "--chef-repo"], "GITURL", "git url for the chef repository", :requireds => false
     option ["-b", "--chef-branch"], "BRANCH", "branch of the chef repository to use", :required => false
     option ['-R', "--chef_runlist"], 'RECIPE|ROLE', 'override chef run_list. recipe[cb::recipe] or role[myrole]. Can be specified multiple times', :multivalued => true, :attribute_name => 'chef_runlist'
+    option ['--no-terminate'], :flag, "Protect this instance from being terminated"
     def execute
+      no_terminate = no_terminate? ? true : nil
       $api.addnode(zone, type, role, environment, nil,
-                   security_group, ami, chef_repo, chef_branch, chef_runlist)
+                   security_group, ami, chef_repo, chef_branch, chef_runlist,
+                   no_terminate)
     end
   end
 
   class TerminateCommand < Clamp::Command
     option ["-i", "--instance"], "INSTANCE", "Instance ID, e.g. i-12345678", :required => true
     option ["-z", "--zone"], "ZONE", "AWS region of the node (deprecated/ignored)", :default => nil
+    option ["-r", "--role"], "ROLE", "Resource name to initilize", :required => true
+    option ["-e", "--environment"], "ENVIRONMENT", "Which environment, e.g. production", :required => true
     def execute
       node = $api.getonenode(instance)
       nodes = [node]
+      puts node.inspect
       infohelper(nodes, false, false)
       zone = node['zone'][0..-2]
-      print Rainbow("Terminate instance? [type yes to confirm]: ").red
+      if node['environment'] != environment || node['role'] != role
+        puts Rainbow("'#{node['role']}-#{node['environment']}' do not match provided value (#{role}-#{environment})").red
+        exit 1
+      end
+      if node['terminate'] == 'false'
+        puts Rainbow('"terminate" command is disabled for this instance').red
+        exit 2
+      end
+      print Rainbow("Terminate instance? [type yes to confirm]: ").green
       res = $stdin.gets.chomp
       if res.downcase == 'yes'
         puts "Terminating instance #{node['role']}:#{node['environment']}:#{node['instance']} in region #{zone}"
-        $api.terminatenode(instance, zone)
+        begin
+          res = $api.terminatenode(instance, zone)
+        rescue
+          puts Rainbow('Cannot terminate instance').red
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -105,7 +105,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement