solusvm 1.0.0.beta3 → 1.1.0.beta1

data/.gitignore

@@ -20,3 +20,6 @@ pkg
 
 .bundle
 Gemfile.lock
+
+.rvmrc
+.rbenv-version

data/.travis.yml

@@ -1,11 +1,17 @@
-script: "bundle exec rake test"
+language: ruby
+script: "bundle exec rake spec"
 notifications:
-  disabled: true
+  email:
+    recipients:
+      - engineering@internal.site5.com
+    on_success: never
+    on_failure: always
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ree
-  - rbx
   - rbx-head
-  - jruby
+  - rbx-18mode
+  - jruby-18mode
+  - jruby-19mode

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Site5 LLC 
+Copyright (c) 2010-2012 Site5.com <http://www.site5.com/>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -168,4 +168,4 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright (c) 2010-2011 Site5. See LICENSE for details.
+Copyright (c) 2010-2012 Site5.com. See LICENSE for details.

data/lib/solusvm.rb

@@ -1,8 +1,7 @@
-require 'net/http'
-require 'net/https'
 require 'cgi'
 require 'rubygems'
 require 'xmlsimple'
+require 'faraday'
 
 module Solusvm
   class << self
@@ -28,6 +27,7 @@ end
 
 require 'solusvm/exceptions'
 require 'solusvm/hash'
+require 'solusvm/solusvm_errors'
 require 'solusvm/base'
 require 'solusvm/general'
 require 'solusvm/client'

data/lib/solusvm/base.rb

@@ -1,3 +1,5 @@
+Faraday.register_middleware :response, :solusvm_errors => Solusvm::SolusvmErrors
+
 module Solusvm
   # Solusvm::Base is the main class for mapping API resources as subclasses.
   class Base
@@ -18,20 +20,13 @@ module Solusvm
     #
     # <tt>force_array</tt> - see parse_response
     def perform_request(options = {}, force_array = false)
-      options.merge!(api_login)
-      http = Net::HTTP.new(api_endpoint.host, api_endpoint.port)
-      if api_endpoint.port == 443
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      http.start do |http|
-        request = Net::HTTP::Get.new("#{api_endpoint.path}?#{options.to_query}")
-        response = http.request(request)
-
-        handle_errors(response)
-        @returned_parameters = parse_response(response.body, force_array)
-        log_messages(options)
-      end
+      response = Faraday.new(:url => api_endpoint, :ssl => {:verify => true}) do |c|
+        c.params = options.merge(api_login)
+        c.response :solusvm_errors
+        c.adapter :net_http
+      end.get
+      @returned_parameters = parse_response(response.body, force_array)
+      log_messages(options)
       successful?
     end
 
@@ -52,23 +47,6 @@ module Solusvm
       end
     end
 
-    # Look for known error messages
-    def handle_errors(response)
-      if (200..299).include? response.code.to_i
-        # Checks for application errors
-        case response.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: #{response.code}"
-      end
-    end
-
     # Returns true when a request has been successful
     #
     #   my_class = MyClass.new
@@ -80,7 +58,7 @@ module Solusvm
 
     # URI parsed API URL
     def api_endpoint
-      Solusvm.api_endpoint
+      Solusvm.api_endpoint.dup
     end
 
     def api_login

data/lib/solusvm/cli/base_cli.rb

@@ -6,7 +6,7 @@ require 'solusvm/version'
 module Solusvm
   class BaseCli < Thor
     include Thor::Actions
-    
+
     class << self
       # Overrides the default banner implementation to output the whole command
       def banner(task, namespace = true, subcommand = false)
@@ -40,14 +40,39 @@ module Solusvm
     end
 
     # Default required options
-    class_option :api_login, :type => :string, :desc => "API ID; Required.",  :aliases => ["-I", "--api-login"], :default => default_option(:id)
-    class_option :api_key,   :type => :string, :desc => "API KEY; Required.", :aliases => ["-K", "--api-key"], :default => default_option(:key)
-    class_option :api_url,   :type => :string, :desc => "API URL; Required.", :aliases => ["-U", "--api-url"], :default => default_option(:url)
+    class_option :api_login, :type => :string, :desc => "API ID; Required.",  :aliases => ["-I", "--api-login"]
+    class_option :api_key,   :type => :string, :desc => "API KEY; Required.", :aliases => ["-K", "--api-key"]
+    class_option :api_url,   :type => :string, :desc => "API URL; Required.", :aliases => ["-U", "--api-url"]
+
+    no_tasks do
+      def api
+        raise NotImplementedError
+      end
+
+      # prints one result element per line, in case it is a list
+      def output(result="", color=nil, force_new_line=(result.to_s !~ /( |\t)$/))
+        if api.successful?
+          Array(result).each do |entry|
+            say(entry, color, force_new_line)
+          end
+        else
+          say("Request failed: #{api.statusmsg}", color, force_new_line)
+        end
+      end
+    end
 
     protected
 
     def configure
-      Solusvm.config(options[:api_login], options[:api_key], :url => options[:api_url])
+      Solusvm.config(
+        present_or_exit(:api_login, :id, "api_login required"),
+        present_or_exit(:api_key, :key, "api_key required"),
+        :url => present_or_exit(:api_url, :url, "api_url required")
+      )
+    end
+
+    def present_or_exit(options_key, default_option_key, message)
+      options[options_key] || BaseCli.default_option(default_option_key) || (say(message) && raise(SystemExit))
     end
   end
 end

data/lib/solusvm/cli/client_cli.rb

@@ -1,7 +1,7 @@
-module Solusvm 
+module Solusvm
   class ClientCli < BaseCli
 
-    desc "create", "Creates a new client"
+    desc "create", "Creates a new h"
     method_option :username, :type => :string, :desc => "Username",  :aliases => ["-u", "--username"]
     method_option :password, :type => :string, :desc => "Password",  :aliases => ["-p", "--password"]
     method_option :email, :type => :string, :desc => "Email",  :aliases => ["-e", "--email"]
@@ -9,37 +9,37 @@ module Solusvm
     method_option :lastname, :type => :string, :desc => "Lastname",  :aliases => ["-l", "--lastname"]
     method_option :company, :type => :string, :desc => "Company",  :aliases => ["-c", "--company"]
     def create
-      say client.create(options)
+      output api.create(options)
     end
 
     desc "change-password USERNAME NEWPASSWORD", "Changes the password of an existing client"
     def change_password(username, password)
-      say client.change_password(username, password)
+      output api.change_password(username, password)
     end
 
     desc "authenticate USERNAME NEWPASSWORD", "Verify a clients login. Returns true when the specified login is correct"
     def authenticate(username, password)
-      say client.authenticate(username, password)
+      output api.authenticate(username, password)
     end
 
     desc "check-exists USERNAME", "Checks if a client exists"
     def check_exists(username)
-      say client.exists?(username)
+      output api.exists?(username)
     end
 
     desc "delete USERNAME", "Deletes an existing client"
     def delete(username)
-      say client.delete(username)
+      output api.delete(username)
     end
 
     desc "list", "Lists existing clients"
     def list
-      say client.list
+      output api.list
     end
 
     private
 
-    def client
+    def api
       @client ||= begin
         configure
         Solusvm::Client.new

data/lib/solusvm/cli/general_cli.rb

@@ -1,24 +1,24 @@
-module Solusvm 
+module Solusvm
   class GeneralCli < BaseCli
 
     desc "templates TYPE", "Lists existing templates for a given type [openvz|xen|xen hvm|kvm]"
     def templates(type)
-      say general.templates(type)
+      output api.templates(type)
     end
 
     desc "plans TYPE", "Lists existing plans for a given type [openvz|xen|xen hvm|kvm]"
     def plans(type)
-      say general.plans(type)
+      output api.plans(type)
     end
 
     desc "isos TYPE", "Lists existing isos for a given type [openvz|xen|xen hvm|kvm]"
     def isos(type)
-      say general.isos(type)
+      output api.isos(type)
     end
 
     private
 
-    def general
+    def api
       @general ||= begin
         configure
         Solusvm::General.new

data/lib/solusvm/cli/node_cli.rb

@@ -1,39 +1,39 @@
-module Solusvm 
+module Solusvm
   class NodeCli < BaseCli
 
     desc "list TYPE", "Lists existing nodes for a given type [openvz|xen|xen hvm|kvm]"
     def list(type)
-      say node.list(type)
+      output api.list(type)
     end
 
     desc "list-ids TYPE", "Lists existing nodes ids for a given type [openvz|xen|xen hvm|kvm]"
     def list_ids(type)
-      say node.ids(type)
+      output api.ids(type)
     end
 
     desc "available-ips VSERVERID", "Lists the available ips for a given node"
     def available_ips(vserverid)
-      say node.available_ips(vserverid).join("\n")
+      output api.available_ips(vserverid)
     end
 
     desc "stats VSERVERID", "Lists statistics for a given node"
     def stats(vserverid)
-      say node.statistics(vserverid).map{|k, v| "#{k} => #{v}" }.join("\n")
+      output api.statistics(vserverid)
     end
 
     desc "xenresources VSERVERID", "Lists xen resources for a given node"
     def xenresources(vserverid)
-      say node.xenresources(vserverid).map{|k, v| "#{k} => #{v}" }.join("\n")
+      output api.xenresources(vserverid)
     end
 
     desc "virtualservers VSERVERID", "Lists the virtual servers for a given node"
     def virtualservers(vserverid)
-      say node.virtualservers(vserverid)
+      output api.virtualservers(vserverid)
     end
 
     private
 
-    def node
+    def api
       @node ||= begin
         configure
         Solusvm::Node.new

data/lib/solusvm/cli/reseller_cli.rb

@@ -1,4 +1,4 @@
-module Solusvm 
+module Solusvm
   class ResellerCli < BaseCli
 
     desc "create", "Creates a new reseller"
@@ -24,7 +24,7 @@ module Solusvm
     method_option :xenhvm, :type => :string, :desc => "y|n Allow building of xen hvm virtual servers (optional)",  :aliases => ["-xhvm", "--xenhvm"]
     method_option :kvm, :type => :string, :desc => "y|n Allow building of kvmvirtual servers (optional)",  :aliases => ["-kvm"]
     def create
-      say reseller.create(options)
+      output api.create(options)
     end
 
     desc "change", "Changes the available resources of a reseller"
@@ -43,27 +43,27 @@ module Solusvm
     method_option :xenhvm, :type => :string, :desc => "y|n Allow building of xen hvm virtual servers (optional)",  :aliases => ["-xhvm", "--xenhvm"]
     method_option :kvm, :type => :string, :desc => "y|n Allow building of kvmvirtual servers (optional)",  :aliases => ["-kvm"]
     def change_resources
-      say reseller.change_resources(options)
+      output api.change_resources(options)
     end
 
     desc "info USERNAME", "Retrieves information from an existing reseller"
     def info(username)
-      say reseller.info(username)
+      output api.info(username)
     end
 
     desc "delete USERNAME", "Deletes an existing reseller"
     def delete(username)
-      say reseller.delete(username)
+      output api.delete(username)
     end
 
     desc "list", "Lists existing resellers"
     def list
-      say reseller.list
+      output api.list
     end
 
     private
 
-    def reseller
+    def api
       @reseller ||= begin
         configure
         Solusvm::Reseller.new

data/lib/solusvm/cli/server_cli.rb

@@ -3,133 +3,133 @@ module Solusvm
 
     desc "status VSERVERID", "Checks the status of a server"
     def status(vserverid)
-      say server.status(vserverid)
+      output api.status(vserverid)
     end
 
     desc "info VSERVERID", "Retrieves information from a server"
     def info(vserverid)
-      say server.info(vserverid)
+      output api.info(vserverid)
     end
 
     desc "vnc VSERVERID", "Retrieves vnc information from a server"
     def vnc(vserverid)
-      say server.vnc(vserverid)
+      output api.vnc(vserverid)
     end
 
     desc "console VSERVERID", "Retrieves console information from a server"
     def console(vserverid)
-      say server.console(vserverid)
+      output api.console(vserverid)
     end
 
     desc "info-all VSERVERID", "Retrieves all availavle information from a server"
     def info_all(vserverid)
-      say server.info_all(vserverid)
+      output api.info_all(vserverid)
     end
 
     desc "change-plan VSERVERID NEWPLAN", "Changes the plan of a server"
     def change_plan(vserverid, newplan)
-      say server.change_plan(vserverid, newplan)
+      output api.change_plan(vserverid, newplan)
     end
 
     desc "change-owner VSERVERID CLIENTID", "Changes the owner of a server"
     def change_owner(vserverid, clientid)
-      say server.change_owner(vserverid, clientid)
+      output api.change_owner(vserverid, clientid)
     end
 
     desc "change-consolepass VSERVERID NEWPASSWORD", "Changes the console password of a server"
     def change_consolepass(vserverid, newpassword)
-      say server.change_consolepass(vserverid, newpassword)
+      output api.change_consolepass(vserverid, newpassword)
     end
 
     desc "change-vncpass VSERVERID NEWPASSWORD", "Changes the vnc password of a server"
     def change_vncpass(vserverid, newpassword)
-      say server.change_vncpass(vserverid, newpassword)
+      output api.change_vncpass(vserverid, newpassword)
     end
 
     desc "change-rootpass VSERVERID NEWPASSWORD", "Changes the root password of a server"
     def change_rootpass(vserverid, newpassword)
-      say server.change_rootpassword(vserverid, newpassword)
+      output api.change_rootpassword(vserverid, newpassword)
     end
 
     desc "change-bootorder VSERVERID BOOTORDER", "Changes the boot order of a server [cd(Hard Disk CDROM)|dc(CDROM Hard Disk)|c(Hard Disk)|d(CDROM)]"
     def change_bootorder(vserverid, newbootorder)
-      say server.change_bootorder(vserverid, newbootorder)
+      output api.change_bootorder(vserverid, newbootorder)
     end
 
     desc "change-hostname VSERVERID HOSTNAME", "Changes the hostname of a server"
     def change_hostname(vserverid, newhostname)
-      say server.change_hostname(vserverid, newhostname)
+      output api.change_hostname(vserverid, newhostname)
     end
 
     desc "addip VSERVERID", "Adds an ip to the server"
     def addip(vserverid)
-      say server.add_ip(vserverid)
+      output api.add_ip(vserverid)
     end
 
     desc "boot VSERVERID", "Boots up a server"
     def boot(vserverid)
-      say server.boot(vserverid)
+      output api.boot(vserverid)
     end
 
     desc "reboot VSERVERID", "Reboots a server"
     def reboot(vserverid)
-      say server.reboot(vserverid)
+      output api.reboot(vserverid)
     end
 
     desc "shutdown VSERVERID", "Shuts down a server"
     def shutdown(vserverid)
-      say server.shutdown(vserverid)
+      output api.shutdown(vserverid)
     end
 
     desc "suspend VSERVERID", "Suspends a server"
     def suspend(vserverid)
-      say server.suspend(vserverid)
+      output api.suspend(vserverid)
     end
 
     desc "resume VSERVERID", "Resumes a server"
     def resume(vserverid)
-      say server.resume(vserverid)
+      output api.resume(vserverid)
     end
 
     desc "check-exists VSERVERID", "Checks if a server exists"
     def check_exists(vserverid)
-      say server.check_exists(vserverid)
+      output api.exists?(vserverid)
     end
 
     desc "terminate VSERVERID", "Terminates a server"
     def terminate(vserverid)
-      say server.terminate(vserverid)
+      output api.terminate(vserverid)
     end
 
     desc "rebuild VSERVERID", "Rebuilds a server"
     method_option :template, :type => :string, :desc => "VPS template to boot from",  :aliases => ["-t", "--template"]
     def rebuild(vserverid)
-      say server.rebuild(vserverid, {:template => options[:template]})
+      output api.rebuild(vserverid, {:template => options[:template]})
     end
 
     desc "tun-switcher VSERVERID SWITCH(on|off)", "Enable/Disable TUN/TAP"
     def tun_switcher(vserverid, switch)
-      say switch(vserverid, switch, :tun_enable, :tun_disable)
+      output switch(vserverid, switch, :tun_enable, :tun_disable)
     end
 
     desc "network-switcher VSERVERID SWITCH(on|off)", "Enable/Disable Network mode"
     def network_switcher(vserverid, switch)
-      say switch(vserverid, switch, :network_enable, :network_disable)
+      output switch(vserverid, switch, :network_enable, :network_disable)
     end
 
     desc "pae-switcher VSERVERID SWITCH(on|off)", "Enable/Disable PAE"
     def pae_switcher(vserverid, switch)
-      say switch(vserverid, switch, :pae_enable, :pae_disable)
+      output switch(vserverid, switch, :pae_enable, :pae_disable)
     end
 
     desc "mountiso VSERVERID ISO", "Mounts an iso"
     def mountiso(vserverid, iso)
-      say server.mountiso(vserverid, iso)
+      output api.mountiso(vserverid, iso)
     end
 
     desc "unmountiso VSERVERID", "Unmounts an iso"
     def unmountiso(vserverid)
-      say server.unmountiso(vserverid)
+      output api.unmountiso(vserverid)
     end
 
     desc "create HOSTNAME PASSWORD", "Creates a new server"
@@ -140,15 +140,15 @@ module Solusvm
     method_option :template, :type => :string, :desc => "VPS template to boot from",  :aliases => ["-t", "--template"]
     method_option :node, :type => :string, :desc => "Node to provision on",  :aliases => ["-n", "--node"]
     def create(hostname, password)
-      say server.create(hostname, password, {
-        :plan => options[:plan], :ips => options[:ips], :type => options[:kind], 
+      output api.create(hostname, password, {
+        :plan => options[:plan], :ips => options[:ips], :type => options[:kind],
         :username => options[:username], :template => options[:template], :node => options[:node]
       })
     end
 
     private
 
-    def server
+    def api
       @server ||= begin
         configure
         Solusvm::Server.new
@@ -157,9 +157,9 @@ module Solusvm
 
     def switch(vserverid, switch_value, on_method, off_method)
       if switch_value == "on"
-        server.send(on_method, vserverid)
+        api.send(on_method, vserverid)
       elsif switch_value == "off"
-        server.send(off_method, vserverid)
+        api.send(off_method, vserverid)
       else
         "Invalid switch value. Valid values are on|off"
       end