flapjack_configurator 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6924183c859202d58b0a39d5bd4ef0a90cfbb5
-  data.tar.gz: f65b30f3d4ecf257a2e964dfa3c27f51d5fde57e
+  metadata.gz: 626f58e99c7829b408debbec10d94a98ab307521
+  data.tar.gz: 8135d6baad67a692107d1348ec6cad5da09fbb40
 SHA512:
-  metadata.gz: 05f44c8e5a7c11334478166df466478e905d1a9cacf1346026232834bf2c0251b04b03c3ba4cb965d3e87d3816b104c3df09579d79ee879f8206615c04031f07
-  data.tar.gz: 02d11b88c7a9d5b03dd73ed44940e48b80cf2ceb30e30b24b4cd5d57944b03280a79efaeec0716cb38c8000ca3dc97e228e9f95bc0e044e9f42da449c8f823bd
+  metadata.gz: 078282c5caa6c2881f82ba7452e5856ee81db0602b9d1921c31b605b1b9cf7c4c9761c51fac250247bfeb8c9732f19680db8a79fc875e5dc113057760fcdcc7e
+  data.tar.gz: 32a402c8722f0fb41ecc4e795f8d3746329daeb892fdad256b3fbbc0912b5d377fb22dda4be79e8d159e1967f4ecfd3257085d920793ee79e02761ea73608a19

data/README.md

@@ -1,6 +1,8 @@
 Flapjack Configurator
 =====================
 
+[![Gem Version](https://badge.fury.io/rb/flapjack_configurator.svg)](https://badge.fury.io/rb/flapjack_configurator)
+
 This gem provides a idempotent, file based fonfigurator for [Flapjack](http://flapjack.io)
 
 Configuration

data/bin/flapjack_configurator

@@ -25,7 +25,7 @@ def parse_arguments(args, logger)
       logger.debug("API URL set to #{url}")
     end
 
-    opts.on('-v', '--verbosity [level]', Integer, 'Set Verbosity, level corresponds to Ruby logger levels (0: debug, 3: error)') do |level|
+    opts.on('-v', '--verbosity [level]', Integer, "Set Verbosity, level corresponds to Ruby logger levels (#{Logger::DEBUG}: debug, #{Logger::FATAL}: fatal)") do |level|
       if level
         logger.level = level
       else
@@ -59,21 +59,10 @@ def parse_arguments(args, logger)
   return options
 end
 
-# Load and merge the configs
-def load_config(file_list, logger)
-  config = {}
-  file_list.each do |file_name|
-    logger.debug("Loading config file #{file_name}")
-    config.deep_merge!(YAML.load_file(file_name))
-  end
-
-  return config
-end
-
 def main
   logger = Logger.new(STDOUT)
   options = parse_arguments(ARGV, logger)
-  config = load_config(options.files, logger)
+  config = FlapjackConfigurator.load_config(options.files, logger)
 
   logger.info('Nothing to do') unless FlapjackConfigurator.configure_flapjack(config, options.api_url, logger)
 end

data/lib/flapjack_configurator.rb

@@ -29,4 +29,15 @@ module FlapjackConfigurator
 
     return ret_val
   end
+
+  # Helper to load and merge config yaml files
+  def self.load_config(file_list, logger)
+    config = {}
+    file_list.each do |file_name|
+      logger.debug("Loading config file #{file_name}")
+      config.deep_merge!(YAML.load_file(file_name))
+    end
+
+    return config
+  end
 end

data/lib/flapjack_configurator/version.rb

@@ -2,5 +2,5 @@
 
 # Define the gem version
 module FlapjackConfigurator
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/functional/config_test_common.rb

@@ -1,5 +1,4 @@
 require_relative '../spec_helper.rb'
-require 'yaml'
 require 'pathname'
 
 # Common support methods for testing the gem
@@ -24,7 +23,11 @@ module TestCommon
     path_obj = Pathname.new('spec/functional/test_configs')
     path_obj += subdir if subdir
     path_obj += "#{name}.yaml"
-    config = YAML.load_file(path_obj)
+
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::FATAL
+
+    config = FlapjackConfigurator.load_config([path_obj.to_s], logger)
     fail "Failed to load test config from #{filename}" unless config
     return config
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack_configurator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Noonan II