plainprograms-merb_virtuozzo 0.2.2 → 0.2.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/lib/merb_virtuozzo/merb_virtuozzo.rb +11 -2
- data/lib/merb_virtuozzo.rb +1 -1
- data/merb_virtuozzo.gemspec +2 -2
- metadata +2 -2
data/Rakefile
CHANGED
@@ -3,7 +3,7 @@ require 'echoe'
|
|
3
3
|
require 'merb-core'
|
4
4
|
require 'merb-core/tasks/merb'
|
5
5
|
|
6
|
-
Echoe.new('merb_virtuozzo', '0.2.
|
6
|
+
Echoe.new('merb_virtuozzo', '0.2.3') do |p|
|
7
7
|
p.description = "Merb plugin for working with Virtuozzo."
|
8
8
|
p.url = "http://github.com/plainprograms/merb_virtuozzo"
|
9
9
|
p.author = "James Thompson"
|
@@ -43,7 +43,6 @@ module Merb
|
|
43
43
|
options[:host] = (config[:host] || "https://localhost:4646")
|
44
44
|
options[:username] = (config[:username] || config[:user] || "")
|
45
45
|
options[:password] = config[:password] || ""
|
46
|
-
options[:realm] = config[:realm] || Virtuozzo::DEFAULT_REALM
|
47
46
|
|
48
47
|
options
|
49
48
|
end
|
@@ -60,7 +59,17 @@ module Merb
|
|
60
59
|
def connect
|
61
60
|
if File.exists?(config_file)
|
62
61
|
Merb.logger.info!("Connecting to the Virtuozzo Agent at '#{config[:host]}' ...")
|
63
|
-
|
62
|
+
|
63
|
+
o = config_options(config)
|
64
|
+
|
65
|
+
connection_options = [
|
66
|
+
o[:host],
|
67
|
+
o[:username],
|
68
|
+
o[:password],
|
69
|
+
o.except(:host, :username, :password)
|
70
|
+
]
|
71
|
+
|
72
|
+
@connection = ::Virtuozzo::SOAP::Connection.new(*connection_options)
|
64
73
|
Merb.logger.error!("Connection Error: #{e}") unless @connection
|
65
74
|
connection
|
66
75
|
else
|
data/lib/merb_virtuozzo.rb
CHANGED
data/merb_virtuozzo.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{merb_virtuozzo}
|
5
|
-
s.version = "0.2.
|
5
|
+
s.version = "0.2.3"
|
6
6
|
|
7
7
|
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
|
8
8
|
s.authors = ["James Thompson"]
|
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
|
|
10
10
|
s.description = %q{Merb plugin for working with Virtuozzo.}
|
11
11
|
s.email = %q{james@plainprograms.com}
|
12
12
|
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"]
|
13
|
-
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"
|
13
|
+
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"]
|
14
14
|
s.has_rdoc = true
|
15
15
|
s.homepage = %q{http://github.com/plainprograms/merb_virtuozzo}
|
16
16
|
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Merb_virtuozzo", "--main", "README.rdoc"]
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: plainprograms-merb_virtuozzo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- James Thompson
|
@@ -57,11 +57,11 @@ files:
|
|
57
57
|
- lib/merb_virtuozzo/virtuozzo.yml.sample
|
58
58
|
- lib/merb_virtuozzo.rb
|
59
59
|
- Manifest
|
60
|
+
- merb_virtuozzo.gemspec
|
60
61
|
- Rakefile
|
61
62
|
- README.rdoc
|
62
63
|
- spec/spec_helper.rb
|
63
64
|
- spec/virtuozzo_spec.rb
|
64
|
-
- merb_virtuozzo.gemspec
|
65
65
|
has_rdoc: true
|
66
66
|
homepage: http://github.com/plainprograms/merb_virtuozzo
|
67
67
|
post_install_message:
|