cap-rightscale 0.3.10 → 0.3.11
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/cap-rightscale.gemspec +4 -3
- data/lib/cap-rightscale/configuration/rightscale.rb +5 -12
- metadata +27 -27
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.11
|
data/cap-rightscale.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{cap-rightscale}
|
8
|
-
s.version = "0.3.
|
8
|
+
s.version = "0.3.11"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Satoshi Ohki"]
|
12
|
-
s.date = %q{2011-02-
|
12
|
+
s.date = %q{2011-02-04}
|
13
13
|
s.description = %q{Capistrano extension that maps RightScale parameters to Roles.}
|
14
14
|
s.email = %q{roothybrid7@gmail.com}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
|
|
44
44
|
s.homepage = %q{http://github.com/roothybrid7/cap-rightscale}
|
45
45
|
s.licenses = ["MIT"]
|
46
46
|
s.require_paths = ["lib"]
|
47
|
-
s.rubygems_version = %q{1.
|
47
|
+
s.rubygems_version = %q{1.3.7}
|
48
48
|
s.summary = %q{Capistrano extension that maps RightScale parameters to Roles}
|
49
49
|
s.test_files = [
|
50
50
|
"spec/cap-rightscale_spec.rb",
|
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
|
|
52
52
|
]
|
53
53
|
|
54
54
|
if s.respond_to? :specification_version then
|
55
|
+
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
55
56
|
s.specification_version = 3
|
56
57
|
|
57
58
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
@@ -1,10 +1,11 @@
|
|
1
|
-
require 'cap-rightscale/utils/rs_utils
|
1
|
+
require 'cap-rightscale/utils/rs_utils'
|
2
2
|
require 'cap-rightscale/configuration/rightscale/resource'
|
3
3
|
|
4
4
|
module Capistrano
|
5
5
|
class Configuration
|
6
6
|
module RightScale
|
7
7
|
attr_writer :validate_echo, :use_nickname, :use_public_ip, :use_rs_cache
|
8
|
+
attr_accessor :domainname
|
8
9
|
|
9
10
|
def get_rs_instance
|
10
11
|
@rs_instance ||= Capistrano::RightScale::Resource.instance
|
@@ -34,10 +35,6 @@ module Capistrano
|
|
34
35
|
@lifetime = time # seconds
|
35
36
|
end
|
36
37
|
|
37
|
-
def domainname(domain)
|
38
|
-
@domain = domain
|
39
|
-
end
|
40
|
-
|
41
38
|
# Get RightScale Server Array
|
42
39
|
# === Parameters
|
43
40
|
# * _role_ - Capistrano role symbol (ex. :app, :web, :db)
|
@@ -73,7 +70,7 @@ start = Time.now
|
|
73
70
|
|
74
71
|
host_list = get_rs_instance.__send__(:array_instances, array.id).select {|i| i[:state] == "operational"}.map do |instance|
|
75
72
|
hostname = instance[:nickname].sub(/ #[0-9]+$/, "-%03d" % instance[:nickname].match(/[0-9]+$/).to_s.to_i)
|
76
|
-
hostname << ".#{
|
73
|
+
hostname << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
|
77
74
|
ip = use_public_ip ? instance[:ip_address] : instance[:private_ip_address]
|
78
75
|
|
79
76
|
logger.info("Found server: #{hostname}(#{ip})")
|
@@ -128,7 +125,7 @@ start = Time.now
|
|
128
125
|
|
129
126
|
host_list = srvs.map do |server|
|
130
127
|
hostname = server[:nickname]
|
131
|
-
hostname << ".#{
|
128
|
+
hostname << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
|
132
129
|
ip = use_public_ip ? server[:settings][:ip_address] : server[:settings][:private_ip_address]
|
133
130
|
|
134
131
|
logger.info("Found server: #{hostname}(#{ip})")
|
@@ -194,7 +191,7 @@ start = Time.now
|
|
194
191
|
if found_ids.size > 0
|
195
192
|
host_list = srvs.select {|s| found_ids.include?(s[:href].match(/[0-9]+$/).to_s)}.map do |server|
|
196
193
|
hostname = server[:nickname]
|
197
|
-
hostname << ".#{
|
194
|
+
hostname << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
|
198
195
|
ip = use_public_ip ? server[:settings][:ip_address] : server[:settings][:private_ip_address]
|
199
196
|
|
200
197
|
logger.info("Found server: #{hostname}(#{ip})")
|
@@ -290,10 +287,6 @@ puts "Time: #{Time.now - start}"
|
|
290
287
|
@use_rs_cache = true if @use_rs_cache.nil?
|
291
288
|
@use_rs_cache
|
292
289
|
end
|
293
|
-
|
294
|
-
def _domain
|
295
|
-
@domain || nil
|
296
|
-
end
|
297
290
|
end
|
298
291
|
end
|
299
292
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cap-rightscale
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 5
|
5
|
+
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 3
|
9
|
-
-
|
10
|
-
version: 0.3.
|
9
|
+
- 11
|
10
|
+
version: 0.3.11
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Satoshi Ohki
|
@@ -15,11 +15,11 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2011-02-
|
18
|
+
date: 2011-02-04 00:00:00 +09:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
|
-
|
22
|
+
prerelease: false
|
23
23
|
version_requirements: &id001 !ruby/object:Gem::Requirement
|
24
24
|
none: false
|
25
25
|
requirements:
|
@@ -31,11 +31,11 @@ dependencies:
|
|
31
31
|
- 3
|
32
32
|
- 0
|
33
33
|
version: 2.3.0
|
34
|
-
|
35
|
-
type: :development
|
34
|
+
name: rspec
|
36
35
|
requirement: *id001
|
36
|
+
type: :development
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
|
-
|
38
|
+
prerelease: false
|
39
39
|
version_requirements: &id002 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
@@ -45,11 +45,11 @@ dependencies:
|
|
45
45
|
segments:
|
46
46
|
- 0
|
47
47
|
version: "0"
|
48
|
-
|
49
|
-
type: :development
|
48
|
+
name: cucumber
|
50
49
|
requirement: *id002
|
50
|
+
type: :development
|
51
51
|
- !ruby/object:Gem::Dependency
|
52
|
-
|
52
|
+
prerelease: false
|
53
53
|
version_requirements: &id003 !ruby/object:Gem::Requirement
|
54
54
|
none: false
|
55
55
|
requirements:
|
@@ -61,11 +61,11 @@ dependencies:
|
|
61
61
|
- 0
|
62
62
|
- 0
|
63
63
|
version: 1.0.0
|
64
|
-
|
65
|
-
type: :development
|
64
|
+
name: bundler
|
66
65
|
requirement: *id003
|
66
|
+
type: :development
|
67
67
|
- !ruby/object:Gem::Dependency
|
68
|
-
|
68
|
+
prerelease: false
|
69
69
|
version_requirements: &id004 !ruby/object:Gem::Requirement
|
70
70
|
none: false
|
71
71
|
requirements:
|
@@ -77,11 +77,11 @@ dependencies:
|
|
77
77
|
- 5
|
78
78
|
- 2
|
79
79
|
version: 1.5.2
|
80
|
-
|
81
|
-
type: :development
|
80
|
+
name: jeweler
|
82
81
|
requirement: *id004
|
82
|
+
type: :development
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
|
84
|
+
prerelease: false
|
85
85
|
version_requirements: &id005 !ruby/object:Gem::Requirement
|
86
86
|
none: false
|
87
87
|
requirements:
|
@@ -91,11 +91,11 @@ dependencies:
|
|
91
91
|
segments:
|
92
92
|
- 0
|
93
93
|
version: "0"
|
94
|
-
|
95
|
-
type: :development
|
94
|
+
name: rcov
|
96
95
|
requirement: *id005
|
96
|
+
type: :development
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
|
98
|
+
prerelease: false
|
99
99
|
version_requirements: &id006 !ruby/object:Gem::Requirement
|
100
100
|
none: false
|
101
101
|
requirements:
|
@@ -106,11 +106,11 @@ dependencies:
|
|
106
106
|
- 2
|
107
107
|
- 4
|
108
108
|
version: "2.4"
|
109
|
-
|
110
|
-
type: :runtime
|
109
|
+
name: capistrano
|
111
110
|
requirement: *id006
|
111
|
+
type: :runtime
|
112
112
|
- !ruby/object:Gem::Dependency
|
113
|
-
|
113
|
+
prerelease: false
|
114
114
|
version_requirements: &id007 !ruby/object:Gem::Requirement
|
115
115
|
none: false
|
116
116
|
requirements:
|
@@ -122,9 +122,9 @@ dependencies:
|
|
122
122
|
- 3
|
123
123
|
- 4
|
124
124
|
version: 0.3.4
|
125
|
-
|
126
|
-
type: :runtime
|
125
|
+
name: rightresource
|
127
126
|
requirement: *id007
|
127
|
+
type: :runtime
|
128
128
|
description: Capistrano extension that maps RightScale parameters to Roles.
|
129
129
|
email: roothybrid7@gmail.com
|
130
130
|
executables: []
|
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
188
188
|
requirements: []
|
189
189
|
|
190
190
|
rubyforge_project:
|
191
|
-
rubygems_version: 1.
|
191
|
+
rubygems_version: 1.3.7
|
192
192
|
signing_key:
|
193
193
|
specification_version: 3
|
194
194
|
summary: Capistrano extension that maps RightScale parameters to Roles
|