jackhammer 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bd9a7e8b2be82da0c8751c93a24c77b40a580de54b40041479e7585487d160
-  data.tar.gz: 06b2c035650f92b9bf48297107457d99820bd54bb80f97a63463b462cc52e320
+  metadata.gz: 485b5598534853da9cc94ce3402e8e81e1f261820208f04d4f343783cf82e231
+  data.tar.gz: e8ae165eb429b89065c8cb3630457bffc15d1be6a9e59826d52466f2a28b19dd
 SHA512:
-  metadata.gz: 380993eadd3d1fc75491dda76684bed6192c9b5761b838d681f81258c844413ee70a07a2a1594a67374c45958e3c6fe3eeaf8cc54657e3ce652421e039910b42
-  data.tar.gz: 18cd2e224c838c1efaad1c80720792af77e68efd1c52b962d272e7824401398ee81ef3acae8eb92c69947b6a25728023b95eb6064381e5cd8c5e43306b1f5e73
+  metadata.gz: b505c5468529bb070b6fd193a460a0252134886059b22858961f54af1932e56fb6096fe9f4fe966e32c76856cb85aad8451fa2aaf22d6c93f97f5d4722b8a92f
+  data.tar.gz: 35afe310870caf60d6a505c9f5839f4043014f7c651166d129116dfa012da4f54f92dd8718ca7ab74f42e9c9f0442e136331134739597e5cecd155698ca126bc

data/Gemfile.lock

@@ -1,40 +1,41 @@
 PATH
   remote: .
   specs:
-    jackhammer (1.3.4)
+    jackhammer (1.3.5)
       bunny (~> 2.14)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    amq-protocol (2.3.1)
-    ast (2.4.0)
+    amq-protocol (2.3.2)
+    ast (2.4.1)
     bunny (2.15.0)
       amq-protocol (~> 2.3, >= 2.3.1)
     bunny-mock (1.7.0)
       bunny (>= 1.7)
     byebug (11.1.3)
     concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.2)
+    diff-lcs (1.4.4)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     minitest (5.14.1)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -49,26 +50,27 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.84.0)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
+    rubocop-ast (0.1.0)
       parser (>= 2.7.0.1)
-    rubocop-performance (1.6.0)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.39.0)
-      rubocop (>= 0.68.1)
+    rubocop-performance (1.7.0)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.42.0)
+      rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -5,4 +5,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[rubocop:auto_correct spec]
+task default: %i[spec rubocop:auto_correct]

data/lib/jackhammer/configuration_validator.rb

@@ -0,0 +1,60 @@
+module Jackhammer
+  class ConfigurationValidator
+    attr_accessor :config_yaml, :environment, :errors
+
+    def initialize
+      @errors = []
+    end
+
+    def validate
+      validate_environment_defined
+      return if errors.any?
+      validate_topic_exchange_defined
+      return if errors.any?
+      validate_queues_defined
+      return if errors.any?
+      validate_handlers_defined
+    end
+
+    def validate_environment_defined
+      return if config_yaml[environment]
+
+      add_error("Environment '#{environment}' is not defined")
+    end
+
+    def validate_topic_exchange_defined
+      return if config_yaml[environment].keys.any?
+
+      add_error("Environment '#{environment}' does not define a topic exchange")
+    end
+
+    def validate_queues_defined
+      topics = config_yaml[environment].keys
+      topics.each do |topic|
+        begin
+          next if config_yaml[environment][topic]['queues']
+        rescue StandardError
+          false
+        end
+
+        add_error("Topic '#{topic}' does not define any queues")
+      end
+    end
+
+    def validate_handlers_defined
+      config_yaml[environment].each do |exchange_name, exchange_config|
+        exchange_config['queues'].each do |qconfig|
+          Object.const_get(qconfig['handler'])
+        rescue NameError
+          add_error("Uninitialized constant #{qconfig['handler']}")
+        end
+      end
+    end
+
+    private
+
+    def add_error(str)
+      @errors << str
+    end
+  end
+end

data/lib/jackhammer/queue_name.rb

@@ -7,7 +7,7 @@ module Jackhammer
     def self.from_routing_key(routing_key)
       fail(InvalidConfigError, "app_name must be set to determine queue_name from routing_key") if app_name.to_s.empty?
 
-      "#{app_name}_#{routing_key}_q".gsub(/[^\w]+/, '_').gsub(/[_]+/, '_')
+      "#{app_name}_#{routing_key}_q".gsub(/[^\w]+/, '_').squeeze('_')
     end
   end
 end

data/lib/jackhammer/rake_task.rb

@@ -0,0 +1,70 @@
+require 'rake'
+require 'rake/tasklib'
+require 'yaml'
+require 'jackhammer/configuration_validator'
+
+module Jackhammer
+  class RakeTask < ::Rake::TaskLib
+    # Name of test task. (default is :jackhammer)
+    attr_accessor :name
+
+    # File path of the configuration file. (default is ./config/jackhammer.yml)
+    attr_accessor :path
+
+    # Description of the test task. (default is 'Validate Jackhammer
+    # configuration')
+    attr_accessor :description
+
+    # Task prerequisites.
+    attr_accessor :deps
+
+    # Specifies the environment to inspect. (default is 'production')
+    attr_accessor :env
+
+    def initialize
+      @name = :jackhammer
+      @env = 'production'
+      @path = './config/jackhammer.yml'
+      @description = 'Validate Jackhammer configuration'
+      @deps = []
+      yield self if block_given?
+      if @name.is_a?(Hash)
+        @deps = @name.values.first
+        @name = @name.keys.first
+      end
+      define
+    end
+
+    def define
+      desc @description
+      task @name => Array(deps) do
+        validator = ConfigurationValidator.new
+        validator.config_yaml = YAML.safe_load(File.read(@path))
+        validator.environment = env
+        validator.validate
+        print_results validator.errors
+      end
+    end
+
+    private
+
+    def print_results(errors)
+      puts "Jackhammer configuration #{path}\n"
+      if errors.any?
+        puts red("Problems identified: #{errors.size}\n")
+        errors.each { |error| puts red(error) }
+        exit 1
+      else
+        puts green('OK')
+      end
+    end
+
+    def red(text)
+      "\e[1;31m#{text}\e[0m"
+    end
+
+    def green(text)
+      "\e[1;32m#{text}\e[0m"
+    end
+  end
+end

data/lib/jackhammer/version.rb

@@ -1,3 +1,3 @@
 module Jackhammer
-  VERSION = '1.3.4'.freeze
+  VERSION = '1.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackhammer
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Scott Serok
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -177,11 +177,13 @@ files:
 - lib/jackhammer.rb
 - lib/jackhammer/cli.rb
 - lib/jackhammer/configuration.rb
+- lib/jackhammer/configuration_validator.rb
 - lib/jackhammer/exceptions.rb
 - lib/jackhammer/log.rb
 - lib/jackhammer/message_receiver.rb
 - lib/jackhammer/queue.rb
 - lib/jackhammer/queue_name.rb
+- lib/jackhammer/rake_task.rb
 - lib/jackhammer/server.rb
 - lib/jackhammer/topic.rb
 - lib/jackhammer/topic_manager.rb