alerty 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc317e075c9f5dbdf24fd431e6b7dddd3f68d1a
-  data.tar.gz: 6288a780b49cbac9d68b662bd5381430270547de
+  metadata.gz: 3ae60fa6de1c6a296b2aaefc0429cf84d716a9f8
+  data.tar.gz: b499e6edb6b41470af44ffad38c07f21ea5daff4
 SHA512:
-  metadata.gz: 3ea49ad7c8ab76fa41268896872061bc2c826d42cae620c8cd900c1b29f6b33afb82a7d6f3b871fbf50b7bd7eaea1e23d3450bfba91a046fb0906016b35df775
-  data.tar.gz: f29f8d6cb14926057761e55e5e0bc1d78ff62375ab9780529f4a94b518a7c825b9f06a646d299227d2f58acc315b6cea173e1b49c2c859806b94851e57927ad9
+  metadata.gz: f88a28b14ce75957b38708936969d8e77fa1f2a8b2789ddbb838fb23ca1af0a9efb3e0cba9b06b92a107f783908727389822c8988f036591f26dee7e03935ddf
+  data.tar.gz: 3bd9c34db9e0140f0e096e284dea90dc23fdee11d3a43772bd0f57c363c2a4e47034d0ffeec197bd75437f97932f8bfee3bc6e0aa9584503ff01359e76140eba

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.0 (2017/03/20)
+
+Enhancements:
+
+* Use popen2e rather than `2>&1`
+
 # 0.2.3 (2017/01/20)
 
 Enhancements:

data/README.md

@@ -77,14 +77,14 @@ Following plugins are available:
 
 ### Naming Convention
 
-You must follow the below naming conventions:
+You must follow following naming conventions:
 
 * gem name: alerty-plugin-xxx (xxx_yyy)
 * file name: lib/alerty/plugin/xxx.rb (xxx_yyy.rb)
 * class name: Alerty::Plugin:Xxx (XxxYyy)
 
 ### Interface
-
+u
 What you have to implement is `#initialize` and `#alert` methods. Here is an example of `file` plugin:
 
 ```ruby
@@ -123,7 +123,7 @@ plugins:
 
 ### record
 
-`record` is a hash whose keys are
+`record` is a hash whose keys are symbols of followings:
 
 * hostname: hostname
 * command: the executed command

data/alerty.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'hashie'
   gem.add_runtime_dependency 'oneline_log_formatter'
-  gem.add_runtime_dependency 'frontkick', '>= 0.4.0'
+  gem.add_runtime_dependency 'frontkick', '>= 0.5.5'
   gem.add_runtime_dependency 'dotenv'
 
   gem.add_development_dependency 'rspec'

data/lib/alerty/command.rb

@@ -6,7 +6,7 @@ class Alerty
   class Command
     def initialize(command:)
       @command = command
-      @opts = { timeout: Config.timeout, exclusive: Config.lock_path }
+      @opts = { timeout: Config.timeout, exclusive: Config.lock_path, popen2e: true }
       @hostname = Socket.gethostname
     end
 
@@ -15,7 +15,7 @@ class Alerty
       with_retry do |retries|
         started_at = Time.now
         begin
-          result = with_clean_env { Frontkick.exec("#{@command} 2>&1", @opts) }
+          result = with_clean_env { Frontkick.exec(@command, @opts) }
         rescue Frontkick::Timeout => e
           record = {
             hostname:   @hostname,
@@ -41,7 +41,7 @@ class Alerty
             hostname:   @hostname,
             command:    @command,
             exitstatus: result.exitstatus,
-            output:     result.stdout,
+            output:     result.output,
             started_at: started_at.to_f,
             duration:   result.duration,
             retries:    retries,

data/lib/alerty/config.rb

@@ -41,7 +41,7 @@ class Alerty
             'lock_path' => lock_path,
             'retry_limit' => retry_limit,
             'retry_wait' => retry_wait,
-            'plugin' => yaml['plugins'],
+            'plugins' => yaml['plugins'],
           }.to_yaml)
         end
         @config

data/lib/alerty/version.rb

@@ -1,3 +1,3 @@
 class Alerty
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/spec/command_spec.rb

@@ -9,15 +9,17 @@ describe Alerty::Command do
           log_level: 'fatal',
           timeout: 20,
           lock_path: '/tmp/lock',
+          config_path: File.join(ROOT, 'spec/cli_spec.yml'),
         )
       end
 
       let(:command) { Alerty::Command.new(command: 'ls') }
 
       it do
-        expect(Frontkick).to receive(:exec).with("ls 2>&1", {
+        expect(Frontkick).to receive(:exec).with("ls", {
           timeout: 20,
           exclusive: '/tmp/lock',
+          popen2e: true,
         }).and_return(Frontkick::Result.new(exit_code: 0))
         expect { command.run! }.not_to raise_error
       end
@@ -41,9 +43,10 @@ describe Alerty::Command do
       let(:command) { Alerty::Command.new(command: 'echo foo') }
 
       it do
-        expect(Frontkick).to receive(:exec).with("echo foo 2>&1", {
+        expect(Frontkick).to receive(:exec).with("echo foo", {
           timeout: nil,
           exclusive: nil,
+          popen2e: true,
         }).and_return(Frontkick::Result.new(stdout: 'foo', exit_code: 1))
         stdout = capture_stdout { expect { command.run! }.to raise_error(SystemExit) }
         expect(JSON.parse(stdout)["output"]).to eql("foo")
@@ -68,10 +71,11 @@ describe Alerty::Command do
       let(:command) { Alerty::Command.new(command: 'sleep 1') }
 
       it do
-        expect(Frontkick).to receive(:exec).with("sleep 1 2>&1", {
+        expect(Frontkick).to receive(:exec).with("sleep 1", {
           timeout: 0.1,
           exclusive: '/tmp/lock',
-        }).and_raise(Frontkick::Timeout.new(111, 'sleep 1 2>&1', true))
+          popen2e: true,
+        }).and_raise(Frontkick::Timeout.new(111, 'sleep 1', true))
         stdout = capture_stdout { expect { command.run! }.to raise_error(SystemExit) }
         expect(JSON.parse(stdout)["output"]).to include("timeout")
       end
@@ -95,9 +99,10 @@ describe Alerty::Command do
       let(:command) { Alerty::Command.new(command: 'sleep 1') }
 
       it do
-        expect(Frontkick).to receive(:exec).with("sleep 1 2>&1", {
+        expect(Frontkick).to receive(:exec).with("sleep 1", {
           timeout: 20,
           exclusive: '/tmp/lock',
+          popen2e: true,
         }).and_raise(Frontkick::Locked)
         stdout = capture_stdout { expect { command.run! }.to raise_error(SystemExit) }
         expect(JSON.parse(stdout)["output"]).to include("lock")
@@ -121,9 +126,10 @@ describe Alerty::Command do
       let(:command) { Alerty::Command.new(command: 'echo foo') }
 
       it do
-        expect(Frontkick).to receive(:exec).twice.with("echo foo 2>&1", {
+        expect(Frontkick).to receive(:exec).twice.with("echo foo", {
           timeout: nil,
           exclusive: nil,
+          popen2e: true,
         }).and_return(Frontkick::Result.new(stdout: 'foo', exit_code: 1))
         stdout = capture_stdout { expect { command.run! }.to raise_error(SystemExit) }
         expect(JSON.parse(stdout)["retries"]).to eql(1)

data/spec/config_spec.rb

@@ -76,8 +76,8 @@ describe Alerty::Config do
     end
 
     it do
-      expect(Alerty::Config.plugins[0]).to be_a(Alerty::Plugin::Stdout)
-      expect(Alerty::Config.plugins[1]).to be_a(Alerty::Plugin::File)
+      expect(Alerty::Config.plugins[0]['type']).to eql('stdout')
+      expect(Alerty::Config.plugins[1]['type']).to eql('file')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alerty
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Send an alert if a given command failed