rubineti 1.3.0 → 1.4.0

data/test/lib/rubineti/job_test.rb

@@ -0,0 +1,39 @@
+require "test_helper"
+
+describe Rubineti::Job do
+  describe "#all" do
+    it "returns an Array" do
+      VCR.use_cassette "jobs" do
+        CONNECTION.job.all.body.size.must_equal 1
+      end
+    end
+  end
+
+  describe "#job_list" do
+    it "returns a Hash" do
+      job_id = cassette_for("jobs").first["id"]
+
+      VCR.use_cassette "job_list" do
+        response = CONNECTION.job.list job_id
+
+        response.body.must_be_kind_of Hash
+      end
+    end
+  end
+
+  describe "#job_delete" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.job.delete :invalid_job_id }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#job_wait" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.job.wait :invalid_job_id }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+end

data/test/lib/rubineti/node_test.rb

@@ -0,0 +1,75 @@
+require "test_helper"
+
+describe Rubineti::Node do
+  describe "#evacuate" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.node.evacuate :invalid_node_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#list" do
+    it "returns a Hash" do
+      node_name = cassette_for("nodes").first["id"]
+
+      VCR.use_cassette "node_list" do
+        response = CONNECTION.node.list node_name
+
+        response.body.must_be_kind_of Hash
+      end
+    end
+  end
+
+  describe "#migrate" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.node.migrate :invalid_node_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#role_create" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.node.role_create :invalid_node_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#role_list" do
+    it "returns a role" do
+      node_name = cassette_for("nodes").first["id"]
+
+      VCR.use_cassette "node_role_list" do
+        response = CONNECTION.node.role_list node_name
+
+        response.body.must_equal "master"
+      end
+    end
+  end
+
+  describe "#all" do
+    it "returns an Array of Hashes" do
+      VCR.use_cassette "nodes" do
+        CONNECTION.node.all.body.size.must_equal 2
+      end
+    end
+  end
+
+  describe "#storage_list" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.node.storage_list :invalid_node_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#storage_modify" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.node.storage_modify :invalid_node_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+end

data/test/{support.rb → test_helper.rb}

@@ -1,17 +1,19 @@
 Bundler.setup :default, :test
 
-require "minitest/spec"
+require "rubineti"
 
-Dir[File.join "./lib", "**", "*.rb"].each { |f| require f }
+require "minitest/spec"
+require "vcr"
+require "webmock"
 
 class MiniTest::Unit::TestCase
-  Connection = Rubineti::Compute.new(
+  CONNECTION = Rubineti::Client.new(
     :host     => "ganeti.primary",
     :user     => "fake",
     :password => "credentials"
   )
   Job_Matcher             = %r{^\d{4}$}
-  Not_Implemented_Matcher = %r{^WARNING: [A-Z][a-z]+#[a-z]+_[a-z_]+ not implemented.$}
+  Not_Implemented_Matcher = %r{^WARNING: [A-Z][a-z]+#[a-z].* not implemented.$}
 
   require "yajl"
   def cassette_for cassette
@@ -21,13 +23,11 @@ class MiniTest::Unit::TestCase
   end
 end
 
-require "vcr"
-require "webmock"
 WebMock.disable_net_connect! :allow => "ganeti.primary"
 VCR.config do |c|
   c.stub_with :webmock
   c.cassette_library_dir     = "test/fixtures/cassettes"
-  c.default_cassette_options = { :record => :new_episodes }
+  c.default_cassette_options = { :record => :none }
 end
 
 MiniTest::Unit.autorun

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - retr0h
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -08:00
+date: 2011-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +25,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 1
+        - 2
+        - 3
         - 0
-        version: 1.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -50,13 +50,11 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -65,13 +63,11 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
+        - 0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
@@ -80,13 +76,11 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
+        - 0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -95,13 +89,11 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id006
@@ -110,13 +102,11 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        - 8
-        version: 0.7.8
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -139,11 +129,11 @@ files:
 - VERSION
 - lib/ganeti.rb
 - lib/rubineti.rb
-- lib/rubineti/compute.rb
-- lib/rubineti/compute/cluster.rb
-- lib/rubineti/compute/instances.rb
-- lib/rubineti/compute/jobs.rb
-- lib/rubineti/compute/node.rb
+- lib/rubineti/client.rb
+- lib/rubineti/cluster.rb
+- lib/rubineti/instance.rb
+- lib/rubineti/job.rb
+- lib/rubineti/node.rb
 - rubineti.gemspec
 - test/fixtures/cassettes/cluster_info.yml
 - test/fixtures/cassettes/cluster_oses.yml
@@ -163,11 +153,11 @@ files:
 - test/fixtures/cassettes/node_list.yml
 - test/fixtures/cassettes/node_role_list.yml
 - test/fixtures/cassettes/nodes.yml
-- test/lib/rubineti/compute/test_cluster.rb
-- test/lib/rubineti/compute/test_instances.rb
-- test/lib/rubineti/compute/test_jobs.rb
-- test/lib/rubineti/compute/test_node.rb
-- test/support.rb
+- test/lib/rubineti/cluster_test.rb
+- test/lib/rubineti/instance_test.rb
+- test/lib/rubineti/job_test.rb
+- test/lib/rubineti/node_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/retr0h/rubineti
 licenses: []
@@ -201,8 +191,8 @@ signing_key:
 specification_version: 3
 summary: Ruby bindings to Ganeti's v2 Remote API.
 test_files: 
-- test/lib/rubineti/compute/test_cluster.rb
-- test/lib/rubineti/compute/test_instances.rb
-- test/lib/rubineti/compute/test_jobs.rb
-- test/lib/rubineti/compute/test_node.rb
-- test/support.rb
+- test/lib/rubineti/cluster_test.rb
+- test/lib/rubineti/instance_test.rb
+- test/lib/rubineti/job_test.rb
+- test/lib/rubineti/node_test.rb
+- test/test_helper.rb

data/lib/rubineti/compute.rb

@@ -1,33 +0,0 @@
-require "hugs"
-
-module Rubineti
-  class Compute
-    ##
-    # Include endpoints.
-    # TODO: meta; discover the endpoints?
-
-    %w(jobs instances cluster node).each do |m|
-      require "rubineti/compute/#{m}"
-      include eval "Rubineti::#{m.capitalize}"
-    end
-
-    ##
-    # 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.new(
-        :user      => options[:user],
-        :password  => options[:password],
-        :host      => options[:host],
-        :port      => options[:port] || 5080,
-      )
-    end
-
-    def request
-      @connection
-    end
-  end
-end

data/test/lib/rubineti/compute/test_cluster.rb

@@ -1,71 +0,0 @@
-require "support"
-
-describe Rubineti::Compute do
-  describe Rubineti::Cluster do
-    describe "#cluster_features" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.cluster_features }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#cluster_info" do
-      it "returns a Hash" do
-        VCR.use_cassette "cluster_info" do
-          response = Connection.cluster_info
-
-          response.must_be_kind_of Hash
-        end
-      end
-    end
-
-    describe "#cluster_redistribute_config" do
-      it "returns a job_id" do
-        VCR.use_cassette "cluster_redistribute_config" do
-          Connection.cluster_redistribute_config.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#cluser_tags_create" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.cluster_tags_create }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#cluser_tags_delete" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.cluster_tags_create }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#cluser_tags_list" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.cluster_tags_list }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#cluser_version" do
-      it "returns a version string" do
-        VCR.use_cassette "cluster_version" do
-          Connection.cluster_version.must_equal 2
-        end
-      end
-    end
-
-    describe "#cluser_os_list" do
-      it "returns an Array" do
-        VCR.use_cassette "cluster_oses" do
-          Connection.cluster_os_list.size.must_equal 1
-       end
-      end
-    end
-  end
-end

data/test/lib/rubineti/compute/test_instances.rb

@@ -1,202 +0,0 @@
-require "support"
-
-describe Rubineti::Compute do
-  describe Rubineti::Instances do
-
-    describe "#instance_activate_disks" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_activate_disks(:invalid_instance_name) }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_create" do
-      it "returns a job_id" do
-        params = {
-          :__version__   => Ganeti::Version,
-          :name          => "compute1",
-          :pnode         => "node1",
-          :snode         => "node2",
-          :disk_template => "drbd8",
-          :disks         => [4096],
-          :beparams      => { :vcpus => 1, :memory => 512 },
-          :os            => "debootstrap+default"
-        }
-
-        VCR.use_cassette "instance_create" do
-          response = Connection.instance_create :body => params, :query => "dry-run=1"
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instance_deactivate_disks" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_deactivate_disks :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_delete" do
-      it "returns a job_id" do
-        VCR.use_cassette "instance_delete" do
-          response = Connection.instance_delete :invalid_instance_name, :query => "dry-run=1"
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instance_export" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_export :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_info" do
-      it "returns a job_id" do
-        instance_name = cassette_for("instances").first["name"]
-
-        VCR.use_cassette "instance_info" do
-          response = Connection.instance_info instance_name
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instance_list" do
-      it "returns a Hash" do
-        instance_name = cassette_for("instances").first["name"]
-
-        VCR.use_cassette "instance_list" do
-          response = Connection.instance_list instance_name
-
-          response.must_be_kind_of Hash
-        end
-      end
-    end
-
-    describe "#instance_migrate" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_migrate :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_modify" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_modify :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_prepare_export" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_prepare_export :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_reboot" do
-      it "returns a job_id" do
-        VCR.use_cassette "instance_reboot" do
-          response = Connection.instance_reboot :invalid_instance_name, :query => "dry-run=1"
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instance_reinstall" do
-      it "returns a job_id" do
-        instance_name = cassette_for("instances").first["name"]
-        params        = {
-          :os => "debootstrap+default"
-        }
-
-        VCR.use_cassette "instance_reinstall" do
-          response = Connection.instance_reinstall instance_name, :body => params
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instance_rename" do
-      it "is not implemented" do
-        lambda { Connection.instance_rename :invalid_instance_name }.must_output(nil, nil).must_equal true
-      end
-    end
-
-    describe "#instance_replace_disks" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_replace_disks :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_shutdown" do
-      it "returns a job_id" do
-        VCR.use_cassette "instance_shutdown" do
-          response = Connection.instance_shutdown :invalid_instance_name, :query => "dry-run=1"
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instances_list" do
-      it "returns an Array of Hashes" do
-        VCR.use_cassette "instances" do
-          response = Connection.instances_list :query => "bulk=1"
-
-          response.size.must_equal 1
-        end
-      end
-    end
-
-    describe "#instance_startup" do
-      it "returns a job_id" do
-        VCR.use_cassette "instance_startup" do
-          response = Connection.instance_startup :invalid_instance_name, :query => "dry-run=1"
-
-          response.must_match Job_Matcher
-        end
-      end
-    end
-
-    describe "#instance_tag_create" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_tag_create :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_tag_delete" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_tag_delete :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-
-    describe "#instance_tag_list" do
-      it "is not implemented" do
-        out, err = capture_io { Connection.instance_tag_list :invalid_instance_name }
-
-        err.must_match Not_Implemented_Matcher
-      end
-    end
-  end
-end