traut 0.0.2 → 0.1.0

data/README.md

@@ -19,9 +19,10 @@ daemon hooked up to Gerrit's ssh stream-events so that we might turn
 example. See `samples/kili`. All payloads are delivered to the
 scripts' stdin.
 
-Traut cannot daemonize itself. We use [supervisord](http://supervisord.org/) to daemonize Traut;
-the code needed to achieve self-daemonization is outside of the core
-focus of this program.
+Traut cannot daemonize itself. We use
+[supervisord](http://supervisord.org/) to daemonize Traut; the code
+needed to achieve self-daemonization is outside of the core focus of
+this program.
 
 Installation
 ------------

data/etc/actions/app.action

@@ -0,0 +1 @@
+com.carepilot.event.code.review.app: deploy/app

data/etc/traut.conf.sample

@@ -4,7 +4,4 @@ amqp:
 logs: /tmp/traut.log
 pid:  /tmp/traut.pid
 scripts: /tmp/traut/scripts
-daemon: true
-
-actions:
-    com.carepilot.event.code.review.app: deploy/app
+action_dir: /tmp/traut/actions

data/lib/traut/runner.rb

@@ -20,11 +20,12 @@ module Traut
           :host => 'localhost',
           :port => '5672'
         },
-        :logs      => '/var/log/traut.log',
-        :config    => '/etc/traut/traut.conf',
-        :scripts   => '/usr/local/bin/traut',
-        :debug     => false,
-        :actions   => nil,
+        :logs       => '/var/log/traut.log',
+        :config     => '/etc/traut/traut.conf',
+        :action_dir => '/etc/traut/actions/',
+        :scripts    => '/usr/local/bin/traut',
+        :debug      => false,
+        :actions    => nil,
       }
 
       parse!
@@ -34,22 +35,22 @@ module Traut
       @parser ||= OptionParser.new do |opts|
         opts.banner = "Usage: traut [options]"
         opts.separator ""
-        opts.on("-A", "--amqp [HOST]", "The AMQP server host") {
+        opts.on("-A", "--amqp HOST", "The AMQP server host") {
           |host| @options[:amqp][:host] = host
         }
-        opts.on("-P", "--amqp_port [PORT]", "The AMQP server host port") {
+        opts.on("-P", "--amqp_port PORT", "The AMQP server host port") {
           |port| @options[:amqp][:port] = port
         }
-        opts.on("-S", "--subscriptions", "The server AMQP subscriptions.") {
-          |subscriptions| @options[:subscriptions] = subscriptions || '*'
-        }
-        opts.on("-C", "--config [FILE]", "Load options from config file") {
+        opts.on("-C", "--config FILE", "Load options from config file") {
           |file| @options[:config] = file
         }
-        opts.on("-s", "--scripts", "Location of traut scripts directory") {
+        opts.on("-s", "--scripts DIR", "Location of traut scripts directory"){
           |scripts| @options[:scripts] = scripts
         }
-        opts.on('-l', '--logs [LOG]', "Location of log directory location") {
+        opts.on("-a", "--actions DIR", "Location of traut actions directory"){
+          |acts| @options[:action_dir] = acts
+        }
+        opts.on('-l', '--logs LOG', "Location of log directory location") {
           |log| @options[:logs] = log
         }
         opts.on('--debug', 'Enable debug logging') {
@@ -108,6 +109,14 @@ module Traut
         YAML.load_file(file).each {
           |key, value| @options[key.to_sym] = value
         }
+        dir = Dir.open(@options[:action_dir])
+        @options[:actions] = {}
+        dir.each do |f|
+          af = File.join(dir, f)
+          if ! File.directory? af
+            YAML.load_file(af).each { |k,v| @options[:actions][k] = v }
+          end
+        end
       end
     end
 

data/lib/traut/version.rb

@@ -1,3 +1,3 @@
 module Traut
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traut
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &76404200 !ruby/object:Gem::Requirement
+  requirement: &80625300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *76404200
+  version_requirements: *80625300
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &76403940 !ruby/object:Gem::Requirement
+  requirement: &80625050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *76403940
+  version_requirements: *80625050
 - !ruby/object:Gem::Dependency
   name: systemu
-  requirement: &76403680 !ruby/object:Gem::Requirement
+  requirement: &80624780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *76403680
+  version_requirements: *80624780
 description: Traut is a configurable daemon for running localhost commands in response
   to events generated elsewhere. AMQP is used as the interchange. Traut can make application
   deployments in response to code checkins, automate database failover and anything
@@ -62,6 +62,7 @@ files:
 - README.md
 - Rakefile
 - bin/traut
+- etc/actions/app.action
 - etc/traut.conf.sample
 - lib/traut.rb
 - lib/traut/runner.rb