cap-rightscale 0.0.9 → 0.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/cap-rightscale.gemspec +2 -3
- data/lib/cap-rightscale/configuration/rightscale.rb +24 -10
- metadata +20 -20
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.0.
|
1
|
+
0.0.10
|
data/cap-rightscale.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{cap-rightscale}
|
8
|
-
s.version = "0.0.
|
8
|
+
s.version = "0.0.10"
|
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"]
|
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
|
|
40
40
|
s.homepage = %q{http://github.com/roothybrid7/cap-rightscale}
|
41
41
|
s.licenses = ["MIT"]
|
42
42
|
s.require_paths = ["lib"]
|
43
|
-
s.rubygems_version = %q{1.
|
43
|
+
s.rubygems_version = %q{1.5.0}
|
44
44
|
s.summary = %q{Capistrano extension that maps RightScale parameters to Roles}
|
45
45
|
s.test_files = [
|
46
46
|
"spec/cap-rightscale_spec.rb",
|
@@ -48,7 +48,6 @@ Gem::Specification.new do |s|
|
|
48
48
|
]
|
49
49
|
|
50
50
|
if s.respond_to? :specification_version then
|
51
|
-
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
52
51
|
s.specification_version = 3
|
53
52
|
|
54
53
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
@@ -10,12 +10,12 @@ module Capistrano
|
|
10
10
|
end
|
11
11
|
|
12
12
|
# register deploy host's /etc/hosts OR dns record(replace 's/ #/-000/' to ServerArray name)
|
13
|
-
def
|
13
|
+
def use_nickname(bool=false)
|
14
14
|
@use_nick = bool
|
15
15
|
end
|
16
16
|
|
17
|
-
def
|
18
|
-
@
|
17
|
+
def domainname(domain)
|
18
|
+
@domain = domain
|
19
19
|
end
|
20
20
|
|
21
21
|
def connect
|
@@ -23,13 +23,8 @@ module Capistrano
|
|
23
23
|
@conn ||= RightResource::Connection.new do |c|
|
24
24
|
c.login(:username => @auth["username"], :password => @auth["password"], :account => @auth["account"])
|
25
25
|
end
|
26
|
-
RightResource::Base.connection = @conn
|
27
|
-
end
|
28
26
|
|
29
|
-
|
30
|
-
return false if ENV['HOSTS']
|
31
|
-
return false if ENV['ROLES'] && ENV['ROLES'].split(',').include?("#{role}") == false
|
32
|
-
return true
|
27
|
+
RightResource::Base.connection = @conn
|
33
28
|
end
|
34
29
|
|
35
30
|
# Get RightScale Server Array
|
@@ -56,6 +51,7 @@ start = Time.now
|
|
56
51
|
|
57
52
|
host_list = ServerArray.instances(array.id).select {|i| i[:state] == "operational"}.map do |instance|
|
58
53
|
hostname = instance[:nickname].sub(/ #[0-9]+$/, "-%03d" % instance[:nickname].match(/[0-9]+$/).to_s.to_i)
|
54
|
+
hostname << ".#{_domain}" if _domain
|
59
55
|
ip = instance[:private_ip_address]
|
60
56
|
logger.info("Found server: #{hostname}(#{ip})")
|
61
57
|
enable_hostname ? hostname : ip
|
@@ -92,6 +88,8 @@ start = Time.now
|
|
92
88
|
|
93
89
|
host_list = srvs.map do |server|
|
94
90
|
hostname = server[:nickname]
|
91
|
+
hostname << ".#{_domain}" if _domain
|
92
|
+
puts hostname
|
95
93
|
ip = server[:settings][:private_ip_address]
|
96
94
|
logger.info("Found server: #{hostname}(#{ip})")
|
97
95
|
enable_hostname ? hostname : ip
|
@@ -140,8 +138,9 @@ start = Time.now
|
|
140
138
|
if found_ids.size > 0
|
141
139
|
host_list = srvs.select {|s| found_ids.include?(s[:href].match(/[0-9]+$/).to_s)}.map do |server|
|
142
140
|
hostname = server[:nickname]
|
141
|
+
hostname << ".#{_domain}" if _domain
|
143
142
|
ip = server[:settings][:private_ip_address]
|
144
|
-
logger.info("Found server: #{
|
143
|
+
logger.info("Found server: #{hostname}(#{ip})")
|
145
144
|
enable_hostname ? hostname : ip
|
146
145
|
end
|
147
146
|
|
@@ -150,6 +149,21 @@ start = Time.now
|
|
150
149
|
puts "Time: #{Time.now - start}"
|
151
150
|
host_list || []
|
152
151
|
end
|
152
|
+
|
153
|
+
private
|
154
|
+
def enable_hostname
|
155
|
+
@use_nick ||= false
|
156
|
+
end
|
157
|
+
|
158
|
+
def _domain
|
159
|
+
@domain || nil
|
160
|
+
end
|
161
|
+
|
162
|
+
def check_role(role)
|
163
|
+
return false if ENV['HOSTS']
|
164
|
+
return false if ENV['ROLES'] && ENV['ROLES'].split(',').include?("#{role}") == false
|
165
|
+
return true
|
166
|
+
end
|
153
167
|
end
|
154
168
|
end
|
155
169
|
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: 11
|
5
|
+
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 0.0.
|
9
|
+
- 10
|
10
|
+
version: 0.0.10
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Satoshi Ohki
|
@@ -19,7 +19,7 @@ date: 2011-02-02 00:00:00 +09:00
|
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
|
-
|
22
|
+
name: rspec
|
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
|
-
requirement: *id001
|
34
|
+
prerelease: false
|
36
35
|
type: :development
|
36
|
+
requirement: *id001
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
|
-
|
38
|
+
name: cucumber
|
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
|
-
requirement: *id002
|
48
|
+
prerelease: false
|
50
49
|
type: :development
|
50
|
+
requirement: *id002
|
51
51
|
- !ruby/object:Gem::Dependency
|
52
|
-
|
52
|
+
name: bundler
|
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
|
-
requirement: *id003
|
64
|
+
prerelease: false
|
66
65
|
type: :development
|
66
|
+
requirement: *id003
|
67
67
|
- !ruby/object:Gem::Dependency
|
68
|
-
|
68
|
+
name: jeweler
|
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
|
-
requirement: *id004
|
80
|
+
prerelease: false
|
82
81
|
type: :development
|
82
|
+
requirement: *id004
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
|
84
|
+
name: rcov
|
85
85
|
version_requirements: &id005 !ruby/object:Gem::Requirement
|
86
86
|
none: false
|
87
87
|
requirements:
|
@@ -91,9 +91,9 @@ dependencies:
|
|
91
91
|
segments:
|
92
92
|
- 0
|
93
93
|
version: "0"
|
94
|
-
|
95
|
-
requirement: *id005
|
94
|
+
prerelease: false
|
96
95
|
type: :development
|
96
|
+
requirement: *id005
|
97
97
|
description: Capistrano extension that maps RightScale parameters to Roles.
|
98
98
|
email: roothybrid7@gmail.com
|
99
99
|
executables: []
|
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
153
153
|
requirements: []
|
154
154
|
|
155
155
|
rubyforge_project:
|
156
|
-
rubygems_version: 1.
|
156
|
+
rubygems_version: 1.5.0
|
157
157
|
signing_key:
|
158
158
|
specification_version: 3
|
159
159
|
summary: Capistrano extension that maps RightScale parameters to Roles
|