rubineti 1.3.0 → 1.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.2-p0@rubineti
+rvm ruby-1.9.2-p136@rubineti

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-gem "hugs", "~> 1.1.0"
+gem "hugs", "~> 2.3.0"
 
 group :development do
   gem "rake"
-  gem "jeweler", "~> 1.5.1"
-  gem "vcr", "~> 1.3.3"
-  gem "webmock", "~> 1.6.1"
-  gem "minitest", "~> 2.0.0"
-  gem "yajl-ruby", "~> 0.7.8"
+  gem "jeweler"
+  gem "vcr"
+  gem "webmock"
+  gem "minitest"
+  gem "yajl-ruby"
 end

data/Gemfile.lock

@@ -1,33 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
+    addressable (2.2.4)
     crack (0.1.8)
     git (1.2.5)
-    hugs (1.1.0)
+    hugs (2.3.0)
+      multipart-post (~> 1.0.1)
       net-http-persistent (~> 1.4.1)
+      nokogiri (~> 1.4.4)
       yajl-ruby (~> 0.7.8)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    minitest (2.0.0)
+    minitest (2.0.2)
+    multipart-post (1.0.1)
     net-http-persistent (1.4.1)
+    nokogiri (1.4.4)
     rake (0.8.7)
-    vcr (1.3.3)
-    webmock (1.6.1)
+    vcr (1.5.1)
+    webmock (1.6.2)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    yajl-ruby (0.7.8)
+    yajl-ruby (0.7.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  hugs (~> 1.1.0)
-  jeweler (~> 1.5.1)
-  minitest (~> 2.0.0)
+  hugs (~> 2.3.0)
+  jeweler
+  minitest
   rake
-  vcr (~> 1.3.3)
-  webmock (~> 1.6.1)
-  yajl-ruby (~> 0.7.8)
+  vcr
+  webmock
+  yajl-ruby

data/README.md

@@ -1,6 +1,6 @@
 # rubineti
 
-[Ruby](http://www.ruby-lang.org/) bindings to [Ganeti's](http://code.google.com/p/ganeti/) Version 2 Remote API.  
+[Ruby](http://www.ruby-lang.org/) bindings to [Ganeti's](http://code.google.com/p/ganeti/) Version 2 Remote API.
 
 ## Usage
 
@@ -10,17 +10,23 @@
 
 ### Examples
 
-See the examples section in the [wiki](http://github.com/retr0h/rubineti/wiki/Examples).
+See the examples section in the [wiki](http://github.com/retr0h/rubineti/wiki).
 
-## Contributions
+## Compatability
 
-I have implemented the end-points immediately needed.  Feel free to send me pull requests, if you
-wish to help out.
+ruby 1.9.2
+
+## Testing
 
-## TODO
+MiniTest will run the tests in a random order.  When rebuilding the fixtures, the entity
+tests depend on the pool tests having already been run.  Since the fixtures change infrequently,
+this should be acceptable.
 
-* Remove #cassette_for test helper.  It's a bad idea to use fixture data to test other fixtures.
+Tests can run offline thanks to [VCR](https://github.com/myronmarston/vcr).
 
-## Credits
+    $ bundle exec rake
 
-Wesley Beary's [fog](https://github.com/geemus/fog), for which I referenced.
+## Contributions
+
+I have implemented the end-points immediately needed.  Feel free to send me pull requests, if you
+wish to help out.

data/Rakefile

@@ -15,7 +15,7 @@ end
 require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
   test.libs   << "./lib" << "./test"
-  test.pattern = "test/**/test_*.rb"
+  test.pattern = "test/**/*_test.rb"
   test.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/ganeti.rb

@@ -2,5 +2,5 @@ module Ganeti
   ##
   # Remote API Version.
 
-  Version = 2
+  Version = 2.freeze
 end

data/lib/rubineti.rb

@@ -1,2 +1,2 @@
-require "rubineti/compute"
+require "rubineti/client"
 require "ganeti"

data/lib/rubineti/client.rb

@@ -0,0 +1,44 @@
+require "hugs"
+
+require "rubineti/cluster"
+require "rubineti/instance"
+require "rubineti/job"
+require "rubineti/node"
+
+module Rubineti
+  class Client
+    ##
+    # Required:
+    # +user+: A String containing the username for use in HTTP Basic auth.
+    # +password+: A String containing the password for use in HTTP Basic auth.
+    # +host+: A String with the host to connect.
+
+    def initialize options
+      @connection = Hugs::Client.new(
+        :user     => options[:user],
+        :password => options[:password],
+        :host     => options[:host],
+        :port     => options[:port] || 5080,
+        :scheme   => "https"
+      )
+      @connection.raise_4xx = true
+      @connection.raise_5xx = true
+    end
+
+    def cluster
+      @cluster ||= Rubineti::Cluster.new @connection
+    end
+
+    def instance
+      @instance ||= Rubineti::Instance.new @connection
+    end
+
+    def job
+      @job ||= Rubineti::Job.new @connection
+    end
+
+    def node
+      @node ||= Rubineti::Node.new @connection
+    end
+  end
+end

data/lib/rubineti/{compute/cluster.rb → cluster.rb}

@@ -1,26 +1,30 @@
 module Rubineti
-  module Cluster
+  class Cluster
+    def initialize connection
+      @connection = connection
+    end
+
     ##
     # Returns a list of features supported by the RAPI server.
 
-    def cluster_features
-      warn "WARNING: Cluster#cluster_features not implemented."
+    def features
+      warn "WARNING: Cluster#features not implemented."
       # get "/#{Ganeti::Version}/features"
     end
 
     ##
     # Returns a list of cluster information.
 
-    def cluster_info
-      request.get "/#{Ganeti::Version}/info"
+    def info
+      @connection.get "/#{Ganeti::Version}/info"
     end
 
     ##
     # Redistribute configuration to all nodes.
     # Returns a job_id.
 
-    def cluster_redistribute_config
-      request.put "/#{Ganeti::Version}/redistribute-config"
+    def redistribute_config
+      @connection.put "/#{Ganeti::Version}/redistribute-config"
     end
 
     ##
@@ -31,8 +35,8 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def cluster_tags_create params = {}
-      warn "WARNING: Cluster#cluster_tags_create not implemented."
+    def tags_create params = {}
+      warn "WARNING: Cluster#tags_create not implemented."
       # put "/#{Ganeti::Version}/tags", params
     end
 
@@ -44,31 +48,31 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def cluster_tags_delete params = {}
-      warn "WARNING: Cluster#cluster_tags_delete not implemented."
+    def tags_delete params = {}
+      warn "WARNING: Cluster#tags_delete not implemented."
       # delete "/#{Ganeti::Version}/tags", params
     end
 
     ##
     # Returns the cluster tags.
 
-    def cluster_tags_list
-      warn "WARNING: Cluster#cluster_tags_list not implemented."
+    def tags_list
+      warn "WARNING: Cluster#tags_list not implemented."
       # get "/#{Ganeti::Version}/tags"
     end
 
     ##
     # Returns the cluster API version.
 
-    def cluster_version
-      request.get "/version"
+    def version
+      @connection.get "/version"
     end
 
     ##
     # Return a list of all OSes.
 
-    def cluster_os_list
-      request.get "/#{Ganeti::Version}/os"
+    def os_list
+      @connection.get "/#{Ganeti::Version}/os"
     end
   end
 end

data/lib/rubineti/{compute/instances.rb → instance.rb}

@@ -1,5 +1,9 @@
 module Rubineti
-  module Instances
+  class Instance
+    def initialize connection
+      @connection = connection
+    end
+
     ##
     # Activate disks on an instance.
     # Returns a job id.
@@ -7,9 +11,9 @@ module Rubineti
     # Takes the bool parameter ignore_size.
     # (useful for forcing activation when recorded size is wrong).
 
-    def instance_activate_disks instance_name, params = {}
-      warn "WARNING: Instances#instance_activate_disks not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/activate-disks", params
+    def activate_disks name, params = {}
+      warn "WARNING: Instance#activate_disks not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/activate-disks", params
     end
 
     ##
@@ -23,17 +27,17 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_create params = {}
-      request.post "/#{Ganeti::Version}/instances", params
+    def create params = {}
+      @connection.post "/#{Ganeti::Version}/instances", params
     end
 
     ##
     # Deactivate disks on an instance.
     # Returns a job id.
 
-    def instance_deactivate_disks instance_name
-      warn "WARNING: Instances#instance_deactivate_disks not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/deactivate-disks"
+    def deactivate_disks name
+      warn "WARNING: Instance#deactivate_disks not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/deactivate-disks"
     end
 
     ##
@@ -44,8 +48,8 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_delete instance_name, params = {}
-      request.delete "/#{Ganeti::Version}/instances/#{instance_name}", params
+    def delete name, params = {}
+      @connection.delete "/#{Ganeti::Version}/instances/#{name}", params
     end
 
     ##
@@ -55,9 +59,9 @@ module Rubineti
     # Body parameters:
     #   - http://docs.ganeti.org/ganeti/#{Ganeti::Version}.2/html/rapi.html#instances-instance-name-export
 
-    def instance_export instance_name, params = {}
-      warn "WARNING: Instances#instance_export not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/export", params
+    def export name, params = {}
+      warn "WARNING: Instance#export not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/export", params
     end
 
     ##
@@ -67,16 +71,16 @@ module Rubineti
     # information from the configuration without querying the instance’s nodes.
     # The result will be a job id.
 
-    def instance_info instance_name, params = {}
-      request.get "/#{Ganeti::Version}/instances/#{instance_name}/info", params
+    def info name, params = {}
+      @connection.get "/#{Ganeti::Version}/instances/#{name}/info", params
     end
 
     ##
     # Returns information about an instance, similar to
     # the bulk output from +#instances_list+.
 
-    def instance_list instance_name
-      request.get "/#{Ganeti::Version}/instances/#{instance_name}"
+    def list name
+      @connection.get "/#{Ganeti::Version}/instances/#{name}"
     end
 
     ##
@@ -86,9 +90,9 @@ module Rubineti
     # Body parameters:
     #   - http://docs.ganeti.org/ganeti/#{Ganeti::Version}.2/html/rapi.html#instances-instance-name-migrate
 
-    def instance_migrate instance_name, params = {}
-      warn "WARNING: Instances#instance_migrate not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/migrate", params
+    def migrate name, params = {}
+      warn "WARNING: Instance#migrate not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/migrate", params
     end
 
     ##
@@ -98,9 +102,9 @@ module Rubineti
     # Body parameters:
     #   - http://docs.ganeti.org/ganeti/#{Ganeti::Version}.2/html/rapi.html#instances-instance-name-modify
 
-    def instance_modify instance_name, params = {}
-      warn "WARNING: Instances#instance_modify not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/modify", params
+    def modify name, params = {}
+      warn "WARNING: Instance#modify not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/modify", params
     end
 
     ##
@@ -109,9 +113,9 @@ module Rubineti
     #
     # Takes one parameter, mode, for the export mode.
 
-    def instance_prepare_export instance_name, params = {}
-      warn "WARNING: Instances#instance_prepare_export not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/prepare-disks", params
+    def prepare_export name, params = {}
+      warn "WARNING: Instance#prepare_export not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/prepare-disks", params
     end
 
     ##
@@ -131,8 +135,8 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_reboot instance_name, params = {}
-      request.post "/#{Ganeti::Version}/instances/#{instance_name}/reboot", params
+    def reboot name, params = {}
+      @connection.post "/#{Ganeti::Version}/instances/#{name}/reboot", params
     end
 
     ##
@@ -141,8 +145,8 @@ module Rubineti
     #
     # Takes the parameters os (OS template name) and nostartup (bool).
 
-    def instance_reinstall instance_name, params = {}
-      request.post "/#{Ganeti::Version}/instances/#{instance_name}/reinstall", params
+    def reinstall name, params = {}
+      @connection.post "/#{Ganeti::Version}/instances/#{name}/reinstall", params
     end
 
     ##
@@ -152,9 +156,9 @@ module Rubineti
     # Body parameters:
     #   - http://docs.ganeti.org/ganeti/#{Ganeti::Version}.2/html/rapi.html#instances-instance-name-rename
 
-    def instance_rename instance_name, params = {}
-      warn "WARNING: Instances#instance_rename not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/rename", params
+    def rename name, params = {}
+      warn "WARNING: Instance#rename not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/rename", params
     end
 
     ##
@@ -169,9 +173,9 @@ module Rubineti
     # Either remote_node or iallocator needs to be defined when using mode=replace_new_secondary.
     # replace_auto tries to determine the broken disk(s) on its own and replacing it.
 
-    def instance_replace_disks instance_name, params = {}
-      warn "WARNING: Instances#instance_replace_disks not implemented."
-      # post "/#{Ganeti::Version}/instances/#{instance_name}/replace-disks", params
+    def replace_disks name, params = {}
+      warn "WARNING: Instance#replace_disks not implemented."
+      # post "/#{Ganeti::Version}/instances/#{name}/replace-disks", params
     end
 
     ##
@@ -182,8 +186,8 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_shutdown instance_name, params = {}
-      request.put "/#{Ganeti::Version}/instances/#{instance_name}/shutdown", params
+    def shutdown name, params = {}
+      @connection.put "/#{Ganeti::Version}/instances/#{name}/shutdown", params
     end
 
     ##
@@ -192,8 +196,8 @@ module Rubineti
     # If the optional bulk parameter (?bulk=1) is provided,
     # the output contains detailed information about instances as a list.
 
-    def instances_list params = {}
-      request.get "/#{Ganeti::Version}/instances", params
+    def all params = {}
+      @connection.get "/#{Ganeti::Version}/instances", params
     end
 
     ##
@@ -204,8 +208,8 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_startup instance_name, params = {}
-      request.put "/#{Ganeti::Version}/instances/#{instance_name}/startup", params
+    def startup name, params = {}
+      @connection.put "/#{Ganeti::Version}/instances/#{name}/startup", params
     end
 
     ##
@@ -216,9 +220,9 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_tag_create instance_name, params = {}
-      warn "WARNING: Instances#instance_tag_create not implemented."
-      # put "/#{Ganeti::Version}/instances/#{instance_name}/tags", params
+    def tag_create name, params = {}
+      warn "WARNING: Instance#tag_create not implemented."
+      # put "/#{Ganeti::Version}/instances/#{name}/tags", params
     end
 
     ##
@@ -229,17 +233,17 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def instance_tag_delete instance_name, params = {}
-      warn "WARNING: Instances#instance_tag_delete not implemented."
-      # delete "/#{Ganeti::Version}/instances/#{instance_name}/tags", params
+    def tag_delete name, params = {}
+      warn "WARNING: Instance#tag_delete not implemented."
+      # delete "/#{Ganeti::Version}/instances/#{name}/tags", params
     end
 
     ##
     # Return a list of tags.
 
-    def instance_tag_list instance_name, params = {}
-      warn "WARNING: Instances#instance_tag_list not implemented."
-      # get "/#{Ganeti::Version}/instances/#{instance_name}/tags", params
+    def tag_list name, params = {}
+      warn "WARNING: Instance#tag_list not implemented."
+      # get "/#{Ganeti::Version}/instances/#{name}/tags", params
     end
   end
 end