rightscale-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9731067ddae5d72c5f362abb7e0b35b51a549978
-  data.tar.gz: 9fc0433996190ff469911813204e89ecdadfb792
+  metadata.gz: cff866f57fce9ced5a2dd94da17a19047c963e9f
+  data.tar.gz: 3649dc2421f581ecf8f2a4ae807a18732014501c
 SHA512:
-  metadata.gz: 598196162d973d27e094c94c19d71a703970e4bc48c3bdb1853cc19c198650f5ef218ca183679e63875c73761b525dc62801a82e028b33d5d0e6cb6a08f5df52
-  data.tar.gz: bb671f3665f19f82302535a930c6358386a5b1d2b4d438ce9d1b4e4cd0da6ffc8103a9fa7ef0495686cad6261f409f125c28a76e70107ad4083a5d9933982ceb
+  metadata.gz: ca0028e8910348c4be6c24f8b860908f44646646c67220dcf63478a7252f499ae7517918d44759634c8dbbc127d3883fb99e4ee2e29087f9fbbffe30038a52e8
+  data.tar.gz: a49994234187dca2298bb12218a4fbccc2c46ea20867719965de0c8440e3fe194555a20ddb1494527558eb35290a69eb173aed779d346dc160937e6b9693a738

data/lib/rightscale_cli/clouds.rb

@@ -18,7 +18,6 @@ require 'thor'
 require 'yaml'
 require 'json'
 require "active_support/core_ext"
-require 'rightscale_cli/logger'
 
 class RightScaleCLI
   class Clouds < Thor
@@ -28,6 +27,9 @@ class RightScaleCLI
     def list()
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
       clouds = []
+
+      $log.info "Retrieving all clouds from #{rightscale.account_id}."
+
       rightscale.clouds.index.each { |cloud|
         clouds.push(cloud.raw)
       }  
@@ -46,14 +48,13 @@ class RightScaleCLI
     option :cloud_type, :type => :string, :required => false
     option :description, :type => :string, :required => false
     def search()
-      log = CLILogger.new
 
       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!")
+      $log.info "Searching for clouds!"
 
       puts "filter: #{filter}" if options[:debug]
       

data/lib/rightscale_cli/deployments.rb

@@ -22,10 +22,8 @@ class RightScaleCLI
   class Deployments < Thor
     namespace :deployments
     
-    desc "show", "Lists all deployments."
-    def show()
-      option :xml, :type => :boolean, :default => false, :aliases => '-X', :desc => 'Return XML.'
-      
+    desc "list", "Lists all deployments."
+    def list()
       deployments = Array.new
       RightApi::Client.new(RightScaleCLI::Config::API).deployments.index.each { |deployment|
         deployments.push(deployment.raw)

data/lib/rightscale_cli/instances.rb

@@ -0,0 +1,115 @@
+# 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 'right_api_client'
+require 'rightscale_cli/logger'
+
+class RightScaleCLI
+  class Instances < Thor
+    namespace :instances
+
+    desc "list", "Lists all instances for a given cloud."
+    option :cloud, :desc => 'The cloud to filter on.', :type => :string, :required => true
+    option :datacenter, :desc => 'The href of the datacenter to filter on', :type => :string, :required => false
+    option :deployment, :desc =>  'The href of the deployment to filter on.', :type => :string, :required => false
+    option :name, :desc => 'Name of the Instance to filter on.', :type => :string, :required => false
+    option :os, :desc => 'The OS platform to filter on.', :type => :string, :required => false
+    option :parent, :desc => 'The href of the parent to filter on.', :type => :string, :required => false
+    option :private_dns => 'The private dns name to filter on.', :type => :string, :required => false
+    option :private_ip, :desc => 'The private ip address to filter on.', :type => :string, :required => false
+    option :public_dns, :desc => 'The public dns name to filter on.', :type => :string, :required => false
+    option :public_ip, :desc => 'The public ip address to filter on.', :type => :string, :required => false
+    option :resource_uid, :desc => 'Resource Unique IDentifier for the Instance to filter on.', :type => :string, :required => false
+    option :server_template, :desc => 'The href of the ServerTemplate to filter on.', :type => :string, :required => false
+    option :state, :desc => 'The state of Instances to filter on.', :type => :string, :required => false
+    def list()
+      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]
+      filter.push("os_platform==#{options[:os]}") if options[:os]
+      filter.push("parent_href==#{options[:parent]}") if options[:parent]
+      filter.push("private_dns_name==#{options[:private_dns]}") if options[:private_dns]
+      filter.push("private_ip_address==#{options[:private_ip]}") if options[:private_ip]
+      filter.push("public_dns==#{options[:public_dns]}") if options[:public_dns]
+      filter.push("public_ip_address==#{options[:public_ip]}") if options[:public_ip]
+      filter.push("resource_uid==#{options[:resource_uid]}") if options[:resource_uid]
+      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]
+
+      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
+    end
+
+    desc "run-exec", "Runs a chef recipe or rightscript on instances of a given cloud."
+    option :cloud, :desc => 'The cloud to filter on.', :type => :string, :required => true
+    option :datacenter, :desc => 'The href of the datacenter to filter on', :type => :string, :required => false
+    option :deployment, :desc =>  'The href of the deployment to filter on.', :type => :string, :required => false
+    option :name, :desc => 'Name of the Instance to filter on.', :type => :string, :required => false
+    option :os, :desc => 'The OS platform to filter on.', :type => :string, :required => false
+    option :parent, :desc => 'The href of the parent to filter on.', :type => :string, :required => false
+    option :private_dns => 'The private dns name to filter on.', :type => :string, :required => false
+    option :private_ip, :desc => 'The private ip address to filter on.', :type => :string, :required => false
+    option :public_dns, :desc => 'The public dns name to filter on.', :type => :string, :required => false
+    option :public_ip, :desc => 'The public ip address to filter on.', :type => :string, :required => false
+    option :resource_uid, :desc => 'Resource Unique IDentifier for the Instance to filter on.', :type => :string, :required => false
+    option :server_template, :desc => 'The href of the ServerTemplate to filter on.', :type => :string, :required => false
+    option :state, :desc => 'The state of Instances to filter on.', :type => :string, :required => false
+    def run_exec(exec_type, exec_identifier)
+      params = {}
+      filter = []
+
+      if exec_type == 'recipe'
+        params['recipe_name'] = exec_identifier
+      elsif exec_type == 'rightscript'
+        params['right_script_href'] = "/api/right_scripts/#{exec_identifier}"
+      end
+
+      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]
+      filter.push("os_platform==#{options[:os]}") if options[:os]
+      filter.push("parent_href==#{options[:parent]}") if options[:parent]
+      filter.push("private_dns_name==#{options[:private_dns]}") if options[:private_dns]
+      filter.push("private_ip_address==#{options[:private_ip]}") if options[:private_ip]
+      filter.push("public_dns==#{options[:public_dns]}") if options[:public_dns]
+      filter.push("public_ip_address==#{options[:public_ip]}") if options[:public_ip]
+      filter.push("resource_uid==#{options[:resource_uid]}") if options[:resource_uid]
+      filter.push("server_template_href==#{options[:server_template]}") if options[:server_template]
+      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]
+      
+      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
+
+      rightscale.clouds(:id => options[:cloud]).show.instances.multi_run_executable(params)
+    end
+    
+    def self.banner(task, namespace = true, subcommand = false)
+      "#{basename} #{task.formatted_usage(self, true, subcommand)}"
+    end
+  end
+end

data/lib/rightscale_cli/logger.rb

@@ -16,124 +16,19 @@
 
 require 'logger'
 
-class RightScaleCLI
-  # A Logger instance that gives better control of messaging the user
-  # and logging app activity.  At it's most basic, you would use <tt>info</tt>
-  # as a replacement for +puts+ and <tt>error</tt> as a replacement
-  # for <tt>STDERR.puts</tt>.  Since this is a logger, however, you
-  # can also use #debug, #warn, and #fatal, and you can control
-  # the format and "logging level" as such.
-  #
-  # So, by default:
-  # * debug messages do not appear anywhere
-  # * info messages appear on the standard output
-  # * warn, error, and fatal messagse appear on the standard error
-  # * The default format of messages is simply the message, no logging cruft, however if your output
-  #   is redirected to a file, a better timestamped logging format is used
-  #
-  # You can customize this in several ways:
-  # 
-  # * You can override the devices used by passing different devices to the constructor
-  # * You can adjust the level of message that goes to the error logger via error_level=
-  # * You can adjust the format for messages to the error logger separately via error_formatter=
-  #
-  # === Example
-  #
-  #     logger = CLILogger.new
-  #     logger.debug("Starting up") # => only the standard output gets this
-  #     logger.warn("careful!") # => only the standard error gets this
-  #     logger.error("Something went wrong!") # => only the standard error gets this
-  #
-  #     logger = CLILogger.new
-  #     logger.error_level = Logger::ERROR
-  #     logger.debug("Starting up") # => only the standard output gets this
-  #     logger.warn("careful!") # => only the standard OUTPUT gets this
-  #     logger.error("Something went wrong!") # => only the standard error gets this
-  #     
-  #     logger = CLILogger.new('logfile.txt')
-  #     logger.debug("Starting up") # => logfile.txt gets this
-  #     logger.error("Something went wrong!") # => BOTH logfile.txt AND the standard error get this
-  class CLILogger < Logger
-    BLANK_FORMAT = proc { |severity,datetime,progname,msg|
-      msg + "\n"
-    }
-
-    # Helper to proxy methods to the super class AND to the internal error logger
-    # 
-    # +symbol+:: Symbol for name of the method to proxy
-    def self.proxy_method(symbol) #:nodoc:
-      old_name = "old_#{symbol}".to_sym
-      alias_method old_name,symbol
-      define_method symbol do |*args,&block|
-        send(old_name,*args,&block)
-        @stderr_logger.send(symbol,*args,&block)
-      end
-    end
-
-    proxy_method :'formatter='
-    proxy_method :'datetime_format='
-
-    def add(severity, message = nil, progname = nil, &block) #:nodoc:
-      if @split_logs 
-        unless severity >= @stderr_logger.level
-          super(severity,message,progname,&block)
-        end
-      else
-        super(severity,message,progname,&block)
-      end
-      @stderr_logger.add(severity,message,progname,&block)
-    end
-   
-    DEFAULT_ERROR_LEVEL = Logger::Severity::WARN
-
-    # A logger that logs error-type messages to a second device; useful
-    # for ensuring that error messages go to standard error.  This should be
-    # pretty smart about doing the right thing.  If both log devices are
-    # ttys, e.g. one is going to standard error and the other to the standard output,
-    # messages only appear once in the overall output stream.  In other words,
-    # an ERROR logged will show up *only* in the standard error.  If either
-    # log device is NOT a tty, then all messages go to +log_device+ and only
-    # errors go to +error_device+
-    #
-    # +log_device+:: device where all log messages should go, based on level
-    # +error_device+:: device where all error messages should go.  By default, this is Logger::Severity::WARN
-    def initialize(log_device=$stdout,error_device=$stderr)
-      super(log_device)
-      @stderr_logger = Logger.new(error_device)
-
-      @split_logs = log_device.tty? && error_device.tty?
-
-      self.level = Logger::Severity::INFO
-      @stderr_logger.level = DEFAULT_ERROR_LEVEL
-
-      self.formatter = BLANK_FORMAT if log_device.tty?
-      @stderr_logger.formatter = BLANK_FORMAT if error_device.tty?
-    end
-
-    def level=(level)
-      super(level)
-      current_error_level = @stderr_logger.level
-      if (level > DEFAULT_ERROR_LEVEL) && @split_logs
-        @stderr_logger.level = level
-      end
-    end
-
-    # Set the threshold for what messages go to the error device.  Note that calling
-    # #level= will *not* affect the error logger *unless* both devices are TTYs.
-    #
-    # +level+:: a constant from Logger::Severity for the level of messages that should go
-    #           to the error logger
-    def error_level=(level)
-      @stderr_logger.level = level
-    end
-
-    # Overrides the formatter for the error logger.  A future call to #formatter= will
-    # affect both, so the order of the calls matters.
-    #
-    # +formatter+:: Proc that handles the formatting, the same as for #formatter=
-    def error_formatter=(formatter)
-      @stderr_logger.formatter=formatter
+unless defined? $log
+  log_init_msg = 'Initializing Logging using '
+  if ENV['RIGHT_API_CLIENT_LOG']
+    if File.exists?(ENV['RIGHT_API_CLIENT_LOG'])
+      file = File.open(ENV['RIGHT_API_CLIENT_LOG'], File::WRONLY | File::APPEND)
+    else
+      file = ENV['RIGHT_API_CLIENT_LOG']
     end
-
+    $log = Logger.new(file)
+    log_init_msg += ENV['RIGHT_API_CLIENT_LOG']
+  else
+    $log = Logger.new(STDOUT)
+    log_init_msg += 'STDOUT'
   end
-end
+  $log.info log_init_msg
+end

data/lib/rightscale_cli/rightscale_cli.rb

@@ -19,6 +19,7 @@ require 'rightscale_cli/output'
 require 'rightscale_cli/clouds'
 require 'rightscale_cli/dashboard'
 require 'rightscale_cli/deployments'
+require 'rightscale_cli/instances'
 require 'rightscale_cli/servers'
 require 'rightscale_cli/server_arrays'
 require 'rightscale_cli/server_templates'
@@ -37,6 +38,7 @@ class RightScaleCLI
     register(Dashboard, 'dashboard', 'dashboard <command>', 'RightScale Dashboard (HTTP hax).')
     register(ServerArrays, 'arrays', 'arrays <command>', 'Manage server arrays.')
     register(Deployments, 'deployments', 'deployments <command>', 'Manage deployments.')
+    register(Instances, 'instances', 'instances <command>', 'Manage instances.')
     register(Servers, 'servers', 'servers <command>', 'Manage servers.')
     register(ServerTemplates, 'server_templates', 'server-templates <command>', 'Manage ServerTemplates.')
   end

data/lib/rightscale_cli/server_arrays.rb

@@ -39,7 +39,6 @@ class RightScaleCLI
     option :deployment, :type => :string, :required => false
     option :name, :type => :string, :required => false
     def list()
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
   
       filter = []
@@ -47,7 +46,7 @@ class RightScaleCLI
       filter.push("deployment_href==/api/deployments/#{options[:cloud]}") if options[:deployment]
       filter.push("name==#{options[:name]}") if options[:name]
 
-      log.info "filter: #{filter}" if options[:debug]
+      $log.debug "filter: #{filter}" if options[:debug]
       
       server_arrays = []
       rightscale.server_arrays.index(:filter => filter).each { |server_array|
@@ -65,7 +64,6 @@ class RightScaleCLI
 
     desc "show", "Shows a server array."
     def show(server_array_id)
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
 
       server_array = rightscale.server_arrays(:id => server_array_id).show.raw
@@ -81,40 +79,35 @@ class RightScaleCLI
     
     desc "state", "Shows the state of a server array."
     def state(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving state for server array, #{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
     end
 
     desc "instances_count", "Shows the instances count of a server array."
     def instances_count(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving instances count for server array, #{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
     end
 
     desc "desc", "Shows the description of a server array."
     def desc(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving description for server array, #{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
     end
 
     desc "name", "Shows the name of a server array."
     def name(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving name for server array, #{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
     end
     
     desc "api_methods", "Lists the API methods available to a server array."
     def api_methods(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving API methods for server array, #{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

data/lib/rightscale_cli/server_arrays/current_instances.rb

@@ -35,7 +35,6 @@ class RightScaleCLI
     option :state, :desc => 'The state of Instances to filter on.', :type => :string, :required => false
 
     def instances(server_array_id)
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
 
       array_instances = []
@@ -54,7 +53,7 @@ class RightScaleCLI
       filter.push("server_template_href==#{options[:server_template]}") if options[:server_template]
       filter.push("state==#{options[:state]}") if options[:state]
 
-      log.info "filter: #{filter}" if options[:debug]
+      $log.debug "filter: #{filter}" if options[:debug]
 
       rightscale.server_arrays(:id => server_array_id).show.current_instances(:filter => filter).index.each { |array_instance|
         array_instances.push(array_instance.raw)

data/lib/rightscale_cli/server_arrays/elasticity_params.rb

@@ -20,8 +20,7 @@ class RightScaleCLI
     desc "params", "Lists the elasticity parameters for a server array."
 
     def params(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving elasticity parameters for server array, #{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
     end

data/lib/rightscale_cli/server_arrays/links.rb

@@ -14,14 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'rightscale_cli/logger'
+
 class RightScaleCLI
   class ServerArrays < Thor
 
     desc "links", "Lists the links for a server array."
 
     def links(server_array_id)
-      log = CLILogger.new
-      log.info "Retrieving links for server array, #{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
     end

data/lib/rightscale_cli/server_arrays/multi_run_executable.rb

@@ -20,7 +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)
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
 
       params = {}
@@ -33,8 +32,8 @@ class RightScaleCLI
       
       server_array = rightscale.server_arrays(:id => server_array_id)
 
-      log.info "params: #{params}" if options[:debug]
-      log.info "Running executable on server array."
+      $log.info "params: #{params}" if options[:debug]
+      $log.info "Running executable on server array."
 
       server_array.multi_run_executable(params)
     end

data/lib/rightscale_cli/server_templates.rb

@@ -30,7 +30,6 @@ class RightScaleCLI
     
     desc "list", "Lists ServerTemplates."
     def list()
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
       server_templates = []
       rightscale.server_templates.index.each { |server_template|
@@ -48,7 +47,6 @@ class RightScaleCLI
     
     desc "show", "Shows a ServerTemplate."
     def show(server_template_id)
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
 
       server_template = rightscale.server_templates(:id => server_template_id).show.raw
@@ -64,7 +62,6 @@ class RightScaleCLI
 
     desc "inputs", "Shows a ServerTemplate's inputs."
     def inputs(server_template_id)
-      log = CLILogger.new
       rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
 
       server_template_inputs = []      

data/lib/rightscale_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rightscale-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Fordham
@@ -107,6 +107,7 @@ files:
 - lib/rightscale_cli/rightscale_cli.rb
 - lib/rightscale_cli/monkey_patches/client_attributes.rb
 - lib/rightscale_cli/output.rb
+- lib/rightscale_cli/instances.rb
 - lib/rightscale_cli/client.rb
 - lib/rightscale_cli/version.rb
 - lib/rightscale_cli/server_templates.rb