larva 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bde0829b8aaeed8e30e47827c6b23fb29140ea8
-  data.tar.gz: 863ec67e91be524556c62d623d805ee472bf8c23
+  metadata.gz: 253b6387b64a8f8bd27ee2b6e532f42c12890d90
+  data.tar.gz: 9cee9c21d012769f6b15f732f9a79a1ae6870dbc
 SHA512:
-  metadata.gz: 2829b4320ee369b5c5e88bda04f2fd6748ce3f2112d8250c592c73fe0734dd193ff2eef6626297449d2ee612dc6676f6e93bcbf99a5bea329821ce0fdec56363
-  data.tar.gz: ebf575ac928b7bd6861be17fd312a465fd89263f0afca433907775efda054e9a4ede98c6564f5199f900b9b80346ea580a4478d312ca008355b195b7b0e1a83d
+  metadata.gz: 78b99443b3b9ac3c933bb1562738b704340edc38aabe36653618fa087449784cf95733e06ad541df6ca49bac920c8cf3fda870f536df9c79a12ceb0736660ec6
+  data.tar.gz: 96c291367029f57c8091eb099dd1a017863a3248f43074ee8840649544880e1822b87b544856cbe588f1b53cfd1b43acfac9083886e464dc5fb59dc6a9de3351

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.3.0 / 2015-10-7
+* [FEATURE] Read all values from propono.yml (@stevenbarragan)
+
 # 1.2.0 / 2015-08-27
 * [FEATURE] Interpolate erb on propono configuration yml (@stevenbarragan)
 

data/lib/larva/configurator.rb

@@ -20,19 +20,9 @@ module Larva
       Filum.setup(@logfile)
       Filum.logger.info "Configuring Daemon"
 
-      if propono_config = parse_config_file('propono.yml')
-        Propono.config do |config|
-          config.use_iam_profile  = propono_config[:use_iam_profile]
-          config.access_key       = propono_config[:access_key]
-          config.secret_key       = propono_config[:secret_key]
-          config.queue_region     = propono_config[:region]
-          config.application_name = propono_config[:application_name]
-          config.queue_suffix     = propono_config[:queue_suffix]
-          config.udp_host         = "pergo.meducation.net"
-          config.udp_port         = "9732"
-          config.logger           = Filum.logger
-        end
-      end
+      propono_config = parse_config_file('propono.yml')
+
+      propono_setup(propono_config)
 
       after_configure if respond_to?(:after_configure)
     end
@@ -43,7 +33,16 @@ module Larva
       hash = YAML::load(contents)
       hash.stringify_keys[@env].symbolize_keys
     rescue
-      nil
+      Hash.new()
+    end
+
+    def propono_setup(propono_config)
+      Propono.config do |config|
+        config.queue_region = propono_config.delete(:region) # Backwards compatible with region key instead of queue_region
+        config.logger       = Filum.logger
+
+        propono_config.each { |key, value| config.send("#{key}=", value) }
+      end
     end
   end
 end

data/lib/larva/version.rb

@@ -1,3 +1,3 @@
 module Larva
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/template/config/propono.yml

@@ -4,9 +4,15 @@ development:
   region: eu-west-1
   application_name: development_larva_spawn
   queue_suffix:
+  max_retries: 1
+  udp_host: pergo.meducation.net
+  udp_port: '9732'
 
 production:
   use_iam_profile: true
   region: eu-west-1
   application_name: larva_spawn
   queue_suffix:
+  max_retries: 1
+  udp_host: pergo.meducation.net
+  udp_port: '9732'

data/test/configurator_test.rb

@@ -37,6 +37,7 @@ module Larva
       assert_equal "pergo.meducation.net", Propono.config.udp_host
       assert_equal "9732", Propono.config.udp_port
       assert_equal Filum.logger, Propono.config.logger
+      assert_equal 1, Propono.config.max_retries
     end
 
     def test_propono_gets_config_with_env
@@ -47,6 +48,7 @@ module Larva
       assert_equal "pergo.meducation.net", Propono.config.udp_host
       assert_equal "9732", Propono.config.udp_port
       assert_equal Filum.logger, Propono.config.logger
+      assert_equal 1, Propono.config.max_retries
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: larva
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - iHiD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: propono