alerty 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec90bd21ce7f831f3a1a688bc29b41eaeec57261
-  data.tar.gz: 0aa77f32295f188671b203cbdc797b30dcb1f707
+  metadata.gz: 8f1c92b7d3ec37c17af10d78fba346435c7be67e
+  data.tar.gz: 84616ba361045f8b94e544eea7626734077f212a
 SHA512:
-  metadata.gz: aa300f5950d396569873bfc8773999a6e9c0ea0d8d903458927b77701c808aa9cb6c7369e91f94c397865e97a6d93fe66db0203db8f11baaf7e8ec6188c31462
-  data.tar.gz: b903dacd0f3df02636e17ff068f34769a65fc76e5b7570600a49896410f655d27e30cb638db7bb186bdec8917c3c1ab330dc0dcc5c59f2ade48fbbbcff305acc
+  metadata.gz: 0479571dc19db4fb6c52f5fa1dca7cf023c15ce6947a68207ba41770027bda7fece31b4580ea11236f82e7a6ce84d3b04256026cce205956c2013a7d19e78d2c
+  data.tar.gz: 2547fee4e93f27d12acc0bc7eceb78ba376e329bc65850d35ae013875a2ef5032b5a1ead04571384343392fc2cd9ec3cfc839b7f3131e2609f200f09ab97d2bb

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.2 (2015/08/13)
+
+Enchancements:
+
+* Allow to configure timeout and lock_path in config file (options outcome)
+* Allow to configure log_path and log_level as command options (options outcome)
+
 # 0.0.1 (2015/08/13)
 
 first version

data/README.md

@@ -17,7 +17,10 @@ gem install alerty
 You can write a configuration file located at `/etc/sysconfig/alerty` (You can configure this path by `ALERTY_CONFIG_FILE` environment variable, or `-c` option):
 
 ```
+log_path: STDOUT
 log_level: 'debug'
+timeout: 10
+lock_path: /tmp/lock
 plugins:
   - type: stdout
 ```
@@ -34,9 +37,11 @@ $ alerty -c example.yml -- ls -l /something_not_exist
 
 ```
 $ bin/alerty -h
-    -c, --config CONFIG_PATH         config file path (default: /etc/sysconfig/alerty)
+    -c, --config CONFIG_FILE         config file path (default: /etc/sysconfig/alerty)
+        --log LOG_FILE               log file path (default: STDOUT)
+        --log-level LOG_LEVEL        log level (default: warn
     -t, --timeout SECONDS            timeout the command (default: no timeout)
-    -l, --lock LOCK_FILE             exclusive lock file not to run the same command duplicatedly (default: no lock)
+    -l, --lock LOCK_FILE             exclusive lock file to prevent running a command duplicatedly (default: no lock)
 ```
 
 ## Plugins

data/alerty.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "alerty"
-  gem.version       = '0.0.1'
+  gem.version       = '0.0.2'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/alerty'

data/example.yml

@@ -1,5 +1,7 @@
 log_path: log/alerty.log
 log_level: debug
+timeout: 10
+lock_path: log/lock
 plugins:
   - type: stdout
   - type: file

data/lib/alerty/cli.rb

@@ -14,24 +14,24 @@ class Alerty
       end
     end
 
-    opts = {
-      config: '/etc/sysconfig/alerty',
-      timeout: nil,
-      exclusive: nil,
+    opts = {}
+    op.on('-c', '--config CONFIG_FILE', "config file path (default: /etc/sysconfig/alerty)") {|v|
+      opts[:config_path] = v
     }
-
-    op.on('-c', '--config CONFIG_FILE', "config file path (default: #{opts[:config]})") {|v|
-      opts[:config] = v
+    op.on('--log LOG_FILE', "log file path (default: STDOUT)") {|v|
+      opts[:log_path] = v
+    }
+    op.on('--log-level LOG_LEVEL', "log level (default: warn)") {|v|
+      opts[:log_level] = v
     }
     op.on('-t', '--timeout SECONDS', "timeout the command (default: no timeout)") {|v|
       opts[:timeout] = v.to_i
     }
     op.on('-l', '--lock LOCK_FILE', "exclusive lock file to prevent running a command duplicatedly (default: no lock)") {|v|
-      opts[:exclusive] = v
+      opts[:lock_path] = v
     }
 
     op.parse!(argv)
-
     opts[:command] = argv.join(' ')
 
     if opts[:command].empty?
@@ -48,8 +48,8 @@ class Alerty
       usage e.message
     end
 
-    Config.configure(config_path: opts[:config]) if opts[:config]
+    Config.configure(opts)
     Config.plugins # load plugins in early stage
-    Command.new(command: opts[:command], opts: opts).run!
+    Command.new(command: opts[:command]).run!
   end
 end

data/lib/alerty/command.rb

@@ -2,9 +2,9 @@ require 'frontkick'
 
 class Alerty
   class Command
-    def initialize(command: , opts: {})
+    def initialize(command:)
       @command = command
-      @opts = opts
+      @opts = { timeout: Config.timeout, exclusive: Config.lock_path }
     end
 
     def run!

data/lib/alerty/config.rb

@@ -4,12 +4,14 @@ require 'hashie/mash'
 class Alerty
   class Config
     class << self
-      def configure(config_path: )
-        @config_path = config_path
+      attr_reader :opts
+
+      def configure(opts)
+        @opts = opts
       end
 
       def config_path
-        @config_path ||= ENV['ALERTY_CONFIG_PATH'] || '/etc/sysconfig/alerty'
+        @config_path ||= opts[:config_path] || ENV['ALERTY_CONFIG_PATH'] || '/etc/sysconfig/alerty'
       end
 
       def config
@@ -17,11 +19,19 @@ class Alerty
       end
 
       def log_path
-        config.log_path || 'STDOUT'
+        opts[:log_path] || config.log_path || 'STDOUT'
       end
 
       def log_level
-        config.log_level || 'warn'
+        opts[:log_level] || config.log_level || 'warn'
+      end
+
+      def timeout
+        opts[:timeout] || config.timeout
+      end
+
+      def lock_path
+        opts[:lock_path] || config.lock_path
       end
 
       def plugins

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alerty
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo