consul_watcher 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3536a05333e1f27b093b1fa741fac026e1304a330e540e480feeb32eadc4b8b
-  data.tar.gz: 16038d2ac2b9c161148b08a8712dce8c68a7aa8f512adb2e8f46b74c13972854
+  metadata.gz: c64ab6b82a3f373abf2f361dcf43fc08331d013abfb88d8d59c6f24599067197
+  data.tar.gz: 8ed45c066f4f81956edde455dee7a6885d6ee46fe50944e1331ed0914f6907ea
 SHA512:
-  metadata.gz: 624df3ed84d3a7a9afe60bdb91c177c2d5e65be12fd200c828e6d884377dfe7f6035122d95e0a7f2d27ab4880fbe6b85928bc01d6c7ce6d8fa5c4cd58d8b7037
-  data.tar.gz: bd24770c6468c2ceb03d4e1446593441464c6af4b9056c85a02ebe007b81db13fdbe837b9fbb5875698b677ff3e234b8f38903eb980e448a5b0a4fcc1f985e6c
+  metadata.gz: 1d8af09da58ddf8865dc5b76a4e6db03ef39fb110356bc7e45c45c5f416b78870d0e0cb64204af65adf4c1b42a212e04ec71eb6b5f563aa4b76963d24becea94
+  data.tar.gz: 6b5d329ea148bc2ffa2e6d16cb460d0ea07d427536235fe56dec7135c3ed29845e0f027c530783d83588d87f2c9a9da9f2d629abf9f44229b1d79ba9c3939020

data/README.md

@@ -1,5 +1,5 @@
 # NOTICE
-This gem is a work in progress.  Please see the [TODO](https://github.com/fortman/consul_watcher/blob/master/docs/TODO.md) documentation
+This gem is a work in progress.  0.0.x versions are considered to be in ALPHA state where functionality will vary greatly between versions.  0.1.0 will be the first BETA relese and will come with better backwards compatibility guarentees.  Please see the [TODO](https://github.com/fortman/consul_watcher/blob/master/docs/TODO.md) documentation
 
 ## First 0.0.1 release.  Partial functionality
 - [ruby gem](https://rubygems.org/gems/consul_watcher)

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/docs/TODO.md

@@ -45,3 +45,5 @@
 | ----------------- |:----------- |
 | AMQP              | FUNC        |
 | JQ                | FUNC        |
+
+# Change filter to be whitelist/blacklist

data/lib/consul_watcher.rb

@@ -9,16 +9,16 @@ require 'consul_watcher/filters'
 # Top Level module to run watch logic
 module ConsulWatcher
   def self.watch(config)
-    #Encoding.default_external = Encoding::UTF_8
-    #Encoding.default_external = Encoding::ASCII_8BIT
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
     assemble(config)
     current_watch_json = $stdin.read
     previous_watch_json = @storage.fetch
     changes = @watch_type.get_changes(previous_watch_json, current_watch_json)
-    # @watch_type.filters.print_filters
     changes.each do |change|
       @destination.send(change)
     end
+    logger.info("Processed #{changes.size} change#{'s' unless changes.size == 1}")
     @storage.push(current_watch_json) unless changes.empty?
   end
 

data/lib/consul_watcher/destination/amqp.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 require 'bunny'
-require 'consul_watcher/class_helper'
 require 'json'
+require 'flazm_ruby_helpers/class'
 
 module ConsulWatcher
   module Destination
     # Send diff output to jq command line
     class Amqp
-      include ClassHelper
+      include FlazmRubyHelpers::Class
 
       def initialize(destination_config)
-        populate_variables(destination_config)
+        initialize_variables(destination_config)
         setup_rabbitmq
       end
 

data/lib/consul_watcher/destination/jq.rb

@@ -2,13 +2,14 @@
 
 require 'open3'
 require 'logger'
+require 'flazm_ruby_helpers/class'
 
 module ConsulWatcher
   module Destination
     # Send diff output to jq command line
     class Jq
       def initialize(destination_config)
-        populate_variables(destination_config)
+        initialize_variables(destination_config)
       end
 
       def send(change)

data/lib/consul_watcher/filters.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
-require 'consul_watcher/class_helper'
+require 'flazm_ruby_helpers/class'
+require 'flazm_ruby_helpers/data_structures'
 
 module ConsulWatcher
   class Filters
-    include ClassHelper
+    include FlazmRubyHelpers::Class
 
     def initialize(filter_config)
-      populate_variables(filter_config)
+      initialize_variables(filter_config)
     end
 
     def add_filters(filters_to_add)
-      @filters = @filters.deep_merge(filters_to_add)
+      @filters = @filters.deep_merge(filters_to_add) unless filters_to_add.nil?
     end
 
     def filter?(change)

data/lib/consul_watcher/storage/consul.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 require 'diplomat'
-require 'consul_watcher/class_helper'
 require 'zlib'
+require 'flazm_ruby_helpers/class'
 
 # This will be a module to store previous consul watch json to compare with previous watch data
 module ConsulWatcher
   module Storage
     # Consul storage for previous watch data
     class Consul
-      include ClassHelper
+      include FlazmRubyHelpers::Class
 
       def initialize(storage_config)
-        populate_variables(storage_config)
+        initialize_variables(storage_config)
         config_diplomat
       end
 
       def fetch
         @logger.debug('fetching state from consul')
         data = Diplomat::Kv.get(cache_file_name)
-        data = Zlib::Inflate.inflate(data) if @encrypt
+        data = Zlib::Inflate.inflate(data) if @compress
         data
       rescue Diplomat::KeyNotFound
         '{}'
@@ -27,7 +27,7 @@ module ConsulWatcher
 
       def push(data)
         @logger.debug('pushing state to consul')
-        Diplomat::Kv.put(cache_file_name, @encrypt ? Zlib::Deflate.deflate(data, Zlib::BEST_COMPRESSION) : data)
+        Diplomat::Kv.put(cache_file_name, @compress ? Zlib::Deflate.deflate(data, Zlib::BEST_COMPRESSION) : data)
       end
 
       def get_filters
@@ -58,7 +58,7 @@ module ConsulWatcher
           parent_dir: 'watch/json-store',
           consul_http_addr: 'http://localhost:8500',
           consul_token: nil,
-          encrypt: false
+          compress: false
         }
       end
     end

data/lib/consul_watcher/storage/disk.rb

@@ -1,32 +1,57 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+require 'zlib'
+require 'flazm_ruby_helpers/class'
+
 module ConsulWatcher
   module Storage
     # Disk storage for previous watch data
     class Disk
+      include FlazmRubyHelpers::Class
+
       def initialize(storage_config)
-        @parent_dir = storage_config['storage_parent_dir'] || '/tmp'
+        initialize_variables(storage_config)
+        FileUtils.mkdir_p(@cache_dir) unless File.directory?(@cache_dir)
       end
 
-      def fetch(watch_name)
-        file = File.open(cache_file_name(watch_name), mode: 'r')
+      def fetch
+        file = File.open(cache_file_name, mode: 'r')
         data = file.read
         file.close
+        data = Zlib::Inflate.inflate(data) if @compress
         data
       rescue Errno::ENOENT
         '{}'
       end
 
-      def push(watch_name, data)
-        file = File.open(cache_file_name(watch_name), mode: 'w')
-        file.write(data)
+      def push(data)
+        file = File.open(cache_file_name, mode: 'w')
+        file.write(@compress ? Zlib::Deflate.deflate(data, Zlib::BEST_COMPRESSION) : data)
         file.close
       end
 
+      def get_filters
+        nil
+      end
+
       private
 
-      def cache_file_name(watch_name)
-        "#{@parent_dir}/#{watch_name}.json"
+      def cache_file_name
+        "#{@cache_dir}/#{@storage_name}.json"
+      end
+
+      def defaults
+        logger = Logger.new(STDOUT)
+        logger.level = Logger::WARN
+        {
+          logger: logger,
+          storage_name: 'disk',
+          cache_dir: 'watch/json-store',
+          consul_http_addr: 'http://localhost:8500',
+          consul_token: nil,
+          compress: false
+        }
       end
     end
   end

data/lib/consul_watcher/watch_type/key.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 require 'base64'
-require 'consul_watcher/class_helper'
+require 'flazm_ruby_helpers/class'
 
 module ConsulWatcher
   module WatchType
     class Key
-      include ClassHelper
+      include FlazmRubyHelpers::Class
 
       attr_accessor :filters
       def initialize(watch_config)
-        populate_variables(watch_config)
+        initialize_variables(watch_config)
       end
 
       def get_changes(previous_watch_json, current_watch_json)
@@ -22,7 +22,6 @@ module ConsulWatcher
           formatted_change
         end.compact
         changes = changes.each.collect.reject {|change| @filters.filter?(change)}
-        puts "size: #{changes.size}"
         changes
       end
 
@@ -38,7 +37,7 @@ module ConsulWatcher
       end
 
       def decode(change)
-        return unless change['element'] == 'Value'
+        return unless change['key_property'] == 'Value'
 
         change['old_value'] = Base64.decode64(change['old_value']) if change['old_value'].is_a? String
         change['new_value'] = Base64.decode64(change['new_value']) if change['new_value'].is_a? String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_watcher
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryan Fortman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,6 @@ files:
 - docs/watch_type/watch_type.md
 - exe/consul_watcher
 - lib/consul_watcher.rb
-- lib/consul_watcher/class_helper.rb
 - lib/consul_watcher/destination/amqp.rb
 - lib/consul_watcher/destination/jq.rb
 - lib/consul_watcher/diff.rb

data/lib/consul_watcher/class_helper.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module ConsulWatcher
-  # Define methods to handle default initialization behavior
-  module ClassHelper
-    def populate_variables(config = {})
-      defaults.each_pair do |key, default_value|
-        key = key.to_s
-        if config[key]
-          instance_variable_set("@#{key}", config[key])
-        elsif ENV[key.upcase.to_s]
-          instance_variable_set("@#{key}", ENV[key.upcase.to_s])
-        else
-          instance_variable_set("@#{key}", default_value)
-        end
-      end
-    end
-  end
-end