rig 0.4.5 → 0.5.0

data/lib/rig/config.rb

@@ -1,49 +1,50 @@
-
 module Rig
-  class << self
+  module Config
+    class << self
+      attr_reader :loaded
+      attr_reader :dir
 
-    def configdir
-      @configdir ||= File.expand_path(ENV["RIG_CONFIG"] || "~/.rig")
-    end
+      @config = {}
+      @loaded = false
 
-    def config
-      @configuration ||= begin
-        c = YAML::load_file("#{configdir}/config.yml")
+      def data
+        @data ||= begin
+          c = YAML::load_file("#{dir}/config.yml")
+
+          Rig::Log.load(c[:logging])
 
-        # 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'
+          Rig::Log.debug "loading plugins from configuration"
+          Rig::Plugin.load(c[:plugins]) if c[:plugins]
+
+          c
         end
+        @loaded = true
+        @data
+      end
 
-        c
+      def dir
+        @dir ||= File.expand_path(ENV["RIG_CONFIG"] || "~/.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."
+      def save
+        yaml = @config.to_yaml
+        file = "#@dir/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
     end
+  end
 
-    def account(name=get_account)
-      @account ||= begin
-        a = Rig::Model::Account.load(name)
-        a[:name] = name
-        a
-      end
+  class << self
+    def config
+      Rig::Config.data
     end
 
-    def save_account
-      name = Rig.account[:name]
-      Rig::Model::Account.save(name, Rig.account)
+    def account
+      Rig::Account.data
     end
 
     def get_config(name)
@@ -54,76 +55,5 @@ module Rig
       Rig::Model::Template.load(name)
     end
 
-    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] && Rig.config[:accounts].count > 0
-      "default"
-    end
-
-  end
-
-  class Oconfig
-    class << self
-      def load_yaml_file(path)
-        file = File.expand_path(path)
-        raise "Configuration not found: #{path} (#{file})" unless File.exists?(file)
-        yaml = YAML.load_file(file)
-        yaml = yaml[yaml.keys.first] if yaml.keys.count == 1
-        self.new(yaml)
-      end
-    end
-
-    def initialize(data={})
-      @data = {}
-      update!(data)
-    end
-
-    def update!(data)
-      data.each do |key, value|
-        self[key] = value
-      end
-    end
-
-    def [](key)
-      @data[key.to_sym]
-    end
-
-    def []=(key, value)
-      if value.kind_of?(Hash)
-        @data[key.to_sym] = Oconfig.new(value)
-      elsif value.kind_of?(Array)
-        @data[key.to_sym] = []
-        value.each do |v|
-          @data[key.to_sym] << Oconfig.new(v)
-        end
-      else
-        @data[key.to_sym] = value
-      end
-    end
-
-    def method_missing(sym, *args)
-      if sym.to_s =~ /(.+)=$/
-        self[$1] = args.first
-      else
-        self[sym]
-      end
-    end
-
-    def to_hash
-      out = {}
-      @data.each do |k, v|
-        out[k] = v.kind_of?(Oconfig) ? v.to_hash : v
-      end
-      out
-    end
-
-    if defined?(YAML)
-      def to_yaml
-        to_hash.to_yaml
-      end
-    end
-
   end
 end

data/lib/rig/log.rb

@@ -0,0 +1,66 @@
+require 'logger'
+
+module Rig
+  module Log
+    LEVELS   = {
+        :debug => ::Logger::DEBUG,
+        :info  => ::Logger::INFO,
+        :warn  => ::Logger::WARN,
+        :error => ::Logger::ERROR,
+        :fatal => ::Logger::FATAL
+    }
+    @loggers = []
+
+    class << self
+      def load(logging={ })
+        begin
+          logging.each do |name, data|
+            level = data[:level]
+            opts  = [*data[:opts]].flatten
+            dest  = opts.shift
+
+            if %w{STDOUT STDERR}.include?(dest)
+              # convert string names to constants
+              dest = Kernel.const_get(dest)
+            elsif dest !~ /^\//
+              # relative paths are relative to configdir
+              dest = "#{Rig::Config.dir}/#{dest}"
+            end
+
+            opts = opts.unshift(dest)
+
+            l       = Logger.new(*opts)
+            l.level = Rig::Log::LEVELS[level.to_sym]
+
+            Rig::Log.add(l)
+          end
+
+          Rig::Log.debug "logging initialized"
+        rescue => e
+          puts "error configuring logging: #{e.message} at #{e.backtrace.first}"
+        end
+      end
+
+      def add(logger)
+        logger.formatter = proc { |severity, datetime, progname, msg| "#{$$}:#{datetime.strftime("%s")} #{severity[0]} #{msg}\n" }
+        @loggers << logger
+      end
+
+      def level=(level)
+        int = LEVELS.key?(level) ? LEVELS[level] : level
+        @loggers.each { |l| l.level = int }
+      end
+
+      # Define the standard logger methods on this class programmatically.
+      # No need to incur method_missing overhead on every log call.
+      # borrowed from Chef::Log
+      LEVELS.keys.each do |method_name|
+        class_eval(<<-METHOD_DEFN, __FILE__, __LINE__)
+          def #{method_name}(msg=nil, &block)
+            @loggers.each {|l| l.#{method_name}(msg, &block) }
+          end
+        METHOD_DEFN
+      end
+    end
+  end
+end

data/lib/rig/model/account.rb

@@ -27,7 +27,7 @@ module Rig
 
         private
         def dir
-          "#{Rig.configdir}/accounts"
+          "#{Rig::Config.dir}/accounts"
         end
       end
     end

data/lib/rig/model/connection.rb

@@ -6,24 +6,31 @@ module Rig
     class << self
       def compute
         @compute ||= begin
-          Fog::Compute.new(Rig.account[:compute])
+          if Rig.account[:compute]
+            Fog::Compute.new(Rig.account[:compute])
+          end
         end
       end
       def balancer
         @balancer ||= begin
-          #TODO: figure out the standardized way of handling balancers
-          Fog::AWS::ELB.new(Rig.account[:balancer])
+          if Rig.account[:balancer]
+            #TODO: figure out the standardized way of handling balancers
+            Fog::AWS::ELB.new(Rig.account[:balancer])
+          end
         end
       end
       def dns
         @dns ||= begin
-          Fog::DNS.new(Rig.account[:dns])
+          if Rig.account[:dns]
+            Fog::DNS.new(Rig.account[:dns])
+          end
         end
       end
-
       def database
         @database ||= begin
-          Rig::Model::Database.new(Rig.account[:database])
+          if Rig.account[:database]
+            Rig::Model::Database.new(Rig.account[:database])
+          end
         end
       end
     end

data/lib/rig/model/environment.rb

@@ -113,10 +113,10 @@ module Rig
         end
 
         # if we've got a chef config, use it
-        if Rig.config[:chef]
-          puts "creating chef environment"
-          Rig::Chef.environment_create(name)
-        end
+        #if Rig.config[:chef]
+        #  puts "creating chef environment"
+        #  Rig::Chef.environment_create(name)
+        #end
 
         # all of this crap to be absolutely sure that the instance has an ip and dns
         puts "sleeping 3"
@@ -136,6 +136,8 @@ module Rig
             puts "server #{server.id} doesn't have public_ip_address"
           end
         end
+
+        Rig::Plugin.run "environment:create", self
       rescue => e
         puts "error creating environment:\n#{e.message} at #{e.backtrace.join("\n")}"
         destroy
@@ -163,10 +165,12 @@ module Rig
         puts "destroying balancers"
         Rig::Model::Balancer.destroy(@balancers)
 
-        if Rig.config[:chef]
-          puts "destroying chef environment"
-          Rig::Chef.environment_destroy(name)
-        end
+        #if Rig.config[:chef]
+        #  puts "destroying chef environment"
+        #  Rig::Chef.environment_destroy(name)
+        #end
+
+        Rig::Plugin.run "environment:destroy", self
       end
 
       def reload

data/lib/rig/model/instance.rb

@@ -41,6 +41,7 @@ module Rig
           server = fog.servers.create(opts)
           fog.create_tags(server.id, tags) if tags.count > 0
           puts ".. created: #{server.id}"
+          Rig::Plugin.run "instance:create", server
           server
         end
 
@@ -52,17 +53,11 @@ module Rig
             ids = list.map {|e| e.kind_of?(String) ? e : e.id}
             puts ".. destroying: #{ids.inspect}"
 
-            # if we've got a chef config, use it
-            if Rig.config[:chef]
-              list.each do |e|
-                Rig::Chef.client_delete(e.tags['Name']) if e.tags['Name']
-                Rig::Chef.node_delete(e.tags['Name']) if e.tags['Name']
-              end
-            end
-
             # destroy the instances
             list.each do |e|
               e.destroy
+
+              Rig::Plugin.run "instance:destroy", e, e.tags
             end
 
             tags = %w{Name Environment Role}.inject({}) {|h, e| h[e] = nil; h }

data/lib/rig/model/template.rb

@@ -26,7 +26,7 @@ module Rig
 
         private
         def dir
-          "#{Rig.configdir}/templates"
+          "#{Rig::Config.dir}/templates"
         end
       end
     end

data/lib/rig/model/userdata.rb

@@ -7,7 +7,7 @@ module Rig
       class << self
         def create(name, role, environment, opts={ })
           package = Rig.get_config(:userdata)
-          directory = "#{Rig.configdir}/userdata/#{package}"
+          directory = "#{Rig::Config.dir}/userdata/#{package}"
           config = YAML.load_file("#{directory}/userdata.yml")
 
           data = {

data/lib/rig/plugin.rb

@@ -0,0 +1,61 @@
+module Rig
+  module Plugin
+    class << self
+      def run(event, *args)
+        @hooks ||= []
+        @hooks.select { |e| e[:event] == event }.each do |plugin|
+          klass = plugin[:class]
+          block = plugin[:block]
+
+          Rig::Log.debug "calling #{klass} :: #{event}"
+          block.call(args.dup)
+        end
+      end
+
+      def on(klass, event, &block)
+        @hooks ||= []
+        @hooks << { :event => event, :class => klass, :block => block }
+      end
+
+      def load(plugins={ })
+        plugins.each do |plugin, data|
+          begin
+            f = "#{Rig::Config.dir}/plugins/#{plugin}"
+            Rig::Log.debug "loading plugin: #{plugin} #{f}"
+            require f
+          rescue LoadError, StandardError => e
+            Rig::Log.error "error while loading plugin: #{plugin}: #{e.message} at #{e.backtrace.first}"
+          end
+        end
+      end
+    end
+
+    module Base
+      def self.included(base)
+        base.extend self
+      end
+
+      def on(event, &block)
+        Rig::Plugin.on(self, event, &block)
+      end
+
+      def command(name, desc, klass=nil, &block)
+        on "commands:loaded" do |args|
+          command = args.shift
+          if klass
+            command.subcommand name, "#{desc} (#{self})", klass
+          else
+            command.subcommand name, "#{desc} (#{self})", &block
+          end
+        end
+      end
+
+      def config_for(klass)
+        name = klass.name.split('::').last.downcase.to_sym
+        return Rig.config[:plugins][name] if Rig.config[:plugins] && Rig.config[:plugins][name]
+        return Rig.account[:plugins][name] if Rig.account[:plugins] && Rig.account[:plugins][name]
+        { }
+      end
+    end
+  end
+end

data/lib/rig/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rig
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -124,6 +124,10 @@ files:
 - bin/rig
 - conf/accounts/default.yml
 - conf/config.yml
+- conf/plugins/chef.rb
+- conf/plugins/mongo.rb
+- conf/plugins/mysql.rb
+- conf/plugins/scout.rb
 - conf/templates/multi.yml
 - conf/templates/solo.yml
 - conf/userdata/chef/userdata.sh.erb
@@ -132,56 +136,31 @@ files:
 - conf/userdata/default/userdata.sh.erb
 - conf/userdata/default/userdata.yml
 - lib/rig.rb
+- lib/rig/account.rb
 - lib/rig/capistrano.rb
-- 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/listener.rb
-- lib/rig/command/balancer/main.rb
-- lib/rig/command/balancer/view.rb
+- lib/rig/command/balancer.rb
 - lib/rig/command/config.rb
-- lib/rig/command/database.rb
-- lib/rig/command/dns/create.rb
-- lib/rig/command/dns/destroy.rb
-- lib/rig/command/dns/edit.rb
-- lib/rig/command/dns/list.rb
-- lib/rig/command/dns/main.rb
-- lib/rig/command/environment/create.rb
-- 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
-- lib/rig/command/instance/main.rb
-- lib/rig/command/instance/tag/get.rb
-- lib/rig/command/instance/tag/main.rb
-- lib/rig/command/instance/tag/remove.rb
-- lib/rig/command/instance/tag/set.rb
-- lib/rig/command/instance/view.rb
-- lib/rig/command/keypair/list.rb
-- lib/rig/command/keypair/main.rb
-- lib/rig/command/main.rb
+- lib/rig/command/dns.rb
+- lib/rig/command/environment.rb
+- lib/rig/command/keypair.rb
 - lib/rig/command/options.rb
+- lib/rig/command/server.rb
 - lib/rig/command/ssh.rb
 - lib/rig/config.rb
+- lib/rig/log.rb
 - lib/rig/model.rb
 - lib/rig/model/account.rb
 - lib/rig/model/balancer.rb
 - lib/rig/model/connection.rb
-- lib/rig/model/database.rb
-- lib/rig/model/database/base.rb
-- lib/rig/model/database/mongodb.rb
-- lib/rig/model/database/mysql.rb
 - lib/rig/model/dns.rb
 - lib/rig/model/environment.rb
 - lib/rig/model/instance.rb
 - lib/rig/model/template.rb
 - lib/rig/model/userdata.rb
+- lib/rig/plugin.rb
 - lib/rig/version.rb
 - rig.gemspec
 homepage: https://github.com/shawncatz/rig
@@ -209,3 +188,4 @@ signing_key:
 specification_version: 3
 summary: Cloud provisioning tool built on ruby fog
 test_files: []
+has_rdoc: