pushyd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5aec80f8d9fb5ae6dea9ded765c0c182cb4df3f
-  data.tar.gz: edd2a2cfebcfe4909f423dbd9df2047cc0022e00
+  metadata.gz: ca463949c5fa9f480b8e633fcc7e643c65b99b49
+  data.tar.gz: 41cc183c357febc1b7e6b0205b77780ac02e74de
 SHA512:
-  metadata.gz: 833db2c5b2b39dc40e238d7156b89b8953771014bd1443cc88bfd2a683b1f669d9bfbe29816248e7aeb14b9a8a745f2c526c1709558fea1905f92edaed04d878
-  data.tar.gz: 15ab75984969df568efe8abb3fc6bfa5e65c2ff23a96d47d9453390d3329c7cc4aac21942ec1dc20226d125ce18dfad08fa6343745dd8c9843875aa1e40920cf
+  metadata.gz: d82de71f0db606d5bac58b41492e8516fade29b2129b9bc87cdfdfa23ea5a6f754e2503f56a6e2dda41249b5f60d22e9022692007800c5b3606e0857888291e1
+  data.tar.gz: 688aad1c187603bfa35e6a48f4f7ded4298518ec38255c63bb8cc9106206d1bde2aed7f806a83d8b3749139a6eaeec90e2ef7fcc4472ae0f2f5cfce39ab4f4f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.3.1)
+    pushyd (0.3.2)
       bunny
       chamber
       daemons

data/README.md

@@ -6,13 +6,13 @@ pushyd
 [![Test Coverage](https://codeclimate.com/github/bmedici/pushyd/badges/coverage.svg)](https://codeclimate.com/github/bmedici/pushyd/coverage)
 [ ![Codeship](https://codeship.com/projects/72fcb0f0-0fa7-0134-fb73-16f75abdb9e2/status?branch=master)](https://codeship.com/projects/156725)
 
-This is a basic proxy listenning to a RabbitMQ bus, and repeating selected messages in POST requests when matching filters
+A nice proxy listenning to a RabbitMQ bus, repeating selected messages in POST requests when filters match routing patterns
 
 
 Known bugs
 ------------------------------------------------------------------------------------
 
-None at this time
+* As this project is based on the Psyck YAML parser, configuration merge from "defaults" section and environment-specific section are broken. A sub-tree defined for a specific environment, will overwrite the corresponding subtree from "defaults". Please repeat whole sections from "defaults".
 
 
 Contributing
@@ -42,10 +42,8 @@ So,
   * add proper tests if adding a feature
   * run the tests using `rake`
   * check for RuboCop style guide violations
-
 4. Commit your changes
 5. Push to the branch (`git push origin my-new-feature`)
-
 6. Create new Pull Request
 
 

data/bin/pushyd

@@ -35,13 +35,6 @@ begin
   # Build Chamber-based configuration from Gemspec with initial context
   Conf.prepare root: APP_ROOT, gemspec: "pushyd", env: cmd_env, config: cmd_config, log: cmd_logfile
 
-  # Display final configuration
-  puts "--- #{Conf.name} #{Conf.version}"
-  puts "Environment    \t #{Conf.env}"
-  puts "Config files   \t #{Conf.files}"
-  puts "Loging to file \t #{Conf[:log]}"
-  puts Conf.dump if cmd_dump
-
 rescue OptionParser::InvalidOption => e
   abort "EXITING: option parser: #{e.message}"
 rescue PushyDaemon::ConfigParseError => e
@@ -50,6 +43,19 @@ rescue StandardError => e
   abort "EXITING: Exception: #{e.message}"
 end
 
+# Display final configuration
+puts "--- #{Conf.name} #{Conf.version}"
+puts "YAML Parser    \t #{YAML.name}"
+puts "Environment    \t #{Conf.env}"
+puts "Config files   \t #{Conf.files}"
+puts "Loging to file \t #{Conf[:log]}"
+
+
+# Quit if config dump requested
+if cmd_dump
+  puts Conf.dump
+  exit(0)
+
 
 # Run daemon
 run_options = {

data/lib/pushyd.rb

@@ -1,5 +1,6 @@
 # Global libs
 require "rubygems"
+require "yaml"
 require "json"
 require "thread"
 require "singleton"
@@ -14,3 +15,6 @@ require_relative "pushyd/proxy"
 require_relative "pushyd/shouter"
 require_relative "pushyd/daemon"
 
+
+
+

data/lib/pushyd/proxy.rb

@@ -1,6 +1,4 @@
 require 'rest_client'
-require 'yaml'
-require 'json'
 require 'terminal-table'
 
 module PushyDaemon

data/lib/pushyd/shouter.rb

@@ -1,6 +1,3 @@
-require 'yaml'
-require 'json'
-
 module PushyDaemon
   class ShouterResponseError       < StandardError; end
   class ShouterChannelClosed       < StandardError; end

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.3.1"
+  spec.version                      = "0.3.2"
 
   # Project description
   spec.name                         = "pushyd"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Bruno MEDICI