some 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bin/some

@@ -1,16 +1,17 @@
 #!/usr/bin/env ruby
+$:.unshift File.dirname(__FILE__) + '/../lib' unless $:.include? File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
-require File.dirname(__FILE__) + '/../lib/some'
-
+require 'some'
 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'
 	option :skip, :aliases => '-s', :desc => 'skip ssh login'
+	option :image_id, :aliases => '-i', :desc => 'image id'
 	def launch(role=nil)
-		id = task("Launch instance") { some.launch(options[:name]) }
+		id = task("Launch instance") { some.launch(options[:name], :image_id => options[:image_id]) }
 		host = task("Acquire hostname") { some.wait_for_hostname(id) }
 		task("Wait for ssh") { some.wait_for_ssh(host) }
 
@@ -104,9 +105,14 @@ class CLI < Thor
 	end
 
 	desc "images", "list images"
+	option :format, :type => :string, :aliases => '-f', :desc => 'format (json)'
 	def images
-		some.images.each do |img|
-			printf "%-5s %s %s\n", img[:image_id], img[:availability_zone], img[:name]
+		if options[:format] == 'json'
+			puts JSON.pretty_generate(some.images)
+		else
+			some.images.each do |img|
+				printf "%-5s %s %s\n", img[:image_id], img[:availability_zone], img[:name]
+			end
 		end
 	end
 

data/lib/some.rb

@@ -6,8 +6,8 @@ require 'socket'
 require 'json'
 
 class Some
-	def launch(name=nil)
-		ami = config['ami']
+	def launch(name=nil, opts={})
+		ami = opts[:image_id] || config['ami']
 		raise "No AMI selected" unless ami
 
 		create_keypair unless File.exists? keypair_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: some
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000Z
+date: 2013-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &197247660 !ruby/object:Gem::Requirement
+  requirement: &5236940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.11.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *197247660
+  version_requirements: *5236940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &197247140 !ruby/object:Gem::Requirement
+  requirement: &5236140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *197247140
+  version_requirements: *5236140
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &197246620 !ruby/object:Gem::Requirement
+  requirement: &5235080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *197246620
+  version_requirements: *5235080
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &197246080 !ruby/object:Gem::Requirement
+  requirement: &5234340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *197246080
+  version_requirements: *5234340
 description: sumo clone for NIFTY Cloud
 email: tidnlyam@gmail.com
 executables: