rightscale-cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4bb058deb48db44d302717cb5975b254c4d4914
-  data.tar.gz: 5e826a2b5d6a6b68823a61dde906f36f47cace1b
+  metadata.gz: 8d2ce2baf29c81d2b85a867713659c964d26f890
+  data.tar.gz: 35ae05487225b689a25e6c8b709e487ce02504b7
 SHA512:
-  metadata.gz: 2f16f06941398b9ad84b3f06121879c549e67dc532195c411cb34af7ca469b097077089438382edead30d7cddf728325c48b9ce07975a15c4ce2f674eef103e0
-  data.tar.gz: 2747385386f8dedd7863e41512e164f8c7684da80fad870a9170c5aa24b3ebf2a7cea9a2344d045381741dd76dafd9e5970f356af709c09d2bfd20f1764b0957
+  metadata.gz: 7ee7e7330c4a4b1aa5be4cf4a11d56156398462b8e14cdfdb0eb7e0bc4935d451a27c73d89a342efbf3c7824bc80a7aeaa5272b7cae602f3b8371fe1baf6c39e
+  data.tar.gz: d706e6fc89434481e328bbcd6cfec740abc74b001e16c415871d2997fe59bb2ad96f075fb2d8134d2bdeb4ec9e906f3368e8d43582f0ed8c8329c41612818365

data/README.md

@@ -25,7 +25,7 @@ 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 is for your account is set with `:api_url`.
+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.
 

data/lib/rightscale_cli/client.rb

@@ -20,10 +20,16 @@ require 'rightscale_cli/logger'
 
 class RightScaleCLI
   class Client
+    attr_accessor :client
     attr_accessor :render
     
-    def initialize(*args)
-      @client = RightApi::Client.new(RightScaleCLI::Config::API)
+    def initialize(options)
+      config = RightScaleCLI::Config::API
+      config[:account_id] = options['account'] if options[:account]
+      config[:api_version] = options['api'] if options[:api]
+
+      @options = options
+      @client = RightApi::Client.new(config)
       @logger = RightScaleCLI::Logger.new()
     end
 
@@ -35,6 +41,20 @@ class RightScaleCLI
       return result
     end
 
+    def show(resource, resource_id, *args)
+      if args.count > 0
+        result = []
+        records = @client.send(resource).index({ :id => resource_id }).show.send(args[0]).index
+        records.each { |record|
+          result.push(record.raw)
+        }
+        @logger.info("Resource count: #{result.count}.")
+      else
+        result = @client.send(resource).index({ :id => resource_id }).show.raw
+      end
+      return result 
+    end
+
     def create(resource, params)
       resource = @client.send("#{resource}s").create(resource => params)
       @logger.info("Created #{resource.href}.")
@@ -46,8 +66,8 @@ class RightScaleCLI
       @logger.info("Deleted #{resource.href}.")
     end
 
-    def render(data, root_element, options)
-      RightScaleCLI::Output.render(data, root_element, options)
+    def render(data, root_element)
+      RightScaleCLI::Output.render(data, root_element, @options)
     end
   end
 end

data/lib/rightscale_cli/deployments.rb

@@ -21,29 +21,35 @@ require 'right_api_client'
 class RightScaleCLI
   class Deployments < Thor
     namespace :deployments
-    
+
+    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 all deployments."
     def list()
-      deployments = Array.new
-      RightApi::Client.new(RightScaleCLI::Config::API).deployments.index.each { |deployment|
-        deployments.push(deployment.raw)
-      }  
-      puts deployments.to_yaml
+      @client.render(@client.get('deployments'), 'deployments')
     end
 
     desc "create", "Creates a deployment."
-    def create(name)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
+    def create(name, description)
+      @client.create('deployment', { :name => name, :description => description })
     end
 
     desc "destroy", "Deletes a deployment."
-    def destroy(deployment)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      
-      # construct deployment
-      deployment = Hash.new
-      rightscale.deployments.delete({:deployment => deployment})
+    def destroy(deployment_id)
+      @client.destroy('deployment', deployment_id)
+    end
+
+    desc "servers", "Lists servers in a deployment."
+    def servers(deployment)
+      @logger.info("Retrieving all servers in deployment, #{deployment}...")
+      @client.render(@client.show('deployments', deployment, 'servers'), 'servers')
     end
 
     def self.banner(task, namespace = true, subcommand = false)

data/lib/rightscale_cli/multi_cloud_images.rb

@@ -26,7 +26,7 @@ class RightScaleCLI
 
     def initialize(*args)
       super
-      @client = RightScaleCLI::Client.new()
+      @client = RightScaleCLI::Client.new(options)
       @logger = RightScaleCLI::Logger.new()
     end
 
@@ -36,9 +36,14 @@ class RightScaleCLI
     desc "list", "Lists all MultiCloud Images."
     def list()
       @logger.info('Retrieving all MultiCloud Images...')
-      @client.render(@client.get('multi_cloud_images'), 'multi_cloud_images', options)
+      @client.render(@client.get('multi_cloud_images'), 'multi_cloud_images')
     end
 
+    desc "show", "Shows a particular MultiCloud Image."
+    def show(multi_cloud_image_id)
+      @client.render(@client.show('multi_cloud_images', multi_cloud_image_id), 'multi_cloud_image')
+    end
+    
     desc "create", "Creates a MultiCloud Image."
     def create(name, description)
       @client.create('multi_cloud_image', { :name => name, :description => description })

data/lib/rightscale_cli/rightscale_cli.rb

@@ -26,18 +26,54 @@ require 'rightscale_cli/repositories'
 require 'rightscale_cli/servers'
 require 'rightscale_cli/server_arrays'
 require 'rightscale_cli/server_templates'
+require 'rightscale_cli/tags'
 require 'rightscale_cli/volumes'
 
 # http://stackoverflow.com/questions/5663519/namespacing-thor-commands-in-a-standalone-ruby-executable
 
 class RightScaleCLI
   class Base < Thor
-    class_option :debug,:type => :boolean, :default => false, :aliases => '-D', :desc => 'Debug mode.'
-    class_option :verbose, :type => :boolean, :default => false, :aliases => '-V', :desc => 'Verbose output.'
-    class_option :silent, :type => :boolean, :default => false, :aliases => '-S', :desc => 'Silent mode, do not print any log.'
-    class_option :non_interactive, :type => :boolean, :default => false, :aliases => '-N', :desc => 'Non-interactive mode.'
-    class_option :dry, :type => :boolean, :default => false, :desc => 'Dry-run only.'
-    
+    class_option :account,
+      :type => :string,
+      :aliases => '-a',
+      :required => false,
+      :desc => 'The RightScale account ID.'
+
+    class_option :api,
+      :type => :string,
+      :aliases => '-A',
+      :required => false,
+      :desc => 'The RightScale API version.'
+
+    class_option :debug,
+      :type => :boolean,
+      :default => false,
+      :aliases => '-D',
+      :desc => 'Debug mode.'
+
+    class_option :verbose,
+      :type => :boolean,
+      :default => false,
+      :aliases => '-V',
+      :desc => 'Verbose output.'
+
+    class_option :silent,
+      :type => :boolean,
+      :default => false,
+      :aliases => '-S',
+      :desc => 'Silent mode, do not print any log.'
+
+    class_option :non_interactive,
+      :type => :boolean,
+      :default => false,
+      :aliases => '-N',
+      :desc => 'Non-interactive mode.'
+
+    class_option :dry,
+      :type => :boolean,
+      :default => false,
+      :desc => 'Dry-run only.'
+
     register(Clouds, 'clouds', 'clouds <command>', 'Query clouds.')
     register(Dashboard, 'dashboard', 'dashboard <command>', 'RightScale Dashboard (HTTP hax).')
     register(ServerArrays, 'arrays', 'arrays <command>', 'Manage server arrays.')
@@ -47,6 +83,7 @@ class RightScaleCLI
     register(Repositories, 'repositories', 'repositories <command>', 'Manage (Chef) Repositories.')
     register(Servers, 'servers', 'servers <command>', 'Manage servers.')
     register(ServerTemplates, 'server_templates', 'server-templates <command>', 'Manage ServerTemplates.')
+    register(Tags, 'tags', 'tags <command>', 'Manage tags.')
     register(Volumes, 'volumes', 'volumes <command>', 'Manage volumes.')
   end
 end

data/lib/rightscale_cli/server_arrays.rb

@@ -31,6 +31,12 @@ class RightScaleCLI
   class ServerArrays < Thor
     namespace :arrays
 
+    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)
     
@@ -62,21 +68,11 @@ class RightScaleCLI
       end
     end
 
-    desc "show", "Shows a server array."
+    desc "show", "Shows a particular server array."
     def show(server_array_id)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
-      server_array = rightscale.server_arrays(:id => server_array_id).show.raw
-
-      if options[:xml]
-        puts server_array.to_xml(:root => 'server_array')
-      elsif options[:json]
-        puts JSON.pretty_generate(server_array)
-      else
-        puts server_array.to_yaml
-      end
+      @client.render(@client.show('server_arrays', server_array_id), 'server_array')
     end
-    
+
     desc "state", "Shows the state of a server array."
     def state(server_array_id)
       $log.info "Retrieving state for server array, #{server_array_id}."
@@ -113,6 +109,16 @@ class RightScaleCLI
       puts server_array
     end
 
+    desc "inputs", 'Update the inputs of the server array.'
+    def inputs(server_array_id)
+      @client.render(@client.show('server_arrays', server_array_id), 'server_array')
+    end
+
+    desc "next", 'Show the next instance properties of the server array.'
+    def next(server_array_id)
+      @client.render(@client.client.server_arrays(:id => server_array_id).show.next_instance.index)
+    end
+
     def self.banner(task, namespace = true, subcommand = false)
       "#{basename} #{task.formatted_usage(self, true, subcommand)}"
     end

data/lib/rightscale_cli/servers.rb

@@ -16,34 +16,39 @@
 
 require 'thor'
 require 'yaml'
-require 'right_api_client'
+require 'rightscale_cli/client'
       
 class RightScaleCLI
   class Servers < Thor
     namespace :servers
 
-    desc "show", "Lists all servers."
-    def show()
-      servers = Array.new
-      RightApi::Client.new(RightScaleCLI::Config::API).servers.index.each { |deployment|
-        servers.push(deployment.raw)
-      }  
-      puts servers.to_yaml
+    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 all servers."
+    def list()
+      @client.render(@client.get('servers'), 'servers')
+    end
+
+    desc "show", "Shows a server."
+    def show(id)
+      @client.render(@client.show('servers', id), 'server')
     end
 
     desc "create", "Creates a server."
     def create(name)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-
+      # todo
     end
 
     desc "destroy", "Deletes a server."
     def destroy(server)
-      rightscale = RightApi::Client.new(RightScaleCLI::Config::API)
-      
-      # construct deployment
-      server = Hash.new
-      rightscale.servers.delete({:server => server})
+      # todo
     end
 
     def self.banner(task, namespace = true, subcommand = false)

data/lib/rightscale_cli/tags.rb

@@ -0,0 +1,60 @@
+# 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/client'
+require 'rightscale_cli/logger'
+
+class RightScaleCLI
+  class Tags < Thor
+    namespace :tags
+
+    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 "search", "Search for resources having a list of tags in a specific resource_type."
+    def search()
+      # todo
+    end
+
+    desc "resource", "Get tags for a list of resource hrefs."
+    def resource(resource_hrefs)
+      @client.client.tags.by_resource(:resource_hrefs => resource_hrefs.split(','))
+    end
+
+    desc "add", "Adds tag(s) to resource(s)."
+    def add(hrefs, tags)
+      @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(',')])
+    end
+
+    def self.banner(task, namespace = true, subcommand = false)
+      "#{basename} #{task.formatted_usage(self, true, subcommand)}"
+    end
+  end
+end

data/lib/rightscale_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rightscale-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Fordham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,36 +101,36 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - bin/rs
 - lib/rightscale_cli.rb
-- lib/rightscale_cli/servers.rb
-- lib/rightscale_cli/rightscale_cli.rb
-- lib/rightscale_cli/repositories.rb
-- lib/rightscale_cli/base.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
 - lib/rightscale_cli/clouds.rb
-- lib/rightscale_cli/deployments.rb
 - lib/rightscale_cli/config.rb
 - lib/rightscale_cli/dashboard.rb
-- lib/rightscale_cli/server_arrays.rb
+- lib/rightscale_cli/deployments.rb
+- lib/rightscale_cli/instances.rb
+- lib/rightscale_cli/logger.rb
+- lib/rightscale_cli/monkey_patches/client_attributes.rb
 - lib/rightscale_cli/multi_cloud_images.rb
+- lib/rightscale_cli/output.rb
 - lib/rightscale_cli/render_options.rb
-- lib/rightscale_cli/volumes.rb
-- lib/rightscale_cli/server_arrays/current_instances.rb
-- lib/rightscale_cli/server_arrays/links.rb
-- lib/rightscale_cli/server_arrays/elasticity_params.rb
+- lib/rightscale_cli/repositories.rb
+- lib/rightscale_cli/rightscale_cli.rb
+- lib/rightscale_cli/server_arrays.rb
 - lib/rightscale_cli/server_arrays/alert_specs.rb
 - lib/rightscale_cli/server_arrays/alerts.rb
+- lib/rightscale_cli/server_arrays/current_instances.rb
+- lib/rightscale_cli/server_arrays/elasticity_params.rb
+- lib/rightscale_cli/server_arrays/links.rb
 - lib/rightscale_cli/server_arrays/multi_run_executable.rb
-- lib/rightscale_cli/logger.rb
+- lib/rightscale_cli/server_templates.rb
+- lib/rightscale_cli/servers.rb
+- lib/rightscale_cli/tags.rb
+- lib/rightscale_cli/version.rb
+- lib/rightscale_cli/volumes.rb
 - lib/yesno.rb
-- README.md
-- LICENSE
 homepage: https://github.com/flaccid/rightscale-cli
 licenses:
 - Apache 2.0
@@ -151,8 +151,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: rightscale-cli
 test_files: []
+has_rdoc: 

data/lib/rightscale_cli/base.rb

@@ -1,5 +0,0 @@
-class RightScaleCLI
-  class Base
-  
-  end
-end