virtualmaster 0.0.3 → 0.0.4

data/README.mdown

@@ -48,8 +48,13 @@ VirtualMaster CLI can install your SSH keys to a remote machine automatically us
 	Instance ready!
 	Try to login using `ssh root@195.140.253.130'
 	
-If you want to specify other key (ie. not ~/.ssh/id_rsa) use option `--identity IDENTITY_FILE`.
+If you want to specify other key (ie. not ~/.ssh/id\_rsa) use option `--identity IDENTITY_FILE`.
 
 ## More information	
 
-Additional topics are available in [the wiki](https://github.com/Virtualmaster/virtualmaster-cli/wiki).
+Additional topics are available in [the wiki](https://github.com/Virtualmaster/virtualmaster-cli/wiki).
+
+## Changelog
+
+* v0.0.5 - Added support for availability zones and instance levels
+* v0.0.3 - First public release

data/lib/vmaster.rb

@@ -2,6 +2,7 @@ require "vmaster/version"
 require "vmaster/helpers"
 require "vmaster/cli"
 require "commander/import"
+require "vmaster/request.rb"
 
 # include commands
 require 'vmaster/config_command'

data/lib/vmaster/helpers.rb

@@ -62,10 +62,10 @@ module VirtualMaster
       profile_list.first
     end
 
-    def self.create_instance(name, image_id, profile_id)
+    def self.create_instance(name, image_id, profile_id, realm)
       api = VirtualMaster::CLI.api
 
-      api.create_instance(image_id, :name => name, :hwp_id => profile_id)
+      api.create_instance(image_id, :name => name, :hwp_id => profile_id, :realm_id => realm)
     end
   end
 end

data/lib/vmaster/request.rb

@@ -0,0 +1,12 @@
+require 'rest_client'
+
+#
+# Monkey-patch RestClient.request to include User Agent 
+#
+module RestClient
+  class Request
+    def default_headers
+		  { :accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate', "User-Agent" => "virtualmaster-cli/#{VirtualMaster::VERSION} #{RUBY_PLATFORM}" }
+		end
+  end
+end

data/lib/vmaster/server_commands.rb

@@ -16,10 +16,14 @@ command :create do |c|
   c.option '--profile PROFILE', String, 'instance hardware profile'
   c.option '--copy-id', 'install public key on a machine'
   c.option '--identity IDENTITY', String, 'SSH identity to use (with --copy-id)'
+  c.option '--zone ZONE', String, 'Availability zone to launch instance i'
+  c.option '--level LEVEL', String, 'Instance level to use (personal, production)'
   c.option '--wait', 'wait for instance to become operational'
   c.action do |args, options|
     # default values
     options.default :identity => File.join(ENV['HOME'], '.ssh/id_rsa')
+    options.default :zone => "prague-l1"
+    options.default :level => "personal"
 
     name = args.shift || abort('Server name required')
 
@@ -58,8 +62,10 @@ command :create do |c|
     abort "Internal error: hardware profile not available" unless hwp
 
     say "Creating '#{profile_name}' instance (#{profile[:memory]} MB memory/#{profile[:storage]/1024} GB storage)"
-
-    instance = VirtualMaster::Helpers.create_instance(name, image_id, hwp.id)
+    
+    realm = "#{options.zone}-#{options.level}"
+    
+    instance = VirtualMaster::Helpers.create_instance(name, image_id, hwp.id, realm)
 
     # TODO handle exceptions (invalid image/profile, limits, etc.)
 
@@ -122,12 +128,12 @@ command :list do |c|
         ip_address = "(not assigned)"
       end
 
-      instances << [instance.name, instance.state, ip_address]
+      instances << [instance.name, instance.state, ip_address, instance.realm.id]
     end
 
     abort "No instances found" if instances.empty?
 
-    table = Terminal::Table.new :headings => ['name','state','ip_address'], :rows => instances
+    table = Terminal::Table.new :headings => ['name','state','ip_address', 'zone'], :rows => instances
     puts table
   end
 end
@@ -136,6 +142,9 @@ def instance_action(action, args)
   name = args.shift || abort('server name required')
 
   instance = VirtualMaster::Helpers.get_instance(name)
+  
+  abort "Invalid instance name!" if instance.nil?
+  
   instance.send("#{action}!")
 end
 

data/lib/vmaster/version.rb

@@ -1,3 +1,3 @@
 module VirtualMaster
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 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: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70220237000360 !ruby/object:Gem::Requirement
+  requirement: &70140390251200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220237000360
+  version_requirements: *70140390251200
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70220236995660 !ruby/object:Gem::Requirement
+  requirement: &70140390250700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220236995660
+  version_requirements: *70140390250700
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70220236993960 !ruby/object:Gem::Requirement
+  requirement: &70140255842280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70220236993960
+  version_requirements: *70140255842280
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70220236992760 !ruby/object:Gem::Requirement
+  requirement: &70140255840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220236992760
+  version_requirements: *70140255840660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220236991620 !ruby/object:Gem::Requirement
+  requirement: &70140255839140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70220236991620
+  version_requirements: *70140255839140
 description: Command line interface to VirtualMaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net
@@ -83,6 +83,7 @@ files:
 - lib/vmaster/cli.rb
 - lib/vmaster/config_command.rb
 - lib/vmaster/helpers.rb
+- lib/vmaster/request.rb
 - lib/vmaster/server_commands.rb
 - lib/vmaster/version.rb
 - spec/commands_spec.rb