dh-proteus 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58675d1b1f45f3ca5711e42b3b52ab646b19e94c387d60184495a72e962a443
-  data.tar.gz: 39db3dcd0b1d7945ff90226ebbe42ccbb0d95020501af66a1f46ba467ed949b9
+  metadata.gz: 84826a1c3ec618db8cb183f9473c01f29632303c1edaf9a4891020cbbe58b0e0
+  data.tar.gz: 86b594f6df68cd0a5a538f907922d1bd59a5bfb04beb612c1f57e3610bd2373b
 SHA512:
-  metadata.gz: f08aa1849fffa7c13f4ea7399d6ae4522dac58cea95926dffe36428a946c08c9bc48cc661802c783a060072ec6bf5293c3396f5af2794e6b076e0c039b0e4a2d
-  data.tar.gz: 366e2801c64b8c9967744e716b441882bf31c18eca254926ecbd3f6e990553f53d7b202ac11b014c769db5a4fb2f7c9dabea017a15a8310739a19b9084e9d063
+  metadata.gz: 0cb7eac70882a21b5d9fbfef7c8e8ebd01f8418047a9b011bf1972a60a23dd147372f01b95d99827475e7a2ae6812c79093f278cd4588dac93ba2210d769d6ea
+  data.tar.gz: c7892a7415cee30fb7cbf93b4f1d103db1a9b1d7a714c88006e8b668106f44b1fb040896eb201da98969d024d3201905b3fa9878e919dda529fc8d3921a40f18

data/lib/proteus/app.rb

@@ -2,6 +2,7 @@ require 'proteus/common'
 require 'proteus/generate'
 require 'proteus/init'
 require 'proteus/global_commands/validate'
+require 'proteus/global_commands/version'
 require 'proteus/context_management/context'
 require 'proteus/context_management/helpers'
 require 'proteus/templates/template_binding'
@@ -82,5 +83,6 @@ module Proteus
     subcommand('init', Proteus::Init)
 
     include Proteus::GlobalCommands::Validate
+    include Proteus::GlobalCommands::Version
   end
 end

data/lib/proteus/commands/remove.rb

@@ -35,8 +35,6 @@ module Proteus
               state_remove_command = <<~STATE_REMOVE_COMMAND
                 cd #{context_path(context)} && \
                 terraform state rm \
-                -var-file=#{var_file(context, environment)} \
-                #{aws_profile} \
                 %{resource_addresses}
               STATE_REMOVE_COMMAND
 

data/lib/proteus/context_management/helpers.rb

@@ -3,8 +3,6 @@ module Proteus
     module Helpers
       include Proteus::Helpers::PathHelpers
       def contexts
-        say "loading contexts", :green
-
         Dir.glob(File.join(contexts_path, "*")).collect do |context_path|
           Context.new(name: File.basename(context_path))
         end

data/lib/proteus/global_commands/version.rb

@@ -0,0 +1,19 @@
+module Proteus
+  module GlobalCommands
+    module Version
+
+      def self.included(thor_class)
+        thor_class.class_eval do
+          desc "version", "Print version information"
+
+          long_desc <<-LONGDESC
+            Print version information
+          LONGDESC
+          def version
+            say Proteus::VERSION, :green
+          end
+        end
+      end
+    end
+  end
+end

data/lib/proteus/helpers/path_helpers.rb

@@ -85,6 +85,11 @@ module Proteus
       def module_hooks_path(context, module_name)
         File.join(module_config_path(context, module_name), 'hooks')
       end
+
+      def module_data_path(context, module_name)
+        File.join(module_config_path(context, module_name), 'data')
+      end
+      
     end
   end
 end

data/lib/proteus/modules/terraform_module.rb

@@ -78,11 +78,50 @@ module Proteus
 
         if File.file?(config_file)
           @data = YAML.load_file(config_file, {}).with_indifferent_access
+          load_referenced_data(@data)
+        end
+      end
+
+      def i(i)
+        ' ' * 2 * i
+      end
+
+      def read(data)
+        if data.end_with?('.yaml')
+          # single file load request
+          file = File.join(module_data_path(@context, @name), data)
+          YAML.load_file(file)
+        else
+          files = Dir.glob(
+            File.join(module_data_path(@context, @name), data, '*.yaml')
+          )
+
+          files.collect do |f|
+            YAML.load_file(f)
+          end.flatten
+        end
+      end
+
+      def load_referenced_data(data, indent: 0, debug: false)
+        if data.is_a?(Array)
+          data.each_with_index do |_, index|
+            load_referenced_data(data[index], indent: indent + 1)
+          end
+        elsif data.is_a?(Hash)
+          data.each do |key, value|
+            if value =~ /__load: (.*)/
+              data[key] = read(Regexp.last_match(1))
+            end
+            load_referenced_data(data[key], indent: indent + 1)
+          end
+        elsif debug
+          # scalar value
         end
       end
 
       def data?
         return false unless @data
+
         @data.any?
       end
 

data/lib/proteus/version.rb

@@ -1,5 +1,5 @@
 module Proteus
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end
 
 if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,6 +202,7 @@ files:
 - lib/proteus/generators/templates/module/module.tf.erb
 - lib/proteus/generators/templates/module/validator.rb.erb
 - lib/proteus/global_commands/validate.rb
+- lib/proteus/global_commands/version.rb
 - lib/proteus/helpers.rb
 - lib/proteus/helpers/path_helpers.rb
 - lib/proteus/helpers/string_helpers.rb