some 0.0.3 → 0.0.4

data/README.md

@@ -107,6 +107,10 @@ NIFTY Cloud 上で手軽にサーバーを立ち上げることができます
  * サーバー作成の際に something という名前の SSH キーと FW を作成します
  * SSH キーは ~/.some/keypair.pem に保存されます
 
+## TODO
+
+ * image_id=17 (Ubuntu 10.04) で bootstrap できない (apt-get update; apt-get install -y curl する必要あり)
+
 ## ライセンス
 
 [sumo](http://github.com/adamwiggins/sumo) と同じく MIT ライセンスで公開します。

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/some

@@ -79,6 +79,13 @@ class CLI < Thor
 		puts "port #{port} scheduled for open"
 	end
 
+	desc "fwlist", "list firewall rules"
+	def fwlist
+		some.firewall_list.each do |fw|
+			printf "%5s %5s %3s     %s\n", fw[:ip_protocol], fw[:from_port], fw[:in_out], (fw[:group] || fw[:cidr])
+		end
+	end
+
 	desc "reset", "delete all the resources created by some (instances, security group, key pair)"
 	def reset
 		some.list.each do |inst|
@@ -88,6 +95,13 @@ class CLI < Thor
 		task("Delete key pair") { some.delete_keypair }
 	end
 
+	desc "images", "list images"
+	def images
+		some.images.each do |img|
+			printf "%-5s %s %s\n", img[:image_id], img[:availability_zone], img[:name]
+		end
+	end
+
 	no_tasks do
 		def some
 			@some ||= Some.new

data/lib/some.rb

@@ -21,7 +21,8 @@ class Some
 			:security_group => 'something',
 			:availability_zone => config['availability_zone'],
 			:disable_api_termination => false,
-			:accounting_type => 2
+			:accounting_type => 2,
+			:agreement => true # for RHEL subscription
 		)
 		result.instancesSet.item[0].instanceId
 	end
@@ -30,6 +31,34 @@ class Some
 		@list ||= fetch_list
 	end
 
+	def firewall_list
+		security_group = find_security_group
+		return [] if security_group.nil? || security_group.ipPermissions.nil?
+
+		security_group.ipPermissions.item.map do |row|
+			{
+				:ip_protocol => row["ipProtocol"],
+				:from_port => row["fromPort"],
+				:in_out => row["inOut"],
+				:group => row["groupName"],
+                                :cidr => (row["ipRanges"]["item"].first["cidrIp"] rescue nil)
+			}
+		end
+	end
+
+	def images
+		result = api.describe_images
+		return [] unless result.imagesSet
+
+		result.imagesSet.item.map do |row|
+			{
+				:image_id => row["imageId"],
+				:name => row["name"],
+				:availability_zone => row["availabilityZone"]
+			}
+		end
+	end
+
 	def volumes
 		result = api.describe_volumes
 		return [] unless result.volumeSet
@@ -227,7 +256,7 @@ class Some
 		{
 			'user' => 'root',
 			'ami' => 26,
-			'availability_zone' => 'east-12',
+			'availability_zone' => 'west-11',
 			'password' => 'password'
 		}
 	end

metadata

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

data/TODO

@@ -1,5 +0,0 @@
- * 
-----------------------------------------
- * motd
- * hostname
- * nifty_cloud