libvirt-ruby 0.0.6 → 1.0.0

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - ree-1.8.7
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.rdoc

@@ -8,21 +8,15 @@ gem install libvirt-ruby
 
 == Dependencies
 
-This gem has as a dependencie the libvirt package. Google it and u will find how to install it on your distro.
+This gem has as a dependency the libvirt package. Google it and u will find how to install it on your distro.
 
 == Usage
 
-You should use one of the classes defined and call the method directly:
- Libvirt::Ruby::Connect.Close([:int])
+You should call the c function directly on the module with the sanem name:
+ Libvirt::Ruby.virConnectClose([:int])
 
 The parameter of the function should be an array where the last instance is the return of the C function.
 
-
-The old method dispatcher still can be called, but is now deprecated. Call dispatcher passing as 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
- third -> a symbol of the retun of the function.
-
 == Experimental
 
 This Gem still experimental, so if you have some problem, feel free to create a new issue.
@@ -36,11 +30,10 @@ Give it a try in another distro and let me know if it works.
 
 Add Support for a ton of thigs. =D
 Improve a lot of things:
- * Remove all classes and make gem wotk without them. Using Just one class: Libvirt::Ruby
- * Create more Exceptions for another type of errors.
  * Create pages on Wiki teaching how to install libvirt on several distros.
  ...
 
 == Contribute
 
-Fork the project and send me a Pull Request. =D
+Fork the project and send me a Pull Request. Your code must be well tested against at least the versions im testing: 1.8.7, 1.9.2 and 1.9.3
+I already have created rake tasks to test on each ruby version. For more info just look inside Rakefile.

data/Rakefile

@@ -4,4 +4,13 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
 desc "Default Task"
-task :default => [ :spec ]
+task :default => [ :spec ]
+
+rubies = %w(1.8.7@libvirt-ruby 1.9.2@libvirt-ruby 1.9.3@libvirt-ruby)
+rubies.each do |ruby|
+  desc "Run the test suite against: #{ruby.split('@')[0]}"
+  task "spec-#{ruby.split('@')[0]}" do
+    puts "Running test suite against: #{ruby.split('@')[0]}"
+    exec("rvm #{ruby} do rspec spec")
+  end
+end

data/lib/libvirt-ruby.rb

@@ -3,12 +3,34 @@ require "ffi"
 
 module Libvirt
   module Ruby
-    autoload :Connect, 'libvirt-ruby/connect'
-    autoload :Domain, 'libvirt-ruby/domain'
     autoload :Exceptions, 'libvirt-ruby/exceptions'
-    autoload :Network, 'libvirt-ruby/network'
-    autoload :StoragePool, 'libvirt-ruby/storage_pool'
-    autoload :StorageVol, 'libvirt-ruby/storage_vol'
-    autoload :Util, 'libvirt-ruby/util'
+
+    extend FFI::Library
+
+    def self.method_missing(method, *args)
+      args.flatten!
+      return_type = args.delete(args.last)
+      raise Libvirt::Ruby::Exceptions::NoReturnParameter unless return_type
+      dispatcher(method, args, return_type)
+    end
+
+    private
+
+    def self.dispatcher(method, args = [], return_type = nil)
+      raise Libvirt::Ruby::Exceptions::WrongCall unless not_direct_call?
+      begin
+        ffi_lib "libvirt"
+        attach_function method.to_s, method.to_s, args, return_type
+        send method.to_s, args
+      rescue FFI::NotFoundError
+        raise Libvirt::Ruby::Exceptions::InvalidFunction.new(method.to_s)
+      rescue LoadError
+        raise Libvirt::Ruby::Exceptions::MissingLib
+      end
+    end
+
+    def self.not_direct_call?
+      caller[1][/`.*'/] and caller[1][/`.*'/][1..-2] == 'method_missing'
+    end
   end
 end

data/lib/libvirt-ruby/exceptions.rb

@@ -3,6 +3,8 @@ module Libvirt
     module Exceptions
       autoload :MissingLib, 'libvirt-ruby/exceptions/missing_lib'
       autoload :InvalidFunction, 'libvirt-ruby/exceptions/invalid_function'
+      autoload :NoReturnParameter, 'libvirt-ruby/exceptions/no_return_parameter'
+      autoload :WrongCall, 'libvirt-ruby/exceptions/wrong_call'
     end
   end
 end

data/lib/libvirt-ruby/exceptions/no_return_parameter.rb

@@ -0,0 +1,11 @@
+module Libvirt
+  module Ruby
+    module Exceptions
+      class NoReturnParameter < StandardError
+        def initialize
+          super("No Return Parameter was Specified. It was by purpose?")
+        end
+      end
+    end
+  end
+end

data/lib/libvirt-ruby/exceptions/wrong_call.rb

@@ -0,0 +1,11 @@
+module Libvirt
+  module Ruby
+    module Exceptions
+      class WrongCall < StandardError
+        def initialize
+          super("This method cannot be called directly. It was by purpose?")
+        end
+      end
+    end
+  end
+end

data/lib/libvirt-ruby/version.rb

@@ -1,5 +1,5 @@
 module Libvirt
   module Ruby
-    VERSION = "0.0.6"
+    VERSION = "1.0.0"
   end
 end

data/spec/libvirt-ruby_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Libvirt::Ruby do
+  let(:libvirt) { Libvirt::Ruby }
+
+  context "when calling any libvirt function directly" do
+    context "without a return type specified" do
+      it "should raise an error" do
+        lambda { libvirt.virConnectClose }.should raise_error(Libvirt::Ruby::Exceptions::NoReturnParameter)
+      end
+    end
+
+    context "with libvirt installed" do
+      before :each do
+        libvirt.stub(:ffi_lib).with("libvirt")
+      end
+
+      context "and the function is a valid one" do
+        before :each do
+          libvirt.stub(:attach_function).with("virConnectClose", "virConnectClose", [], :int).and_return(true)
+          libvirt.stub(:send).with("virConnectClose", [])
+        end
+
+        after :each do
+          libvirt.virConnectClose([:int])
+        end
+
+        it "should attach it as a binding for C's function" do
+          libvirt.should_receive(:attach_function).with("virConnectClose", "virConnectClose", [], :int).and_return(true)
+        end
+
+        it "should call the new attached method" do
+          libvirt.should_receive(:send).with("virConnectClose", [])
+        end
+      end
+
+      context "and the function is not a valid one" do
+        before :each do
+          libvirt.stub(:attach_function).with("virConnectAbc", "virConnectAbc", [], :int).and_raise(FFI::NotFoundError.new('Abc', 'libvirt'))
+        end
+
+        it "should raise an exception" do
+          lambda { libvirt.virConnectAbc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
+        end
+      end
+    end
+
+    context "without libvirt installed" do
+      it "should raise an exception" do
+        lambda { libvirt.virConnectAbc([:int])  }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
+      end
+    end
+  end
+
+  context "when calling method #dispatcher directly" do
+    it "should raise an exception" do
+      lambda { libvirt.dispatcher('virConnectClose', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::WrongCall)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libvirt-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &4851100 !ruby/object:Gem::Requirement
+  requirement: &7272040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4851100
+  version_requirements: *7272040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &4850320 !ruby/object:Gem::Requirement
+  requirement: &7271500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4850320
+  version_requirements: *7271500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &4849620 !ruby/object:Gem::Requirement
+  requirement: &7270500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4849620
+  version_requirements: *7270500
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &4849080 !ruby/object:Gem::Requirement
+  requirement: &7269940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4849080
+  version_requirements: *7269940
 description: Access Libvirt's C Library through ruby classes and methods
 email: plribeiro3000@gmail.com
 executables: []
@@ -64,27 +64,20 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - lib/libvirt-ruby.rb
-- lib/libvirt-ruby/connect.rb
-- lib/libvirt-ruby/domain.rb
 - lib/libvirt-ruby/exceptions.rb
 - lib/libvirt-ruby/exceptions/invalid_function.rb
 - lib/libvirt-ruby/exceptions/missing_lib.rb
-- lib/libvirt-ruby/network.rb
-- lib/libvirt-ruby/storage_pool.rb
-- lib/libvirt-ruby/storage_vol.rb
-- lib/libvirt-ruby/util.rb
+- lib/libvirt-ruby/exceptions/no_return_parameter.rb
+- lib/libvirt-ruby/exceptions/wrong_call.rb
 - lib/libvirt-ruby/version.rb
 - libvirt-ruby.gemspec
-- spec/libvirt-ruby/connect_spec.rb
-- spec/libvirt-ruby/domain_spec.rb
-- spec/libvirt-ruby/network_spec.rb
-- spec/libvirt-ruby/storage_pool_spec.rb
-- spec/libvirt-ruby/storage_vol_spec.rb
+- spec/libvirt-ruby_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []

data/lib/libvirt-ruby/connect.rb

@@ -1,9 +0,0 @@
-module Libvirt
-  module Ruby
-    class Connect < Libvirt::Ruby::Util
-      def self.klass
-        "virConnect"
-      end
-    end
-  end
-end

data/lib/libvirt-ruby/domain.rb

@@ -1,9 +0,0 @@
-module Libvirt
-  module Ruby
-    class Domain < Libvirt::Ruby::Util
-      def self.klass
-        "virDomain"
-      end
-    end
-  end
-end

data/lib/libvirt-ruby/network.rb

@@ -1,9 +0,0 @@
-module Libvirt
-  module Ruby
-    class Network < Libvirt::Ruby::Util
-      def self.klass
-        "virNetwork"
-      end
-    end
-  end
-end

data/lib/libvirt-ruby/storage_pool.rb

@@ -1,9 +0,0 @@
-module Libvirt
-  module Ruby
-    class StoragePool < Libvirt::Ruby::Util
-      def self.klass
-        "virStoragePool"
-      end
-    end
-  end
-end

data/lib/libvirt-ruby/storage_vol.rb

@@ -1,9 +0,0 @@
-module Libvirt
-  module Ruby
-    class StorageVol < Libvirt::Ruby::Util
-      def self.klass
-        "virStorageVol"
-      end
-    end
-  end
-end

data/lib/libvirt-ruby/util.rb

@@ -1,34 +0,0 @@
-module Libvirt
-  module Ruby
-    class Util
-      extend FFI::Library
-
-      def self.method_missing(method, *args)
-        args.flatten!
-        return_type = args.delete(args.last)
-        dispatcher(method, args, return_type)
-      end
-
-      def self.dispatcher(method, args = [], return_type = nil)
-        unless not_direct_call?
-          warn "[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead."
-        end
-        begin
-          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
-        rescue FFI::NotFoundError
-          raise Libvirt::Ruby::Exceptions::InvalidFunction.new(self.klass + method.to_s)
-        rescue LoadError
-          raise Libvirt::Ruby::Exceptions::MissingLib
-        end
-      end
-
-      private
-
-      def self.not_direct_call?
-        caller[1][/`.*'/] and caller[1][/`.*'/][1..-2] == 'method_missing'
-      end
-    end
-  end
-end

data/spec/libvirt-ruby/connect_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Libvirt::Ruby::Connect do
-  let(:connect) { Libvirt::Ruby::Connect }
-
-  context "when calling method #dispatcher" do
-    context "that is now deprecated" do
-      before :each do
-        connect.stub(:ffi_lib).with("libvirt")
-        connect.stub(:attach_function).with("virConnectClose", "virConnectClose", [], :int)
-        connect.stub(:send).with("virConnectClose", [])
-      end
-
-      it "should raise a deprecated method warning" do
-        connect.should_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        connect.dispatcher('Close', [], :int)
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        connect.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        connect.stub(:ffi_lib).with("libvirt")
-      end
-
-      context "and a valid libvirt function" do
-        before :each do
-          connect.stub(:attach_function).with("virConnectClose", "virConnectClose", [], :int)
-          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)
-        end
-
-        it "should call the new attached method" do
-          connect.should_receive(:send).with("virConnectClose", [])
-        end
-      end
-
-      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 "without libvirt installed" do
-      before :each do
-        connect.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-      end
-
-      it "should raise an exception" do
-        lambda { connect.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-
-  context "when calling any libvirt function directly" do
-    context "that is the new way" do
-      before :each do
-        connect.stub(:ffi_lib).with("libvirt")
-        connect.stub(:attach_function).with("virConnectClose", "virConnectClose", [], :int)
-        connect.stub(:send).with("virConnectClose", [])
-      end
-
-      it "should  not raise a deprecated method warning" do
-        connect.should_not_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        connect.Close([:int])
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        connect.stub(:ffi_lib).with("libvirt")
-      end
-
-      context "and the function is a valid one" 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.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)
-        end
-
-        it "should call the new attached method" do
-          connect.should_receive(:send).with("virConnectClose", [])
-        end
-      end
-
-      context "and the function is not a valid one" 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.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
-        end
-      end
-    end
-
-    context "without libvirt installed" do
-      it "should raise an exception" do
-        lambda { connect.Abc([:int])  }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-end

data/spec/libvirt-ruby/domain_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Libvirt::Ruby::Domain do
-  let(:domain) { Libvirt::Ruby::Domain }
-
-  context "when calling method #dispatcher" do
-    context "that is now deprecated" do
-      before :each do
-        domain.stub(:ffi_lib).with("libvirt")
-        domain.stub(:attach_function).with("virDomainCreate", "virDomainCreate", [], :int)
-        domain.stub(:send).with("virDomainCreate", [])
-      end
-
-      it "should raise a deprecated method warning" do
-        domain.should_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        domain.dispatcher('Create', [], :int)
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        domain.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        domain.stub(:ffi_lib).with("libvirt")
-      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)
-        end
-
-        it "should call the new attached method" do
-          domain.should_receive(:send).with("virDomainCreate", [])
-        end
-      end
-
-      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 "without libvirt installed" do
-      before :each do
-        domain.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-      end
-
-      it "should raise an exception" do
-        lambda { domain.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-
-  context "when calling any libvirt function directly" do
-    context "that is the new way" do
-      before :each do
-        domain.stub(:ffi_lib).with("libvirt")
-        domain.stub(:attach_function).with("virDomainCreate", "virDomainCreate", [], :int)
-        domain.stub(:send).with("virDomainCreate", [])
-      end
-
-      it "should  not raise a deprecated method warning" do
-        domain.should_not_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        domain.Create([:int])
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        domain.stub(:ffi_lib).with("libvirt")
-      end
-
-      context "and the function is a valid one" 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.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)
-        end
-
-        it "should call the new attached method" do
-          domain.should_receive(:send).with("virDomainCreate", [])
-        end
-      end
-
-      context "and the function is not a valid one" 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.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
-        end
-      end
-    end
-
-    context "without libvirt installed" do
-      it "should raise an exception" do
-        lambda { domain.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-end

data/spec/libvirt-ruby/network_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Libvirt::Ruby::Network do
-  let(:network) { Libvirt::Ruby::Network }
-
-  context "when calling method #dispatcher" do
-    context "that is now deprecated" do
-      before :each do
-        network.stub(:ffi_lib).with("libvirt")
-        network.stub(:attach_function).with("virNetworkRef", "virNetworkRef", [], :int)
-        network.stub(:send).with("virNetworkRef", [])
-      end
-
-      it "should raise a deprecated method warning" do
-        network.should_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        network.dispatcher('Ref', [], :int)
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        network.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        network.stub(:ffi_lib).with("libvirt")
-      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)
-        end
-
-        it "should call the new attached method" do
-          network.should_receive(:send).with("virNetworkRef", [])
-        end
-      end
-
-      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 "without libvirt installed" do
-      before :each do
-        network.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-      end
-
-      it "should raise an exception" do
-        lambda { network.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-
-  context "when calling any libvirt function directly" do
-    context "that is the new way" do
-      before :each do
-        network.stub(:ffi_lib).with("libvirt")
-        network.stub(:attach_function).with("virNetworkRef", "virNetworkRef", [], :int)
-        network.stub(:send).with("virNetworkRef", [])
-      end
-
-      it "should  not raise a deprecated method warning" do
-        network.should_not_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        network.Ref([:int])
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        network.stub(:ffi_lib).with("libvirt")
-      end
-
-      context "and the function is a valid one" 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.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)
-        end
-
-        it "should call the new attached method" do
-          network.should_receive(:send).with("virNetworkRef", [])
-        end
-      end
-
-      context "and the function is not a valid one" 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.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
-        end
-      end
-    end
-
-    context "without libvirt installed" do
-      it "should raise an exception" do
-        lambda { network.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-end

data/spec/libvirt-ruby/storage_pool_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Libvirt::Ruby::StoragePool do
-  let(:storage_pool) { Libvirt::Ruby::StoragePool }
-
-  context "when calling method #dispatcher" do
-    context "that is now deprecated" do
-      before :each do
-        storage_pool.stub(:ffi_lib).with("libvirt")
-        storage_pool.stub(:attach_function).with("virStoragePoolRefresh", "virStoragePoolRefresh", [], :int)
-        storage_pool.stub(:send).with("virStoragePoolRefresh", [])
-      end
-
-      it "should raise a deprecated method warning" do
-        storage_pool.should_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        storage_pool.dispatcher('Refresh', [], :int)
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        storage_pool.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        storage_pool.stub(:ffi_lib).with("libvirt")
-      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)
-        end
-
-        it "should call the new attached method" do
-          storage_pool.should_receive(:send).with("virStoragePoolRefresh", [])
-        end
-      end
-
-      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 "without libvirt installed" do
-      before :each do
-        storage_pool.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-      end
-
-      it "should raise an exception" do
-        lambda { storage_pool.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-
-  context "when calling any libvirt function directly" do
-    context "that is the new way" do
-      before :each do
-        storage_pool.stub(:ffi_lib).with("libvirt")
-        storage_pool.stub(:attach_function).with("virStoragePoolRefresh", "virStoragePoolRefresh", [], :int)
-        storage_pool.stub(:send).with("virStoragePoolRefresh", [])
-      end
-
-      it "should  not raise a deprecated method warning" do
-        storage_pool.should_not_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        storage_pool.Refresh([:int])
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        storage_pool.stub(:ffi_lib).with("libvirt")
-      end
-
-      context "and the function is a valid one" 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.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)
-        end
-
-        it "should call the new attached method" do
-          storage_pool.should_receive(:send).with("virStoragePoolRefresh", [])
-        end
-      end
-
-      context "and the function is not a valid one" 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.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
-        end
-      end
-    end
-
-    context "without libvirt installed" do
-      it "should raise an exception" do
-        lambda { storage_pool.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-end

data/spec/libvirt-ruby/storage_vol_spec.rb

@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Libvirt::Ruby::StorageVol do
-  let(:storage_vol) { Libvirt::Ruby::StorageVol }
-
-  context "when calling method #dispatcher" do
-    context "that is now deprecated" do
-      before :each do
-        storage_vol.stub(:ffi_lib).with("libvirt")
-        storage_vol.stub(:attach_function).with("virStorageVolResize", "virStorageVolResize", [], :int)
-        storage_vol.stub(:send).with("virStorageVolResize", [])
-      end
-
-      it "should raise a deprecated method warning" do
-        storage_vol.should_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        storage_vol.dispatcher('Resize', [], :int)
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        storage_vol.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        storage_vol.stub(:ffi_lib).with("libvirt")
-      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)
-        end
-
-        it "should call the new attached method" do
-          storage_vol.should_receive(:send).with("virStorageVolResize", [])
-        end
-      end
-
-      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 "without libvirt installed" do
-      before :each do
-        storage_vol.stub(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-      end
-
-      it "should raise an exception" do
-        lambda { storage_vol.dispatcher('Abc', [], :int) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-
-  context "when calling method #dispatcher" do
-    context "that is the new way" do
-      before :each do
-        storage_vol.stub(:ffi_lib).with("libvirt")
-        storage_vol.stub(:attach_function).with("virStorageVolResize", "virStorageVolResize", [], :int)
-        storage_vol.stub(:send).with("virStorageVolResize", [])
-      end
-
-      it "should  not raise a deprecated method warning" do
-        storage_vol.should_not_receive(:warn).with("[DEPRECATION] `dispatcher` is deprecated.  Please call the function directly instead.")
-        storage_vol.Resize([:int])
-      end
-    end
-
-    context "with libvirt installed" do
-      before :each do
-        storage_vol.stub(:ffi_lib).with("libvirt")
-      end
-
-      context "and the function is a valid one" 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.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)
-        end
-
-        it "should call the new attached method" do
-          storage_vol.should_receive(:send).with("virStorageVolResize", [])
-        end
-      end
-
-      context "and the function is not a valid one" 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.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::InvalidFunction)
-        end
-      end
-    end
-
-    context "without libvirt installed" do
-      it "should raise an exception" do
-        lambda { storage_vol.Abc([:int]) }.should raise_error(Libvirt::Ruby::Exceptions::MissingLib)
-      end
-    end
-  end
-end