knife-nc 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in knife-rackspace.gemspec
 gemspec

data/HISTORY.md

@@ -0,0 +1,20 @@
+# 変更履歴
+
+## 0.0.2
+
+ * gem install knife-nc で nifty-cloud-sdk gem もインストールされるようになった
+ * nc server delete コマンドの、サーバ停止しているのに停止しようとしてエラーになるバグを修正した
+ * nc server delete コマンドの、disable_api_termination が true になっていると削除できないバグを修正した
+ * nc server list コマンドの、サーバが 1 台も存在しないとエラー終了してしまうバグを修正した
+
+## 0.0.1
+
+version 0.0.0 がインストールされているとうまく動かないことがあるかもしれないので、gem uninstall knife-nc -v 0.0.0 したほうがいいかもです。
+
+ * NIFTY Cloud 上の主要な 8 イメージに対応した
+ * 起動時スクリプトに対応した
+ * -R または --ssh-passphrase で SSH パスフレーズが指定できるようになった
+
+## 0.0.0
+
+ * 初期インポート

data/README.md

@@ -96,7 +96,6 @@ knife bootstrap からこのスクリプトを利用するには下記のよう
 
 ## TODO
 
- * nc server create の -U オプション (起動スクリプト指定) の動作確認ができていない
  * nc server create の --template-file オプション (ブートストラップ用テンプレート指定) の動作確認ができていない
 
 ## ライセンス

data/knife-nc.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.summary = "NIFTY Cloud Support for Chef's Knife Command"
   s.description = s.summary
   s.extra_rdoc_files = ["README.md", "LICENSE" ]
+  s.add_dependency "nifty-cloud-sdk", ">= 1.7"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/chef/knife/nc_server_delete.rb

@@ -42,6 +42,11 @@ class Chef
         :long => "--node-name NAME",
         :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
 
+      option :force,
+        :long => "--force",
+        :default => false,
+        :description => "Force to delete server by changing the server's disableApiTermination attribute to false."
+
       # Extracted from Chef::Knife.delete_object, because it has a
       # confirmation step built in... By specifying the '--purge'
       # flag (and also explicitly confirming the server destruction!)
@@ -78,15 +83,33 @@ class Chef
             puts "\n"
             confirm("Do you really want to delete this server")
 
-            print "\n#{ui.color("Waiting for server to shutdown", :magenta)}"
-            connection.stop_instances(:instance_id => instance_id, :force => true)
-            while server.instanceState.name != 'stopped'
-              print "."
-              server = connection.describe_instances(:instance_id => instance_id).reservationSet.item.first.instancesSet.item.first
-              sleep 5
+            if server.instanceState.name != 'stopped'
+              print "\n#{ui.color("Waiting for server to shutdown", :magenta)}"
+              connection.stop_instances(:instance_id => instance_id, :force => true)
+              while server.instanceState.name != 'stopped'
+                print "."
+                server = connection.describe_instances(:instance_id => instance_id).reservationSet.item.first.instancesSet.item.first
+                sleep 5
+              end
+              puts("done\n")
             end
 
-            puts("done\n")
+            attribute = connection.describe_instance_attribute(:instance_id => instance_id, :attribute => 'disableApiTermination')
+            if attribute.disableApiTermination.value != 'false'
+              if config[:force] == false
+                ui.error("Server's 'disableApiTermination' attribute is true. Use --force option to delete server.")
+                exit 1
+              else
+                print "\n#{ui.color("Enabling API termination for server", :magenta)}"
+                connection.modify_instance_attribute(:instance_id => instance_id, :attribute => 'disableApiTermination', :value => 'false')
+                while attribute.disableApiTermination.value != 'false'
+                  print "."
+                  attribute = connection.describe_instance_attribute(:instance_id => instance_id, :attribute => 'disableApiTermination')
+                  sleep 5
+                end
+                puts("done\n")
+              end
+            end
 
             connection.terminate_instances(:instance_id => instance_id)
 

data/lib/chef/knife/nc_server_list.rb

@@ -41,25 +41,28 @@ class Chef
           ui.color('Security Group', :bold),
           ui.color('State', :bold)
         ]
-        connection.describe_instances.reservationSet.item.each do |instance|
-          server = instance.instancesSet.item.first
-          group = instance.groupSet
-          server_list << server.instanceId
-          server_list << server.ipAddress.to_s
-          server_list << server.privateIpAddress.to_s
-          server_list << server.instanceType
-          server_list << server.imageId
-          server_list << server.keyName
-          server_list << (group ? group.item.first.groupId : '')
-          server_list << begin
-            state = server.instanceState.name
-            case state
-            when 'sotopped', 'warning', 'waiting', 'creating', 'suspending', 'uploading', 'import_error'
-              ui.color(state, :red)
-            when 'pending'
-              ui.color(state, :yellow)
-            else
-              ui.color(state, :green)
+        set = connection.describe_instances.reservationSet
+        if set
+          set.item.each do |instance|
+            server = instance.instancesSet.item.first
+            group = instance.groupSet
+            server_list << server.instanceId
+            server_list << server.ipAddress.to_s
+            server_list << server.privateIpAddress.to_s
+            server_list << server.instanceType
+            server_list << server.imageId
+            server_list << server.keyName
+            server_list << (group ? group.item.first.groupId : '')
+            server_list << begin
+              state = server.instanceState.name
+              case state
+              when 'sotopped', 'warning', 'waiting', 'creating', 'suspending', 'uploading', 'import_error'
+                ui.color(state, :red)
+              when 'pending'
+                ui.color(state, :yellow)
+              else
+                ui.color(state, :green)
+              end
             end
           end
         end

data/lib/knife-nc/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Nc
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-nc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000Z
-dependencies: []
+date: 2012-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nifty-cloud-sdk
+  requirement: &70198309663100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70198309663100
 description: NIFTY Cloud Support for Chef's Knife Command
 email:
 - tidnlyam@gmail.com
@@ -23,6 +34,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
@@ -58,9 +70,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: NIFTY Cloud Support for Chef's Knife Command
 test_files:
 - spec/spec_helper.rb
+has_rdoc: true