capify-ec2 1.2.6.pre.2 → 1.2.7.pre
Sign up to get free protection for your applications and to get access to all the features.
- data/Changelog.md +3 -3
- data/capify-ec2.gemspec +1 -1
- data/lib/capify-ec2.rb +2 -2
- data/lib/capify-ec2/capistrano.rb +3 -2
- data/lib/capify-ec2/version.rb +1 -1
- data/readme.md +5 -5
- metadata +79 -43
data/Changelog.md
CHANGED
@@ -1,13 +1,13 @@
|
|
1
|
-
## 1.2.6 (
|
1
|
+
## 1.2.6 (May 16, 2012)
|
2
2
|
|
3
3
|
Notes:
|
4
4
|
|
5
5
|
- Minor refactoring to make the code clearer
|
6
|
+
- Updated code to allow commas and any amount of whitespace between options and roles (Thanks ennui2342)
|
7
|
+
- Updated documentation to reflect multiple correct formats.
|
6
8
|
|
7
9
|
Bugfixes:
|
8
10
|
|
9
|
-
- Documentation showed whitespaces in Options and Roles, but they weren't supported in the code. (Thanks ennui2342)
|
10
|
-
|
11
11
|
## 1.2.5 (Jan 26, 2012)
|
12
12
|
|
13
13
|
Features:
|
data/capify-ec2.gemspec
CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
|
|
18
18
|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
19
19
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
20
20
|
s.require_paths = ["lib"]
|
21
|
-
s.add_dependency('fog', '=1.
|
21
|
+
s.add_dependency('fog', '=1.3.1')
|
22
22
|
s.add_dependency('colored', '=1.2')
|
23
23
|
s.add_dependency('capistrano')
|
24
24
|
end
|
data/lib/capify-ec2.rb
CHANGED
@@ -53,11 +53,11 @@ class CapifyEc2
|
|
53
53
|
end
|
54
54
|
|
55
55
|
def desired_instances(region = nil)
|
56
|
-
|
56
|
+
@ec2_config[:project_tag].nil? ? @instances : project_instances
|
57
57
|
end
|
58
58
|
|
59
59
|
def get_instances_by_role(role)
|
60
|
-
desired_instances.select {|instance| instance.tags['Roles'].split(%r{
|
60
|
+
desired_instances.select {|instance| instance.tags['Roles'].split(%r{,\s*}).include?(role.to_s) rescue false}
|
61
61
|
end
|
62
62
|
|
63
63
|
def get_instances_by_region(roles, region)
|
@@ -123,9 +123,10 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
123
123
|
options = role[:options]
|
124
124
|
new_options = {}
|
125
125
|
options.each {|key, value| new_options[key] = true if value.to_s == instance.name}
|
126
|
-
instance.tags["Options"].split(%r{
|
127
|
-
|
126
|
+
instance.tags["Options"].split(%r{,\s*}).each { |option| new_options[option.to_sym] = true} rescue false
|
127
|
+
|
128
128
|
if new_options
|
129
|
+
p new_options
|
129
130
|
role role[:name].to_sym, instance.contact_point, new_options
|
130
131
|
else
|
131
132
|
role role[:name].to_sym, instance.contact_point
|
data/lib/capify-ec2/version.rb
CHANGED
data/readme.md
CHANGED
@@ -5,9 +5,9 @@ capify-ec2 is used to generate capistrano namespaces using ec2 tags.
|
|
5
5
|
|
6
6
|
eg: If you have three servers on amazon's ec2.
|
7
7
|
|
8
|
-
server-1 Tag: Roles => "web", Options => "cron,resque"
|
8
|
+
server-1 Tag: Roles => "web", Options => "cron,resque, db"
|
9
9
|
server-2 Tag: Roles => "db"
|
10
|
-
server-3 Tag: Roles => "web,db"
|
10
|
+
server-3 Tag: Roles => "web,db, app"
|
11
11
|
|
12
12
|
Installing
|
13
13
|
|
@@ -64,7 +64,7 @@ end
|
|
64
64
|
Running
|
65
65
|
|
66
66
|
```ruby
|
67
|
-
cap web date
|
67
|
+
cap web ec2:date
|
68
68
|
```
|
69
69
|
|
70
70
|
will run the date command on all server's tagged with the web role
|
@@ -72,7 +72,7 @@ will run the date command on all server's tagged with the web role
|
|
72
72
|
Running
|
73
73
|
|
74
74
|
```ruby
|
75
|
-
cap server-1 ec2:
|
75
|
+
cap server-1 ec2:register_instance -s loadbalancer=elb-1
|
76
76
|
```
|
77
77
|
|
78
78
|
will register server-1 to be used by elb-1
|
@@ -80,7 +80,7 @@ will register server-1 to be used by elb-1
|
|
80
80
|
Running
|
81
81
|
|
82
82
|
```ruby
|
83
|
-
cap server-1 ec2:
|
83
|
+
cap server-1 ec2:deregister_instance
|
84
84
|
```
|
85
85
|
|
86
86
|
will remove server-1 from whatever instance it is currently
|
metadata
CHANGED
@@ -1,58 +1,81 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: capify-ec2
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
hash: 1118461980
|
5
5
|
prerelease: 6
|
6
|
+
segments:
|
7
|
+
- 1
|
8
|
+
- 2
|
9
|
+
- 7
|
10
|
+
- pre
|
11
|
+
version: 1.2.7.pre
|
6
12
|
platform: ruby
|
7
|
-
authors:
|
13
|
+
authors:
|
8
14
|
- Noah Cantor
|
9
15
|
- Siddharth Dawara
|
10
16
|
autorequire:
|
11
17
|
bindir: bin
|
12
18
|
cert_chain: []
|
13
|
-
|
14
|
-
|
15
|
-
|
19
|
+
|
20
|
+
date: 2012-05-16 00:00:00 +01:00
|
21
|
+
default_executable:
|
22
|
+
dependencies:
|
23
|
+
- !ruby/object:Gem::Dependency
|
16
24
|
name: fog
|
17
|
-
|
25
|
+
prerelease: false
|
26
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
18
27
|
none: false
|
19
|
-
requirements:
|
20
|
-
- - =
|
21
|
-
- !ruby/object:Gem::Version
|
22
|
-
|
28
|
+
requirements:
|
29
|
+
- - "="
|
30
|
+
- !ruby/object:Gem::Version
|
31
|
+
hash: 25
|
32
|
+
segments:
|
33
|
+
- 1
|
34
|
+
- 3
|
35
|
+
- 1
|
36
|
+
version: 1.3.1
|
23
37
|
type: :runtime
|
24
|
-
|
25
|
-
|
26
|
-
- !ruby/object:Gem::Dependency
|
38
|
+
version_requirements: *id001
|
39
|
+
- !ruby/object:Gem::Dependency
|
27
40
|
name: colored
|
28
|
-
|
41
|
+
prerelease: false
|
42
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
29
43
|
none: false
|
30
|
-
requirements:
|
31
|
-
- - =
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
|
44
|
+
requirements:
|
45
|
+
- - "="
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
hash: 11
|
48
|
+
segments:
|
49
|
+
- 1
|
50
|
+
- 2
|
51
|
+
version: "1.2"
|
34
52
|
type: :runtime
|
35
|
-
|
36
|
-
|
37
|
-
- !ruby/object:Gem::Dependency
|
53
|
+
version_requirements: *id002
|
54
|
+
- !ruby/object:Gem::Dependency
|
38
55
|
name: capistrano
|
39
|
-
|
56
|
+
prerelease: false
|
57
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
40
58
|
none: false
|
41
|
-
requirements:
|
42
|
-
- -
|
43
|
-
- !ruby/object:Gem::Version
|
44
|
-
|
59
|
+
requirements:
|
60
|
+
- - ">="
|
61
|
+
- !ruby/object:Gem::Version
|
62
|
+
hash: 3
|
63
|
+
segments:
|
64
|
+
- 0
|
65
|
+
version: "0"
|
45
66
|
type: :runtime
|
46
|
-
|
47
|
-
version_requirements: *2156513060
|
67
|
+
version_requirements: *id003
|
48
68
|
description: Grabs roles from ec2's tags and autogenerates capistrano tasks
|
49
|
-
email:
|
69
|
+
email:
|
50
70
|
- noah.cantor@forward.co.uk
|
51
71
|
- siddharth.dawara@forward.co.uk
|
52
72
|
executables: []
|
73
|
+
|
53
74
|
extensions: []
|
75
|
+
|
54
76
|
extra_rdoc_files: []
|
55
|
-
|
77
|
+
|
78
|
+
files:
|
56
79
|
- .gitignore
|
57
80
|
- Changelog.md
|
58
81
|
- Gemfile
|
@@ -64,28 +87,41 @@ files:
|
|
64
87
|
- lib/capify-ec2/server.rb
|
65
88
|
- lib/capify-ec2/version.rb
|
66
89
|
- readme.md
|
90
|
+
has_rdoc: true
|
67
91
|
homepage: http://github.com/forward/capify-ec2
|
68
92
|
licenses: []
|
93
|
+
|
69
94
|
post_install_message:
|
70
95
|
rdoc_options: []
|
71
|
-
|
96
|
+
|
97
|
+
require_paths:
|
72
98
|
- lib
|
73
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
99
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
74
100
|
none: false
|
75
|
-
requirements:
|
76
|
-
- -
|
77
|
-
- !ruby/object:Gem::Version
|
78
|
-
|
79
|
-
|
101
|
+
requirements:
|
102
|
+
- - ">="
|
103
|
+
- !ruby/object:Gem::Version
|
104
|
+
hash: 3
|
105
|
+
segments:
|
106
|
+
- 0
|
107
|
+
version: "0"
|
108
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
80
109
|
none: false
|
81
|
-
requirements:
|
82
|
-
- -
|
83
|
-
- !ruby/object:Gem::Version
|
110
|
+
requirements:
|
111
|
+
- - ">"
|
112
|
+
- !ruby/object:Gem::Version
|
113
|
+
hash: 25
|
114
|
+
segments:
|
115
|
+
- 1
|
116
|
+
- 3
|
117
|
+
- 1
|
84
118
|
version: 1.3.1
|
85
119
|
requirements: []
|
120
|
+
|
86
121
|
rubyforge_project: capify-ec2
|
87
|
-
rubygems_version: 1.
|
122
|
+
rubygems_version: 1.6.2
|
88
123
|
signing_key:
|
89
124
|
specification_version: 3
|
90
125
|
summary: Grabs roles from ec2's tags and autogenerates capistrano tasks
|
91
126
|
test_files: []
|
127
|
+
|