rightscale-cli 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d2ce2baf29c81d2b85a867713659c964d26f890
-  data.tar.gz: 35ae05487225b689a25e6c8b709e487ce02504b7
+  metadata.gz: 30b894476ef574eb618ff58fc7d74788f92b5366
+  data.tar.gz: e08b213e26d2701562fc84741b66b0807f50962e
 SHA512:
-  metadata.gz: 7ee7e7330c4a4b1aa5be4cf4a11d56156398462b8e14cdfdb0eb7e0bc4935d451a27c73d89a342efbf3c7824bc80a7aeaa5272b7cae602f3b8371fe1baf6c39e
-  data.tar.gz: d706e6fc89434481e328bbcd6cfec740abc74b001e16c415871d2997fe59bb2ad96f075fb2d8134d2bdeb4ec9e906f3368e8d43582f0ed8c8329c41612818365
+  metadata.gz: 9b71a5e57925a199e4b25645af5da46721340ea0af3f53ada9cf0ac42cb5f08a61f1a7562e05fd06459f66b429f08b78309052a71844320fb14516f109eba466
+  data.tar.gz: da846a1d796168e57f5f4d21d10de8d45b3f05d79746150445448a39aeb13b47810c980dbfe1e9fecc0e57aa803446934281b11b0a354622b3ec094f86de9da6

data/README.md

@@ -10,7 +10,7 @@ Ruby >= 1.9.1 is required.
 
 Install the latest RubyGem from RubyGems.org:
 
-    gem install rightscale-cli
+    $ gem install rightscale-cli
 
 For more information, see https://rubygems.org/gems/rightscale-cli.
 
@@ -24,9 +24,12 @@ As a result, to avoid overwriting the `/usr/bin/rs` binary, use a different loca
 
 ## Configuration
 
-Setup `~/.rightscale/right_api_client.yml` with your RightScale credentials.
-Ensure the correct shard for your account is set with `:api_url`.
+This can easily be done interactively with the tool once installed:
+
+    $ rs configure all
 
+Or, manually setup `~/.rightscale/right_api_client.yml` with your RightScale credentials.
+Ensure the correct shard for your account is set with `:api_url`.
 An example file is available, https://github.com/rightscale/right_api_client/blob/master/config/login.yml.example.
 
 ## Usage

data/lib/ask_pass.rb

@@ -0,0 +1,23 @@
+# Author:: Chris Fordham (<chris@fordham-nagy.id.au>)
+# Copyright:: Copyright (c) 2013 Chris Fordham
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+def ask_pass
+  require 'io/console'
+  print 'Password: '
+  password = STDIN.noecho(&:gets).strip
+  puts
+  return password
+end

data/lib/rightscale_cli/client.rb

@@ -17,6 +17,7 @@
 require 'right_api_client'
 require 'rightscale_cli/config'
 require 'rightscale_cli/logger'
+require 'ask_pass'
 
 class RightScaleCLI
   class Client
@@ -24,10 +25,16 @@ class RightScaleCLI
     attr_accessor :render
     
     def initialize(options)
-      config = RightScaleCLI::Config::API
+      config = RightScaleCLI::Config.new.local
       config[:account_id] = options['account'] if options[:account]
+      config[:email] = options['user'] if options[:user]
       config[:api_version] = options['api'] if options[:api]
 
+      if options['password'] || (!config[:password] && !config[:password_base64])
+        config[:password] = ask_pass
+        config[:password_base64] = nil    # set this to nil so it is not used by precedence
+      end
+
       @options = options
       @client = RightApi::Client.new(config)
       @logger = RightScaleCLI::Logger.new()

data/lib/rightscale_cli/clouds.rb

@@ -15,32 +15,30 @@
 # limitations under the License.
 
 require 'thor'
-require 'yaml'
-require 'json'
-require "active_support/core_ext"
+require 'rightscale_cli/client'
+require 'rightscale_cli/logger'
 
 class RightScaleCLI
   class Clouds < Thor
     namespace :clouds
 
-    desc "list", "Lists all clouds."
-    def list()
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      clouds = []
+    def initialize(*args)
+      super
+      @client = RightScaleCLI::Client.new(options)
+      @logger = RightScaleCLI::Logger.new()
+    end
 
-      $log.info "Retrieving all clouds from #{rightscale.account_id}."
+    # include render options
+    eval(IO.read("#{File.dirname(File.expand_path(__FILE__))}/render_options.rb"), binding)
 
-      rightscale.clouds.index.each { |cloud|
-        clouds.push(cloud.raw)
-      }  
-      puts clouds.to_yaml
+    desc "list", "Lists all clouds."
+    def list()
+      @client.render(@client.get('clouds'), 'clouds')
     end
 
     desc "show", "Shows a cloud."
     def show(cloud_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      cloud = rightscale.clouds(:id => cloud_id).show.raw
-      puts cloud.to_yaml
+      @client.render(@client.show('clouds', cloud_id), 'cloud')
     end
 
     desc "search", "Searches for clouds by cloud type, name, description."
@@ -48,22 +46,21 @@ class RightScaleCLI
     option :cloud_type, :type => :string, :required => false
     option :description, :type => :string, :required => false
     def search()
-
       filter = []
       filter.push("name==#{options[:name]}") if options[:name]
       filter.push("cloud_type==#{options[:cloud_type]}") if options[:cloud_type]
       filter.push("description==#{options[:cloud]}") if options[:description]
 
-      $log.info "Searching for clouds!"
+      @logger.info "Searching for clouds!"
 
       puts "filter: #{filter}" if options[:debug]
       
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)      
       clouds = []
-      rightscale.clouds.index(:filter => filter).each { |cloud|
+      @client.client.clouds.index(:filter => filter).each { |cloud|
         clouds.push(cloud.raw)
       }  
-      puts clouds.to_yaml
+
+      @client.render(clouds, 'clouds')
     end
 
     def self.banner(task, namespace = true, subcommand = false)

data/lib/rightscale_cli/config.rb

@@ -18,6 +18,11 @@ require 'yaml'
 
 class RightScaleCLI
   class Config
-    API = YAML.load_file(File.join(ENV['HOME'], '.rightscale', 'right_api_client.yml'))
+    attr_accessor :local, :path
+
+    def initialize(*args)
+      @path = File.join(ENV['HOME'], '.rightscale', 'right_api_client.yml')
+      @local = YAML.load_file(@path)
+    end
   end
 end

data/lib/rightscale_cli/configure.rb

@@ -0,0 +1,101 @@
+# Author:: Chris Fordham (<chris@fordham-nagy.id.au>)
+# Copyright:: Copyright (c) 2013 Chris Fordham
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'thor'
+require 'yaml'
+require 'rightscale_cli/config'
+require 'rightscale_cli/logger'
+require 'rightscale_cli/client'
+require 'ask_pass'
+require 'erb'
+require "base64"
+
+class RightScaleCLI
+  class Configure < Thor
+    namespace :configure
+
+    def initialize(*args)
+      super
+      @logger = RightScaleCLI::Logger.new()
+      @template_path = File.join(File.dirname(__FILE__), '..', 'templates', '/right_api_client.yml.erb')
+      @config = RightScaleCLI::Config.new
+      @directives = {}
+    end
+
+    no_commands{
+    def update_conf(directives)
+      renderer = ERB.new(IO.read(@template_path))
+      File.open(@config.path, 'w') {|f| f.write(renderer.result(binding)) }
+    end
+    }
+
+    desc "account", "Configure the RightScale account ID for the client."
+    def account()
+      update_conf(@config.local.merge({:account_id => ask("RightScale account ID (e.g. 1337):")}))
+    end
+
+    desc "user", "Configure the RightScale user for the client."
+    def user()
+      update_conf(@config.local.merge({:email => ask("RightScale username (e.g. bill.gates@microsoft.com):")}))
+    end
+
+    desc "password", "Configure the RightScale user password for the client."
+    def password()
+      update_conf(@config.local.merge({:password_base64 => Base64.encode64(ask_pass).strip}))
+    end
+
+    desc "api", "Configure the RightScale API version used by the client."
+    def api()
+      update_conf(@config.local.merge({:api_version => ask("RightScale API version (e.g. 1.5):")}))
+    end
+
+    desc "shard", "Configure the RightScale shard used by the client."
+    def shard()
+      update_conf(@config.local.merge({:api_url => "https://#{ask("RightScale shard (e.g. us-4.rightscale.com):")}"}))
+    end
+
+    desc "show", "Print the current configuration from ~/.rightscale/right_api_client.yml."
+    def show()
+      puts @config.local
+    end
+
+    desc "all", "Configure RightScale CLI."
+    def all()
+      #directives = {
+      #  :account_id => account(),
+      #  :email => user(),
+      #  :password_base64 => Base64.encode64(ask_pass).strip,
+      #  :api_url => shard(),
+      #  :api_version => api()
+      #}
+      #@logger.debug(directives)
+
+      # currently this is the lazy way, each is written sequentially
+      account()
+      user()
+      password()
+      shard()
+      api()
+      puts 'Configuration saved.'
+    end
+
+    #default_task :all
+
+    def self.banner(task, namespace = true, subcommand = false)
+      "#{basename} #{task.formatted_usage(self, true, subcommand)}"
+    end
+  end
+end

data/lib/rightscale_cli/dashboard.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 require 'thor'
-require 'yaml'
 require "net/https"
 require "uri"
 require 'rightscale_cli/logger'
@@ -24,17 +23,21 @@ require 'rightscale_cli/client'
 class RightScaleCLI
   class Dashboard < Thor
     namespace :dashboard
-    
+
+    def initialize(*args)
+      super
+      @client = RightScaleCLI::Client.new(options)
+      @logger = RightScaleCLI::Logger.new()
+    end
+
     desc "overview", "RightScale Dashboard Overview."
     def overview()
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      uri = URI.parse("#{rightscale.api_url}/acct/#{rightscale.account_id}/dashboard;overview")
+      uri = URI.parse("#{@client.client.api_url}/acct/#{@client.client.account_id}/dashboard;overview")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = Net::HTTP::Get.new(uri.request_uri)
-      request.add_field("Cookie", rightscale.last_request[:request].headers[:cookie])
+      request.add_field("Cookie", @client.client.last_request[:request].headers[:cookie])
 
       response = http.request(request)
       puts response.body
@@ -42,14 +45,12 @@ class RightScaleCLI
 
     desc "scrape", "Scrape a dashboard URL by href."
     def scrape(href)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      uri = URI.parse("#{rightscale.api_url}#{href}")
+      uri = URI.parse("#{@client.client.api_url}#{href}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = Net::HTTP::Get.new(uri.request_uri)
-      request.add_field("Cookie", rightscale.last_request[:request].headers[:cookie])
+      request.add_field("Cookie", @client.client.last_request[:request].headers[:cookie])
 
       response = http.request(request)
       puts response.body
@@ -57,14 +58,12 @@ class RightScaleCLI
 
     desc "ajax", "Scrape a dashboard URL via AJAX."
     def ajax(href)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      uri = URI.parse("#{rightscale.api_url}#{href}")
+      uri = URI.parse("#{@client.client.api_url}#{href}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = Net::HTTP::Get.new(uri.request_uri)
-      request.add_field("Cookie", rightscale.last_request[:request].headers[:cookie])
+      request.add_field("Cookie", @client.client.last_request[:request].headers[:cookie])
       request.add_field("X-Requested-With", "XMLHttpRequest")
 
       response = http.request(request)

data/lib/rightscale_cli/deployments.rb

@@ -16,8 +16,9 @@
 
 require 'thor'
 require 'yaml'
-require 'right_api_client'
-      
+require 'rightscale_cli/client'
+require 'rightscale_cli/logger'
+
 class RightScaleCLI
   class Deployments < Thor
     namespace :deployments
@@ -52,6 +53,18 @@ class RightScaleCLI
       @client.render(@client.show('deployments', deployment, 'servers'), 'servers')
     end
 
+    desc "terminate", "Terminates all servers in a deployment."
+    def terminate(deployment)
+      @client.show('deployments', deployment, 'servers').each { |server|
+        unless server['state'] == 'inactive'
+          current_instance = server['links'].select { |link| link['rel'] == 'current_instance' }.first['href']
+          cloud = current_instance.split('/')[3]
+          instance_id = current_instance.split('/').last
+          @client.client.clouds(:id => cloud).show.instances(:id => instance_id).terminate
+        end
+      }
+    end
+
     def self.banner(task, namespace = true, subcommand = false)
       "#{basename} #{task.formatted_usage(self, true, subcommand)}"
     end

data/lib/rightscale_cli/instances.rb

@@ -15,8 +15,7 @@
 # limitations under the License.
 
 require 'thor'
-require 'yaml'
-require 'right_api_client'
+require 'rightscale_cli/client'
 require 'rightscale_cli/logger'
 
 class RightScaleCLI
@@ -54,12 +53,9 @@ class RightScaleCLI
       filter.push("server_template_href==#{options[:server_template]}") if options[:server_template]
       filter.push("state==#{options[:state]}") if options[:state]
 
-      $log.debug "filter: #{filter}" if options[:debug]
+      @logger.debug "filter: #{filter}" if options[:debug]
 
-      RightApi::Client.new(RightScaleCLI::Config::API).clouds(:id => options[:cloud]).show.instances(:filter => filter).index.each { |instance|
-        instances.push(instance.raw)
-      }  
-      puts instances.to_yaml
+      @client.render(@client.clent.clouds(:id => options[:cloud]).show.instances(:filter => filter).index)
     end
 
     desc "run-exec", "Runs a chef recipe or rightscript on instances of a given cloud."
@@ -100,12 +96,10 @@ class RightScaleCLI
       filter.push("state==#{options[:state]}") if options[:state]
 
       params['filter'] = filter
-      $log.debug "filter: #{filter}" if options[:debug]
-      $log.debug "params: #{params}" if options[:debug]
+      @logger.debug "filter: #{filter}" if options[:debug]
+      @logger.debug "params: #{params}" if options[:debug]
       
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      rightscale.clouds(:id => options[:cloud]).show.instances.multi_run_executable(params)
+      @client.client.clouds(:id => options[:cloud]).show.instances.multi_run_executable(params)
     end
     
     def self.banner(task, namespace = true, subcommand = false)

data/lib/rightscale_cli/multi_cloud_images.rb

@@ -16,7 +16,6 @@
 
 require 'thor'
 require 'yaml'
-require 'right_api_client'
 require 'rightscale_cli/client'
 require 'rightscale_cli/logger'
 

data/lib/rightscale_cli/repositories.rb

@@ -15,17 +15,22 @@
 # limitations under the License.
 
 require 'thor'
-require 'right_api_client'
+require 'rightscale_cli/client'
+require 'rightscale_cli/logger'
 
 class RightScaleCLI
   class Repositories < Thor
     namespace :repositories
 
+    def initialize(*args)
+      super
+      @client = RightScaleCLI::Client.new(options)
+      @logger = RightScaleCLI::Logger.new()
+    end
+
     desc "list", "Lists all (Chef) Repositories."
     def list()
-      repositories = []
-      RightApi::Client.new(RightScaleCLI::Config::API).repositories.index.each { |repos| repositories.push(repos.raw) }  
-      RightScaleCLI::Output.render(repositories, 'repositories', options)
+      @client.render(@client.get('repositories'), 'repositories')
     end
 
     desc "create", "Creates a (Chef) Repository."
@@ -48,12 +53,12 @@ class RightScaleCLI
       puts repository if options[:verbose]
 
       $log.info "Creating RightScale repository, '#{repository['name']}'."
-      repo = RightApi::Client.new(RightScaleCLI::Config::API).repositories.create({ :repository => repository })
+      @client.client.repositories.create({ :repository => repository })
     end
 
     desc "destroy", "Deletes a (Chef) Repository."
     def destroy(id)
-      RightApi::Client.new(RightScaleCLI::Config::API).repositories.index(:id => id).destroy
+      @client.client.repositories.index(:id => id).destroy
     end
 
     def self.banner(task, namespace = true, subcommand = false)

data/lib/rightscale_cli/rightscale_cli.rb

@@ -17,6 +17,7 @@
 require 'thor'
 require 'rightscale_cli/config'
 require 'rightscale_cli/logger'
+require 'rightscale_cli/configure'
 require 'rightscale_cli/clouds'
 require 'rightscale_cli/dashboard'
 require 'rightscale_cli/deployments'
@@ -37,13 +38,25 @@ class RightScaleCLI
       :type => :string,
       :aliases => '-a',
       :required => false,
-      :desc => 'The RightScale account ID.'
+      :desc => 'RightScale account ID.'
+
+    class_option :user,
+      :type => :string,
+      :aliases => '-u',
+      :required => false,
+      :desc => 'RightScale user.'
+
+    class_option :password,
+      :type => :boolean,
+      :aliases => '-p',
+      :required => false,
+      :desc => 'RightScale user password.'
 
     class_option :api,
       :type => :string,
       :aliases => '-A',
       :required => false,
-      :desc => 'The RightScale API version.'
+      :desc => 'RightScale API version.'
 
     class_option :debug,
       :type => :boolean,
@@ -74,6 +87,7 @@ class RightScaleCLI
       :default => false,
       :desc => 'Dry-run only.'
 
+    register(Configure, 'configure', 'configure <command>', 'Configure the RightScale credentials used by the client.')
     register(Clouds, 'clouds', 'clouds <command>', 'Query clouds.')
     register(Dashboard, 'dashboard', 'dashboard <command>', 'RightScale Dashboard (HTTP hax).')
     register(ServerArrays, 'arrays', 'arrays <command>', 'Manage server arrays.')

data/lib/rightscale_cli/server_arrays.rb

@@ -15,9 +15,6 @@
 # limitations under the License.
 
 require 'thor'
-require 'yaml'
-require 'json'
-require "active_support/core_ext"
 require 'rightscale_cli/logger'
 require 'rightscale_cli/client'
 require 'rightscale_cli/server_arrays/alerts'
@@ -45,27 +42,19 @@ class RightScaleCLI
     option :deployment, :type => :string, :required => false
     option :name, :type => :string, :required => false
     def list()
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-  
       filter = []
       filter.push("cloud_href==/api/clouds/#{options[:cloud]}") if options[:cloud]
       filter.push("deployment_href==/api/deployments/#{options[:cloud]}") if options[:deployment]
       filter.push("name==#{options[:name]}") if options[:name]
 
-      $log.debug "filter: #{filter}" if options[:debug]
+      @logger.debug "filter: #{filter}" if options[:debug]
       
       server_arrays = []
-      rightscale.server_arrays.index(:filter => filter).each { |server_array|
+      @client.client.server_arrays.index(:filter => filter).each { |server_array|
         server_arrays.push(server_array.raw)
       }
 
-      if options[:xml]
-        puts server_arrays.to_xml(:root => 'server_arrays')
-      elsif options[:json]
-        puts JSON.pretty_generate(server_arrays)
-      else
-        puts server_arrays.to_yaml
-      end
+      @client.render(server_arrays, 'server_arrays')
     end
 
     desc "show", "Shows a particular server array."
@@ -75,38 +64,32 @@ class RightScaleCLI
 
     desc "state", "Shows the state of a server array."
     def state(server_array_id)
-      $log.info "Retrieving state for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      puts rightscale.server_arrays(:id => server_array_id).show.state
+      @logger.info "Retrieving state for server array, #{server_array_id}."
+      puts @client.client.server_arrays(:id => server_array_id).show.state
     end
 
     desc "instances_count", "Shows the instances count of a server array."
     def instances_count(server_array_id)
-      $log.info "Retrieving instances count for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      puts rightscale.server_arrays(:id => server_array_id).show.instances_count
+      @logger.info "Retrieving instances count for server array, #{server_array_id}."
+      puts @client.client.server_arrays(:id => server_array_id).show.instances_count
     end
 
     desc "desc", "Shows the description of a server array."
     def desc(server_array_id)
-      $log.info "Retrieving description for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      puts rightscale.server_arrays(:id => server_array_id).show.description
+      @logger.info "Retrieving description for server array, #{server_array_id}."
+      puts @client.client.server_arrays(:id => server_array_id).show.description
     end
 
     desc "name", "Shows the name of a server array."
     def name(server_array_id)
-      $log.info "Retrieving name for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      puts rightscale.server_arrays(:id => server_array_id).show.name
+      @logger.info "Retrieving name for server array, #{server_array_id}."
+      puts @client.client.server_arrays(:id => server_array_id).show.name
     end
     
     desc "api_methods", "Lists the API methods available to a server array."
     def api_methods(server_array_id)
-      $log.info "Retrieving API methods for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      server_array = rightscale.server_arrays(:id => server_array_id).show.api_methods
-      puts server_array
+      @logger.info "Retrieving API methods for server array, #{server_array_id}."
+      puts @client.client.server_arrays(:id => server_array_id).show.api_methods
     end
 
     desc "inputs", 'Update the inputs of the server array.'

data/lib/rightscale_cli/server_arrays/alert_specs.rb

@@ -20,20 +20,12 @@ class RightScaleCLI
     desc "alert_specs", "Shows a server array's alert specifications."
 
     def alert_specs(server_array_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
       alert_specs = []
-      rightscale.server_arrays(:id => server_array_id).show.alert_specs.index.each { |alert_spec|
+      @client.client.server_arrays(:id => server_array_id).show.alert_specs.index.each { |alert_spec|
         alert_specs.push(alert_spec.raw)
       }
 
-      if options[:xml]
-        puts alert_specs.to_xml(:root => 'alert_specs')
-      elsif options[:json]
-        puts JSON.pretty_generate(alert_specs)
-      else
-        puts alert_specs.to_yaml
-      end
+      @client.render(alert_specs, 'server_array')
     end
   end
 end

data/lib/rightscale_cli/server_arrays/alerts.rb

@@ -20,17 +20,7 @@ class RightScaleCLI
     desc "alerts", "Shows a server array's active alerts."
 
     def alerts(server_array_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      array_alerts = rightscale.server_arrays(:id => server_array_id).show.alerts.index
-
-      if options[:xml]
-        puts array_alerts.to_xml(:root => 'alerts')
-      elsif options[:json]
-        puts JSON.pretty_generate(array_alerts)
-      else
-        puts array_alerts.to_yaml
-      end
+      @client.render(@client.client.server_arrays(:id => server_array_id).show.alerts.index, 'alert_specs')
     end
   end
 end

data/lib/rightscale_cli/server_arrays/current_instances.rb

@@ -35,11 +35,7 @@ class RightScaleCLI
     option :state, :desc => 'The state of Instances to filter on.', :type => :string, :required => false
 
     def instances(server_array_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      array_instances = []
       filter = []
-
       filter.push("datacenter_href==#{options[:datacenter]}") if options[:datacenter]
       filter.push("deployment_href==#{options[:deployment]}") if options[:deployment]
       filter.push("name==#{options[:private_ip]}") if options[:name]
@@ -53,13 +49,14 @@ class RightScaleCLI
       filter.push("server_template_href==#{options[:server_template]}") if options[:server_template]
       filter.push("state==#{options[:state]}") if options[:state]
 
-      $log.debug "filter: #{filter}" if options[:debug]
+      @logger.debug "filter: #{filter}" if options[:debug]
 
-      rightscale.server_arrays(:id => server_array_id).show.current_instances(:filter => filter).index.each { |array_instance|
+      array_instances = []
+      @client.client.server_arrays(:id => server_array_id).show.current_instances(:filter => filter).index.each { |array_instance|
         array_instances.push(array_instance.raw)
       }
 
-      RightScaleCLI::Output.render(array_instances, 'array_instances', options)
+      @client.render(array_instances, 'array_instances')
     end
   end
 end

data/lib/rightscale_cli/server_arrays/elasticity_params.rb

@@ -20,9 +20,8 @@ class RightScaleCLI
     desc "params", "Lists the elasticity parameters for a server array."
 
     def params(server_array_id)
-      $log.info "Retrieving elasticity parameters for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      puts rightscale.server_arrays(:id => server_array_id).show.elasticity_params.to_yaml
+      @logger.info "Retrieving elasticity parameters for server array, #{server_array_id}."
+      @client.render(@client.client.server_arrays(:id => server_array_id).show.elasticity_params, 'server_array')
     end
   end
 end

data/lib/rightscale_cli/server_arrays/links.rb

@@ -14,17 +14,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'rightscale_cli/client'
 require 'rightscale_cli/logger'
 
 class RightScaleCLI
   class ServerArrays < Thor
 
+    def initialize(*args)
+      super
+      @client = RightScaleCLI::Client.new(options)
+      @logger = RightScaleCLI::Logger.new()
+    end
+    
     desc "links", "Lists the links for a server array."
 
     def links(server_array_id)
-      $log.info "Retrieving links for server array, #{server_array_id}."
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      puts rightscale.server_arrays(:id => server_array_id).show.links.to_yaml
+      @logger.info "Retrieving links for server array, #{server_array_id}."
+      @client.render(@client.client.server_arrays(:id => server_array_id).show.links, 'links')
     end
   end
 end

data/lib/rightscale_cli/server_arrays/multi_run_executable.rb

@@ -20,8 +20,6 @@ class RightScaleCLI
     desc "run_exec", "Runs a RightScript or Chef recipe on the array instances."
 
     def run_exec(server_array_id, exec_type, exec_identifier)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
       params = {}
 
       if exec_type == 'recipe'
@@ -30,10 +28,10 @@ class RightScaleCLI
         params['right_script_href'] = "/api/right_scripts/#{exec_identifier}"
       end
       
-      server_array = rightscale.server_arrays(:id => server_array_id)
+      server_array = @client.client.server_arrays(:id => server_array_id)
 
-      $log.info "params: #{params}" if options[:debug]
-      $log.info "Running executable on server array."
+      @logger.info "params: #{params}" if options[:debug]
+      @logger.info "Running executable on server array."
 
       server_array.multi_run_executable(params)
     end

data/lib/rightscale_cli/server_templates.rb

@@ -25,68 +25,44 @@ class RightScaleCLI
   class ServerTemplates < Thor
     namespace :server_templates
 
+    def initialize(*args)
+      super
+      @client = RightScaleCLI::Client.new(options)
+      @logger = RightScaleCLI::Logger.new()
+    end
+
     # include render options
     eval(IO.read("#{File.dirname(File.expand_path(__FILE__))}/render_options.rb"), binding)
     
     desc "list", "Lists ServerTemplates."
     def list()
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      server_templates = []
-      rightscale.server_templates.index.each { |server_template|
-        server_templates.push(server_template.raw)
-      }
-
-      if options[:xml]
-        puts server_templates.to_xml(:root => 'server_templates')
-      elsif options[:json]
-        puts JSON.pretty_generate(server_templates)
-      else
-        puts server_templates.to_yaml
-      end
+      @client.render(@client.get('server_templates'), 'server_templates')
     end
     
     desc "show", "Shows a ServerTemplate."
     def show(server_template_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      server_template = rightscale.server_templates(:id => server_template_id).show.raw
-
-      if options[:xml]
-        puts server_template.to_xml(:root => 'server_template')
-      elsif options[:json]
-        puts JSON.pretty_generate(server_template)
-      else
-        puts server_template.to_yaml
-      end
+      @client.render(@client.show('server_templates', server_template_id), 'server_template')
     end
 
     desc "inputs", "Shows a ServerTemplate's inputs."
     def inputs(server_template_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      server_template_inputs = []      
-      rightscale.server_templates(:id => server_template_id).show.inputs.index.each { |input| server_template_inputs.push(input.raw) }
-
-      if options[:xml]
-        puts server_template_inputs.to_xml(:root => 'server_template')
-      elsif options[:json]
-        puts JSON.pretty_generate(server_template_inputs)
-      else
-        puts server_template_inputs.to_yaml
+      server_template_inputs = []
+      @client.client.server_templates(:id => server_template_id).show.inputs.index.each do |input|
+        server_template_inputs.push(input.raw)
       end
+      @client.render(server_template_inputs, 'inputs')
     end
     
     desc "inputs_dashboard", "Inputs scraped from dashboard."
     def inputs_dashboard(server_template_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      uri = URI.parse("#{rightscale.api_url}/acct/#{rightscale.account_id}/inputs/edit_inputs?container_id=#{server_template_id}&container_type=ServerTemplate")
+      uri = URI.parse("#{@client.client.api_url}/acct/#{@client.client.account_id}/inputs/edit_inputs?container_id=#{server_template_id}&container_type=ServerTemplate")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = Net::HTTP::Get.new(uri.request_uri)
-      request.add_field("Referer", "#{rightscale.api_url}/acct/#{rightscale.account_id}/server_templates/#{server_template_id}")
+      request.add_field("Referer", "#{@client.client.api_url}/acct/#{@client.client.account_id}/server_templates/#{server_template_id}")
       request.add_field("X-Requested-With", "XMLHttpRequest")
-      request.add_field("Cookie", rightscale.last_request[:request].headers[:cookie])
+      request.add_field("Cookie", @client.client.last_request[:request].headers[:cookie])
       response = http.request(request)
       puts response.body if options[:debug]
 
@@ -104,13 +80,7 @@ class RightScaleCLI
         inputs.push(input)
       }
 
-      if options[:xml]
-        puts inputs.to_xml(:root => 'inputs')
-      elsif options[:json]
-        puts JSON.pretty_generate(inputs)
-      else
-        puts inputs.to_yaml
-      end
+      @client.render(inputs, 'inputs')
     end
   end
 end

data/lib/rightscale_cli/tags.rb

@@ -34,8 +34,9 @@ class RightScaleCLI
     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."
-    def search()
-      # todo
+    def search(resource_type, tag)
+      #@client.render(@client.client.tags.by_tag({:resource_type => resource_type, :tags => [ tag ]}), 'servers')
+      puts @client.client.tags.by_tag({:resource_type => resource_type, :tags => [ tag ]}).count
     end
 
     desc "resource", "Get tags for a list of resource hrefs."
@@ -45,12 +46,12 @@ class RightScaleCLI
 
     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)."
     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)

data/lib/rightscale_cli/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 class RightScaleCLI
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/rightscale_cli/volumes.rb

@@ -15,9 +15,6 @@
 # limitations under the License.
 
 require 'thor'
-require 'yaml'
-require 'json'
-require "active_support/core_ext"
 require 'rightscale_cli/logger'
 require 'rightscale_cli/client'
 
@@ -25,6 +22,12 @@ class RightScaleCLI
   class Volumes < Thor
     namespace :volumes
 
+    def initialize(*args)
+      super
+      @client = RightScaleCLI::Client.new(options)
+      @logger = RightScaleCLI::Logger.new()
+    end
+
     # include render options
     eval(IO.read("#{File.dirname(File.expand_path(__FILE__))}/render_options.rb"), binding)
     
@@ -35,31 +38,28 @@ class RightScaleCLI
     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()
-      volumes = []      
       filter = []
-
       filter.push("datacenter_href==/api/clouds/#{options[:cloud]}/datacenters/#{options[:datacenter]}") if options[:datacenter]
       filter.push("description==#{options[:description]}") if options[:description]
       filter.push("name==#{options[:name]}") if options[:name]
       filter.push("parent_volume_snapshot_href==#{options[:parent]}") if options[:parent]
       filter.push("resource_uid==#{options[:resource_uid]}") if options[:resource_uid]
 
-      $log.debug "filter: #{filter}" if options[:debug]
+      @logger.debug "filter: #{filter}" if options[:debug]
 
-      RightApi::Client.new(RightScaleCLI::Config::API).clouds(:id => options[:cloud]).show.volumes(:filter => filter).index.each { |volume|
+      volumes = []
+      @client.client.clouds(:id => options[:cloud]).show.volumes(:filter => filter).index.each { |volume|
         volumes.push(volume.raw)
       }
 
-      RightScaleCLI::Output.render(volumes, 'volumes', options)
+      @client.render(volumes, 'volumes')
     end
 
     desc "show", "Shows a volume."
     option :cloud, :desc => "The cloud to query for volumes in.", :type => :string, :required => true
     def show(volume_id)
-      volume = RightApi::Client.new(RightScaleCLI::Config::API).clouds(:id => options[:cloud]).show.volumes(:id => volume_id).show.raw
-      RightScaleCLI::Output.render(volume, 'volume', options)
+      @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)

data/lib/templates/right_api_client.yml.erb

@@ -0,0 +1,35 @@
+# The API login details can be put in a YAML file. This is an example login.yml which
+# will be needed for login_to_client_irb.rb quick login method.
+
+# Account ID is a required parameter. You can find your account number by logging into the
+# RightScale dashboard (https://my.rightscale.com), navigate to the Settings > Account Settings page.
+# The account number is at the end of the browser address bar.
+: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.
+:email: <%= directives[:email] %>
+:password_base64: <%= directives[:password_base64] %>
+
+# 1. Use the following parameters to login with your email and plaintext password:
+#:email: <%= directives[:email] %>
+#:password: my_password
+
+# 2. Use the following parameter to login with an instance_token:
+# To find the instance_token, launch a server, navigate to the info page and under
+# User Data box, you will see RS_API_TOKEN = your_account_id:the_instance_token
+#:instance_token: my_instance_token
+
+# 3. Use the following parameter to send a pre-authenticated cookie with every request:
+#:cookies: my_cookie_string
+
+# 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
+
+# The following are optional parameters:
+:api_url: <%= directives[:api_url] %>
+:api_version: <%= directives[:api_version] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rightscale-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Fordham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -104,10 +104,12 @@ files:
 - LICENSE
 - README.md
 - bin/rs
+- lib/ask_pass.rb
 - lib/rightscale_cli.rb
 - lib/rightscale_cli/client.rb
 - lib/rightscale_cli/clouds.rb
 - lib/rightscale_cli/config.rb
+- lib/rightscale_cli/configure.rb
 - lib/rightscale_cli/dashboard.rb
 - lib/rightscale_cli/deployments.rb
 - lib/rightscale_cli/instances.rb
@@ -130,6 +132,7 @@ files:
 - lib/rightscale_cli/tags.rb
 - lib/rightscale_cli/version.rb
 - lib/rightscale_cli/volumes.rb
+- lib/templates/right_api_client.yml.erb
 - lib/yesno.rb
 homepage: https://github.com/flaccid/rightscale-cli
 licenses: