merb_virtuozzo 0.2.2 → 0.2.3

data/Manifest

@@ -3,6 +3,7 @@ lib/merb_virtuozzo/merbtasks.rb
 lib/merb_virtuozzo/virtuozzo.yml.sample
 lib/merb_virtuozzo.rb
 Manifest
+merb_virtuozzo.gemspec
 Rakefile
 README.rdoc
 spec/spec_helper.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'echoe'
 require 'merb-core'
 require 'merb-core/tasks/merb'
 
-Echoe.new('merb_virtuozzo', '0.2.2') do |p|
+Echoe.new('merb_virtuozzo', '0.2.3') do |p|
   p.description               = "Merb plugin for working with Virtuozzo."
   p.url                       = "http://github.com/plainprograms/merb_virtuozzo"
   p.author                    = "James Thompson"

data/lib/merb_virtuozzo/merb_virtuozzo.rb

@@ -43,7 +43,6 @@ module Merb
         options[:host] = (config[:host] || "https://localhost:4646")
         options[:username] = (config[:username] || config[:user] || "")
         options[:password] = config[:password] || ""
-        options[:realm] = config[:realm] || Virtuozzo::DEFAULT_REALM
 
         options
       end
@@ -60,7 +59,17 @@ module Merb
       def connect
         if File.exists?(config_file)
           Merb.logger.info!("Connecting to the Virtuozzo Agent at '#{config[:host]}' ...")
-          @connection = ::Virtuozzo::Connection.new(config_options(config))
+          
+          o = config_options(config)
+          
+          connection_options = [
+              o[:host],
+              o[:username],
+              o[:password],
+              o.except(:host, :username, :password)
+            ]
+          
+          @connection = ::Virtuozzo::SOAP::Connection.new(*connection_options)
           Merb.logger.error!("Connection Error: #{e}") unless @connection
           connection
         else

data/lib/merb_virtuozzo.rb

@@ -1,7 +1,7 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
   dependency 'virtuozzo', '~>0.5'
-
+  
   require File.join(File.dirname(__FILE__) / "merb_virtuozzo" / "merb_virtuozzo")
   
   Merb::BootLoader.before_app_loads do

data/merb_virtuozzo.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merb_virtuozzo}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Thompson"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Merb plugin for working with Virtuozzo.}
   s.email = %q{james@plainprograms.com}
   s.extra_rdoc_files = ["lib/merb_virtuozzo/merb_virtuozzo.rb", "lib/merb_virtuozzo/merbtasks.rb", "lib/merb_virtuozzo/virtuozzo.yml.sample", "lib/merb_virtuozzo.rb", "README.rdoc"]
-  s.files = ["lib/merb_virtuozzo/merb_virtuozzo.rb", "lib/merb_virtuozzo/merbtasks.rb", "lib/merb_virtuozzo/virtuozzo.yml.sample", "lib/merb_virtuozzo.rb", "Manifest", "Rakefile", "README.rdoc", "spec/spec_helper.rb", "spec/virtuozzo_spec.rb", "merb_virtuozzo.gemspec"]
+  s.files = ["lib/merb_virtuozzo/merb_virtuozzo.rb", "lib/merb_virtuozzo/merbtasks.rb", "lib/merb_virtuozzo/virtuozzo.yml.sample", "lib/merb_virtuozzo.rb", "Manifest", "merb_virtuozzo.gemspec", "Rakefile", "README.rdoc", "spec/spec_helper.rb", "spec/virtuozzo_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/plainprograms/merb_virtuozzo}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Merb_virtuozzo", "--main", "README.rdoc"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_virtuozzo
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - James Thompson
@@ -60,11 +60,11 @@ files:
 - lib/merb_virtuozzo/virtuozzo.yml.sample
 - lib/merb_virtuozzo.rb
 - Manifest
+- merb_virtuozzo.gemspec
 - Rakefile
 - README.rdoc
 - spec/spec_helper.rb
 - spec/virtuozzo_spec.rb
-- merb_virtuozzo.gemspec
 has_rdoc: true
 homepage: http://github.com/plainprograms/merb_virtuozzo
 post_install_message: