solusvm 1.0.0.beta3 → 1.1.0.beta1

data/lib/solusvm/solusvm_errors.rb

@@ -0,0 +1,22 @@
+module Solusvm
+  class SolusvmErrors < Faraday::Response::Middleware
+
+    def on_complete(env)
+      if (200..299).include? env[:status]
+        # Checks for application errors
+        case env[:body].downcase
+        when /invalid ipaddress/i
+          raise "This IP is not authorized to use the API"
+        when /Invalid id or key/i
+          raise "Invalid ID or key"
+        when /Node not found/i
+          raise "Node does not exist"
+        end
+      else
+        raise SolusvmError, "Bad HTTP Status: #{env[:status]}"
+      end
+
+    end
+
+  end
+end

data/lib/solusvm/version.rb

@@ -1,3 +1,3 @@
 module Solusvm
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.1.0.beta1"
 end

data/solusvm.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'xml-simple', '~> 1.1.1'
   s.add_runtime_dependency 'thor', '~> 0.14.6'
+  s.add_runtime_dependency 'faraday', '~> 0.8.0rc2'
   s.add_runtime_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
 
   s.add_development_dependency 'redgreen', '~> 1.2.2'
   s.add_development_dependency 'fakeweb', '~> 1.3.0'
+  s.add_development_dependency 'vcr', '~> 2.0.0'
   s.add_development_dependency 'mocha', '~> 0.10.3'
   s.add_development_dependency 'rdoc', '~> 3.12'
   s.add_development_dependency 'rake', '~> 0.9.2.2'

data/test/cli/test_base_cli.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+require 'solusvm/cli'
+
+class TestBaseCli < Test::Unit::TestCase
+
+  def setup
+    # Prevents mocha from stubbing non existent methods so that we now if the CLI is failing because
+    # something was moved around.
+    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+
+    @base_cli = Solusvm::BaseCli.new
+    @api      = Solusvm::Base.new
+
+    @base_cli.stubs(:api).returns(@api)
+  end
+
+  def test_should_print_multiple_lines_if_enumerable
+    @api.stubs(:successful?).returns(true)
+    @base_cli.expects(:say).with("val1", nil, true)
+    @base_cli.expects(:say).with("val2", nil, true)
+
+    @base_cli.output(["val1", "val2"])
+  end
+
+  def test_should_print_error_if_not_successful
+    @api.stubs(:successful?).returns(false)
+    @api.stubs(:statusmsg).returns("the message")
+    @base_cli.expects(:say).with("Request failed: the message", nil, true)
+
+    @base_cli.output("result")
+  end
+end

data/test/cli/test_client_cli.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'solusvm/cli'
 
 class TestClientCli < Test::Unit::TestCase
@@ -11,24 +11,26 @@ class TestClientCli < Test::Unit::TestCase
 
   def test_should_delegate_client_create_to_client
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Client.stubs(:new => mock{ expects(:create).with() do |options|
-      expected = {
-        :username => "theusername",
-        :password => "thepassword",
-        :email => "theemail",
-        :firstname => "thefirstname",
-        :lastname => "thelastname",
-        :company => "thecompany"
-      }
-
-      expected.all? { |k,v| options[k] == v }
-
-      end.returns("theresult") 
-    })
+    api = mock do
+      expects(:successful?).returns(true)
+      expects(:create).with() do |options|
+        expected = {
+          :username => "theusername",
+          :password => "thepassword",
+          :email => "theemail",
+          :firstname => "thefirstname",
+          :lastname => "thelastname",
+          :company => "thecompany"
+        }
+
+        expected.all? { |k,v| options[k] == v }
+      end.returns("theresult")
+    end
+    Solusvm::Client.stubs(:new => api)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments([
-      "client", "create", 
+      "client", "create",
       "--username", "theusername",
       "--password", "thepassword",
       "--email", "theemail",
@@ -40,7 +42,10 @@ class TestClientCli < Test::Unit::TestCase
 
   def test_should_delegate_client_change_password_to_client
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Client.stubs(:new => mock{ expects(:change_password).with("theusername", "thepassword").returns("theresult") })
+    Solusvm::Client.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_password).with("theusername", "thepassword").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["client", "change-password", "theusername", "thepassword"]))
@@ -48,7 +53,10 @@ class TestClientCli < Test::Unit::TestCase
 
   def test_should_delegate_client_authenticate_to_client
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Client.stubs(:new => mock{ expects(:authenticate).with("theusername", "thepassword").returns("theresult") })
+    Solusvm::Client.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:authenticate).with("theusername", "thepassword").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["client", "authenticate", "theusername", "thepassword"]))
@@ -56,7 +64,10 @@ class TestClientCli < Test::Unit::TestCase
 
   def test_should_delegate_client_check_exists_to_client
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Client.stubs(:new => mock{ expects(:exists?).with("theusername").returns("theresult") })
+    Solusvm::Client.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:exists?).with("theusername").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["client", "check-exists", "theusername"]))
@@ -64,7 +75,10 @@ class TestClientCli < Test::Unit::TestCase
 
   def test_should_delegate_client_delete_to_client
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Client.stubs(:new => mock{ expects(:delete).with("theusername").returns("theresult") })
+    Solusvm::Client.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:delete).with("theusername").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["client", "delete", "theusername"]))
@@ -72,7 +86,10 @@ class TestClientCli < Test::Unit::TestCase
 
   def test_should_delegate_client_list_to_client
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Client.stubs(:new => mock{ expects(:list).returns("theresult") })
+    Solusvm::Client.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:list).returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["client", "list"]))

data/test/cli/test_general_cli.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'solusvm/cli'
 
 class TestGeneralCli < Test::Unit::TestCase
@@ -11,7 +11,10 @@ class TestGeneralCli < Test::Unit::TestCase
 
   def test_should_delegate_templates_to_general
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::General.stubs(:new => mock{ expects(:templates).with("type").returns("thetemplates")})
+    Solusvm::General.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:templates).with("type").returns("thetemplates")
+    end)
 
     $stdout.expects(:puts).with("thetemplates")
     Solusvm::Cli.start(cli_expand_base_arguments(["general", "templates", "type"]))
@@ -19,7 +22,10 @@ class TestGeneralCli < Test::Unit::TestCase
 
   def test_should_delegate_plans_to_general
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::General.stubs(:new => mock{ expects(:plans).with("type").returns("theplans")})
+    Solusvm::General.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:plans).with("type").returns("theplans")
+    end)
 
     $stdout.expects(:puts).with("theplans")
     Solusvm::Cli.start(cli_expand_base_arguments(["general", "plans", "type"]))
@@ -27,7 +33,10 @@ class TestGeneralCli < Test::Unit::TestCase
 
   def test_should_delegate_isos_to_general
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::General.stubs(:new => mock{ expects(:isos).with("type").returns("theisos")})
+    Solusvm::General.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:isos).with("type").returns("theisos")
+    end)
 
     $stdout.expects(:puts).with("theisos")
     Solusvm::Cli.start(cli_expand_base_arguments(["general", "isos", "type"]))

data/test/cli/test_node_cli.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'solusvm/cli'
 
 class TestNodeCli < Test::Unit::TestCase
@@ -11,35 +11,43 @@ class TestNodeCli < Test::Unit::TestCase
 
   def test_should_delegate_node_available_ips_to_node
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Node.stubs(:new => mock{ expects(:available_ips).with("thevserverid").returns(["ip1", "ip2"]) })
+    Solusvm::Node.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:available_ips).with("thevserverid").returns("theips")
+    end)
 
-    $stdout.expects(:puts).with("ip1\nip2")
+    $stdout.expects(:puts).with("theips")
     Solusvm::Cli.start(cli_expand_base_arguments(["node", "available-ips", "thevserverid"]))
   end
 
   def test_should_delegate_node_stats_to_node
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Node.stubs(:new => mock{ expects(:statistics).with("thevserverid").returns({
-      :stat1 => "val1", :stat2 => "val2"
-    })})
+    Solusvm::Node.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:statistics).with("thevserverid").returns("thestats")
+    end)
 
-    $stdout.expects(:puts).with("stat1 => val1\nstat2 => val2")
+    $stdout.expects(:puts).with("thestats")
     Solusvm::Cli.start(cli_expand_base_arguments(["node", "stats", "thevserverid"]))
   end
 
   def test_should_delegate_node_xenresources_to_node
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Node.stubs(:new => mock{ expects(:xenresources).with("thevserverid").returns({
-      :stat1 => "val1", :stat2 => "val2"
-    })})
+    Solusvm::Node.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:xenresources).with("thevserverid").returns("theresources")
+    end)
 
-    $stdout.expects(:puts).with("stat1 => val1\nstat2 => val2")
+    $stdout.expects(:puts).with("theresources")
     Solusvm::Cli.start(cli_expand_base_arguments(["node", "xenresources", "thevserverid"]))
   end
 
   def test_should_delegate_node_virtualservers_to_node
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Node.stubs(:new => mock{ expects(:virtualservers).with("thevserverid").returns("thedata")})
+    Solusvm::Node.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:virtualservers).with("thevserverid").returns("thedata")
+    end)
 
     $stdout.expects(:puts).with("thedata")
     Solusvm::Cli.start(cli_expand_base_arguments(["node", "virtualservers", "thevserverid"]))
@@ -47,7 +55,10 @@ class TestNodeCli < Test::Unit::TestCase
 
   def test_should_delegate_nodes_list_to_node
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Node.stubs(:new => mock{ expects(:list).with("type").returns("thenodes")})
+    Solusvm::Node.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:list).with("type").returns("thenodes")
+    end)
 
     $stdout.expects(:puts).with("thenodes")
     Solusvm::Cli.start(cli_expand_base_arguments(["node", "list", "type"]))
@@ -55,7 +66,10 @@ class TestNodeCli < Test::Unit::TestCase
 
   def test_should_delegate_nodes_ids_to_node
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Node.stubs(:new => mock{ expects(:ids).with("type").returns("thenodes")})
+    Solusvm::Node.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:ids).with("type").returns("thenodes")
+    end)
 
     $stdout.expects(:puts).with("thenodes")
     Solusvm::Cli.start(cli_expand_base_arguments(["node", "list-ids", "type"]))

data/test/cli/test_reseller_cli.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'solusvm/cli'
 
 class TestResellerCli < Test::Unit::TestCase
@@ -11,39 +11,40 @@ class TestResellerCli < Test::Unit::TestCase
 
   def test_should_delegate_reseller_create_to_reseller
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock{ expects(:create).with() do |options|
-      expected = {
-        :username => "theusername",
-        :password => "thepassword",
-        :email => "theemail",
-        :firstname => "thefirstname",
-        :lastname => "thelastname",
-        :company => "thecompany",
-        :usernameprefix => "theusernameprefix",
-        :maxvps => "themaxvps",
-        :maxusers => "themaxusers",
-        :maxmem => "themaxmem",
-        :maxburst => "themaxburst",
-        :maxdisk => "themaxdisk",
-        :maxbw => "themaxbw",
-        :maxipv4 => "themaxipv4",
-        :maxipv6 => "themaxipv6",
-        :nodegroups => "thenodegroups",
-        :mediagroups => "themediagroups",
-        :openvz => "theopenvz",
-        :xenpv => "thexenpv",
-        :xenhvm => "thexenhvm",
-        :kvm => "thekvm"
-      }
-
-      expected.all? { |k,v| options[k] == v }
-
-      end.returns("theresult") 
-    })
+    Solusvm::Reseller.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:create).with() do |options|
+        expected = {
+          :username => "theusername",
+          :password => "thepassword",
+          :email => "theemail",
+          :firstname => "thefirstname",
+          :lastname => "thelastname",
+          :company => "thecompany",
+          :usernameprefix => "theusernameprefix",
+          :maxvps => "themaxvps",
+          :maxusers => "themaxusers",
+          :maxmem => "themaxmem",
+          :maxburst => "themaxburst",
+          :maxdisk => "themaxdisk",
+          :maxbw => "themaxbw",
+          :maxipv4 => "themaxipv4",
+          :maxipv6 => "themaxipv6",
+          :nodegroups => "thenodegroups",
+          :mediagroups => "themediagroups",
+          :openvz => "theopenvz",
+          :xenpv => "thexenpv",
+          :xenhvm => "thexenhvm",
+          :kvm => "thekvm"
+        }
+
+        expected.all? { |k,v| options[k] == v }
+      end.returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments([
-      "reseller", "create", 
+      "reseller", "create",
       "--username", "theusername",
       "--password", "thepassword",
       "--email", "theemail",
@@ -70,32 +71,33 @@ class TestResellerCli < Test::Unit::TestCase
 
   def test_should_delegate_reseller_change_resources_to_reseller
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock{ expects(:change_resources).with() do |options|
-      expected = {
-        :maxvps => "themaxvps",
-        :maxusers => "themaxusers",
-        :maxmem => "themaxmem",
-        :maxburst => "themaxburst",
-        :maxdisk => "themaxdisk",
-        :maxbw => "themaxbw",
-        :maxipv4 => "themaxipv4",
-        :maxipv6 => "themaxipv6",
-        :nodegroups => "thenodegroups",
-        :mediagroups => "themediagroups",
-        :openvz => "theopenvz",
-        :xenpv => "thexenpv",
-        :xenhvm => "thexenhvm",
-        :kvm => "thekvm"
-      }
-
-      expected.all? { |k,v| options[k] == v }
-
-      end.returns("theresult") 
-    })
+    Solusvm::Reseller.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_resources).with() do |options|
+        expected = {
+          :maxvps => "themaxvps",
+          :maxusers => "themaxusers",
+          :maxmem => "themaxmem",
+          :maxburst => "themaxburst",
+          :maxdisk => "themaxdisk",
+          :maxbw => "themaxbw",
+          :maxipv4 => "themaxipv4",
+          :maxipv6 => "themaxipv6",
+          :nodegroups => "thenodegroups",
+          :mediagroups => "themediagroups",
+          :openvz => "theopenvz",
+          :xenpv => "thexenpv",
+          :xenhvm => "thexenhvm",
+          :kvm => "thekvm"
+        }
+
+        expected.all? { |k,v| options[k] == v }
+      end.returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments([
-      "reseller", "change-resources", 
+      "reseller", "change-resources",
       "--maxvps", "themaxvps",
       "--maxusers", "themaxusers",
       "--maxmem", "themaxmem",
@@ -115,7 +117,10 @@ class TestResellerCli < Test::Unit::TestCase
 
   def test_should_delegate_reseller_info_to_reseller
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock{ expects(:info).with("theusername").returns("theresult") })
+    Solusvm::Reseller.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:info).with("theusername").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["reseller", "info", "theusername"]))
@@ -123,7 +128,10 @@ class TestResellerCli < Test::Unit::TestCase
 
   def test_should_delegate_reseller_delete_to_reseller
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock{ expects(:delete).with("theusername").returns("theresult") })
+    Solusvm::Reseller.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:delete).with("theusername").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["reseller", "delete", "theusername"]))
@@ -131,9 +139,12 @@ class TestResellerCli < Test::Unit::TestCase
 
   def test_should_delegate_reseller_list_to_reseller
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock{ expects(:list).returns("theresult") })
+    Solusvm::Reseller.stubs(:new => mock do
+      expects(:successful?).returns(true)
+     expects(:list).returns("theresult")
+   end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["reseller", "list"]))
-  end  
+  end
 end