virtualmaster 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fed6b617e4c8894e4e2dce0414634f707e7be28d
+  data.tar.gz: 20f3861cca0a88b7a42a0d83fcadbdafa654e426
+SHA512:
+  metadata.gz: c96e127bba630aaa93541691027f166bd25e63570de728aec588a3e8c88e4551914687bbde9e5e087becc0abdf826f97c17a84310e928131a046bcddc4cd43f5
+  data.tar.gz: 4b63cba421b1cfadab508d9b9a1092f9b886e1a98233b664dd4e781f82c5dca2c00352c6a7ffbb394382037647283f348123500ccc1208e746743acd55cbe929

data/lib/vmaster/cli.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'deltacloud'
+require 'deltacloud_vm/client'
 
 module VirtualMaster
   class CLI
@@ -38,8 +38,8 @@ module VirtualMaster
           end
 
           begin
-            @@api = DeltaCloud.new(@@config[:username], @@config[:password], VirtualMaster::DEFAULT_URL)
-          rescue DeltaCloud::API::BackendError => e
+            @@api = DeltacloudVM::Client(VirtualMaster::DEFAULT_URL, @@config[:username], @@config[:password])
+          rescue DeltacloudVM::Client::BackendError => e
             abort "Invalid API response: #{e.message}"
           rescue Exception => e
             abort "Unable to connect to Virtualmaster's DeltaCloud API: #{e.message}" 

data/lib/vmaster/config_command.rb

@@ -26,7 +26,7 @@ command :config do |c|
 
     # verify and store credentials
     begin
-      api = DeltaCloud.new(options.username, options.password, VirtualMaster::DEFAULT_URL)
+      api = DeltacloudVM::Client(VirtualMaster::DEFAULT_URL, options.username, options.password)
 
       config = {
         'username' => options.username,
@@ -41,7 +41,7 @@ command :config do |c|
       end
 
       say "Setting stored under #{config_file}"
-    rescue DeltaCloud::API::BackendError => e
+    rescue DeltacloudVM::Client::BackendError => e
       say "Unable to connect to VirtualMaster API: #{e.message}"
     rescue Exception => e
       say "Unable to configure environment: #{e.message}"

data/lib/vmaster/server_commands.rb

@@ -3,6 +3,7 @@ require 'net/ssh'
 require 'logger'
 require "base64"
 require 'openssl'
+require 'xmlsimple'
 
 log = Logger.new(STDOUT)
 log.level = Logger::WARN
@@ -85,9 +86,10 @@ command :create do |c|
     say "Instance launch request accepted. Instance ID #{instance.id}"
 
     # FIXME authentication is missrepresented within Ruby object
-    password = instance.authentication[:username]
+    instance_hash = XmlSimple.new().xml_in(instance.original_body.body)
+    password = instance_hash['authentication'].first['login'].first['password'].first
     puts
-    say "Default password '#{password}'"
+    say "Default password #{password}"
     puts
 
     options.password = password
@@ -121,7 +123,7 @@ command :list do |c|
 
     VirtualMaster::Helpers.get_instances.each do |instance|
       unless instance.public_addresses.first.nil?
-        ip_address = instance.public_addresses.first[:address]
+        ip_address = instance.public_addresses.first.value
       else
         ip_address = "(not assigned)"
       end

data/lib/vmaster/version.rb

@@ -1,5 +1,5 @@
 module VirtualMaster
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 
   def self.cli_spec_version
     VERSION.to_f.to_s

data/spec/deltacloud_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
-require 'deltacloud'
+require 'deltacloud/client'
 require 'vmaster/helpers'
 
 describe "DeltaCloud API integration" do
   it "should return HTTP 401 when called without valid credentials" do
     lambda {
-      DeltaCloud.new(nil,nil, VirtualMaster::DEFAULT_URL)
-    }.should raise_error(DeltaCloud::API::BackendError, "401 : Not authorized / Invalid credentials")
+      DeltacloudVM::Client(VirtualMaster::DEFAULT_URL, nil,nil)
+    }.should raise_error(DeltacloudVM::Client::BackendError, "401 : Not authorized / Invalid credentials")
   end
 end

data/virtualmaster.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
   
-  s.add_dependency "commander", "~> 4.1.2"
-  s.add_dependency "deltacloud-client", "~> 0.5.0"
-  s.add_dependency "terminal-table", "~> 1.4.4"
-  s.add_dependency "net-ssh", "~> 2.3.0"
+  s.add_dependency "commander", "~> 4.3"
+  s.add_dependency "deltacloud-client-vm", "~> 1.1.4.3"
+  s.add_dependency "terminal-table", "~> 1.5"
+  s.add_dependency "net-ssh", "~> 2.9"
+  s.add_dependency "xml-simple", "~> 1.1"
 
   s.add_development_dependency "rspec", "~> 2"
   s.add_development_dependency "simplecov"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Adam Kliment
@@ -10,118 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: deltacloud-client
+  name: deltacloud-client-vm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.1.4.3
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Command line interface to Virtualmaster. Control your virtual infrastructure.
@@ -132,7 +131,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.mdown
@@ -155,30 +154,26 @@ files:
 - virtualmaster.gemspec
 homepage: https://github.com/virtualmaster/virtualmaster-cli
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: vmaster
-rubygems_version: 1.8.24
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line interface to Virtualmaster
-test_files:
-- spec/commands_spec.rb
-- spec/deltacloud_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: