some 0.0.5 → 0.0.6

data/README.md

@@ -110,6 +110,8 @@ NIFTY Cloud 上で手軽にサーバーを立ち上げることができます
 ## TODO
 
  * image_id=17 (Ubuntu 10.04) で bootstrap できない (apt-get update; apt-get install -y curl する必要あり)
+ * かっこいいロゴを github ページにつける、あるいは github pages を使ってほーむぺーじを作る
+ * デフォルトの設定ファイルを同梱するようにする
 
 ## ライセンス
 

data/Rakefile

@@ -13,6 +13,7 @@ Jeweler::Tasks.new do |s|
 	s.add_dependency "nifty-cloud-sdk", "1.11.beta1"
 	s.add_dependency "thor"
 	s.add_dependency "net-ssh"
+	s.add_dependency "capistrano"
 end
 
 Jeweler::RubyforgeTasks.new

data/TODO

@@ -1,5 +1,33 @@
-capistrano 連携
+* some コマンドがどんどん便利になっていく
 
+自分で欲しい機能をガンガン盛り込んでいったら、便利すぎて手放せない感じになってきた。
 
+** some reset
 
-some sync コマンドで全サーバーに全サーバの ohai を撒くみたいなのいいかも
+some コマンドで作成したすべてのインスタンス・FW・キーを削除する。
+
+** some cap
+
+some コマンドで作成したインスタンスに対して capistrano を実行できる。
+
+some list
+some cap invoke ROLES="server1,server2" COMMAND="hostname"
+
+** some cache
+
+インスタンス一覧を ~/.some/cache にキャッシュする。
+
+** some sync
+
+some コマンドで作成したすべてのインスタンスから ohai 情報を取得し、
+すべてのインスタンスの /var/chef/data_bags/hostname.json に配置する。
+chef-solo-search と組み合わせると Chef サーバがなくてもレシピで search が使える。
+munin とかで使うと便利。
+
+** some batch
+
+some コマンドを一括実行できる。
+
+** some start/stop
+
+** some volumes/create_volume/attach_volume/detach_volume

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/some

@@ -47,9 +47,14 @@ class CLI < Thor
 	end
 
 	desc "list", "list running instances"
+	option :format, :type => :string, :aliases => '-f', :desc => 'format (capfile)'
 	def list
-		some.list.each do |inst|
-			printf "%-50s %-12s %s\n", inst[:hostname], inst[:instance_id], inst[:status]
+		if options[:format] == 'capfile'
+			puts some.capfile
+		else
+			some.list.each do |inst|
+				printf "%-15s %-15s %s\n", inst[:hostname], inst[:instance_id], inst[:status]
+			end
 		end
 	end
 
@@ -57,9 +62,8 @@ class CLI < Thor
 	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
+			task('Stop Instance') { some.stop(inst[:instance_id]); "done" }
+			task('Wait to stop') { some.wait_to_stop(inst[:instance_id]) }
 		end
 		some.terminate(inst[:instance_id])
 		some.wait_to_terminate(inst[:instance_id])
@@ -103,6 +107,132 @@ class CLI < Thor
 		end
 	end
 
+	desc "cap", "call capistrano"
+	def cap(*args)
+		File.open(ENV['HOME'] + '/.some/Capfile', 'w') do |f|
+			f.write some.capfile
+		end
+		system "cap -f ~/.some/Capfile #{args.join(' ')}"
+	end
+
+	desc "cache", "cache instance list"
+	def cache(*args)
+		some.cache_list
+	end
+
+	desc "sync", "sync nodes"
+	def sync
+		some.sync
+	end
+
+	desc "batch 'command1, command2'", "batch execute"
+	def batch(arg)
+		commands = arg.split(";")
+		commands.each do |x|
+			system("some #{x}")
+		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 "start [<instance_id or hostname>]", "start specified instance or first available"
+	option :wait, :aliases => '-w', :desc => 'wait to start'
+	def start(id=nil)
+		inst = some.find(id) || (some.stopped).first || abort("No stopped instances")
+		task('Start instance') { some.start(inst[:instance_id]); "done" }
+		task('Wait to start') { some.wait_for_hostname(inst[:instance_id]) } if options[:wait]
+	end
+
+	desc "stop [<instance_id or hostname>]", "stop specified instance or first available"
+	option :wait, :aliases => '-w', :desc => 'wait to stop'
+	def stop(id=nil)
+		inst = some.find(id) || (some.running | some.pending).first || abort("No running or pending instances")
+		task('Stop Instance') { some.stop(inst[:instance_id]); "done" }
+		task('Wait to stop') { some.wait_to_stop(inst[:instance_id]) } if options[:wait]
+	end
+
+
+	desc "create_volume [<instance_id or hostname>]", "create a volume"
+	option :name, :type => :string, :aliases => '-n', :desc => 'volume name'
+	def create_volume(id=nil)
+		inst = some.find(id) || (some.running | some.pending).first || abort("No running or pending instances")
+
+		orig_status = inst[:status]
+		if inst[:status] == 'running'
+			task('Stop Instance') { some.stop(inst[:instance_id]); "done" }
+			task("Wait to stop") { some.wait_to_stop(inst[:instance_id]) }
+		end
+
+		task("Create 100GB volume") { some.create_volume(options[:name], inst[:instance_id]) }
+
+		some.reload
+		inst = some.find(inst[:instance_id])
+		if inst[:status] == 'stopped' && orig_status == 'running'
+			task('Start instance') { some.start(inst[:instance_id]); "done" }
+			task("Wait to start") { some.wait_for_hostname(inst[:instance_id]) }
+		end
+	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 = (some.find(inst_id) || some.running.first || abort("No running instances"))
+
+		orig_status = inst[:status]
+		if inst[:status] == 'running'
+			task('Stop Instance') { some.stop(inst[:instance_id]); "done" }
+			task("Wait to stop") { some.wait_to_stop(inst[:instance_id]) }
+		end
+
+		device ||= '/dev/sdc1'
+		task("Attach #{vol_id} to #{inst_id} as #{device}") do
+			some.attach(vol_id, inst[:instance_id], device)
+		end
+
+		some.reload
+		inst = some.find(inst[:instance_id])
+		if inst[:status] == 'stopped' && orig_status == 'running'
+			task("Wait to start") do
+				task('Start instance') { some.start(inst[:instance_id]); "done" }
+				task("Wait to start") { some.wait_for_hostname(inst[:instance_id]) }
+			end
+		end
+	end
+
+	desc "detach [<volume_id>]", "detach volume from instance"
+	def detach(volume=nil)
+		volume = (some.find_volume(volume) || some.attached_volumes.first || abort("No attached volumes"))
+		vol_id = volume[:volume_id]
+		inst = some.find(volume[:instance_id])
+
+		orig_status = inst[:status]
+		if inst[:status] == 'running'
+			task('Stop Instance') { some.stop(inst[:instance_id]); "done" }
+			task("Wait to stop") { some.wait_to_stop(inst[:instance_id]) }
+		end
+
+		task("Detach #{vol_id}") { some.detach(vol_id) }
+
+		some.reload
+		inst = some.find(inst[:instance_id])
+		if inst[:status] == 'stopped' && orig_status == 'running'
+			task("Wait to start") do
+				some.start(inst[:instance_id])
+				some.wait_for_hostname(inst[:instance_id])
+			end
+		end
+	end
+
 	no_tasks do
 		def some
 			@some ||= Some.new

data/lib/some.rb

@@ -1,3 +1,4 @@
+require 'net/scp'
 require 'net/ssh'
 require 'NIFTY'
 require 'yaml'
@@ -33,6 +34,19 @@ class Some
 		@list ||= fetch_list
 	end
 
+	def reload
+		@list = fetch_list
+	end
+
+	def capfile
+		[
+			%Q(set :user, "#{config["user"]}"),
+			%Q(ssh_options[:keys] = "#{keypair_file}"),
+			%Q(ssh_options[:passphrase] = "#{config["password"]}"),
+			list.map {|inst| %Q(server "#{inst[:public_ip]}", "#{inst[:instance_id]}")}
+		].flatten.join("\n")
+	end
+
 	def firewall_list
 		security_group = find_security_group
 		return [] if security_group.nil? || security_group.ipPermissions.nil?
@@ -43,7 +57,7 @@ class Some
 				:from_port => row["fromPort"],
 				:in_out => row["inOut"],
 				:group => row["groupName"],
-                                :cidr => (row["ipRanges"]["item"].first["cidrIp"] rescue nil)
+				:cidr => (row["ipRanges"]["item"].first["cidrIp"] rescue nil)
 			}
 		end
 	end
@@ -102,10 +116,12 @@ class Some
 		"done"
 	end
 
-	def create_volume(size)
+	def create_volume(vol_id, inst_id)
 		result = api.create_volume(
+			:volume_id => vol_id,
+			:instance_id => inst_id,
 			:availability_zone => config['availability_zone'],
-			:size => size.to_s
+			:size => 1
 		)
 		result["volumeId"]
 	end
@@ -116,6 +132,7 @@ class Some
 	end
 
 	def fetch_list
+		return YAML.load File.read(ENV["HOME"] + "/.some/cache") if File.exists?(ENV["HOME"] + "/.some/cache")
 		result = api.describe_instances
 		return [] unless result.reservationSet
 
@@ -135,6 +152,43 @@ class Some
 		instances
 	end
 
+	def cache_list
+		File.open(ENV["HOME"] + "/.some/cache", "w") do |f|
+			f.write(fetch_list.to_yaml)
+		end
+	end
+
+	def sync
+		# TODO: raise error if ohai is not installed on the server
+		ohai = Hash.new{|h,k| h[k] = ""}
+		list.each do |inst|
+			puts "-----> getting ohai.json from #{inst[:instance_id]}"
+			Net::SSH.start(inst[:hostname], config['user'], :keys => [keypair_file], :passphrase => config['password']) do |ssh|
+				File.open("#{ENV['HOME']}/.some/ssh.log", 'w') do |f|
+					ssh.exec!("mkdir -p /var/chef/data_bags/node && ohai --log_level fatal") do |ch, stream, data|
+						ohai[inst[:instance_id]] += data if stream == :stdout
+					end
+				end
+			end
+		end
+		list.each do |inst|
+			puts "-----> pushing ohai.json list to #{inst[:instance_id]}"
+			Net::SCP.start(inst[:hostname], config['user'], :keys => [keypair_file], :passphrase => config['password']) do |scp|
+				list.each do |inst|
+					json = {
+						"id" => inst[:instance_id],
+						"name" => inst[:instance_id],
+						"chef_environment" => "_default",
+						"json_class" => "Chef::Node",
+						"run_list" => [],
+						"automatic" => JSON.parse(ohai[inst[:instance_id]])
+					}
+					scp.upload! StringIO.new(JSON.pretty_generate(json)), "/var/chef/data_bags/node/#{inst[:instance_id]}.json"
+				end
+			end
+		end
+	end
+
 	def find(id_or_hostname)
 		return unless id_or_hostname
 		id_or_hostname = id_or_hostname.strip.downcase
@@ -161,6 +215,10 @@ class Some
 		list_by_status('pending')
 	end
 
+	def stopped
+		list_by_status('stopped')
+	end
+
 	def list_by_status(status)
 		list.select { |i| i[:status] == status }
 	end
@@ -185,7 +243,6 @@ class Some
 
 	def wait_to_stop(instance_id)
 		raise ArgumentError unless instance_id
-		api.stop_instances(:instance_id => [ instance_id ])
 		loop do
 			if inst = instance_info(instance_id)
 				if inst[:status] == 'stopped'
@@ -229,8 +286,8 @@ class Some
 	end
 
 	def setup_role(hostname, role)
-                dna = JSON.parse(config['role'][role])
-                dna.update("some" => {"instances" => list})
+		dna = JSON.parse(config['role'][role])
+		dna.update("some" => {"instances" => list})
 		commands = [
 			"echo \'#{JSON.pretty_generate(dna)}\' > /etc/chef/dna.json",
 			"chef-solo -r #{config['cookbooks_url']}"
@@ -250,6 +307,14 @@ class Some
 		end
 	end
 
+	def start(instance_id)
+		api.start_instances(:instance_id => [ instance_id ])
+	end
+
+	def stop(instance_id)
+		api.stop_instances(:instance_id => [ instance_id ])
+	end
+
 	def terminate(instance_id)
 		api.terminate_instances(:instance_id => [ instance_id ])
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: some
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000Z
+date: 2013-04-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &75940320 !ruby/object:Gem::Requirement
+  requirement: &199117720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.11.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *75940320
+  version_requirements: *199117720
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &75939740 !ruby/object:Gem::Requirement
+  requirement: &199117200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75939740
+  version_requirements: *199117200
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &75939160 !ruby/object:Gem::Requirement
+  requirement: &199116680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75939160
+  version_requirements: *199116680
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &199116180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *199116180
 description: sumo clone for NIFTY Cloud
 email: tidnlyam@gmail.com
 executables: