terraframe 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c298bb5fae6f55bd0926b9f6ee7d51317a932c
-  data.tar.gz: 1e27ef8d075df5f45a8f32b0bc6790b303c575d3
+  metadata.gz: 2af2c4fd034f13f39c212b92ff6b62b84336238a
+  data.tar.gz: 879e04c38e9f2257aa5a2d0a5fc6e9429a0ff9d7
 SHA512:
-  metadata.gz: 494647a04c86977f4652244a39984e201693628303619122bd50584a73e80c19c350b0e3c6df1392318de2de5829e8247f114e7b83bffd3dcb652986468b1da2
-  data.tar.gz: 4a5b5829ce32c10cf1f39e4e72b77246ada761a612ec5fe2da3f86fe5fa153e532f42d152c49bb1984639fe11839b3ea56f68ccd7fe0067e32dd2c21d140ea92
+  metadata.gz: 08053ef0830878e586cfaa71050db9ac86cf8a87ea4acfb8d0348f6759b6fec1dc7338444914e74d46746c521f8f5b5577983162bd1eb93c259807c10890a83c
+  data.tar.gz: 2b81f5742f3e391302a269c4a900a223fac75464cd78a6895ae8b998438fcb6ceecb86289d65d002a58895287e1671cf031dd01ec116806e436366fce1fc2945

data/bin/terraframe

@@ -3,30 +3,53 @@
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
-require 'logger'
-require 'trollop'
-require 'terraframe'
-require 'awesome_print'
-
-opts = Trollop::options do
-  opt :input_file,    "Input file(s) to process into a Terraform script.",
-                      :short => "f", :type => :string, :multi => true, :required => true
-  opt :variable_file, "Variable file (YAML or JSON, not tfvars!).",
-                      :short => "v", :type => :string, :multi => true
-  opt :pretty_print,  "Pretty-prints the Terraform output.", :default => true
-  opt :verbose,       "Increases logging verbosity.", :default => false
-end
+def main()
+  require 'logger'
+  require 'trollop'
+  require 'terraframe'
+  require 'awesome_print'
+  require 'hashie/mash'
+
+  opts = Trollop::options do
+    opt :input_file,        "Input file(s) to process into a Terraform script.",
+                            :short => "f", :type => :string, :multi => true, :required => true
+    opt :variable_file,     "Variable file (YAML or JSON, not tfvars!).",
+                            :short => "v", :type => :string, :multi => true
+    opt :override_variable, "'key,value' to be injected into the Terraframe args hash.",
+                            :short => "o", :type => :string, :multi => true
+    opt :pretty_print,      "Pretty-prints the Terraform output.", :default => true
+    opt :verbose,           "Increases logging verbosity.", :default => false
+  end
+
+  processor = Terraframe::Processor.new
+  if opts[:verbose]
+    processor.logger.level = Logger::DEBUG
+  end
+  processor.logger.ap opts.inspect, :debug
 
-processor = Terraframe::Processor.new
-if opts[:verbose]
-  processor.logger.level = Logger::DEBUG
+  output = processor.process_files(opts[:input_file],
+                                   opts[:variable_file] || [],
+                                   process_properties(opts[:override_variable]))
+  if opts[:pretty_print]
+    output = JSON.pretty_generate(JSON.parse(output))
+  end
+
+  processor.logger.info "Writing output to stdout."
+  puts output
 end
-processor.logger.debug opts.inspect
 
-output = processor.process_files(opts[:input_file], opts[:variable_file] || [])
-if opts[:pretty_print]
-  output = JSON.pretty_generate(JSON.parse(output))
+def process_properties(props)
+  hash = props.map { |p| p.split("=", 2) }.to_h
+
+  hash_trees = hash.map do |main_key, main_value|
+    main_key.to_s.split(".").reverse.inject(main_value) do |value, key|
+      {key.to_s => value}
+    end
+  end
+
+  retval = {}
+  hash_trees.each { |h| retval.deep_merge!(h) }
+  retval
 end
 
-processor.logger.info "Writing output to stdout."
-puts output
+main()

data/lib/terraframe/processor.rb

@@ -32,24 +32,28 @@ module Terraframe
       @contexts[name] = context
     end
 
-    def process_files(scripts, variables)
+    def process_files(scripts, variable_files, override_variables)
       scripts = scripts.map { |f| File.expand_path(f) }
-      variables = variables.map { |f| File.expand_path(f) }
+      variable_files = variable_files.map { |f| File.expand_path(f) }
 
       missing_scripts = scripts.reject { |f| File.exist?(f) }
-      missing_variables = variables.reject { |f| File.exist?(f) }
-      unless missing_scripts.empty? && missing_variables.empty?
+      missing_variable_files = variable_files.reject { |f| File.exist?(f) }
+      unless missing_scripts.empty? && missing_variable_files.empty?
         missing_scripts.each { |f| logger.fatal "Script file not found: #{f}" }
-        missing_variables.each { |f| logger.fatal "Variable file not found: #{f}" }
+        missing_variable_files.each { |f| logger.fatal "Variable file not found: #{f}" }
         raise "One or more specified files were missing."
       end
 
-      apply(Hash[scripts.zip(scripts.map { |f| IO.read(f) })], load_variables(variables))
+
+      script_pairs = scripts.zip(scripts.map { |f| IO.read(f) })
+      vars = load_variable_files(variable_files).deep_merge(override_variables)
+
+      apply(script_pairs.to_h, vars)
     end
 
-    def load_variables(variables)
+    def load_variable_files(variable_files)
       vars = {}
-      variables.each { |f| vars = vars.deep_merge(YAML::load_file(f)) }
+      variable_files.each { |f| vars = vars.deep_merge(YAML::load_file(f)) }
       vars
     end
 

data/lib/terraframe/script_item.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'hashie/mash'
 
 module Terraframe
   class ScriptItem
@@ -7,7 +8,7 @@ module Terraframe
 
     def initialize(vars, &block)
       @fields = {}
-      @vars = vars
+      @vars = Hashie::Mash.new(vars)
 
       instance_eval &block
     end
@@ -19,6 +20,10 @@ module Terraframe
     ## DSL FUNCTIONS BELOW
     def method_missing(method_name, *args, &block)
       if args.length == 1
+        if args[0] == nil
+          raise "Passed nil to '#{method_name}'. Generally disallowed, subclass ScriptItem if you need this."
+        end
+
         @fields[method_name.to_sym] = args[0]
       else
         raise "Multiple fields passed to a scalar auto-argument '#{method_name}'."

data/lib/terraframe/state.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'recursive_open_struct'
+require 'hashie/mash'
 
 module Terraframe
   class State
@@ -10,7 +10,7 @@ module Terraframe
       @logger = logger
       logger.info "Initializing state."
 
-      @vars = RecursiveOpenStruct.new(vars, :recurse_over_arrays => true )
+      @vars = Hashie::Mash.new(vars)
       logger.debug "State variables:"
       logger.ap vars, :debug
 

data/lib/terraframe/version.rb

@@ -1,3 +1,3 @@
 module Terraframe
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/terraframe.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     "trollop",                "~> 2.0"
   spec.add_runtime_dependency     "activesupport",          "~> 4.2.0"
   spec.add_runtime_dependency     "awesome_print",          "~> 1.6.1"
-  spec.add_runtime_dependency     "recursive-open-struct",  "~> 0.5.0"
+  spec.add_runtime_dependency     'hashie',                 '~> 3.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraframe
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Ed Ropple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: recursive-open-struct
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 3.3.2
 description: 
 email:
 - ed@edropple.com