cap-rightscale 0.4.0 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.0
1
+ 0.4.1
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{cap-rightscale}
8
- s.version = "0.4.0"
8
+ s.version = "0.4.1"
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"]
@@ -69,7 +69,7 @@ start = Time.now
69
69
  srvs = get_rs_instance.array_instances(array.id).select {|i| i[:state] == "operational"}
70
70
 
71
71
  if params.include?(:except_tags)
72
- except_tags_params = {:resource_type => "ec2_instance", :tags => [params[:except_tags]]}
72
+ except_tags_params = {:resource_type => "ec2_instance", :tags => params[:except_tags]}
73
73
  srvs = servers_with_tags_set(params[:deployment], srvs, except_tags_params, :minus)
74
74
  return [] if srvs.size == 0 # Not found servers matching tag
75
75
  end
@@ -126,7 +126,7 @@ start = Time.now
126
126
  srvs = srvs.select {|s| /#{params[:name_prefix]}/ =~ s[:nickname]} if params[:name_prefix]
127
127
 
128
128
  if params.include?(:except_tags)
129
- except_tags_params = {:resource_type => "ec2_instance", :tags => [params[:except_tags]]}
129
+ except_tags_params = {:resource_type => "ec2_instance", :tags => params[:except_tags]}
130
130
  srvs = servers_with_tags_set(params[:deployment], srvs, except_tags_params, :minus)
131
131
  return [] if srvs.size == 0 # Not found servers matching tag
132
132
  end
@@ -181,12 +181,12 @@ start = Time.now
181
181
  logger.info("querying rightscale for servers matching tags #{params[:tags]} in deployment #{dept.nickname}...")
182
182
  srvs = dept.servers.select {|s| s[:state] == "operational"}
183
183
 
184
- ts_params = {:resource_type => "ec2_instance", :tags => [params[:tags]]}
184
+ ts_params = {:resource_type => "ec2_instance", :tags => params[:tags]}
185
185
  srvs = servers_with_tags_set(params[:deployment], srvs, ts_params, :intersect)
186
186
  return [] if srvs.size == 0 # Not found servers matching tag
187
187
 
188
188
  if params.include?(:except_tags)
189
- except_tags_params = {:resource_type => "ec2_instance", :tags => [params[:except_tags]]}
189
+ except_tags_params = {:resource_type => "ec2_instance", :tags => params[:except_tags]}
190
190
  srvs = servers_with_tags_set(params[:deployment], srvs, except_tags_params, :minus)
191
191
  return [] if srvs.size == 0 # Not found servers matching tag
192
192
  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: 15
4
+ hash: 13
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
- - 0
10
- version: 0.4.0
9
+ - 1
10
+ version: 0.4.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Satoshi Ohki