rig 0.3.5 → 0.3.6

data/lib/rig/command.rb

@@ -10,6 +10,8 @@ require 'rig/command/options'
 
 require 'rig/command/main'
 require 'rig/command/ssh'
+require 'rig/command/account'
+require 'rig/command/config'
 
 require 'rig/command/environment/main'
 require 'rig/command/environment/list'

data/lib/rig/command/abstract.rb

@@ -22,23 +22,36 @@ module Rig
         puts table(columns, *rows)
       end
 
-      def instance_list(list)
+      def instance_list(list, detailed=false)
         rows = []
         list.each do |server|
           r = []
           r << server.tags['Name']
           r << server.tags['Environment']
           r << server.tags['Role']
-          r << (server.tags['Protected'] ? '*' : '')
+          r << (server.tags['Protected'] ? 'true' : '')
           r << server.public_ip_address.to_s
-          r << server.private_ip_address.to_s
+          if detailed
+            r << server.private_ip_address.to_s
+          end
           r << server.flavor_id.to_s
           r << server.id.to_s
           r << server.state.to_s.downcase
           rows << r
         end
 
-        print_table(%w{Name Environment Role Pr PublicIP PrivateIP Size InstanceID State}, rows)
+        cols = []
+        cols << "Name"
+        cols << "Environment"
+        cols << "Role"
+        cols << "Protected"
+        cols << "Public IP"
+        cols << "Private IP" if detailed
+        cols << "Size"
+        cols << "Instance ID"
+        cols << "State"
+
+        print_table(cols, rows)
       end
 
       def execute

data/lib/rig/command/account.rb

@@ -0,0 +1,48 @@
+module Rig
+  module Command
+    module Account
+      class List < Abstract
+        def execute
+          list = Rig::Model::Account.list
+          rows = []
+          list.each do |n, f|
+            rows << [(Rig.config.default_account == n.to_s), (Rig.account.name == n.to_s), n, f]
+          end
+          print_table(%w{Default Current Name Location}, rows)
+        end
+      end
+
+      # TODO: figure out how to make this work with YAML references
+      #class Change < Abstract
+      #  PROPS = %w{awsid awskey dnszone region}
+      #  parameter "PROPERTY", "the property of config to change, must be one of #{PROPS.inspect}"
+      #  parameter "VALUE", "the value to set for the property"
+      #  def execute
+      #    case property
+      #      when "awsid"
+      #        Rig.account.common.aws_access_key_id = value
+      #        Rig.save_account
+      #      when "awskey"
+      #        Rig.account.common.aws_secret_access_key = value
+      #        Rig.save_account
+      #      when "dnszone"
+      #        Rig.account.dns_zone = value
+      #        Rig.save_account
+      #      when "region"
+      #        Rig.account.region = value
+      #        Rig.save_account
+      #      else
+      #        puts "Property #{property} not supported"
+      #    end
+      #  end
+      #end
+
+      class Main < Abstract
+        subcommand "list", "list the accounts available", List
+        #subcommand "change", "change account configuration values", Change
+        self.default_subcommand = "list"
+      end
+    end
+  end
+end
+Rig::Command::Main.subcommand "account", "manage rig account files", Rig::Command::Account::Main

data/lib/rig/command/config.rb

@@ -0,0 +1,37 @@
+module Rig
+  module Command
+    module Config
+      class Change < Abstract
+        PROPS = %w{knife user}
+        parameter "PROPERTY", "the property of config to change, must be one of #{PROPS.inspect}"
+        parameter "VALUE", "the value to set for the property"
+        def execute
+          case property
+            when "knife"
+              Rig.config.chef.knife = value
+              Rig.save_configuration
+            when "user"
+              Rig.config.ssh.user = value
+              Rig.save_configuration
+            else
+              puts "Property #{property} not supported"
+          end
+        end
+      end
+
+      class Dump < Abstract
+        def execute
+          puts "Rig Version: #{Rig::Version::STRING}"
+          puts Rig.config.to_yaml
+        end
+      end
+
+      class Main < Abstract
+        subcommand "dump", "dump configuration as yaml", Dump
+        subcommand "change", "Change configuration values from the command line", Change
+        self.default_subcommand = "dump"
+      end
+    end
+  end
+end
+Rig::Command::Main.subcommand "config", "manage rig configuration file", Rig::Command::Config::Main

data/lib/rig/command/instance/list.rb

@@ -6,6 +6,7 @@ module Rig
       class List < Abstract
         include Options::ShowAll
 
+        option %w{-d --detailed}, :flag, "show more information in table"
         parameter "[ENV]", "environment"
 
         def execute
@@ -15,7 +16,7 @@ module Rig
           filters["tag:Environment"] = env if env
 
           list = connection.servers.all(filters)
-          instance_list(list)
+          instance_list(list, detailed?)
         end
       end
     end

data/lib/rig/command/main.rb

@@ -3,22 +3,6 @@ require 'awesome_print'
 module Rig
   module Command
     class Main < Abstract
-      option %w{--config}, :flag, "print configuration and exit" do |c|
-        puts "Rig Version: #{Rig::Version::STRING}"
-        puts Rig.config.to_yaml
-        exit(0)
-      end
-
-      subcommand "accounts", "show account list" do
-        def execute
-          list = Rig::Model::Account.list
-          rows = []
-          list.each do |n, f|
-            rows << [(Rig.config.default_account == n.to_s), (Rig.account.name == n.to_s), n, f]
-          end
-          print_table(%w{Default Current Name Location}, rows)
-        end
-      end
 
       subcommand "chef", "test chef configuration" do
         def execute

data/lib/rig/config.rb

@@ -23,10 +23,27 @@ module Rig
       end
     end
 
+    def save_configuration
+      yaml = config.to_yaml
+      file = "#{configdir}/config.yml"
+      back = "#{file}.#{Time.now.to_i}"
+      puts "backing up configuration -> #{back}"
+      FileUtils.cp(file, back)
+      File.open(file, "w") {|f| f.write(yaml+"\n")}
+      puts "new configuration saved."
+    end
+
     def account(name=get_account)
-      a = Rig::Model::Account.load(name)
-      a.name = name
-      a
+      @account ||= begin
+        a = Rig::Model::Account.load(name)
+        a.name = name
+        a
+      end
+    end
+
+    def save_account
+      name = Rig.account.name
+      Rig::Model::Account.save(name, Rig.account)
     end
 
     def get_config(name)

data/lib/rig/model/account.rb

@@ -15,6 +15,16 @@ module Rig
           end
         end
 
+        def save(name, data)
+          yaml = data.to_yaml
+          file = "#{dir}/#{name}.yml"
+          back = "#{file}.#{Time.now.to_i}"
+          puts "backing up configuration -> #{back}"
+          FileUtils.cp(file, back)
+          File.open(file, "w") {|f| f.write(yaml+"\n")}
+          puts "new configuration saved."
+        end
+
         private
         def dir
           "#{Rig.configdir}/accounts"

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 3
-      TINY  = 5
+      TINY  = 6
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rig
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Shawn Catanzarite
@@ -126,10 +126,12 @@ files:
 - lib/rig/chef.rb
 - lib/rig/command.rb
 - lib/rig/command/abstract.rb
+- lib/rig/command/account.rb
 - lib/rig/command/balancer/destroy.rb
 - lib/rig/command/balancer/list.rb
 - lib/rig/command/balancer/main.rb
 - lib/rig/command/balancer/view.rb
+- lib/rig/command/config.rb
 - lib/rig/command/dns/create.rb
 - lib/rig/command/dns/destroy.rb
 - lib/rig/command/dns/edit.rb