rightscale-cli 0.5.5 → 0.5.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a3a62715238e21f2f66762d5bd335f8a89ee08c1
4
- data.tar.gz: 3996b804f297cf31d93a810f4d625dcdb22ae682
3
+ metadata.gz: d73aea7fe3a92d3746b84c82a0a05b95687f448d
4
+ data.tar.gz: 2b30e3d123ffcbbb732c8f156b8dc00ae9094e2a
5
5
  SHA512:
6
- metadata.gz: 36e172f28dc9ddc0017151043ab40bd601e257627da0c73aa2342e794d6366cb8c583694d74eb4601884bf32591dfda5b52641e73fe388d9f22e965adcb1a685
7
- data.tar.gz: 8fc544749a7b3a7c302ff9e84a145d957eb45174da950b909c4161a7deb4cccb01b67cc65288fc51b28a82dc44a31b302375b0931398ac5fea7dd900b53a8f2f
6
+ metadata.gz: 7f23569d351f6677090c1586981c12cb20baecc7f8ca25ce8038c03f43017015db4f5b55ae056e3b4f81097fbfd7d1c415224febe84b96363282447dcedc7484
7
+ data.tar.gz: 75b64675b468f59833906310c752860bc7ce0d2a82982a02c8422d5f0f6b0045c13dacee1518e43da83d43c99fe10f4eae4d129d8a8edb409c060fdcc884f813
@@ -42,7 +42,7 @@ class RightScaleCLI
42
42
  @client.get('clouds').each { |cloud|
43
43
  cloud_id = cloud['links'].select { |link| link['rel'] == 'instances' }.first['href'].split('/')[3]
44
44
  c = cloud.select{|x| basic_fields.include?(x)}
45
- c['cloud_id'] = cloud_id
45
+ c['cloud_id'] = cloud_id.to_i
46
46
  basic_clouds.push(c)
47
47
  }
48
48
  clouds = basic_clouds
@@ -32,9 +32,37 @@ class RightScaleCLI
32
32
  eval(IO.read("#{File.dirname(File.expand_path(__FILE__))}/render_options.rb"), binding)
33
33
 
34
34
  desc "search", "Search for resources having a list of tags in a specific resource_type."
35
+ option :deleted, :type => :boolean, :required => false, :default => false
36
+ option :all, :type => :boolean, :required => false, :default => false
37
+ option :count, :type => :boolean, :required => false, :default => false
38
+ option :prefix, :type => :boolean, :required => false, :default => false
35
39
  def search(resource_type, tag)
36
- #@client.render(@client.client.tags.by_tag({:resource_type => resource_type, :tags => [ tag ]}), 'servers')
37
- puts @client.client.tags.by_tag({:resource_type => resource_type, :tags => [ tag ]}).count
40
+ if options[:prefix]
41
+ options[:prefix] = tag
42
+ results = @client.client.tags.by_tag({
43
+ :with_deleted => options[:deleted],
44
+ :match_all => options[:all],
45
+ :include_tags_with_prefix => options[:prefix],
46
+ :resource_type => resource_type,
47
+ :tags => [ tag ]})
48
+ else
49
+ results = @client.client.tags.by_tag({
50
+ :with_deleted => options[:deleted],
51
+ :match_all => options[:all],
52
+ :resource_type => resource_type,
53
+ :tags => [ tag ]})
54
+ end
55
+
56
+ resources = []
57
+ results.each { |resource| resources.push(resource.raw) }
58
+
59
+ if resources.count > 0
60
+ resource_count = resources[0]['links'].count
61
+ else
62
+ resource_count = 0
63
+ end
64
+ @logger.info "Found #{resource_count} #{resource_type} with tag, '#{tag}'."
65
+ @client.render(resources[0], 'tag_search') unless ( options[:count] || resource_count == 0 )
38
66
  end
39
67
 
40
68
  desc "resource", "Get tags for a list of resource hrefs."
@@ -15,5 +15,5 @@
15
15
  # limitations under the License.
16
16
 
17
17
  class RightScaleCLI
18
- VERSION = '0.5.5'
18
+ VERSION = '0.5.6'
19
19
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rightscale-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5
4
+ version: 0.5.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Fordham