libvirt-ruby 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,4 +1,4 @@
-= Libvirt-Ruby {<img src="https://secure.travis-ci.org/plribeiro3000/libvirt-ruby.png" />}[http://travis-ci.org/plribeiro3000/libvirt-ruby]
+= Libvirt-Ruby  {<img src="https://secure.travis-ci.org/plribeiro3000/libvirt-ruby.png" />}[http://travis-ci.org/plribeiro3000/libvirt-ruby]
 
 Rails gem to map functions from libvirt's library to ruby.
 
@@ -15,8 +15,7 @@ This gem has as a dependencie the libvirt package. Google it and u will find how
 You should one of the classes defined and call method dispatcher passing parameters:
  first -> the method just like the one from Libvirt in C as a string except the vir and the name of the Class just like 'Close' from 'virConnectClose'
  second -> the args of the function in C in the same order
-
-Your second parameter must be an array where the last value is a symbol of what the function should return.
+ third -> a symbol of the retun of the function.
 
 == Experimental
 

data/lib/libvirt-ruby/connect.rb

@@ -1,15 +1,6 @@
 module Libvirt
   module Ruby
-    module Connect
-      extend Libvirt::Ruby::Util
-      extend FFI::Library
-
-      begin
-        ffi_lib "libvirt.so.0"
-      rescue LoadError
-        raise Libvirt::Ruby::Exceptions::MissingLib
-      end
-
+    class Connect < Libvirt::Ruby::Util
       def self.klass
         "virConnect"
       end

data/lib/libvirt-ruby/domain.rb

@@ -1,15 +1,6 @@
 module Libvirt
   module Ruby
-    module Domain
-      extend Libvirt::Ruby::Util
-      extend FFI::Library
-
-      begin
-        ffi_lib "libvirt.so.0"
-      rescue LoadError
-        raise Libvirt::Ruby::Exceptions::MissingLib
-      end
-
+    class Domain < Libvirt::Ruby::Util
       def self.klass
         "virDomain"
       end

data/lib/libvirt-ruby/network.rb

@@ -1,15 +1,6 @@
 module Libvirt
   module Ruby
-    module Network
-      extend Libvirt::Ruby::Util
-      extend FFI::Library
-
-      begin
-        ffi_lib "libvirt.so.0"
-      rescue LoadError
-        raise Libvirt::Ruby::Exceptions::MissingLib
-      end
-
+    class Network < Libvirt::Ruby::Util
       def self.klass
         "virNetwork"
       end

data/lib/libvirt-ruby/storage_pool.rb

@@ -1,15 +1,6 @@
 module Libvirt
   module Ruby
-    module StoragePool
-      extend Libvirt::Ruby::Util
-      extend FFI::Library
-
-      begin
-        ffi_lib "libvirt.so.0"
-      rescue LoadError
-        raise Libvirt::Ruby::Exceptions::MissingLib
-      end
-
+    class StoragePool < Libvirt::Ruby::Util
       def self.klass
         "virStoragePool"
       end

data/lib/libvirt-ruby/storage_vol.rb

@@ -1,15 +1,6 @@
 module Libvirt
   module Ruby
-    module StorageVol
-      extend Libvirt::Ruby::Util
-      extend FFI::Library
-
-      begin
-        ffi_lib "libvirt.so.0"
-      rescue LoadError
-        raise Libvirt::Ruby::Exceptions::MissingLib
-      end
-
+    class StorageVol < Libvirt::Ruby::Util
       def self.klass
         "virStorageVol"
       end

data/lib/libvirt-ruby/util.rb

@@ -1,13 +1,17 @@
 module Libvirt
   module Ruby
-    module Util
-      def dispatcher(method, args = [])
+    class Util
+      extend FFI::Library
+
+      def self.dispatcher(method, args = [], return_type)
         begin
-          return_type = args.delete(args.last)
+          ffi_lib "libvirt"
           attach_function (self.klass + method.to_s), (self.klass + method.to_s), args, return_type
-          send((self.klass + method.to_s), args)
+          send (self.klass + method.to_s), args
         rescue FFI::NotFoundError
           raise Libvirt::Ruby::Exceptions::InvalidFunction.new(self.klass + method.to_s)
+        rescue LoadError
+          raise Libvirt::Ruby::Exceptions::MissingLib
         end
       end
     end

data/lib/libvirt-ruby/version.rb

@@ -1,5 +1,5 @@
 module Libvirt
   module Ruby
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/libvirt-ruby/connect_spec.rb

@@ -4,28 +4,44 @@ describe Libvirt::Ruby::Connect do
   let(:connect) { Libvirt::Ruby::Connect }
 
   context "when calling method #dispatcher" do
-    context "with a valid libvirt function" do
+    context "with libvirt installed" do
       before :each do
-        connect.stub(:attach_function).with("virConnectClose", "virConnectClose", [], :int).and_return(true)
-        connect.stub(:send).with("virConnectClose", [])
+        connect.stub(:ffi_lib).with("libvirt")
       end
 
-      after :each do
-        connect.dispatcher('Close', [:int])
-      end
+      context "and a valid libvirt function" do
+        before :each do
+          connect.stub(:attach_function).with("virConnectClose", "virConnectClose", [], :int).and_return(true)
+          connect.stub(:send).with("virConnectClose", [])
+        end
+
+        after :each do
+          connect.dispatcher('Close', [], :int)
+        end
 
-      it "should attach it as a binding for C's function" do
-        connect.should_receive(:attach_function).with("virConnectClose", "virConnectClose", [], :int).and_return(true)
+        it "should attach it as a binding for C's function" do
+          connect.should_receive(:attach_function).with("virConnectClose", "virConnectClose", [], :int).and_return(true)
+        end
+
+        it "should call the new attached method" do
+          connect.should_receive(:send).with("virConnectClose", [])
+        end
       end
 
-      it "should call the new attached method" do
-        connect.should_receive(:send).with("virConnectClose", [])
+      context "and an invalid libvirt function" do
+        before :each do
+          connect.stub(:attach_function).with("virConnectAbc", "virConnectAbc", [], :int).and_raise(FFI::NotFoundError.new('Abc', 'libvirt'))
+        end
+
+        it "should raise an exception" do
+          lambda { connect.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+        end
       end
     end
 
-    context "with an invalid libvirt function" do
-      it "should return an invalid function message" do
-        lambda { connect.dispatcher('Abc', [:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+    context "without libvirt installed" do
+      it "should raise an exception" do
+        lambda { connect.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
       end
     end
   end

data/spec/libvirt-ruby/domain_spec.rb

@@ -4,28 +4,44 @@ describe Libvirt::Ruby::Domain do
   let(:domain) { Libvirt::Ruby::Domain }
 
   context "when calling method #dispatcher" do
-    context "with a valid libvirt function" do
+    context "with libvirt installed" do
       before :each do
-        domain.stub(:attach_function).with("virDomainCreate", "virDomainCreate", [], :int).and_return(true)
-        domain.stub(:send).with("virDomainCreate", [])
+        domain.stub(:ffi_lib).with("libvirt")
       end
 
-      after :each do
-        domain.dispatcher('Create', [:int])
-      end
+      context "and a valid libvirt function" do
+        before :each do
+          domain.stub(:attach_function).with("virDomainCreate", "virDomainCreate", [], :int).and_return(true)
+          domain.stub(:send).with("virDomainCreate", [])
+        end
+
+        after :each do
+          domain.dispatcher('Create', [], :int)
+        end
 
-      it "should attach it as a binding for C's function" do
-        domain.should_receive(:attach_function).with("virDomainCreate", "virDomainCreate", [], :int).and_return(true)
+        it "should attach it as a binding for C's function" do
+          domain.should_receive(:attach_function).with("virDomainCreate", "virDomainCreate", [], :int).and_return(true)
+        end
+
+        it "should call the new attached method" do
+          domain.should_receive(:send).with("virDomainCreate", [])
+        end
       end
 
-      it "should call the new attached method" do
-        domain.should_receive(:send).with("virDomainCreate", [])
+      context "and an invalid libvirt function" do
+        before :each do
+          domain.stub(:attach_function).with("virDomainAbc", "virDomainAbc", [], :int).and_raise(FFI::NotFoundError.new('Abc', 'libvirt'))
+        end
+
+        it "should raise an exception" do
+          lambda { domain.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+        end
       end
     end
 
-    context "with an invalid libvirt function" do
-      it "should return an invalid function message" do
-        lambda { domain.dispatcher('Abc', [:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+    context "without libvirt installed" do
+      it "should raise an exception" do
+        lambda { domain.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
       end
     end
   end

data/spec/libvirt-ruby/network_spec.rb

@@ -4,28 +4,44 @@ describe Libvirt::Ruby::Network do
   let(:network) { Libvirt::Ruby::Network }
 
   context "when calling method #dispatcher" do
-    context "with a valid libvirt function" do
+    context "with libvirt installed" do
       before :each do
-        network.stub(:attach_function).with("virNetworkRef", "virNetworkRef", [], :int).and_return(true)
-        network.stub(:send).with("virNetworkRef", [])
+        network.stub(:ffi_lib).with("libvirt")
       end
 
-      after :each do
-        network.dispatcher('Ref', [:int])
-      end
+      context "and a valid libvirt function" do
+        before :each do
+          network.stub(:attach_function).with("virNetworkRef", "virNetworkRef", [], :int).and_return(true)
+          network.stub(:send).with("virNetworkRef", [])
+        end
+
+        after :each do
+          network.dispatcher('Ref', [], :int)
+        end
 
-      it "should attach it as a binding for C's function" do
-        network.should_receive(:attach_function).with("virNetworkRef", "virNetworkRef", [], :int).and_return(true)
+        it "should attach it as a binding for C's function" do
+          network.should_receive(:attach_function).with("virNetworkRef", "virNetworkRef", [], :int).and_return(true)
+        end
+
+        it "should call the new attached method" do
+          network.should_receive(:send).with("virNetworkRef", [])
+        end
       end
 
-      it "should call the new attached method" do
-        network.should_receive(:send).with("virNetworkRef", [])
+      context "and an invalid libvirt function" do
+        before :each do
+          network.stub(:attach_function).with("virNetworkAbc", "virNetworkAbc", [], :int).and_raise(FFI::NotFoundError.new('Abc', 'libvirt'))
+        end
+
+        it "should raise an exception" do
+          lambda { network.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+        end
       end
     end
 
-    context "with an invalid libvirt function" do
-      it "should return an invalid function message" do
-        lambda { network.dispatcher('Abc', [:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+    context "without libvirt installed" do
+      it "should raise an exception" do
+        lambda { network.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
       end
     end
   end

data/spec/libvirt-ruby/storage_pool_spec.rb

@@ -4,28 +4,44 @@ describe Libvirt::Ruby::StoragePool do
   let(:storage_pool) { Libvirt::Ruby::StoragePool }
 
   context "when calling method #dispatcher" do
-    context "with a valid libvirt function" do
+    context "with libvirt installed" do
       before :each do
-        storage_pool.stub(:attach_function).with("virStoragePoolRefresh", "virStoragePoolRefresh", [], :int).and_return(true)
-        storage_pool.stub(:send).with("virStoragePoolRefresh", [])
+        storage_pool.stub(:ffi_lib).with("libvirt")
       end
 
-      after :each do
-        storage_pool.dispatcher('Refresh', [:int])
-      end
+      context "and a valid libvirt function" do
+        before :each do
+          storage_pool.stub(:attach_function).with("virStoragePoolRefresh", "virStoragePoolRefresh", [], :int).and_return(true)
+          storage_pool.stub(:send).with("virStoragePoolRefresh", [])
+        end
+
+        after :each do
+          storage_pool.dispatcher('Refresh', [], :int)
+        end
 
-      it "should attach it as a binding for C's function" do
-        storage_pool.should_receive(:attach_function).with("virStoragePoolRefresh", "virStoragePoolRefresh", [], :int).and_return(true)
+        it "should attach it as a binding for C's function" do
+          storage_pool.should_receive(:attach_function).with("virStoragePoolRefresh", "virStoragePoolRefresh", [], :int).and_return(true)
+        end
+
+        it "should call the new attached method" do
+          storage_pool.should_receive(:send).with("virStoragePoolRefresh", [])
+        end
       end
 
-      it "should call the new attached method" do
-        storage_pool.should_receive(:send).with("virStoragePoolRefresh", [])
+      context "and an invalid libvirt function" do
+        before :each do
+          storage_pool.stub(:attach_function).with("virStoragePoolAbc", "virStoragePoolAbc", [], :int).and_raise(FFI::NotFoundError.new('Abc', 'libvirt'))
+        end
+
+        it "should raise an exception" do
+          lambda { storage_pool.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+        end
       end
     end
 
-    context "with an invalid libvirt function" do
-      it "should return an invalid function message" do
-        lambda { storage_pool.dispatcher('Abc', [:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+    context "without libvirt installed" do
+      it "should raise an exception" do
+        lambda { storage_pool.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
       end
     end
   end

data/spec/libvirt-ruby/storage_vol_spec.rb

@@ -4,28 +4,44 @@ describe Libvirt::Ruby::StorageVol do
   let(:storage_vol) { Libvirt::Ruby::StorageVol }
 
   context "when calling method #dispatcher" do
-    context "with a valid libvirt function" do
+    context "with libvirt installed" do
       before :each do
-        storage_vol.stub(:attach_function).with("virStorageVolResize", "virStorageVolResize", [], :int).and_return(true)
-        storage_vol.stub(:send).with("virStorageVolResize", [])
+        storage_vol.stub(:ffi_lib).with("libvirt")
       end
 
-      after :each do
-        storage_vol.dispatcher('Resize', [:int])
-      end
+      context "and a valid libvirt function" do
+        before :each do
+          storage_vol.stub(:attach_function).with("virStorageVolResize", "virStorageVolResize", [], :int).and_return(true)
+          storage_vol.stub(:send).with("virStorageVolResize", [])
+        end
+
+        after :each do
+          storage_vol.dispatcher('Resize', [], :int)
+        end
 
-      it "should attach it as a binding for C's function" do
-        storage_vol.should_receive(:attach_function).with("virStorageVolResize", "virStorageVolResize", [], :int).and_return(true)
+        it "should attach it as a binding for C's function" do
+          storage_vol.should_receive(:attach_function).with("virStorageVolResize", "virStorageVolResize", [], :int).and_return(true)
+        end
+
+        it "should call the new attached method" do
+          storage_vol.should_receive(:send).with("virStorageVolResize", [])
+        end
       end
 
-      it "should call the new attached method" do
-        storage_vol.should_receive(:send).with("virStorageVolResize", [])
+      context "and an invalid libvirt function" do
+        before :each do
+          storage_vol.stub(:attach_function).with("virStorageVolAbc", "virStorageVolAbc", [], :int).and_raise(FFI::NotFoundError.new('Abc', 'libvirt'))
+        end
+
+        it "should raise an exception" do
+          lambda { storage_vol.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+        end
       end
     end
 
-    context "with an invalid libvirt function" do
-      it "should return an invalid function message" do
-        lambda { storage_vol.dispatcher('Abc', [:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+    context "without libvirt installed" do
+      it "should raise an exception" do
+        lambda { storage_vol.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libvirt-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &12651960 !ruby/object:Gem::Requirement
+  requirement: &13546920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12651960
+  version_requirements: *13546920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12651440 !ruby/object:Gem::Requirement
+  requirement: &13546320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12651440
+  version_requirements: *13546320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12650440 !ruby/object:Gem::Requirement
+  requirement: &13545340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12650440
+  version_requirements: *13545340
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &12649920 !ruby/object:Gem::Requirement
+  requirement: &13544880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12649920
+  version_requirements: *13544880
 description: Access Libvirt's C Library through ruby classes and methods
 email: plribeiro3000@gmail.com
 executables: []