consul_watcher 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e50318d48e6289402eb0458fe4e4223a548810de65f592400dc3e7012f4443b
-  data.tar.gz: 4e25cb74e2e614f9a874aa07a9e8627a2733233cc3503ebb61ea4bc94a09afcd
+  metadata.gz: 1154bc525d36859510163c742472b9d58b850ff800e9e07bba309e7796fd9385
+  data.tar.gz: a8f35ed4aca91c81e57050343aa26354fa86a6c11a1bc0fe9522356492c7711c
 SHA512:
-  metadata.gz: a5e77b1018fce3771ccc803f0341067761ea55bfb19330332f9152d9beef7ad47971ca3a28e61e56b787ee7b9b902bdb898177b08c598083efdbf3858fb5885c
-  data.tar.gz: 18fac72357f24ab0e88516c79439fcef5bab11cc1c7f766e03dc63ace7897ed8c30c673706c3cfcf2bc363c8bee9ced936255f200c339fb8e6a1aca671d716c7
+  metadata.gz: a0ca51f1b7e53edc15384239730a5fb30a4d9dbecd44fd3323e560c43339e1d690c0d070d28af9ad189745c599cc2e681444d76dec66915bf9885eec0f0760f7
+  data.tar.gz: 81e309621849f103fe61495df030f6c33988e5a3ee0d423f23f3894dd7e22da2ea283a3901d3cb22a95956210126db901f34e6b87226088003615d33a492479d

data/Rakefile

@@ -2,63 +2,57 @@
 
 require 'bundler/gem_tasks'
 require 'open3'
-require_relative 'lib/consul_watcher/rake_helper'
+require 'flazm_ruby_helpers/os'
+require 'flazm_ruby_helpers/project'
+require_relative 'test/lib/rake_helper'
 
 spec_file = Gem::Specification.load('consul_watcher.gemspec')
 
 task default: :docker_build
 
-task :docker_tag, [:version, :docker_image_id] do |_task, args|
-  puts "Docker id #{args['docker_image_id']} => tag rfortman/consul_watcher:#{args['version']}"
-  tag_cmd = "docker tag #{args['docker_image_id']} rfortman/consul_watcher:#{args['version']}"
-  Open3.popen3(tag_cmd) do |_stdin, _stdout, stderr, wait_thr|
-    error = stderr.read
-    puts error unless wait_thr.value.success?
-  end
-end
-
 task docker_build: [:build] do
-  docker_image_id = nil
   build_cmd = "docker build --build-arg gem_file=consul_watcher-#{spec_file.version}.gem ."
-  threads = []
-  Open3.popen3(build_cmd) do |_stdin, stdout, stderr, wait_thr|
-    { out: stdout, err: stderr }.each do |key, stream|
-      threads << Thread.new do
-        until (raw_line = stream.gets).nil?
-          match = raw_line.match(/Successfully built (.*)$/i)
-          docker_image_id = match.captures[0] if match
-          puts raw_line.to_s
-        end
-      end
-    end
-    threads.each(&:join)
-    if wait_thr.value.success?
-      Rake::Task['docker_tag'].invoke(spec_file.version, docker_image_id)
-      Rake::Task['docker_tag'].reenable
-      Rake::Task['docker_tag'].invoke('latest', docker_image_id)
-    end
-  end
+  image_id = FlazmRubyHelpers::Project::Docker.build(build_cmd)
+  FlazmRubyHelpers::Project::Docker.tag(spec_file.metadata['docker_image_name'],
+                                        spec_file.version,
+                                        image_id)
+  FlazmRubyHelpers::Project::Docker.tag(spec_file.metadata['docker_image_name'],
+                                        'latest',
+                                        image_id)
 end
 
 task :start_deps do
   cmd = 'docker-compose --file test/docker-compose.yml up -d consul rabbitmq'
-  ConsulWatcher::RakeHelper.exec(cmd)
+  FlazmRubyHelpers::Os.exec(cmd)
   urls = [
     'http://localhost:8500/v1/status/leader',
     'http://localhost:15672'
   ]
-  ConsulWatcher::RakeHelper.wait_for_urls(urls)
-  ConsulWatcher::RakeHelper.config_rabbitmq
+  FlazmRubyHelpers::Http.wait_for_urls(urls)
 end
 
 task up: [:start_deps] do
-  cmd = 'docker-compose --file test/docker-compose.yml up -d consul-watcher'
-  _output, _status = ConsulWatcher::RakeHelper.exec(cmd)
+  _output, _success = FlazmRubyHelpers::Os.exec('docker-compose --file test/docker-compose.yml up -d consul-watcher')
+end
+
+task :consume do
+  ConsulWatcher::RakeHelper.config_rabbitmq
   puts 'Starting queue consumer'
   ConsulWatcher::RakeHelper.consumer_start
 end
 
 task :down do
-  cmd = 'docker-compose --file test/docker-compose.yml down'
-  _output, _status = ConsulWatcher::RakeHelper.exec(cmd)
+  _output, _success = FlazmRubyHelpers::Os.exec('docker-compose --file test/docker-compose.yml down')
+end
+
+task publish: [:build, :docker_build] do
+  FlazmRubyHelpers::Project::Git.publish(spec_file.version.to_s, 'origin', 'master')
+  FlazmRubyHelpers::Project::Docker.publish(spec_file.metadata['docker_image_name'], spec_file.version.to_s)
+  FlazmRubyHelpers::Project::Gem.publish(spec_file.name.to_s, spec_file.version.to_s)
+end
+
+task :unpublish do
+  _output, _success = FlazmRubyHelpers::Os.exec("git tag --delete #{spec_file.version.to_s}")
+  _output, _success = FlazmRubyHelpers::Os.exec("gem yank #{spec_file.name.to_s} -v #{spec_file.version.to_s}")
+  puts "Please delete the tag from dockerhub at https://cloud.docker.com/repository/registry-1.docker.io/#{spec_file.metadata['docker_image_name']}/tags"
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/consul_watcher.gemspec

@@ -4,13 +4,15 @@ lib = File.expand_path('lib', '..')
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = 'consul_watcher'
-  spec.version       = IO.read('VERSION').chomp
-  spec.authors       = ['Ryan Fortman']
-  spec.email         = ['r.fortman.dev@gmail.com']
-
-  spec.summary       = 'Send consul watch events to an amqp.'
-  spec.homepage      = 'https://github.com/fortman/consul_watcher'
+  spec.name     = 'consul_watcher'
+  spec.version  = IO.read('VERSION').chomp
+  spec.authors  = ['Ryan Fortman']
+  spec.email    = ['r.fortman.dev@gmail.com']
+  spec.summary  = 'Send consul watch events to an amqp.'
+  spec.homepage = 'https://github.com/fortman/consul_watcher'
+  spec.metadata = {
+    'docker_image_name' => 'rfortman/consul_watcher'
+  } 
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -19,11 +21,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_runtime_dependency 'bundler', '~> 2.0'
+  spec.add_dependency 'flazm_ruby_helpers', '~> 0.0.1'
+  spec.add_runtime_dependency 'bunny', '~> 1.7.0'
   spec.add_runtime_dependency 'diplomat', '~> 2.2.4'
-  spec.add_dependency 'bunny', '~> 1.7.0'
-  spec.add_dependency 'hashdiff', '~> 0.3'
-  spec.add_dependency 'slop', '~> 4.6'
+  spec.add_runtime_dependency 'hashdiff', '~> 0.3'
+  spec.add_runtime_dependency 'slop', '~> 4.6'
 end

data/docs/TODO.md

@@ -12,11 +12,12 @@
 | PROP        | proposed                                     |
 
 ## High level tasks
-| task                               | status |
-|:---------------------------------- |:------ |
-| Create documentation               | IP     |
-| Publish docker image and ruby gem  | IP     |
-| Write unit tests                   | PL     |
+| task                                         | status |
+|:-------------------------------------------- |:------ |
+| Create documentation                         | IP     |
+| Publish docker image and ruby gem            | IP     |
+| Write unit tests                             | PL     |
+| Write super classes for shared functionality | PL     |
 
 ## Functional ruby classes implementation
 
@@ -33,10 +34,10 @@
 | ---------------- |:----------- |
 | key/keyprefix    | FUNC        |
 | checks           | IP          |
-| services         | planned     |
-| service          | planned     |
-| nodes            | planned     |
-| event            | planned     |
+| services         | PL          |
+| service          | PL          |
+| nodes            | PL          |
+| event            | PL          |
 
 #### Destination class implementation status
 

data/lib/consul_watcher.rb

@@ -15,6 +15,7 @@ module ConsulWatcher
     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

data/lib/consul_watcher/destination/amqp.rb

@@ -16,11 +16,7 @@ module ConsulWatcher
       end
 
       def setup_rabbitmq
-        @conn = Bunny.new(host: @rabbitmq_server,
-                          port: @rabbitmq_port,
-                          vhost: @rabbitmq_vhost,
-                          username: @rabbitmq_username,
-                          password: @rabbitmq_password)
+        @conn = Bunny.new(rabbitmq_opts)
         @conn.start
         @ch = @conn.create_channel
         @ex = Bunny::Exchange.new(@ch,
@@ -29,6 +25,23 @@ module ConsulWatcher
                                   durable: true)
       end
 
+      def rabbitmq_opts
+        opts = {}
+        opts[:vhost] = @rabbitmq_vhost
+        opts[:username] = @rabbitmq_username
+        opts[:password] = @rabbitmq_password
+        if @rabbitmq_addresses
+          opts[:addresses] = @rabbitmq_addresses
+        elsif @rabbitmq_hosts
+          opts[:hosts] = @rabbitmq_hosts
+          opts[:port] = @rabbitmq_port if @rabbitmq_port
+        elsif @rabbitmq_host
+          opts[:host] = @rabbitmq_host
+          opts[:port] = @rabbitmq_port if @rabbitmq_port
+        end
+        opts
+      end
+
       def send(change)
         @logger.debug('publishing message')
         routing_key = change['id']
@@ -47,7 +60,12 @@ module ConsulWatcher
         logger.level = Logger::DEBUG
         {
           logger: logger,
-          rabbitmq_server: 'localhost',
+          #rabbitmq_host: nil,
+          rabbitmq_host: 'rabbitmq',
+          #rabbitmq_hosts: ['rabbitmq', 'localhost'],
+          #rabbitmq_host: 'localhost',
+          #rabbitmq_hosts: nil,
+          rabbitmq_addresses: nil,
           rabbitmq_port: '5672',
           rabbitmq_vhost: '/',
           rabbitmq_username: 'guest',

data/lib/consul_watcher/destination/jq.rb

@@ -31,14 +31,9 @@ module ConsulWatcher
         logger = Logger.new(STDOUT)
         logger.level = Logger::INFO
         {
-          logger: logger,
-          rabbitmq_server: 'localhost',
-          rabbitmq_port: '5672',
-          rabbitmq_vhost: '/',
-          rabbitmq_username: 'guest',
-          rabbitmq_password: 'guest',
-          rabbitmq_exchange: 'amq.topic'
+          logger: logger
         }
+      end
     end
   end
 end

data/lib/consul_watcher/filters.rb

@@ -11,20 +11,29 @@ module ConsulWatcher
     end
 
     def add_filters(filters_to_add)
-      @filters.merge!(filters_to_add)
+      @filters = @filters.deep_merge(filters_to_add)
     end
 
     def filter?(change)
-      @filters.each do |attribute, regex|
-        match = change.key?(attribute) ? change[attribute].match?(/#{regex}/) : false
+      @filters.each do |attribute, regexs|
+        next unless change.key?(attribute) && !change[attribute].nil?
+
+        match = match?(change[attribute], regexs)
         if match
-          @logger.debug("filtered #{change['id']} #{attribute} on regex #{regex}")
-          return true 
+          @logger.debug("filtered #{attribute} '#{change[attribute]}' against regular expressions #{regexs}")
+          return true
         end
       end
       false
     end
 
+    def match?(value, regexs)
+      results = regexs.each.collect do |regex|
+        value.match?(/#{regex}/)
+      end
+      results.any?
+    end
+
     def print_filters
       @filters.each do |filter|
         @logger.debug("filter: #{filter}")
@@ -35,7 +44,7 @@ module ConsulWatcher
 
     def defaults
       logger = Logger.new(STDOUT)
-      logger.level = Logger::WARN
+      logger.level = Logger::DEBUG
       {
         logger: logger,
         filters: {}

data/lib/consul_watcher/storage/consul.rb

@@ -31,7 +31,7 @@ module ConsulWatcher
       end
 
       def get_filters
-        { 'key_path' => cache_file_name }
+        { 'key_path' => [ cache_file_name ] }
       end
 
       private

data/lib/consul_watcher/watch_type/key.rb

@@ -22,6 +22,7 @@ module ConsulWatcher
           formatted_change
         end.compact
         changes = changes.each.collect.reject {|change| @filters.filter?(change)}
+        puts "size: #{changes.size}"
         changes
       end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: consul_watcher
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Fortman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -25,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: flazm_ruby_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: diplomat
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +148,14 @@ files:
 - lib/consul_watcher/destination/jq.rb
 - lib/consul_watcher/diff.rb
 - lib/consul_watcher/filters.rb
-- lib/consul_watcher/rake_helper.rb
 - lib/consul_watcher/storage/consul.rb
 - lib/consul_watcher/storage/disk.rb
 - lib/consul_watcher/watch_type/checks.rb
 - lib/consul_watcher/watch_type/key.rb
 homepage: https://github.com/fortman/consul_watcher
 licenses: []
-metadata: {}
+metadata:
+  docker_image_name: rfortman/consul_watcher
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/consul_watcher/rake_helper.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-
-# frozen_string_literal: true
-
-require 'open3'
-require 'net/http'
-require 'bunny'
-require 'json'
-
-module ConsulWatcher
-  module RakeHelper
-    def self.exec(command, stream: true)
-      output = [] ; threads = [] ; status = nil
-      Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
-        { out: stdout, err: stderr }.each do |_key, stream|
-          threads << Thread.new do
-            until (raw_line = stream.gets).nil?
-              output << raw_line.to_s
-              puts raw_line.to_s if stream
-            end
-          end
-        end
-        threads.each(&:join)
-        status = wait_thr.value.success?
-      end
-      return output, status
-    end
-
-    def self.wait_for_urls(urls)
-      urls.each do |url|
-        uri = URI(url)
-        error = true
-        Net::HTTP.start(uri.host, uri.port, read_timeout: 5, max_retries: 12) do |http|
-          while error
-            begin
-              response = http.request(Net::HTTP::Get.new(uri))
-              error = false
-            rescue EOFError
-              retry
-            end
-          end
-          raise Exception unless response.code == '200'
-
-          puts "up: #{url}"
-        end
-      end
-    end
-
-    def self.config_rabbitmq
-      conn = Bunny.new(host: 'localhost', port: '5672', vhost: '/', \
-                       username: 'guest', password: 'guest')
-      conn.start
-      ch = conn.create_channel
-      ex = Bunny::Exchange.new(ch, :topic, 'amq.topic', durable: true)
-      @queue = ch.queue('consul_watcher', durable: true).bind(ex, routing_key: 'consul_watcher.key.#')
-      nil
-    end
-
-    def self.process_message(delivery_info, properties, body)
-      puts "routing_key: #{delivery_info[:routing_key]}"
-      puts "properties: #{properties}"
-      puts "body:\n#{body}"
-      puts
-    end
-
-    def self.consumer_start
-      @consumer ||= @queue.subscribe(block: true, &itself.method(:process_message))
-      nil
-    end
-
-    def self.consumer_stop
-      @consumer&.cancel
-      @consumer = nil
-    end
-  end
-end