rimu 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzA2MTJjMDViNTBkNDQ0YmM2ZDBlZTA5MDUyZjdhMTNhZjVkYzBkOQ==
+    ODY3ZWYzM2U4MTA2ZjcxMDM2MWEwYTMzYWEzZjgzOTYxZjg4Mjg2MQ==
   data.tar.gz: !binary |-
-    ZDRmNWFkMzllODgwNjE5M2FiNjBhZWRmYThhMzBiNGEzZWQzNTkxNg==
+    NTk0MTNkMDRkYjU2NDgxODlmZmQ4YWFjOGY3N2FjYjY4MjA2ZWQwMQ==
 SHA512:
   metadata.gz: !binary |-
-    YjQ5YTAzYjRkZDI2ZDJhODUwMWRhMGRhZTQ1NDdhZjllZWQwODk5NzhmNmQ1
-    OTk1ZWZmOTQxZGE3MGJlMjliY2JiYTQ1NmJiMDIwODdkZjM2MTc5OWFmNmNi
-    ZTIyNTBjZTc3NjUzMzFkYjI1ODEyYmVmZTE2OTg1NmMzYTRmMjg=
+    ZmQ3OTVlNzRiMTM2NTgwZDIyMmFmYTJhY2VhZDFiODg1NGQ0OWMwOGI4MzQ5
+    ODlkZWViNDFkMzRjMTdlOWNlMTQyNDk5M2MxZGRkZjlmMjliYWQ5NDI2NTgx
+    ZTlhZGJiNWY5Y2JiNjhmYTIxODI2MzVkYjViM2I2YTJhMzZiYmM=
   data.tar.gz: !binary |-
-    YzU0NTk3ODBmMTlkZGIwY2YyMDcxOWNiNjk2ZWIwNWQ5MWNjMzlmZjM5NWY2
-    ZGQzMzI3NzBiNWY4OTIxZThmZWRmM2VhMzBlODI3MDIxMzIzNmIzMDU0N2Q3
-    NTQ1YTIzMjAzM2U2ZmE4ZjViZDM3NGM3Y2Q4ZWZkYzYwM2M5ZGI=
+    MWVmNTQwZjZkM2I3YjFiMGU4OTNkMTFmOGYxYWJjMWM4ZDVlYmU4MzNjODQ3
+    NmExNjc1NThmNTQ2OTBiYTU1OGEwOGRkZTdmNTYwYzQwMDg0YjE1OGNjMGM3
+    ZGVkMzgzMjQ3MjY0MDNiYjJiOTQ0ZDIxODY4ZDdiNzkyOGQ0YTY=

data/.codeclimate.yml

@@ -1,11 +1,12 @@
 ---
 engines:
   fixme:
-    enabled: true
+      enabled: true
   rubocop:
-    enabled: true
+      enabled: true
 ratings:
-  paths:
-  - "**.rb"
+    paths:
+        - "**.rb"
 exclude_paths:
-- spec/**/*
+    - "**.yml"
+    - spec/**/*

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/*.gem
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/README.md

@@ -6,6 +6,7 @@ This gem provides bindings for the [Rimuhosting](https://www.rimuhosting.com/) [
 [![codecov.io](https://codecov.io/github/akissa/rimu/coverage.svg?branch=master)](https://codecov.io/github/akissa/rimu?branch=master)
 [![Test Coverage](https://codeclimate.com/github/akissa/rimu/badges/coverage.svg)](https://codeclimate.com/github/akissa/rimu/coverage)
 [![Code Climate](https://codeclimate.com/github/akissa/rimu/badges/gpa.svg)](https://codeclimate.com/github/akissa/rimu)
+[![Gem Version](https://badge.fury.io/rb/rimu.svg)](https://badge.fury.io/rb/rimu)
 [![MPLv2 License](https://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
 
 ## Installation

data/lib/rimu/orders.rb

@@ -1,9 +1,19 @@
+require 'cgi'
+
 class Rimu::Orders < Rimu
-    def orders
-        send_request("/r/orders", "about_orders")
+    def orders(params={})
+        raise ArgumentError, "params should be a hash" unless params.is_a?(Hash)
+        default_params = {
+            :include_inactive => 'N',
+            :server_type => 'VPS',
+        }
+        filters = prep_data(default_params, params)
+        path = "/r/orders;" + filters.collect {|k,v| "#{k}=#{CGI::escape(v.to_s)}"}.join(';')
+        send_request(path, "about_orders")
     end
 
-    def order(oid, domain)
-        send_request("/r/orders/order-#{oid}-#{domain}", "about_order")
+    def order(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        send_request("/r/orders/order-#{oid}-dn", "about_order")
     end
 end

data/lib/rimu/servers.rb

@@ -1,45 +1,122 @@
 class Rimu::Servers < Rimu
+    def default_vps_params
+        @default_vps_params = {
+            :billing_oid => nil,
+            :dc_location => nil,
+            :file_injection_data => nil,
+            :host_server_oid => nil,
+            :instantiation_options => {
+                :domain_name => nil,
+                :password => nil,
+                :distro => nil,
+                :cloud_config_data => nil,
+                :control_panel => nil,
+            },
+            :instantiation_via_clone_options => {
+                :domain_name => nil,
+                :vps_order_oid_to_clone => nil,
+            },
+            :ip_request => {
+                :extra_ip_reason => nil,
+                :num_ips => nil,
+                :requested_ips => nil,
+            },
+            :is_just_minimal_init => nil,
+            :meta_data => nil,
+            :pricing_plan_code => nil,
+            :user_oid => nil,
+            :vps_parameters => {
+                :disk_space_mb => nil,
+                :memory_mb => nil,
+                :disk_space_2_mb => nil,
+            },
+            :vps_type => nil,
+        }
+    end
+
     def create(params)
-        send_request("/r/orders/new-vps", "about_order", "POST", params)
+        raise ArgumentError, "params should be a hash" unless params.is_a?(Hash)
+        raise ArgumentError, "params should contain atleast instantiation_options or instantiation_via_clone_options" \
+        unless params.has_key?(:instantiation_options) || params.has_key?(:instantiation_via_clone_options)
+        data = {:new_order_request => prep_data(default_vps_params, params)}
+        send_request("/r/orders/new-vps", "about_order", "POST", data)
     end
 
-    def info(oid)
+    def reinstall(oid, params={})
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        raise ArgumentError, "params should be a hash" unless params.is_a?(Hash)
+        data = {:reinstall_request => prep_data(default_vps_params, params)}
+        send_request("/r/orders/order-#{oid}-dn/vps/reinstall", "running_vps_info", "PUT", data)
+    end
+
+    def status(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
         send_request("/r/orders/order-#{oid}-dn/vps", "running_vps_info")
     end
 
+    def info(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        send_request("/r/orders/order-#{oid}-dn/vps", "about_order")
+    end
+
     def cancel(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
         send_request("/r/orders/order-#{oid}-dn/vps", "cancel_messages", "DELETE")
     end
 
     def move(oid, params)
-        send_request("/r/orders/order-#{oid}-dn/vps/host-server", "about_order", "PUT", params)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        raise ArgumentError, "params should be a hash" unless params.is_a?(Hash)
+        default_params = {
+            :update_dns=>false,
+            :move_reason=>'',
+            :pricing_change_option=>'CHOOSE_BEST_OPTION',
+            :selected_host_server_oid=>nil
+        }
+        data = {:vps_move_request => prep_data(default_params, params)}
+        send_request("/r/orders/order-#{oid}-dn/vps/host-server", "about_order", "PUT", data)
     end
 
-    def resize(oid)
-        send_request("/r/orders/order-#{oid}-dn/vps/parameters", "resource_change_result", "PUT", params)
+    def resize(oid, params)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        raise ArgumentError, "params should be a hash" unless params.is_a?(Hash)
+        default_params = {
+            :disk_space_2_mb => nil,
+            :disk_space_mb => nil,
+            :memory_mb => nil,
+        }
+        data = {:vps_resize_request => prep_data(default_params, params)}
+        send_request("/r/orders/order-#{oid}-dn/vps/parameters", "resource_change_result", "PUT", data)
     end
 
-    def reinstall(oid)
-        send_request("/r/orders/order-#{oid}-dn/vps/reinstall", "running_vps_info", "PUT", params)
+    def change_state(oid, new_state)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        params = {:running_state_change_request=>{:running_state=>new_state}}
+        send_request("/r/orders/order-#{oid}-dn/vps/running-state", "running_vps_info", "PUT", params)
     end
 
-    def reboot(oid, params)
-        send_request("/r/orders/order-#{oid}-dn/vps/running-state", "running_vps_info", "PUT", params)
+    def reboot(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        change_state(oid, "RESTARTING")
     end
 
-    def shutdown(oid, params)
-        send_request("/r/orders/order-#{oid}-dn/vps/running-state", "running_vps_info", "PUT", params)
+    def shutdown(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        change_state(oid, "NOTRUNNING")
     end
 
-    def start(oid, params)
-        send_request("/r/orders/order-#{oid}-dn/vps/running-state", "running_vps_info", "PUT", params)
+    def start(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        change_state(oid, "RUNNING")
     end
 
-    def power_cycle(oid, params)
-        send_request("/r/orders/order-#{oid}-dn/vps/running-state", "running_vps_info", "PUT", params)
+    def power_cycle(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
+        change_state(oid, "POWERCYCLING")
     end
 
     def data_transfer(oid)
+        raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
         send_request("/r/orders/order-#{oid}-dn/vps/data-transfer-usage", "data_transfer_usage_info")
     end
 end

data/lib/rimu.rb

@@ -28,40 +28,43 @@ class Rimu
             'Content-Type' =>'application/json',
             'Accept' =>'application/json',
             'User-Agent' => 'RimuAPI-Ruby',
-            'Authorization' => 'rimuhosting apikey=' % @api_key
+            'Authorization' => 'rimuhosting apikey=#{api_key}',
         }
     end
 
     def post(path, data)
-        logger.info "POST #{api_url.to_s}#{path} body:#{data.inspect}" if logger
-        @options = {headers: set_headers, body: data}
-        HTTParty.post(api_url + path, @options).parsed_response
+        logger.info "POST #{api_url}#{path} body:#{data.inspect}" if logger
+        options = {headers: set_headers, body: data}
+        HTTParty.post(api_url + path, options).parsed_response
     end
 
     def get(path)
-        logger.info "GET #{api_url.to_s}#{path}" if logger
-        @options = {headers: set_headers}
-        HTTParty.get(api_url + path, @options).parsed_response
+        logger.info "GET #{api_url}#{path}" if logger
+        options = {headers: set_headers}
+        HTTParty.get(api_url + path, options).parsed_response
     end
 
     def delete(path)
-        logger.info "DELETE #{api_url.to_s}#{path}" if logger
-        @options = {headers: set_headers}
-        HTTParty.delete(api_url + path, @options).parsed_response
+        logger.info "DELETE #{api_url}#{path}" if logger
+        options = {headers: set_headers}
+        HTTParty.delete(api_url + path, options).parsed_response
     end
 
     def error?(response)
-        response and response["extended_error_infos"] and ! response["extended_error_infos"].empty?
+        response and response["jaxrs_response"] and \
+        response["jaxrs_response"]["response_type"] and \
+        response["jaxrs_response"]["response_type"] == "ERROR"
     end
 
     def error_message(response)
-        response["extended_error_infos"].collect { |err|
-            "  - Error #{err["human_readable_message"]}.  "
-        }.join("\n")
+        "  - Error: #{response["jaxrs_response"]["human_readable_message"]}"
     end
 
     def format_response(response, field)
-        result = response[field]
+        result = response[response.keys[0]]
+        if result.is_a?(Hash) and result.has_key?(field)
+            result = result[field]
+        end
         return result.collect {|item| convert_item(item) } if result.class == Array
         return result unless result.respond_to?(:keys)
         convert_item(result)
@@ -75,7 +78,7 @@ class Rimu
         OpenStruct.new(response)
     end
 
-    def send_request(path, field, method="GET", data=false)
+    def send_request(path, field, method="GET", data=nil)
         if method == "POST"
             response = post(path, data)
         elsif method == "PUT"
@@ -97,8 +100,21 @@ class Rimu
         send_request("/r/billing-methods", "billing_methods")
     end
 
-    def pricing_plans
-        send_request("/r/pricing-plans", "billing_methods")
+    # def pricing_plans
+    #     send_request("/r/pricing-plans", "pricing_plan_infos")
+    # end
+
+    def prep_data(default_params, params)
+        params.keep_if {|k,_| default_params.keys.include? k }
+        new_params = default_params.merge(params)
+        new_params.each_pair do |key, val|
+            if val.is_a?(Hash)
+                val.keep_if {|_,v| v != nil }
+                val.keep_if {|k,_| default_params[key].keys.include? k }
+            end
+        end
+        new_params.keep_if {|_,v| (v.is_a?(Hash) && ! v.empty?) || (! v.is_a?(Hash) && v != nil) }
+        return new_params
     end
 
     def self.has_namespace(*namespaces)

data/rimu.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rimu"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Andrew Colin Kissa"]
   spec.email         = ["andrew@topdog.za.net"]
   spec.license       = "MPL-2.0"
@@ -15,11 +15,15 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 1.9.3'
+  spec.extra_rdoc_files = ['README.md']
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", '~> 0'
-  spec.add_development_dependency "mocha", '~> 0'
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-core"
+  spec.add_development_dependency "rspec-expectations"
+  spec.add_development_dependency "mocha", "~> 0"
   spec.add_runtime_dependency "httparty", "~> 0.0"
   spec.add_runtime_dependency "json", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rimu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Colin Kissa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -99,7 +127,8 @@ email:
 - andrew@topdog.za.net
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
 - .codeclimate.yml
 - .gitignore
@@ -126,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='