app_builder 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3b02b45d10717bea5bf4e75f3862ec60a4b10f0edc0b20b0fd0f2d445bad62e
-  data.tar.gz: 9312743688c2126077e420d5dd9f4b3a313ba0448f17220493ca0c8fe2d2ef59
+  metadata.gz: 6f2c3eb1f29506c9d100320779e17513e7c32661209c48f849a31f5cba48bfb3
+  data.tar.gz: 68d348db9295814fcb9b351e7e36f97891ff7e501701d5dc661ace572e2e311c
 SHA512:
-  metadata.gz: 69e03f7e4feda4f1bb33a88ba311a2018a77fdff3b89ec1914425dbce0d0f8d928cedb89c25a99647faf790fa68ccd1fadd1197ee4c0b17005d40323a1b421cc
-  data.tar.gz: e67bd657c56b04e85d76043c34a029abe678ba3dc8de7330a6e8b7a355d463df93b30d08a0d8392ca76b5ce499eb99551016561a9e5aad7cad6c02277e276765
+  metadata.gz: 3d170c4d5b76988d117e46bce7f40ed5fc56a97cef5732a66c4960ebf5841bcf2e538e2b1245568ebd80b5d08a4a1f600fc3c25614ed2309919728d4c5d4dc58
+  data.tar.gz: bb8066f6826e2618c7ad5453a398b74c96e7f76a9ca3994775eb89b30d1bd77d6b2ddade6264e796aea35278d6353a201b59dccf3bceaae83d773613116c80e9

data/lib/app_builder/environment.rb

@@ -1,56 +1,58 @@
 module AppBuilder
   class Environment
     attr_accessor :name
-    attr_reader :repo_path, :branch, :source_path
+    attr_reader :repo_path, :branch, :source_path, :source_type
 
     def initialize(source_path, options = {})
       @name        = options[:name] || ENV.fetch("APP_ENV", "default")
       @repo_path   = options[:repo_path] || `git rev-parse --show-toplevel`.chomp
       @branch      = options[:branch] || ENV.fetch("TARGET_BRANCH", `git symbolic-ref --short HEAD`.chomp)
       @source_path = source_path
-      @from_branch = options.fetch(:from_branch, true)
+      @source_type = options.fetch(:source_type, :git) # :git (git show branch:path) or :path (File.read(path))
     end
 
     def create_file(template_path, output_path)
       File.open(output_path, "w") do |f|
-        f.write(ERB.new(File.read(template_path)).result(template_binding))
+        f.write(ERB.new(File.read(template_path)).result(binding))
       end
     end
 
-    def template_binding
-      env = source.fetch(name.to_s)
-      Class.new.tap { |klass|
-        klass.define_method(:env) { env }
-      }.instance_eval { binding }
-    end
-
     def [](key)
       hash.fetch(key.to_s, nil)
     end
 
     def to_hash
-      source.fetch(name.to_s)
+      raw_source.fetch(name.to_s)
     end
     alias :hash :to_hash
 
-    def source
+    def raw_source
       @source ||= load_source
     end
 
     private
 
       def load_source
-        if from_branch
-          YAML.load(
-            ERB.new(
-              Dir.chdir(repo_path) {
-                `git show #{branch}:#{source_path}`
-              }
-            ).result(binding)
-          )
+        case source_type
+        when :git
+          raw_src = Dir.chdir(repo_path) { `git show #{branch}:#{source_path}` }
+        when :path
+          raw_src = File.read(source_path)
         else
-          YAML.load_file(source_path)
+          raise "Unknown source_type: #{source_type}"
         end
+
+        YAML.load(ERB.new(raw_src).result(binding))
+      end
+
+      def method_missing(name, *args, &block)
+        super unless hash.has_key?(name.to_s)
+
+        hash.fetch(name.to_s)
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        hash.has_key?(name.to_s)
       end
   end
 end

data/lib/app_builder/version.rb

@@ -1,3 +1,3 @@
 module AppBuilder
-  VERSION = "0.2.6".freeze
+  VERSION = "0.2.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh