app_builder 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0cda82ca1043fd288c27ea1ba7d407dbfcc9a73e48b7f05611b166891e45220
-  data.tar.gz: 78db32348bee99238d155d6ba9107b2b6c10f704fb0a6e5aaef5ffc763b9a976
+  metadata.gz: 3173253884ec857d662944d0647e1861ad3d51e279771d53e6c8abb429756aae
+  data.tar.gz: 1f1bac980c6215572dbf16a66bed9c15bd8d98b5a5d794188dcbf69e6aaaecc9
 SHA512:
-  metadata.gz: a109c1cb7480cd771539e2d15310ba767b04ea3a77624394a8a58f80bc787de3d44bc3a231c648943afa5244cd00dc229233eab286bcb290261f566e9520aa22
-  data.tar.gz: 742cb157bd79786924cd16d9e52cc2ee39cc1e234631997461fd9b83cdf7dda3df11c80ab67b7a0b4fc4eb73d671810a0c9ca63f7493e75347152d15c77df935
+  metadata.gz: 2ceb59f49f272eff890091fb17da7593d13cd53846ccdfda858912aabe27bac3d95535ae3b2b2200eca9c8ef072bdba455ba553037e66a8d23edaf0ec1efd431
+  data.tar.gz: 3c94d733b78b32227e456254b01451ae59db4651c68f09f963cf279af77ef504a278a9dd7781924ee36733ca0826d0b2cb4ae80f9cc835640a867c53739d7db3

data/lib/app_builder/environment.rb

@@ -3,11 +3,12 @@ module AppBuilder
     attr_accessor :name
     attr_reader :repo_path, :branch, :source_path
 
-    def initialize(source_path, name: nil, repo_path: nil, branch: nil)
-      @name        = name || ENV.fetch("APP_ENV", "default")
-      @repo_path   = repo_path || `git rev-parse --show-toplevel`.chomp
-      @branch      = branch || ENV.fetch("TARGET_BRANCH", `git symbolic-ref --short HEAD`.chomp)
+    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)
     end
 
     def create_file(template_path, output_path)
@@ -33,13 +34,23 @@ module AppBuilder
     alias :hash :to_hash
 
     def source
-      @source ||= YAML.load(
-        ERB.new(
-          Dir.chdir(repo_path) {
-            `git show #{branch}:#{source_path}`
-          }
-        ).result(binding)
-      )
+      @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)
+          )
+        else
+          YAML.load_file(source_path)
+        end
+      end
   end
 end

data/lib/app_builder/version.rb

@@ -1,3 +1,3 @@
 module AppBuilder
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

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