kongfigure 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf57cebf09bbe6f5d2a0be2ef0b963d26b8482fdf3be87d38308db576593effe
-  data.tar.gz: f072f428db96554d2fd79b1121af4fe414cf8a61153d71ff853d3720f71b59fc
+  metadata.gz: 65d5602bfed712c59cc8c2dba6c00e13f782d42155dabed11a3483f57d52ee8e
+  data.tar.gz: 0ebe8e6a7404fa178b7b57c0fe9c299d3993488a055fd8f005911d5b181618c9
 SHA512:
-  metadata.gz: 90325a8f142dbf70982d3d3d5e05d8f1d7eb9c85d5283c202334cc32c9fb97b500768a24b81b909e27522b4b0e94f8c09c0ed54b89a441f6c17b0545b2f726a4
-  data.tar.gz: 114692c7a0dae4e049cfd0b5441d2817ceeb7bf126fb8a922ff0c82aa7811846b1efe1cd962400927b421bb5aa8488ee0f9f838547069c021118b77b6c324ebe
+  metadata.gz: 0773bea047fca72dc0316252a8e4d67ccd5de7088b82833fef789882c8526928a54a6229a9da4854dbecb802e9e1dedc5edf1ce6e54d9a7389f8c3b8bd0d71a7
+  data.tar.gz: e7ec43aa67c41d17d5f8735d83f1601a55eb3b728a411b82cabe5fa117a69221c6b7e1f432dd9ca220105669932cd117c349aa18139000b236d19d1a604b63df

data/lib/kongfigure/cli.rb

@@ -5,7 +5,9 @@ module Kongfigure
     attr_accessor :options
 
     def initialize
-      @options       = {}
+      @options       = {
+        debug: false
+      }
       @option_parser = OptionParser.new do |parser|
         parser.on("-f", "--file FILE", "Path to the Kongfigure configuration file.") do |file|
           @options[:file] = file
@@ -13,6 +15,9 @@ module Kongfigure
         parser.on("-u", "--url URL", "Url to the kong admin API.") do |url|
           @options[:url] = url
         end
+        parser.on("-d", "--debug", "Debug mode.") do
+          @options[:debug] = true
+        end
       end
     end
 

data/lib/kongfigure/configuration.rb

@@ -1,7 +1,3 @@
-require "optparse"
-require "pp"
-require "awesome_print"
-
 module Kongfigure
   class Configuration
 

data/lib/kongfigure/parser.rb

@@ -1,17 +1,18 @@
-require "yaml"
-
 module Kongfigure
   class Parser
 
-    def initialize(file)
-      @yaml_configuration = File.read(file)
+    def initialize(file, debug=false)
+      @yaml_erb_configuration = File.read(file)
+      @debug                  = debug
     end
 
     def parse!
       return @configuration unless @configuration.nil?
       @configuration = Kongfigure::Configuration.new
       puts "Parsing YAML configuration...".colorize(:color => :white, :background => :red)
-      YAML.load(@yaml_configuration).each do |key, value|
+      parsed_configuration = YAML.load(ERB.new(@yaml_erb_configuration).result)
+      ap parsed_configuration if @debug
+      parsed_configuration.each do |key, value|
         case key
         when "url"
           @configuration.url = value

data/lib/kongfigure/services/base.rb

@@ -155,7 +155,7 @@ module Kongfigure::Services
 
     def cleanup_plugins(http_client, local_resource, remote_resource)
       remote_resource.plugins.each do |plugin|
-        unless find_related_resource(plugin, local_resource.plugins)
+        if local_resource.nil? || find_related_resource(plugin, local_resource.plugins).nil?
           http_client.delete("#{resource_name}/#{remote_resource.identifier}/plugins/#{plugin.id}")
         end
       end

data/lib/kongfigure/services/service.rb

@@ -44,7 +44,7 @@ module Kongfigure::Services
       end
       # cleanup useless routes
       remote_resource.routes.each do |remote_resource_route|
-        unless local_resource.has_route?(remote_resource_route)
+        if local_resource.nil? || !local_resource.has_route?(remote_resource_route)
           http_client.delete("routes/#{remote_resource_route.id}")
         end
       end

data/lib/kongfigure/version.rb

@@ -1,3 +1,3 @@
 module Kongfigure
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/kongfigure.rb

@@ -27,6 +27,11 @@ require_relative "kongfigure/errors/invalid_configuration.rb"
 
 require "rest-client"
 require "logger"
+require "yaml"
+require "erb"
+require "optparse"
+require "pp"
+require "awesome_print"
 
 module Kongfigure
   def self.logger
@@ -38,7 +43,7 @@ module Kongfigure
     cli           = Kongfigure::CLI.new
     options       = cli.parse!(args)
     # Parser
-    parser        = Kongfigure::Parser.new(options[:file])
+    parser        = Kongfigure::Parser.new(options[:file], options[:debug])
     http_client   = Kongfigure::HTTPClient.new(parser, options[:url])
     kong          = Kongfigure::Kong.new(parser, http_client)
     kong.apply!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kongfigure
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ibanity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler