rightscale-cli 0.5.6 → 0.6.0

data/lib/rightscale_cli/tags.rb

@@ -19,38 +19,39 @@ require 'rightscale_cli/client'
 require 'rightscale_cli/logger'
 
 class RightScaleCLI
+  # Represents RightScale Tags
   class Tags < Thor
     namespace :tags
 
     def initialize(*args)
       super
       @client = RightScaleCLI::Client.new(options)
-      @logger = RightScaleCLI::Logger.new()
+      @logger = RightScaleCLI::Logger.new
     end
 
     # include render options
     eval(IO.read("#{File.dirname(File.expand_path(__FILE__))}/render_options.rb"), binding)
 
-    desc "search", "Search for resources having a list of tags in a specific resource_type."
-    option :deleted, :type => :boolean, :required => false, :default => false
-    option :all, :type => :boolean, :required => false, :default => false
-    option :count, :type => :boolean, :required => false, :default => false
-    option :prefix, :type => :boolean, :required => false, :default => false
+    desc 'search', 'search for resources having a list of tags in a specific resource_type'
+    option :deleted, type: :boolean, required: false, default: false
+    option :all, type: :boolean, required: false, default: false
+    option :count, type: :boolean, required: false, default: false
+    option :prefix, type: :boolean, required: false, default: false
     def search(resource_type, tag)
       if options[:prefix]
-        options[:prefix] = tag 
-        results = @client.client.tags.by_tag({
-          :with_deleted => options[:deleted],
-          :match_all => options[:all],
-          :include_tags_with_prefix => options[:prefix],
-          :resource_type => resource_type,
-          :tags => [ tag ]})
+        options[:prefix] = tag
+        results = @client.client.tags.by_tag(
+          with_deleted: options[:deleted],
+          match_all: options[:all],
+          include_tags_with_prefix: options[:prefix],
+          resource_type: resource_type,
+          tags: [tag])
       else
-        results = @client.client.tags.by_tag({
-          :with_deleted => options[:deleted],
-          :match_all => options[:all],
-          :resource_type => resource_type,
-          :tags => [ tag ]})
+        results = @client.client.tags.by_tag(
+          with_deleted: options[:deleted],
+          match_all: options[:all],
+          resource_type: resource_type,
+          tags: [tag])
       end
 
       resources = []
@@ -62,25 +63,27 @@ class RightScaleCLI
         resource_count = 0
       end
       @logger.info "Found #{resource_count} #{resource_type} with tag, '#{tag}'."
-      @client.render(resources[0], 'tag_search') unless ( options[:count] || resource_count == 0 )
+      @client.render(resources[0], 'tag_search') unless options[:count] || resource_count == 0
     end
 
-    desc "resource", "Get tags for a list of resource hrefs."
+    desc 'resource', 'get tags for a list of resource hrefs'
     def resource(resource_hrefs)
-      @client.client.tags.by_resource(:resource_hrefs => resource_hrefs.split(','))
+      @client.client.tags.by_resource(resource_hrefs: resource_hrefs.split(','))
     end
 
-    desc "add", "Adds tag(s) to resource(s)."
+    desc 'add', 'adds tag(s) to resource(s).'
     def add(hrefs, tags)
-      @client.client.tags.multi_add(:resource_hrefs => hrefs.split(','), :tags => tags.split(','))
+      @client.client.tags.multi_add(resource_hrefs: hrefs.split(','),
+                                    tags: tags.split(','))
     end
 
-    desc "delete", "Deletes tags from resource(s)."
+    desc 'delete', 'deletes tags from resource(s).'
     def delete(hrefs, tags)
-      @client.client.tags.multi_delete(:resource_hrefs => hrefs.split(','), :tags => tags.split(','))
+      @client.client.tags.multi_delete(resource_hrefs: hrefs.split(','),
+                                       tags: tags.split(','))
     end
 
-    def self.banner(task, namespace = true, subcommand = false)
+    def self.banner(task, _namespace = true, subcommand = false)
       "#{basename} #{task.formatted_usage(self, true, subcommand)}"
     end
   end

data/lib/rightscale_cli/version.rb

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# RightScale CLI package
 class RightScaleCLI
-  VERSION = '0.5.6'
+  VERSION = '0.6.0'
 end

data/lib/rightscale_cli/volumes.rb

@@ -1,5 +1,5 @@
 # Author:: Chris Fordham (<chris@fordham-nagy.id.au>)
-# Copyright:: Copyright (c) 2013 Chris Fordham
+# Copyright:: Copyright (c) 2013-2015 Chris Fordham
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,26 +19,56 @@ require 'rightscale_cli/logger'
 require 'rightscale_cli/client'
 
 class RightScaleCLI
+  # Represents Storage Volumes
   class Volumes < Thor
     namespace :volumes
 
     def initialize(*args)
       super
       @client = RightScaleCLI::Client.new(options)
-      @logger = RightScaleCLI::Logger.new()
+      @logger = RightScaleCLI::Logger.new
     end
 
-    # include render options
-    eval(IO.read("#{File.dirname(File.expand_path(__FILE__))}/render_options.rb"), binding)
-    
-    desc "list", "Lists volumes, optionally with filter by datacenter, description, name, parent volume snapshot or resource UID."
-    option :cloud, :desc => "The cloud to query for volumes in.", :type => :string, :required => true
-    option :datacenter, :desc => "The href of the Datacenter / Zone the Volume is in.", :type => :string, :required => false
-    option :description, :desc => "The description of the Volume to filter on.", :type => :string, :required => false
-    option :name, :desc => "The name of the Volume to filter on.", :type => :string, :required => false
-    option :parent, :desc => "The href of the snapshot from which the volume was created.", :type => :string, :required => false
-    option :resource_uid, :desc => "Resource Unique IDentifier for the Volume to filter on.", :type => :string, :required => false
-    def list()
+    class_option :xml,
+                 type: :boolean,
+                 default: false,
+                 aliases: '-X',
+                 required: false,
+                 desc: 'returns xml'
+    class_option :json,
+                 type: :boolean,
+                 default: false,
+                 aliases: '-J',
+                 required: false,
+                 desc: 'returns json'
+
+    desc 'list', 'lists volumes, optionally with filter by datacenter, ' \
+      'description, name, parent volume snapshot or resource UID'
+    option :cloud,
+           desc: 'the cloud to query for volumes in',
+           type: :string,
+           required: true
+    option :datacenter,
+           desc: 'the href of the datacenter / zone the volume is in',
+           type: :string,
+           required: false
+    option :description,
+           desc: 'the description of the Volume to filter on',
+           type: :string,
+           required: false
+    option :name,
+           desc: 'the name of the Volume to filter on',
+           type: :string,
+           required: false
+    option :parent,
+           desc: 'the href of the snapshot from which the volume was created',
+           type: :string,
+           required: false
+    option :resource_uid,
+           desc: 'a resource unique identifier for the volume to filter on',
+           type: :string,
+           required: false
+    def list
       filter = []
       filter.push("datacenter_href==/api/clouds/#{options[:cloud]}/datacenters/#{options[:datacenter]}") if options[:datacenter]
       filter.push("description==#{options[:description]}") if options[:description]
@@ -49,20 +79,25 @@ class RightScaleCLI
       @logger.debug "filter: #{filter}" if options[:debug]
 
       volumes = []
-      @client.client.clouds(:id => options[:cloud]).show.volumes(:filter => filter).index.each { |volume|
+      @client.client.clouds(id: options[:cloud])
+        .show.volumes(filter: filter).index.each do |volume|
         volumes.push(volume.raw)
-      }
+      end
 
       @client.render(volumes, 'volumes')
     end
 
-    desc "show", "Shows a volume."
-    option :cloud, :desc => "The cloud to query for volumes in.", :type => :string, :required => true
+    desc 'show', 'shows a single volume'
+    option :cloud,
+           desc: 'the cloud to query for volumes in',
+           type: :string,
+           required: true
     def show(volume_id)
-      @client.render(@client.client.clouds(:id => options[:cloud]).show.volumes(:id => volume_id).show.raw, 'volume')
+      @client.render(@client.client.clouds(id: options[:cloud])
+        .show.volumes(id: volume_id).show.raw, 'volume')
     end
 
-    def self.banner(task, namespace = true, subcommand = false)
+    def self.banner(task, _namespace = true, subcommand = false)
       "#{basename} #{task.formatted_usage(self, true, subcommand)}"
     end
   end

data/lib/templates/right_api_client.yml.erb

@@ -7,11 +7,13 @@
 :account_id: <%= @directives[:account_id] %>
 
 # There are five login mechanisms:
-
+ 
 # 0. Use the following parameters to login with your email and base64-encoded password:
 # To encode your plaintext password, use 'base64' command or similar.
+<% if @directives[:email] %>
 :email: <%= @directives[:email] %>
 :password_base64: <%= @directives[:password_base64] %>
+<% end %>
 
 # 1. Use the following parameters to login with your email and plaintext password:
 #:email: <%= @directives[:email] %>
@@ -28,8 +30,10 @@
 # 4. Use the following parameter to send an existing OAuth access token with every request:
 # To learn more about OAuth and how to obtain an access token, see
 # http://support.rightscale.com/12-Guides/03-Rightscale_API/OAuth
-#:access_token: my_token_string
+:access_token: <%= @directives[:access_token] %>
 
 # The following are optional parameters:
 :api_url: <%= @directives[:api_url] %>
 :api_version: <%= @directives[:api_version] %>
+:refresh_token: <%= @directives[:refresh_token] %>
+:token_endpoint: <%= @directives[:token_endpoint] %>

data/lib/yesno.rb

@@ -16,16 +16,12 @@
 
 def yesno
   begin
-    system("stty raw -echo")
+    system('stty raw -echo')
     str = STDIN.getc
   ensure
-    system("stty -raw echo")
+    system('stty -raw echo')
   end
-  if str.downcase == "y"
-    return true
-  elsif str.downcase == "n"
-    return false
-  else
-    raise "Invalid response. Please enter y/n."
+  { 'y' => true, 'n' => false }.fetch(str.downcase) do
+    fail 'Invalid response. Please enter y/n.'
   end
 end

metadata

@@ -1,130 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: rightscale-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Fordham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: right_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 description: RightScale command line interface client.
 email: chris@fordham-nagy.id.au
 executables:
+- rightscale
 - rs
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/rightscale
 - bin/rs
 - lib/ask_pass.rb
+- lib/deployment_cat.rb
 - lib/rightscale_cli.rb
 - lib/rightscale_cli/client.rb
 - lib/rightscale_cli/clouds.rb
@@ -136,7 +139,11 @@ files:
 - lib/rightscale_cli/logger.rb
 - lib/rightscale_cli/monkey_patches/client_attributes.rb
 - lib/rightscale_cli/multi_cloud_images.rb
+- lib/rightscale_cli/network/networks.rb
+- lib/rightscale_cli/network/security_groups.rb
 - lib/rightscale_cli/output.rb
+- lib/rightscale_cli/recurring_volume_attachments.rb
+- lib/rightscale_cli/refresh.rb
 - lib/rightscale_cli/render_options.rb
 - lib/rightscale_cli/repositories.rb
 - lib/rightscale_cli/rightscale_cli.rb
@@ -149,6 +156,7 @@ files:
 - lib/rightscale_cli/server_arrays/multi_run_executable.rb
 - lib/rightscale_cli/server_templates.rb
 - lib/rightscale_cli/servers.rb
+- lib/rightscale_cli/ssh_keys.rb
 - lib/rightscale_cli/tags.rb
 - lib/rightscale_cli/version.rb
 - lib/rightscale_cli/volumes.rb
@@ -164,19 +172,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: rightscale-cli
 test_files: []
-has_rdoc: