virtualmaster 0.0.6 → 0.0.7

data/bin/virtualmaster

@@ -20,3 +20,12 @@ default_command :help
 VirtualMaster::CLI.run do
 end
 
+include Commander::UI
+include Commander::UI::AskForClass
+include Commander::Delegates
+
+$terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+
+Commander::Runner.instance.run!
+
+

data/lib/vmaster.rb

@@ -1,8 +1,23 @@
+
+require 'commander/delegates'
 require "vmaster/version"
 require "vmaster/helpers"
 require "vmaster/cli"
-require "commander/import"
-require "vmaster/request.rb"
+require "vmaster/request"
+
+require 'commander'
+require 'commander/delegates'
+
+#
+# snippet from commander:lib/commander/import.rb needed when manually calling
+# run! instead of relying on at_exit { run! } (sic!).
+#
+include Commander::UI
+include Commander::UI::AskForClass
+include Commander::Delegates
+
+$terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+
 
 # include commands
 require 'vmaster/config_command'

data/lib/vmaster/cli.rb

@@ -19,7 +19,13 @@ module VirtualMaster
           puts
         end
 
-        @@api = DeltaCloud.new(@@config[:username], @@config[:password], VirtualMaster::DEFAULT_URL)
+        begin
+          @@api = DeltaCloud.new(@@config[:username], @@config[:password], VirtualMaster::DEFAULT_URL)
+        rescue DeltaCloud::API::BackendError => e
+          abort "Invalid API response: #{e.message}"
+        rescue Exception => e
+          abort "Unable to connect to Virtualmaster's DeltaCloud API: #{e.message}" 
+        end
       end
 
       yield

data/lib/vmaster/server_commands.rb

@@ -37,11 +37,13 @@ command :create do |c|
     if options.image
       image_name = options.image
 
-
       if image_name.match /^[\d]+$/
         # use image_id directly
         image_id = image_name.to_i
 
+        image_name = nil
+      elsif image_name.match /^http(s)?:\/\//
+        image_id = image_name
         image_name = nil
       else
         # lookup predefined images
@@ -51,7 +53,7 @@ command :create do |c|
       end
     end
 
-    say image_name ? "Using image '#{image_name}' with ID #{image_id}" : "Using image with ID #{image_id}"
+    say image_name ? "Using image '#{image_name}' with ID #{image_id}" : "Using image #{image_id}"
 
     # instance hardware profile
     profile_name = options.profile || VirtualMaster::DEFAULT_PROFILE

data/lib/vmaster/version.rb

@@ -1,3 +1,3 @@
 module VirtualMaster
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70257759342520 !ruby/object:Gem::Requirement
+  requirement: &70327968586800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70257759342520
+  version_requirements: *70327968586800
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70257759342020 !ruby/object:Gem::Requirement
+  requirement: &70327968586300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70257759342020
+  version_requirements: *70327968586300
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70257759341560 !ruby/object:Gem::Requirement
+  requirement: &70327967699220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70257759341560
+  version_requirements: *70327967699220
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70257759341100 !ruby/object:Gem::Requirement
+  requirement: &70327967698520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70257759341100
+  version_requirements: *70327967698520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70257755270800 !ruby/object:Gem::Requirement
+  requirement: &70327967697440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70257755270800
+  version_requirements: *70327967697440
 description: Command line interface to VirtualMaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net