some 0.0.0 → 0.0.1

data/TODO

@@ -0,0 +1,2 @@
+ * インデント直す
+ * ポート開ける用の cookbooks 作る

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/bin/some

@@ -73,65 +73,18 @@ class CLI < Thor
 		end
 	end
 
-	desc "console [<instance_id or hostname>]", "get console output for instance or first available"
-	def console(id=nil)
-		inst = some.find(id) || (some.running | some.pending).first || abort("No running or pending instances")
-
-		puts some.console_output(inst[:instance_id]).inspect
-	end
-
 	desc "terminate [<instance_id or hostname>]", "terminate specified instance or first available"
 	def terminate(id=nil)
 		inst = some.find(id) || (some.running | some.pending).first || abort("No running or pending instances")
-
+                if inst[:status] != 'stopped'
+                        task 'Wait to stop' do
+                                some.wait_to_stop(inst[:instance_id])
+                        end
+                end
 		some.terminate(inst[:instance_id])
 		puts "#{inst[:hostname] || inst[:instance_id]} scheduled for termination"
 	end
 
-	desc "terminate_all", "terminate all instances"
-	def terminate_all
-		instances = (some.running | some.pending)
-		abort("No running or pending instances") if instances.empty?
-		instances.each do |inst|
-			some.terminate(inst[:instance_id])
-			puts "#{inst[:hostname] || inst[:instance_id]} scheduled for termination"
-		end
-	end
-
-	desc "volumes", "list all volumes"
-	def volumes
-		some.volumes.each do |v|
-			printf "%-10s %4sGB %10s %15s %15s\n", v[:volume_id], v[:size], v[:status], v[:instance], v[:device]
-		end
-	end
-
-	desc "create_volume [<megabytes>]", "create a volume"
-	def create_volume(size=5)
-		task("Create #{size}GB volume") { some.create_volume(size) }
-	end
-
-	desc "destroy_volume [<volume_id>]", "destroy a volume"
-	def destroy_volume(volume=nil)
-		vol_id = (some.find_volume(volume) || some.nondestroyed_volumes.first || abort("No volumes"))[:volume_id]
-		task("Destroy volume") { some.destroy_volume(vol_id) }
-	end
-
-	desc "attach [<volume_id>] [<instance_id or hostname>] [<device>]", "attach volume to running instance"
-	def attach(volume=nil, inst_id=nil, device=nil)
-		vol_id = (some.find_volume(volume) || some.available_volumes.first || abort("No available volumes"))[:volume_id]
-		inst_id = (some.find(inst_id) || some.running.first || abort("No running instances"))[:instance_id]
-		device ||= '/dev/sdc1'
-		task("Attach #{vol_id} to #{inst_id} as #{device}") do
-			some.attach(vol_id, inst_id, device)
-		end
-	end
-
-	desc "detach [<volume_id>]", "detach volume from instance"
-	def detach(volume=nil)
-		vol_id = (some.find_volume(volume) || some.attached_volumes.first || abort("No attached volumes"))[:volume_id]
-		task("Detach #{vol_id}") { some.detach(vol_id) }
-	end
-
 	no_tasks do
 		def some
 			@some ||= Some.new

data/lib/some.rb

@@ -1,3 +1,4 @@
+require 'net/ssh'
 require 'NIFTY'
 require 'yaml'
 require 'socket'
@@ -146,6 +147,21 @@ class Some
 		end
 	end
 
+	def wait_to_stop(instance_id)
+		raise ArgumentError unless instance_id
+                api.stop_instances(:instance_id => [ instance_id ])
+                puts "waiting for #{instance_id} to stop "
+		loop do
+                        print '.'
+			if inst = instance_info(instance_id)
+				if inst[:status] == 'stopped'
+                                        break
+				end
+			end
+			sleep 5
+		end
+	end
+
 	def wait_for_ssh(hostname)
 		raise ArgumentError unless hostname
 		loop do
@@ -177,12 +193,12 @@ class Some
 	end
 
 	def ssh(hostname, cmds)
-		IO.popen("ssh -i #{keypair_file} #{config['user']}@#{hostname} > ~/.some/ssh.log 2>&1", "w") do |pipe|
-			pipe.puts cmds.join(' && ')
-		end
-		unless $?.success?
-			abort "failed\nCheck ~/.some/ssh.log for the output"
-		end
+                Net::SSH.start(hostname, config['user'], :keys => [keypair_file], :passphrase => config['password']) do |ssh|
+                        File.open("#{ENV['HOME']}/.some/ssh.log", 'w') do |f|
+                                f.write(ssh.exec!(cmds.join(' && ')))
+                        end
+                end
+		# TODO: abort "failed\nCheck ~/.some/ssh.log for the output"
 	end
 
 	def resources(hostname)
@@ -204,27 +220,9 @@ class Some
 	end
 
 	def terminate(instance_id)
-                inst = instance_info(instance_id)
-                if inst[:status] != 'stopped'
-                        api.stop_instances(:instance_id => [ instance_id ])
-                        puts "waiting for #{instance_id} to stop "
-		        loop do
-                                print '.'
-		        	if inst = instance_info(instance_id)
-		        		if inst[:status] == 'stopped'
-                                                break
-		        		end
-		        	end
-		        	sleep 5
-		        end
-                end
 		api.terminate_instances(:instance_id => [ instance_id ])
 	end
 
-	def console_output(instance_id)
-		api.get_console_output(:instance_id => instance_id)["output"]
-	end
-
 	def config
 		@config ||= default_config.merge read_config
 	end
@@ -232,7 +230,7 @@ class Some
 	def default_config
 		{
 			'user' => 'root',
-			'ami' => 'ami-ed46a784',
+			'ami' => 26,
 			'availability_zone' => 'east-12',
                         'password' => 'password'
 		}
@@ -282,10 +280,10 @@ class Some
 
 	def api
                 @api ||= NIFTY::Cloud::Base.new(
-                  :access_key => config['access_key'], 
-                  :secret_key => config['secret_key'], 
-                  :server => server,
-                  :path => '/api'
+                        :access_key => config['access_key'], 
+                        :secret_key => config['secret_key'], 
+                        :server => server,
+                        :path => '/api'
                 )
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: some
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000Z
+date: 2013-04-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &110762780 !ruby/object:Gem::Requirement
+  requirement: &259249220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *110762780
+  version_requirements: *259249220
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &110762200 !ruby/object:Gem::Requirement
+  requirement: &259248640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *110762200
+  version_requirements: *259248640
 description: sumo clone for NIFTY Cloud
 email: tidnlyam@gmail.com
 executables:
@@ -40,9 +40,11 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- TODO
 files:
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - bin/some
 - lib/some.rb