rig 0.3.4 → 0.3.5

data/lib/rig/capistrano.rb

@@ -12,7 +12,7 @@ module Rig
       env     = ENV['ENVIRONMENT'] || Rig.config.environment
       role    = ENV['ROLE'] || Rig.config.role
       servers = Rig::Model::Environment.find(env).servers
-      list    = servers.select { |s| s.tags['Role'] == role }
+      list    = role == 'all' ? servers : servers.select { |s| s.tags['Role'] == role }
 
       raise "Rig could not find any servers matching environment=#{env} and role=#{role}" unless list && list.count > 0
       list.each do |s|
@@ -41,8 +41,9 @@ configuration.load do
   Rig.config.environment = ARGV[0]
   Rig.config.role        = ARGV[1]
 
+  # create dummy tasks for environment and role
   begin
-    [ARGV[0], ARGV[1]].each do |arg|
+    ARGV.first(2).each do |arg|
       task arg do
         nil
       end

data/lib/rig/chef.rb

@@ -42,6 +42,12 @@ module Rig
         client.destroy if client
       end
 
+      def client_list
+        configure
+        # TODO: better error handling
+        ::Chef::ApiClient.list
+      end
+
       def node_delete(name)
         configure
         # TODO: better error handling

data/lib/rig/command.rb

@@ -15,6 +15,7 @@ require 'rig/command/environment/main'
 require 'rig/command/environment/list'
 require 'rig/command/environment/create'
 require 'rig/command/environment/destroy'
+require 'rig/command/environment/protect'
 
 require 'rig/command/balancer/main'
 require 'rig/command/balancer/list'

data/lib/rig/command/abstract.rb

@@ -4,9 +4,19 @@ module Rig
   module Command
     class Abstract < Clamp::Command
       option ["-n", "--test"], :flag, "use Fog.mock! to test command without creating / destroying cloud resources" do |o|
+        Rig.config.mock = true
         Fog.mock!
       end
-      option ["-a", "--account"], "ACCOUNT", "set the rig account to use", :default => "default"
+
+      option ["-a", "--account"], "ACCOUNT", "set the rig account to use", :default => "default" do |a|
+        Rig.config.account = a
+        a
+      end
+
+      option ["-v", "--version"], :flag, "print version number and exit" do |v|
+        puts "Rig Version: #{Rig::Version::STRING}"
+        exit(0)
+      end
 
       def print_table(columns, rows)
         puts table(columns, *rows)
@@ -19,6 +29,7 @@ module Rig
           r << server.tags['Name']
           r << server.tags['Environment']
           r << server.tags['Role']
+          r << (server.tags['Protected'] ? '*' : '')
           r << server.public_ip_address.to_s
           r << server.private_ip_address.to_s
           r << server.flavor_id.to_s
@@ -27,7 +38,7 @@ module Rig
           rows << r
         end
 
-        print_table(%w{Name Environment Role PublicIP PrivateIP Size InstanceID State}, rows)
+        print_table(%w{Name Environment Role Pr PublicIP PrivateIP Size InstanceID State}, rows)
       end
 
       def execute

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

@@ -17,9 +17,9 @@ module Rig
             rows = []
             envs.each do |e|
               env = Rig::Model::Environment.find(e)
-              rows << [env.name, env.template, env.region, env.servers.count, env.balancers.count]
+              rows << [env.name, env.template, env.region, env.servers.count, env.balancers.count, env.protected?]
             end
-            print_table(%w{Name Template Region Servers# Balancers#}, rows)
+            print_table(%w{Name Template Region Servers# Balancers# Protected?}, rows)
           end
         end
       end

data/lib/rig/command/environment/protect.rb

@@ -0,0 +1,22 @@
+module Rig
+  module Command
+    module Environment
+      class Protect < Abstract
+        option ["-u","--undo"], :flag, "disable protection instead of enabling"
+        parameter "NAME", "the environment to protect"
+
+        def execute
+          env = Rig::Model::Environment.find(name)
+          raise "Environment #{name} not found" if env.nil?
+          connection = Rig::Connection.compute
+          val = undo? ? "false" : "true"
+
+          env.servers.each do |s|
+            connection.create_tags(s.id, "Protected" => val)
+          end
+        end
+      end
+    end
+  end
+end
+Rig::Command::Environment::Main.subcommand "protect", "[un]set protection on environment, preventing termination", Rig::Command::Environment::Protect

data/lib/rig/command/instance/tag/get.rb

@@ -4,32 +4,12 @@ module Rig
       module Tag
         class Get < Abstract
           include Options::Config
-          include Options::Instance
-          include Options::InstanceName
 
-          def execute
-            unless iname || iid
-              raise "Must set either instance name or instance id (-iname or -iid)"
-            end
-
-            connection = Rig::Connection.compute
-            if iid
-              instance = connection.servers.get(iid)
-            else
-              list = connection.servers.all({"tag:Name" => iname})
-              if list.count > 1
-                puts "there is more than one instance that matches:"
-                instance_list(list)
-                return
-              end
-              instance = list.first
-            end
-
-            unless instance
-              puts "could not find instance"
-              return
-            end
+          parameter "NAME", "the name of the instance to get tags for"
 
+          def execute
+            instance = Rig::Model::Instance.find(name)
+            raise "instance not found #{name}" unless instance
             puts "#{instance.tags.inspect}"
           end
         end

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

@@ -4,13 +4,13 @@ module Rig
       class View < Abstract
         include Options::ShowAll
 
+        # TODO: something wrong here, view is showing all instances
         parameter "NAME", "name of instance"
 
         def execute
           list = Rig::Model::Instance.find(name)
           list.each do |item|
-            puts item.attributes.to_yaml
-            puts
+            ap item.attributes
           end
         end
       end

data/lib/rig/command/main.rb

@@ -12,9 +12,24 @@ module Rig
       subcommand "accounts", "show account list" do
         def execute
           list = Rig::Model::Account.list
+          rows = []
           list.each do |n, f|
-            puts " #{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
+          raise "chef not configured" unless Rig.config.chef
+
+          list = Rig::Chef.client_list
+          rows = []
+          list.each do |c|
+            rows << c
+          end
+          print_table(%w{Name Location}, rows)
         end
       end
 

data/lib/rig/config.rb

@@ -1,9 +1,6 @@
 
 module Rig
   class << self
-    @templates = []
-    @accounts = []
-    @cache_config = []
 
     def configdir
       @configdir ||= File.expand_path(ENV["RIG_CONFIG"] || "~/.rig")
@@ -12,15 +9,24 @@ module Rig
     def config
       @configuration ||= begin
         c = Rig::Oconfig.load_yaml_file("#{configdir}/config.yml")
-        if c.chef
+
+        # prevent Chef and Capistrano being loaded at the same time
+        # requirements on net-ssh conflict (chef ~> 2.1.4)
+        #
+        # this makes it so we don't have to use bundler to run
+        # rig and cap together.
+        if c.chef && !defined?(Rig::Capistrano)
           require 'rig/chef'
         end
+
         c
       end
     end
 
     def account(name=get_account)
-      Rig::Model::Account.load(name)
+      a = Rig::Model::Account.load(name)
+      a.name = name
+      a
     end
 
     def get_config(name)
@@ -33,10 +39,12 @@ module Rig
 
     def get_account
       return ENV['RIG_ACCOUNT'] if ENV['RIG_ACCOUNT']
+      return Rig.config.account if Rig.config.account
       return Rig.config.default_account if Rig.config.default_account
       return Rig.config.accounts.first if Rig.config.accounts.count > 0
       "default"
     end
+
   end
 
   class Oconfig

data/lib/rig/model/environment.rb

@@ -10,28 +10,28 @@ module Rig
       attr_reader :region
       attr_reader :flavor
 
-      TEMPLATES = {
-          :solo  => {
-              :groups    => %w{app-server db-inqcloud-dev},
-              :instances => [
-                  :solo => {
-                      :flavor  => 'c1.medium',
-                      :count   => 1,
-                      :balance => true,
-                      :primary => true
-                  }
-              ]
-          },
-          :multi => {
-              :groups    => %w{app-server db-inqcloud-dev},
-              :instances => [
-                  :harvester => { :flavor => 'c1.large', :count => 3, :image => "ami-faketest" },
-                  :queue     => { :flavor => 'c1.medium', :count => 3 },
-                  :cache     => { :flavor => 'm1.medium', :count => 3 },
-                  :app       => { :flavor => 'c1.large', :count => 3, :balance => true, :primary => true }
-              ]
-          }
-      }
+      #TEMPLATES = {
+      #    :solo  => {
+      #        :groups    => %w{app-server db-inqcloud-dev},
+      #        :instances => [
+      #            :solo => {
+      #                :flavor  => 'c1.medium',
+      #                :count   => 1,
+      #                :balance => true,
+      #                :primary => true
+      #            }
+      #        ]
+      #    },
+      #    :multi => {
+      #        :groups    => %w{app-server db-inqcloud-dev},
+      #        :instances => [
+      #            :harvester => { :flavor => 'c1.large', :count => 3, :image => "ami-faketest" },
+      #            :queue     => { :flavor => 'c1.medium', :count => 3 },
+      #            :cache     => { :flavor => 'm1.medium', :count => 3 },
+      #            :app       => { :flavor => 'c1.large', :count => 3, :balance => true, :primary => true }
+      #        ]
+      #    }
+      #}
 
       class << self
         def list
@@ -55,6 +55,7 @@ module Rig
 
         def destroy(name, template=nil, opts={ })
           env = self.find(name, template, opts)
+          raise "environment has protected instances" if env.protected?
           puts "destroying: #{name}"
           env.destroy
           true
@@ -205,6 +206,11 @@ module Rig
       def reload
         find_servers
         find_balancers
+        @protected = @servers.any? {|s| s.tags["Protected"] == "true" }
+      end
+
+      def protected?
+        @protected
       end
 
       private

data/lib/rig/model/instance.rb

@@ -5,7 +5,7 @@ module Rig
     class Instance
       class << self
         def all(filters={})
-          Rig::Connection.compute.servers.all(filters)
+          @all ||= Rig::Connection.compute.servers.all(filters)
         end
 
         def running
@@ -14,9 +14,11 @@ module Rig
 
         def find(id)
           if id =~ /^i-/
-            Rig::Connection.compute.servers.find(id)
+            puts "find #{id}"
+            Rig::Connection.compute.servers.get(id)
           else
             # must be tag:Name
+            puts "all tag:Name => #{id}"
             Rig::Connection.compute.servers.all({"tag:Name"=>id})
           end
         end
@@ -24,6 +26,7 @@ module Rig
         def find_by_environment(env)
           Rig::Connection.compute.servers.all({"tag:Environment"=>env})
         end
+
         def find_by_role_and_environment(role, env)
           Rig::Connection.compute.servers.all({"tag:Environment"=> env, "tag:Role" => role})
         end

data/lib/rig/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rig
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Shawn Catanzarite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-26 00:00:00 Z
+date: 2012-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clamp
@@ -139,6 +139,7 @@ files:
 - lib/rig/command/environment/destroy.rb
 - lib/rig/command/environment/list.rb
 - lib/rig/command/environment/main.rb
+- lib/rig/command/environment/protect.rb
 - lib/rig/command/instance/create.rb
 - lib/rig/command/instance/destroy.rb
 - lib/rig/command/instance/list.rb
@@ -200,3 +201,4 @@ specification_version: 3
 summary: Cloud provisioning tool built on ruby fog
 test_files: []
 
+has_rdoc: