app_builder 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f2c3eb1f29506c9d100320779e17513e7c32661209c48f849a31f5cba48bfb3
-  data.tar.gz: 68d348db9295814fcb9b351e7e36f97891ff7e501701d5dc661ace572e2e311c
+  metadata.gz: 17548e7a9045b333ec79ef1e8f0abeb616d6c6ace73d3a306516f140906a4df3
+  data.tar.gz: 19890dc60cbc42ea8b2656a8e8889c91642e59818ed4a761b26bebfef6dafb82
 SHA512:
-  metadata.gz: 3d170c4d5b76988d117e46bce7f40ed5fc56a97cef5732a66c4960ebf5841bcf2e538e2b1245568ebd80b5d08a4a1f600fc3c25614ed2309919728d4c5d4dc58
-  data.tar.gz: bb8066f6826e2618c7ad5453a398b74c96e7f76a9ca3994775eb89b30d1bd77d6b2ddade6264e796aea35278d6353a201b59dccf3bceaae83d773613116c80e9
+  metadata.gz: 3b1ad7ed2325454f51eb6f1cfa7277f79469bfa01a67475fb7f92cc173abd8940a462f7648a52e739f5ba4b472371f4312f911dbb959368fa86c336bbad30775
+  data.tar.gz: af54e1427a7e8c15c56901d78702c79b25403ba5d106cb4e95b3cb71233141135e506f098cd94a1be9f19d7bf70cb395711a2b4af3552978e8d7e9e2ff77984d

data/lib/app_builder.rb

@@ -17,4 +17,3 @@ require "app_builder/base"
 require "app_builder/archiver"
 require "app_builder/builder"
 require "app_builder/uploader"
-require "app_builder/environment.rb"

data/lib/app_builder/server.rb

@@ -43,7 +43,7 @@ module AppBuilder
       if local?
         if erb
           log(:info, "Create #{dest_path} from #{src_path}")
-          File.open(dest_path, "w") { |f| f.write(ERB.new(File.read(src_path)).result) }
+          File.open(dest_path, "w") { |f| f.write(ERB.new(File.read(src_path), nil, "-").result) }
         else
           execute("cp #{src_path} #{dest_path}")
         end
@@ -53,7 +53,7 @@ module AppBuilder
           if erb
             begin
               f = Tempfile.open(File.basename(dest_path))
-              f.write(ERB.new(File.read(src_path)).result)
+              f.write(ERB.new(File.read(src_path), nil, "-").result)
               f.close
               ssh.scp.upload!(f.path, dest_path)
             rescue

data/lib/app_builder/uploader.rb

@@ -47,7 +47,7 @@ module AppBuilder
 
     def generate_manifest
       checksum = `openssl sha256 #{builded_src_path} | awk -F"=" '{ print $2 }'`.strip
-      manifest = ERB.new(File.read(manifest_template_path)).result(binding)
+      manifest = ERB.new(File.read(manifest_template_path), nil, "-").result(binding)
       File.open(builded_manifest_path, "w") { |f| f.write(manifest) }
     end
 

data/lib/app_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -129,7 +129,6 @@ files:
 - lib/app_builder/base.rb
 - lib/app_builder/builder.rb
 - lib/app_builder/config.rb
-- lib/app_builder/environment.rb
 - lib/app_builder/logger.rb
 - lib/app_builder/server.rb
 - lib/app_builder/template/manifest.yml.erb

data/lib/app_builder/environment.rb

@@ -1,58 +0,0 @@
-module AppBuilder
-  class Environment
-    attr_accessor :name
-    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
-      @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(binding))
-      end
-    end
-
-    def [](key)
-      hash.fetch(key.to_s, nil)
-    end
-
-    def to_hash
-      raw_source.fetch(name.to_s)
-    end
-    alias :hash :to_hash
-
-    def raw_source
-      @source ||= load_source
-    end
-
-    private
-
-      def load_source
-        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
-          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