some 0.0.4 → 0.0.5

data/Rakefile

@@ -12,6 +12,7 @@ Jeweler::Tasks.new do |s|
 	s.executables = %w(some)
 	s.add_dependency "nifty-cloud-sdk", "1.11.beta1"
 	s.add_dependency "thor"
+	s.add_dependency "net-ssh"
 end
 
 Jeweler::RubyforgeTasks.new

data/TODO

@@ -0,0 +1,5 @@
+capistrano 連携
+
+
+
+some sync コマンドで全サーバーに全サーバの ohai を撒くみたいなのいいかも

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/some

@@ -7,8 +7,9 @@ require 'thor'
 
 class CLI < Thor
 	desc "launch [<role>]", "launch an instance as role, or omit to ssh to vanilla instance"
+	option :name, :type => :string, :aliases => '-n', :desc => 'instance name'
 	def launch(role=nil)
-		id = task("Launch instance") { some.launch }
+		id = task("Launch instance") { some.launch(options[:name]) }
 		host = task("Acquire hostname") { some.wait_for_hostname(id) }
 		task("Wait for ssh") { some.wait_for_ssh(host) }
 
@@ -76,7 +77,7 @@ class CLI < Thor
 	def closefw(port)
 		raise ArgumentError unless port
 		some.close_firewall(port)
-		puts "port #{port} scheduled for open"
+		puts "port #{port} scheduled for close"
 	end
 
 	desc "fwlist", "list firewall rules"

data/lib/some.rb

@@ -2,9 +2,10 @@ require 'net/ssh'
 require 'NIFTY'
 require 'yaml'
 require 'socket'
+require 'json'
 
 class Some
-	def launch
+	def launch(name=nil)
 		ami = config['ami']
 		raise "No AMI selected" unless ami
 
@@ -15,6 +16,7 @@ class Some
 		open_firewall(22)
 
 		result = api.run_instances(
+			:instance_id => name,
 			:image_id => ami,
 			:instance_type => config['instance_size'] || 'mini',
 			:key_name => 'something',
@@ -124,7 +126,9 @@ class Some
 				instances << {
 					:instance_id => item.instanceId,
 					:status => item.instanceState.name,
-					:hostname => item.dnsName
+					:hostname => item.dnsName,
+					:public_ip => item.ipAddress,
+					:private_ip => item.privateIpAddress
 				}
 			end
 		end
@@ -225,8 +229,10 @@ class Some
 	end
 
 	def setup_role(hostname, role)
+                dna = JSON.parse(config['role'][role])
+                dna.update("some" => {"instances" => list})
 		commands = [
-			"echo \'#{config['role'][role]}\' > /etc/chef/dna.json",
+			"echo \'#{JSON.pretty_generate(dna)}\' > /etc/chef/dna.json",
 			"chef-solo -r #{config['cookbooks_url']}"
 		]
 		ssh(hostname, commands)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: some
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000Z
+date: 2013-04-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &212713900 !ruby/object:Gem::Requirement
+  requirement: &75940320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.11.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *212713900
+  version_requirements: *75940320
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &212713320 !ruby/object:Gem::Requirement
+  requirement: &75939740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *212713320
+  version_requirements: *75939740
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &75939160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *75939160
 description: sumo clone for NIFTY Cloud
 email: tidnlyam@gmail.com
 executables:
@@ -40,9 +51,11 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
+- TODO
 files:
 - README.md
 - Rakefile
+- TODO
 - VERSION
 - bin/some
 - lib/some.rb