rubineti 1.1.0 → 1.2.0

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-gem "yajl-ruby", "~> 0.7.8"
-gem "net-http-persistent", "~> 1.4.1"
+gem "hugs", "~> 1.0.0"
 
 group :development do
   gem "rake"
@@ -9,5 +8,5 @@ group :development do
   gem "vcr", "~> 1.3.3"
   gem "webmock", "~> 1.6.1"
   gem "minitest", "~> 2.0.0"
-  gem "mocha", "~> 0.9.10"
+  gem "yajl-ruby", "~> 0.7.8"
 end

data/Gemfile.lock

@@ -4,13 +4,14 @@ GEM
     addressable (2.2.2)
     crack (0.1.8)
     git (1.2.5)
+    hugs (1.0.0)
+      net-http-persistent (~> 1.4.1)
+      yajl-ruby (~> 0.7.8)
     jeweler (1.5.1)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     minitest (2.0.0)
-    mocha (0.9.10)
-      rake
     net-http-persistent (1.4.1)
     rake (0.8.7)
     vcr (1.3.3)
@@ -23,10 +24,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  hugs (~> 1.0.0)
   jeweler (~> 1.5.1)
   minitest (~> 2.0.0)
-  mocha (~> 0.9.10)
-  net-http-persistent (~> 1.4.1)
   rake
   vcr (~> 1.3.3)
   webmock (~> 1.6.1)

data/README.md

@@ -10,35 +10,17 @@
 
 ### Examples
 
-Initialize a connection
-
-    @connection = Rubineti::Compute.new :host => "ganeti.primary", :credentials => "fake:credentials"
-
-View all jobs
-
-    @connection.jobs_list
-
-Handling query params
-
-    @connection.instance_info "instance_name", :query => "bulk=1"
-
-The responses are objectified [(by Yajl)](https://github.com/lloyd/yajl), and returned unmodified.
-
-## Testing
-
-Tests can run offline thanks to [VCR](https://github.com/myronmarston/vcr).
-
-    $ bundle exec rake
-
-## Documents
-
-* [Ganeti's remote API](http://docs.ganeti.org/ganeti/2.1/html/rapi.html)
+See the examples section in the [wiki](http://github.com/retr0h/rubineti/wiki/Examples).
 
 ## Contributions
 
 I have implemented the end-points immediately needed.  Feel free to send me pull requests, if you
 wish to help out.
 
+## TODO
+
+* Remove #cassette_for test helper.  It's a bad idea to use fixture data to test other fixtures.
+
 ## Credits
 
 Wesley Beary's [fog](https://github.com/geemus/fog), for which I referenced.

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/rubineti/compute/cluster.rb

@@ -12,7 +12,7 @@ module Rubineti
     # Returns a list of cluster information.
 
     def cluster_info
-      get "/#{Ganeti::Version}/info"
+      request.get "/#{Ganeti::Version}/info"
     end
 
     ##
@@ -20,7 +20,7 @@ module Rubineti
     # Returns a job_id.
 
     def cluster_redistribute_config
-      put "/#{Ganeti::Version}/redistribute-config"
+      request.put "/#{Ganeti::Version}/redistribute-config"
     end
 
     ##
@@ -61,14 +61,14 @@ module Rubineti
     # Returns the cluster API version.
 
     def cluster_version
-      get "/version"
+      request.get "/version"
     end
 
     ##
     # Return a list of all OSes.
 
     def cluster_os_list
-      get "/#{Ganeti::Version}/os"
+      request.get "/#{Ganeti::Version}/os"
     end
   end
 end

data/lib/rubineti/compute/instances.rb

@@ -24,7 +24,7 @@ module Rubineti
     # checks will be done.
 
     def instance_create params = {}
-      post "/#{Ganeti::Version}/instances", params
+      request.post "/#{Ganeti::Version}/instances", params
     end
 
     ##
@@ -45,7 +45,7 @@ module Rubineti
     # checks will be done.
 
     def instance_delete instance_name, params = {}
-      delete "/#{Ganeti::Version}/instances/#{instance_name}", params
+      request.delete "/#{Ganeti::Version}/instances/#{instance_name}", params
     end
 
     ##
@@ -68,7 +68,7 @@ module Rubineti
     # The result will be a job id.
 
     def instance_info instance_name, params = {}
-      get "/#{Ganeti::Version}/instances/#{instance_name}/info", params
+      request.get "/#{Ganeti::Version}/instances/#{instance_name}/info", params
     end
 
     ##
@@ -76,7 +76,7 @@ module Rubineti
     # the bulk output from +#instances_list+.
 
     def instance_list instance_name
-      get "/#{Ganeti::Version}/instances/#{instance_name}"
+      request.get "/#{Ganeti::Version}/instances/#{instance_name}"
     end
 
     ##
@@ -132,7 +132,7 @@ module Rubineti
     # checks will be done.
 
     def instance_reboot instance_name, params = {}
-      post "/#{Ganeti::Version}/instances/#{instance_name}/reboot", params
+      request.post "/#{Ganeti::Version}/instances/#{instance_name}/reboot", params
     end
 
     ##
@@ -142,7 +142,7 @@ module Rubineti
     # Takes the parameters os (OS template name) and nostartup (bool).
 
     def instance_reinstall instance_name, params = {}
-      post "/#{Ganeti::Version}/instances/#{instance_name}/reinstall", params
+      request.post "/#{Ganeti::Version}/instances/#{instance_name}/reinstall", params
     end
 
     ##
@@ -153,7 +153,7 @@ module Rubineti
     #   - http://docs.ganeti.org/ganeti/#{Ganeti::Version}.2/html/rapi.html#instances-instance-name-rename
 
     def instance_rename instance_name, params = {}
-      $stderr.print "WARNING: Instances#instance_rename not implemented."
+      warn "WARNING: Instances#instance_rename not implemented."
       # put "/#{Ganeti::Version}/instances/#{instance_name}/rename", params
     end
 
@@ -183,7 +183,7 @@ module Rubineti
     # checks will be done.
 
     def instance_shutdown instance_name, params = {}
-      put "/#{Ganeti::Version}/instances/#{instance_name}/shutdown", params
+      request.put "/#{Ganeti::Version}/instances/#{instance_name}/shutdown", params
     end
 
     ##
@@ -193,7 +193,7 @@ module Rubineti
     # the output contains detailed information about instances as a list.
 
     def instances_list params = {}
-      get "/#{Ganeti::Version}/instances", params
+      request.get "/#{Ganeti::Version}/instances", params
     end
 
     ##
@@ -205,7 +205,7 @@ module Rubineti
     # checks will be done.
 
     def instance_startup instance_name, params = {}
-      put "/#{Ganeti::Version}/instances/#{instance_name}/startup", params
+      request.put "/#{Ganeti::Version}/instances/#{instance_name}/startup", params
     end
 
     ##

data/lib/rubineti/compute/jobs.rb

@@ -4,7 +4,7 @@ module Rubineti
     # Returns an Array of all jobs.
 
     def jobs_list
-      get "/#{Ganeti::Version}/jobs"
+      request.get "/#{Ganeti::Version}/jobs"
     end
 
     ##
@@ -13,7 +13,7 @@ module Rubineti
     # +job_id+: A String of the 'job id'.
 
     def job_list job_id
-      get "/#{Ganeti::Version}/jobs/#{job_id}"
+      request.get "/#{Ganeti::Version}/jobs/#{job_id}"
     end
 
     ##

data/lib/rubineti/compute/node.rb

@@ -22,7 +22,7 @@ module Rubineti
     # Returns information about a node.
 
     def node_list node_name
-      get "/2/nodes/#{node_name}"
+      request.get "/2/nodes/#{node_name}"
     end
 
     ##
@@ -55,7 +55,7 @@ module Rubineti
     # Returns the current node role.
 
     def node_role_list node_name
-      get "/2/nodes/#{node_name}/role"
+      request.get "/2/nodes/#{node_name}/role"
     end
 
     ##
@@ -65,7 +65,7 @@ module Rubineti
     # the output contains detailed information about instances as a list.
 
     def nodes_list params = {}
-      get "/2/nodes", params
+      request.get "/2/nodes", params
     end
 
     ##

data/lib/rubineti/compute.rb

@@ -1,12 +1,7 @@
-require "net/http/persistent"
-require "base64"
+require "hugs"
 
 module Rubineti
   class Compute
-    Headers = {
-      :json => "application/json"
-    }.freeze
-
     ##
     # Include endpoints.
     # TODO: meta; discover the endpoints?
@@ -23,88 +18,16 @@ module Rubineti
     # +host+: A String with the host to connect.
 
     def initialize options
-      @user        = options[:user]
-      @password    = options[:password]
-      @host        = options[:host]
-      @port        = options[:port]   || 5080
-      @scheme      = options[:scheme] || "https"
-
-      requires [:user, :password, :host]
-    end
-
-    ##
-    # Perform an HTTP get, delete, post, or put.
-    # +path+: A String with the path to the HTTP resource.
-    # +params+: A Hash with the following keys:
-    #   - +:query+: Query String in the format "foo=bar"
-    #   - +:body+: A sub Hash to be JSON encoded, and  posted in
-    #     the message body.
-
-    %w(get delete post put).each do |verb|
-      define_method verb do |*args|
-        path   = args[0]
-        params = args[1] || {}
-        clazz  = eval "Net::HTTP::#{verb.capitalize}"
-
-        parse response_for(clazz, path, params)
-      end
-    end
-
-    ##
-    # :method: get
-
-    ##
-    # :method: delete
-
-    ##
-    # :method: post
-
-    ##
-    # :method: put
-
-  private
-    ##
-    # Worker method to be called by #get, #delete, #post, #put.
-    # Method arguments have been documented in the callers.
-
-    def response_for request, path, params
-      query = params[:query] && params.delete(:query)
-      body  = params[:body] && params.delete(:body)
-
-      @http ||= Net::HTTP::Persistent.new
-      @url  ||= URI.parse "#{@scheme}://#{@host}:#{@port}"
-
-      @request      = request.new [path, query].compact.join "?"
-      @request.body = encode(body) if body
-      common_headers @request
-
-      @http.request(@url, @request).body
-    end
-
-    def common_headers request
-      request.basic_auth @user, @password
-      case request.class.to_s
-        when Net::HTTP::Get.to_s, Net::HTTP::Delete.to_s
-          request.add_field "accept", Headers[:json]
-        when Net::HTTP::Post.to_s, Net::HTTP::Put.to_s
-          request.add_field "accept", Headers[:json]
-          request.add_field "content-type", Headers[:json]
-      end
-    end
-
-    def parse data
-      ::Yajl::Parser.parse data
-    end
-
-    def encode hash
-      ::Yajl::Encoder.encode hash
+      @connection  = Hugs.new(
+        :user      => options[:user],
+        :password  => options[:password],
+        :host      => options[:host],
+        :port      => options[:port] || 5080,
+      )
     end
 
-    def requires args
-      args.each do |arg|
-        raise StandardError.new "FATAL: Rubineti::Compute#initialize :#{arg} required." if
-          self.instance_variable_get(:"@#{arg}").nil?
-      end
+    def request
+      @connection
     end
   end
 end

data/rubineti.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubineti}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2010-12-11}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -53,7 +53,6 @@ Gem::Specification.new do |s|
     "test/lib/rubineti/compute/test_instances.rb",
     "test/lib/rubineti/compute/test_jobs.rb",
     "test/lib/rubineti/compute/test_node.rb",
-    "test/lib/rubineti/test_compute.rb",
     "test/support.rb"
   ]
   s.homepage = %q{http://github.com/retr0h/rubineti}
@@ -65,7 +64,6 @@ Gem::Specification.new do |s|
     "test/lib/rubineti/compute/test_instances.rb",
     "test/lib/rubineti/compute/test_jobs.rb",
     "test/lib/rubineti/compute/test_node.rb",
-    "test/lib/rubineti/test_compute.rb",
     "test/support.rb"
   ]
 
@@ -74,33 +72,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
-      s.add_runtime_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
+      s.add_runtime_dependency(%q<hugs>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<vcr>, ["~> 1.3.3"])
       s.add_development_dependency(%q<webmock>, ["~> 1.6.1"])
       s.add_development_dependency(%q<minitest>, ["~> 2.0.0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_development_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
     else
-      s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
-      s.add_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
+      s.add_dependency(%q<hugs>, ["~> 1.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<vcr>, ["~> 1.3.3"])
       s.add_dependency(%q<webmock>, ["~> 1.6.1"])
       s.add_dependency(%q<minitest>, ["~> 2.0.0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
     end
   else
-    s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
-    s.add_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
+    s.add_dependency(%q<hugs>, ["~> 1.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<vcr>, ["~> 1.3.3"])
     s.add_dependency(%q<webmock>, ["~> 1.6.1"])
     s.add_dependency(%q<minitest>, ["~> 2.0.0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+    s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
   end
 end
 

data/test/support.rb

@@ -1,18 +1,16 @@
 Bundler.setup :default, :test
 
 require "minitest/spec"
-require "mocha"
 
 Dir[File.join "./lib", "**", "*.rb"].each { |f| require f }
 
 class MiniTest::Unit::TestCase
   Connection = Rubineti::Compute.new(
-    :host => "ganeti.primary",
-    :user => "fake",
+    :host     => "ganeti.primary",
+    :user     => "fake",
     :password => "credentials"
   )
   Job_Matcher             = %r{^\d{4}$}
-  Json_Headers_Matcher    = %r{#{Rubineti::Compute::Headers[:json]}}
   Not_Implemented_Matcher = %r{^WARNING: [A-Z][a-z]+#[a-z]+_[a-z_]+ not implemented.$}
 
   require "yajl"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - retr0h
@@ -14,42 +14,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2010-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: hugs
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 7
-        - 8
-        version: 0.7.8
+        - 0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-http-persistent
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,10 +44,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,10 +59,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: vcr
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,10 +74,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -104,10 +89,10 @@ dependencies:
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -119,22 +104,22 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: yajl-ruby
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 10
-        version: 0.9.10
+        - 7
+        - 8
+        version: 0.7.8
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 description: 
 email: john@dewey.ws
 executables: []
@@ -182,7 +167,6 @@ files:
 - test/lib/rubineti/compute/test_instances.rb
 - test/lib/rubineti/compute/test_jobs.rb
 - test/lib/rubineti/compute/test_node.rb
-- test/lib/rubineti/test_compute.rb
 - test/support.rb
 has_rdoc: true
 homepage: http://github.com/retr0h/rubineti
@@ -221,5 +205,4 @@ test_files:
 - test/lib/rubineti/compute/test_instances.rb
 - test/lib/rubineti/compute/test_jobs.rb
 - test/lib/rubineti/compute/test_node.rb
-- test/lib/rubineti/test_compute.rb
 - test/support.rb

data/test/lib/rubineti/test_compute.rb

@@ -1,92 +0,0 @@
-require "support"
-
-describe Rubineti::Compute do
-  before do
-    @user         = "fake"
-    @password     = "credentials"
-    @valid_params = {
-      :host     => "ganeti.primary",
-      :user     => @user,
-      :password => @password
-    }
-  end
-
-  describe "#requires" do
-    [:user, :password, :host].each do |opt|
-      it "has required '#{opt}' option" do
-        lambda { Rubineti::Compute.new @valid_params.reject { |k,v| k == opt } }.must_raise StandardError
-      end
-    end
-  end
-
-  describe "#response_for" do
-    before do
-      @instance = Rubineti::Compute.new @valid_params
-      @http     = mock(:request => mock(:body => :body))
-      @request  = Net::HTTP::Get
-
-      Net::HTTP::Persistent.stubs :new => @http
-    end
-
-    it "generates a path" do
-      @instance.send :response_for, @request, "/", {}
-
-      @instance.instance_variable_get(:@request).path.must_equal "/"
-    end
-
-    it "generates a path when a valid :query exists" do
-      @instance.send :response_for, @request, "/", :query => "foo=bar"
-
-      @instance.instance_variable_get(:@request).path.must_equal "/?foo=bar"
-    end
-
-    it "generates a path when a nil :query exists" do
-      @instance.send :response_for, @request, "/", :query => nil
-
-      @instance.instance_variable_get(:@request).path.must_equal "/"
-    end
-
-    it "sets the body as JSON when a valid :body exists" do
-      @instance.send :response_for, @request, "/", :body => {:foo => :bar}
-
-      @instance.instance_variable_get(:@request).body.must_equal '{"foo":"bar"}'
-    end
-
-    it "doesn't set the body when an invalid :body exists" do
-      @instance.send :response_for, @request, "/", :body => nil
-
-      @instance.instance_variable_get(:@request).body.must_be_nil
-    end
-
-    describe "headers" do
-      it "has authentication" do
-        @instance.send :response_for, @request, "/", {}
-
-        @instance.instance_variable_get(:@request).get_fields("authorization").join.
-          must_match %r{Basic #{Base64.encode64("#{@user}:#{@password}").delete("\r\n")}}
-      end
-
-      [Net::HTTP::Post, Net::HTTP::Put].each do |clazz|
-        it "has content-type and accept for '#{clazz}'" do
-          @instance.send :response_for, clazz, "/", {}
-
-          @instance.instance_variable_get(:@request).get_fields("content-type").join.
-            must_match Json_Headers_Matcher
-          @instance.instance_variable_get(:@request).get_fields("accept").join.
-            must_match Json_Headers_Matcher
-        end
-      end
-
-      [Net::HTTP::Get, Net::HTTP::Delete].each do |clazz|
-        it "has accept for '#{clazz}'" do
-          @instance.send :response_for, clazz, "/", {}
-
-          @instance.instance_variable_get(:@request).get_fields("accept").join.
-            must_match Json_Headers_Matcher
-          @instance.instance_variable_get(:@request).get_fields("content-type").
-            must_be_nil
-        end
-      end
-    end
-  end
-end