rightscale-cli 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac4bf566926e6c5d1fc28e6d5f9bb8a95f9757f
-  data.tar.gz: c2a383530d59631460496293bfcfc6dc12ed4dd4
+  metadata.gz: 1156a9a906152fa3289a2d566200e0f3c50973ac
+  data.tar.gz: eefa246fca31de0429b29abc099eb1b97569570d
 SHA512:
-  metadata.gz: ca723891f38355aa870f04fe711f2b3de221133b21b11378b77098d5b3dd77cb4b105355e0d9cfaaaf0db9a60930b498e94a4e2c5c509b2fcc92365e105bc88f
-  data.tar.gz: 10307926ce934939d79e73d6baa3728689f6f8a553c4975b2916c546cc931c3a27197370500c1f52b232b0bcde75b1bf55fc4ac5582eae7d9688a07a87a96852
+  metadata.gz: c4bb172cb85e1ca200369881305106b507807a33a5c88c9afe83d9bdec8719a1c7941530c3bcb108422b905d7d1f550a453255332fde9dda8bcd2561a9eac8e3
+  data.tar.gz: 03050c7b7e681593ae161b008860bb065f4599b5e7e1d70b6e1a6731320bf50d9e38643e93def8fe2e7b0d3919a567ea177731b108aa9ec46e2bc4b6f375434e

data/lib/rightscale_cli/client.rb

@@ -25,7 +25,7 @@ class RightScaleCLI
     attr_accessor :render
     
     def initialize(options)
-      config = RightScaleCLI::Config.new.local
+      config = RightScaleCLI::Config.new.directives
       config[:account_id] = options['account'] if options[:account]
       config[:email] = options['user'] if options[:user]
       config[:api_version] = options['api'] if options[:api]

data/lib/rightscale_cli/config.rb

@@ -15,14 +15,34 @@
 # limitations under the License.
 
 require 'yaml'
+require 'fileutils'
 
 class RightScaleCLI
   class Config
-    attr_accessor :local, :path
+    attr_accessor :template_path, :config_home, :config_path, :directives
 
     def initialize(*args)
-      @path = File.join(ENV['HOME'], '.rightscale', 'right_api_client.yml')
-      @local = YAML.load_file(@path)
+      @template_path = File.join(File.dirname(__FILE__), '..', 'templates', 'right_api_client.yml.erb')
+      @config_home = File.join(ENV['HOME'], '.rightscale')
+      @config_path = File.join(@config_home, 'right_api_client.yml')
+
+      Dir.mkdir(@config_home) unless File.exists?(@config_home)
+      FileUtils.touch(@config_path)
+      
+      # write a fresh file if it does not load/parse
+      unless YAML.load_file(@config_path)
+        @directives = {
+           :account_id => '',
+           :email => '',
+           :password_base64 => '',
+           :api_url => 'https://us-4.rightscale.com',
+           :api_version => '1.5'
+        }
+        File.open(@config_path, 'w') {|f| f.write(ERB.new(IO.read(@template_path)).result(binding)) }
+      end
+
+      # load/reload the directives from the file
+      @directives = YAML.load_file(@config_path)
     end
   end
 end

data/lib/rightscale_cli/configure.rb

@@ -30,60 +30,53 @@ class RightScaleCLI
     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 = {}
+      @directives = @config.directives
     end
 
     no_commands{
-    def update_conf(directives)
-      renderer = ERB.new(IO.read(@template_path))
-      Dir.mkdir(File.dirname(@config.path)) unless File.exists?(File.dirname(@config.path))
-      File.open(@config.path, 'w') {|f| f.write(renderer.result(binding)) }
+    def update_conf()
+      File.open(@config.config_path, 'w') {|f| f.write(ERB.new(IO.read(@config.template_path)).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):")}))
+      @directives.merge!( { :account_id => ask("RightScale account ID (e.g. 1337):")})
+      update_conf
     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):")}))
+      @directives.merge!( { :email => ask("RightScale username (e.g. bill.gates@microsoft.com):") })
+      update_conf
     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}))
+      @directives.merge!( { :password_base64 => Base64.encode64(ask_pass).strip })
+      update_conf
     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):")}))
+      @directives.merge!( { :api_version => ask("RightScale API version (e.g. 1.5):") })
+      update_conf
     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):")}"}))
+      @directives.merge!( { :api_url => "https://#{ask("RightScale shard (e.g. us-4.rightscale.com):")}" })
+      update_conf
     end
 
     desc "show", "Print the current configuration from ~/.rightscale/right_api_client.yml."
     def show()
-      puts @config.local
+      puts @directives
     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

data/lib/rightscale_cli/deployments.rb

@@ -57,10 +57,11 @@ class RightScaleCLI
     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
+          server.terminate
+          #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

data/lib/rightscale_cli/version.rb

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

data/lib/templates/right_api_client.yml.erb

@@ -4,17 +4,17 @@
 # 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] %>
+: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] %>
+:email: <%= @directives[:email] %>
+:password_base64: <%= @directives[:password_base64] %>
 
 # 1. Use the following parameters to login with your email and plaintext password:
-#:email: <%= directives[:email] %>
+#:email: <%= @directives[:email] %>
 #:password: my_password
 
 # 2. Use the following parameter to login with an instance_token:
@@ -31,5 +31,5 @@
 #:access_token: my_token_string
 
 # The following are optional parameters:
-:api_url: <%= directives[:api_url] %>
-:api_version: <%= directives[:api_version] %>
+: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.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Chris Fordham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport