chef-deployment-monitor 1.1.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bee53a7e75c0085be4061b598629ae0b8a8cbfb
-  data.tar.gz: 36b89c247e0707ce0d662a2d54e90dccdd2a6475
+  metadata.gz: 3f31ffdf254faae23202f6f4ec3635e59e909afa
+  data.tar.gz: 04a3e643a46400d82b4d781aca382ef872a2b423
 SHA512:
-  metadata.gz: bd22cf5c5e8a406e6675be0c6d2f93907c6ede42e244b3160a56ecb0b5471845d6c10c10555aecbf5c19864ffe8c535f3439e214c5932734d54437c78c78223b
-  data.tar.gz: 548a782648c49501fbad976aff5c17b15687f853d144a9aa622d57d6515d6f7c7aa5f1cc1ed0fc479d47b276948e11d7745a0e3dd758ca81a4b9572c7dca999f
+  metadata.gz: fa8010bc885eecc8752326f0a962b540b34764b979930bf3fd891a492669114998a6f17de356a7dc506d13a423f68f59023d78082aba3e769a42db3eac72d156
+  data.tar.gz: e4662c1e430e15989847c63aa18212dd63126ddd287da59255150012ae413704466024e995c3d9747d22d8b60bda7bca91dd85bd6c7bb9338aeebca733d0f19e

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.2.0
+- 2.3.0
 deploy:
   provider: rubygems
   api_key:

data/chef-deployment-monitor.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'chef_deployment_monitor/version'
 
 Gem::Specification.new do |s|
   s.name              = 'chef-deployment-monitor'
-  s.version           = Chef::Deployment::Monitor::VERSION
+  s.version           = '1.2.1'
   s.platform          = Gem::Platform::RUBY
   s.has_rdoc          = false
   s.extra_rdoc_files  = ['LICENSE']

data/lib/chef_deployment_monitor/config.rb

@@ -24,9 +24,11 @@ class Chef
         extend Mixlib::Config
         config_strict_mode true
 
-        default :blacklisted?, Proc.new { |data| false } # rubocop:disable Lint/UnusedBlockArgument:
-        default :marker_file, '/tmp/last_chef_deployment'
-        default :history_file, '/tmp/lasts_chef_deployment'
+        default :blacklisted?, Proc.new { |data| false } # rubocop:disable Lint/UnusedBlockArgument, Lint/AmbiguousBlockAssociation
+        default :route, Proc.new { |data| "" } # rubocop:disable Lint/UnusedBlockArgument, Lint/AmbiguousBlockAssociation
+        default :output_file_directory, '/tmp/'
+        default :marker_file_template, '%slast-deployment.json'
+        default :history_file_template, '%slast-deployments.json'
         default :history_file_size, 1000
         %w(
       mon_file

data/lib/chef_deployment_monitor/logmon.rb

@@ -22,9 +22,10 @@ class Chef
   class Deployment
     class Monitor
       class Logmon
+        def initialize
+          @sinks = { }
+        end
         def run
-          sinks = [MarkerFileSink.new, HistoryFileSink.new]
-
           begin
             File.open(Monitor::Config[:mon_file]) do |mon|
               mon.extend(File::Tail)
@@ -38,7 +39,7 @@ class Chef
                   unless filter(data)
                     Monitor::Log.new(data.to_json, 'INFO')
                     data = digest(data)
-                    sinks.each { |sink| sink.receive(data) }
+                    sinks(data).each { |sink| sink.receive(data) }
                   end
                 end
               end
@@ -46,6 +47,17 @@ class Chef
           end
         end
 
+        def sinks(data)
+          route = Monitor::Config[:route].call(data)
+          unless @sinks.has_key? route
+            @sinks[route] = [MarkerFileSink.new(::File.join(Monitor::Config[:output_file_directory],
+                                                            Monitor::Config[:marker_file_template] % route)),
+                             HistoryFileSink.new(::File.join(Monitor::Config[:output_file_directory],
+                                                             Monitor::Config[:history_file_template] % route))]
+          end
+          @sinks[route]
+        end
+
         def format(data)
           # convert to timestamp
           data_dup = data.dup

data/lib/chef_deployment_monitor/sinks.rb

@@ -9,11 +9,17 @@ class Chef
       end
 
       class MarkerFileSink < Sink
+        attr_reader :file
+
+        def initialize(outfile)
+          @file    = outfile
+        end
+
         # will modify the marker file
         # last write data of marker file will be within 5 seconds
         # of last deployement
         def receive(data)
-          File.open(Monitor::Config[:marker_file], 'w+') do |f|
+          File.open(file, 'w+') do |f|
             f.write(data.to_json)
           end
         end
@@ -23,10 +29,10 @@ class Chef
 
         attr_reader :file
 
-        def initialize
-          @file    = Monitor::Config[:history_file]
+        def initialize(outfile)
+          @file    = outfile
           @history = if File.exist?(file)
-                       JSON.parse(File.read(file)) rescue []
+                       JSON.parse(File.read(file)) rescue [] # rubocop:disable Lint/RescueWithoutErrorClass
                      else
                        []
                      end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-deployment-monitor
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Sander Botman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file-tail
@@ -116,7 +116,6 @@ files:
 - lib/chef_deployment_monitor/log.rb
 - lib/chef_deployment_monitor/logmon.rb
 - lib/chef_deployment_monitor/sinks.rb
-- lib/chef_deployment_monitor/version.rb
 - lib/chef_logmon.rb
 homepage: https://github.com/kamaradclimber/chef-deployment-monitor
 licenses:
@@ -138,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Chef Monitoring tool to monitor all changes made

data/lib/chef_deployment_monitor/version.rb

@@ -1,25 +0,0 @@
-#
-# Author:: Sander Botman (<sander.botman@gmail.com>)
-# Copyright:: Copyright (c) 2014 Sander Botman.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class Chef
-  class Deployment
-    class Monitor
-      VERSION = '1.1.3'
-      MAJOR, MINOR, TINY = VERSION.split('.')
-    end
-  end
-end