solusvm 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4451786d329d5751f51fb0d8dec53fa8589497b3
-  data.tar.gz: 3462c6bb605665e3df5dd589e444b83172df3f90
+  metadata.gz: 9c51edb4b2a1565f254f3764f713865e60c9f0b7
+  data.tar.gz: d0940f9709bd079e7e68d7d95675e7a3c629a4c2
 SHA512:
-  metadata.gz: ca1d0d49a13a4e4478313c469d06b039f9ab590cb1e108844dfebbe6b8c799cb1e28b8ace2bc6c6e32ed5d8a0809d696ab4bf43af434e136eb15d6e31ef5d2db
-  data.tar.gz: 40c3f7284e36c40ea32fb9817bf82c5f9211e93db02a2332505581239f76455cb682a30b45260ab8f564215167dd2fa75e70f64e02581077c5b79c22e6586149
+  metadata.gz: 9ea7f18ed0eea58289cd486fe03d81b754d5a474bd75250d2fc8e8363ccd0b4d83909c41e5d497a9c2a5f93d550ef38512340b68e720bd4ad466a2df92a1c8e4
+  data.tar.gz: dbb3c21df6def9db1cabee02f789978c3fa245b7d9f25782c84cacd79f085e407c494484fca18e66372f5225a5a71d1b6de620d7d7eb9122e8d40ba6e6aae7c8

data/lib/solusvm/base.rb

@@ -26,6 +26,8 @@ module Solusvm
       ca_path  = File.join(File.dirname(__FILE__), "..", "cacert.pem")
       ssl      = {verify: true, ca_file: File.expand_path(ca_path)}
 
+      options.reject! {|_,v| v.nil? }
+
       response = Faraday.new(url: api_endpoint, ssl: ssl) do |c|
         c.params = options.merge(api_login)
         c.adapter :net_http

data/lib/solusvm/server.rb

@@ -165,11 +165,17 @@ module Solusvm
     end
 
     # Retrieves server console information.
-    def console(vid)
-      perform_request(action: 'vserver-console', vserverid: vid)
+    #
+    # params - A Hash to pass optional parameters to vserver-console call:
+    #          :access - A String that can be 'enable' or 'disable'
+    #          :time   - A Integer that can be 1|2|3|4|5|6|7|8
+    #
+    # returns a Hash
+    def console(vid, params = {})
+      perform_request(action: 'vserver-console', vserverid: vid, access: params[:access], time: params[:time])
       returned_parameters
     end
-    
+
     # Retrieves all available server information.
     def info_all(vid)
       perform_request(action: 'vserver-infoall', vserverid: vid)

data/lib/solusvm/version.rb

@@ -1,3 +1,3 @@
 module Solusvm
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/test/solusvm/test_server.rb

@@ -228,6 +228,13 @@ class TestServer < Test::Unit::TestCase
     assert_equal 'theconsoleport', info['consoleport']
     assert_equal 'theconsolepassword', info['consolepassword']
     assert_equal 'theconsoleusername', info['consoleusername']
+
+    # with the optional parameters
+    VCR.use_cassette "server/console" do
+      @server.console(1, access: "admin", time: 1)
+    end
+    # a check to see if it returned a expected parameter even with the optional parameter
+    assert_equal 'thetype', @server.returned_parameters['type']
   end
 
   def test_info_all

data/test/vcr_cassettes/server/console.yml

@@ -12,4 +12,17 @@ http_interactions:
     body: <status>success</status><statusmsg></statusmsg> <type>thetype</type><consoleip>theconsoleip</consoleip><consoleport>theconsoleport</consoleport><consolepassword>theconsolepassword</consolepassword><consoleusername>theconsoleusername</consoleusername>
     http_version: '1.1'
   recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+- request:
+    method: get
+    uri: http://www.example.com/api?action=vserver-console&vserverid=1&access=admin&time=1&id=api_id&key=api_key
+    body: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    body: <status>success</status><statusmsg></statusmsg> <type>thetype</type><consoleip>theconsoleip</consoleip><consoleport>theconsoleport</consoleport><consolepassword>theconsolepassword</consolepassword><consoleusername>theconsoleusername</consoleusername>
+    http_version: '1.1'
+  recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+
 recorded_with: VCR 2.0.0

data/test/vcr_cassettes/server/create.yml

@@ -14,7 +14,7 @@ http_interactions:
   recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
 - request: 
     method: get
-    uri: http://www.example.com/api?type=xen&username&ips=1&node&plan&template&password=&hostname=&action=vserver-create&id=api_id&key=api_key
+    uri: http://www.example.com/api?type=xen&ips=1&password=&hostname=&action=vserver-create&id=api_id&key=api_key
     body: ''
     headers: {}
   response: 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solusvm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Justin Mazzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple