dply 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f29d96cf7879f2fdeae544b8786fc31f791d6426c45d37d3c096adce397f2af
-  data.tar.gz: 3ea7b2f1e64fcef2f81a81eecc9eda6f6709866d5818869b16c7c3447bec9215
+  metadata.gz: 2a742b7e51a3fa6f6c3dde85c7e865ce808f06f4daadfdac8b9e484c0fa537dd
+  data.tar.gz: a10e414804b13354bd1e47a78edb498aa219e43bddfdc488f4a1efdbe12e47c8
 SHA512:
-  metadata.gz: 99b236593f11eefae1d1ed9c0ad0d3c1a733662a6c2c2c4d3fe2e111fb3b8383bb21a5ea1b2ae926baa20a61ebe4459a446a938b7ad6f6b76823cc7b37fe20fa
-  data.tar.gz: 8327e1f35451fb78ec59a2d1acb8482eddf25cc75b5345af99df3e563bb9bd6299d33330158c8d258634e826e976ec58bdef75fe402c8e0c84a17069d17e0ac7
+  metadata.gz: 630810896801f78190c74fa7988e13308c71d388870ffcb500a9adf9d197fd1f4fe377fa5aa6339ff76274b23a3121b039c877a1664eb7167c5be00b0d1196a6
+  data.tar.gz: 96a09128c85ba165e1f77077c402a1680a9d189116878bf7d5137500c4236d63602f633f973bf1357932bd0b3fc6ab396bd3d6d8040c9b4b49f4646f0e502035

data/lib/dply/app_config.rb

@@ -37,13 +37,9 @@ module Dply
       end
     end
 
-    def render_config(override_file: nil)
-      config_data = load_yml "application.yml", optional: true
-      if override_file
-        data = load_yml override_file, optional: true
-        config_data.deep_merge! data
-      end
-
+    def render_config
+      load_config
+      config_data = load_yml "meta.yml", optional: true
       tmp_file = "tmp/config_render.tmp"
       @config_map.each do |dest, src|
         raise Error, %(error dest "#{dest}" is a directory) if File.directory? dest

data/lib/dply/build.rb

@@ -12,8 +12,7 @@ module Dply
     extend Forwardable
     include Helper
 
-    def_delegators :config, :branch, :config_download_url,
-                          :config_map, :dir_map, :config_skip_download
+    def_delegators :config, :branch, :config_map, :dir_map, :meta_conf
 
     attr_reader :config
 
@@ -23,7 +22,7 @@ module Dply
 
     def run
       setup
-      download_configs if config_download_url
+      meta_conf.generate if meta_conf
       Dir.chdir repo_dir do
         git_step
         git.clean
@@ -33,7 +32,7 @@ module Dply
         link_build_dir
         bundle.install
         bundle.clean
-        util.run config.task
+        util.run config.task, render_config: false
         generate_checksum
       end
     end
@@ -45,13 +44,6 @@ module Dply
       setup.build
     end
 
-    def download_configs
-      files = config_map.values.uniq
-      downloader = ConfigDownloader.new(files, config_download_url)
-      downloader.skip_download = config_skip_download
-      downloader.download_all
-    end
-
     def git_step
       return unless config.git
       if config.no_pull

data/lib/dply/build_config.rb

@@ -1,4 +1,5 @@
 require 'dply/base_config'
+require_relative 'meta_config'
 
 module Dply
   class BuildConfig < BaseConfig
@@ -14,8 +15,16 @@ module Dply
       opt :config_map, type: Hash
       opt :dir_map, type: Hash
       opt :shared_dirs, type: Array
-      opt :config_download_url
-      opt :config_skip_download, type: Array
+      opt :meta_conf, type: MetaConfig
+    end
+
+    def meta_conf(&block)
+      conf = MetaConfig.new("config")
+      conf.instance_eval &block
+      config_map({
+        "meta.yml" => "meta_generated.yml"
+      })
+      set(:meta_conf, conf)
     end
 
     def default_config

data/lib/dply/deploy_config.rb

@@ -1,4 +1,5 @@
 require 'dply/base_config'
+require_relative 'meta_config'
 
 module Dply
   class DeployConfig < BaseConfig
@@ -13,11 +14,19 @@ module Dply
       opt :shared_dirs, type: Array
       opt :config_map, type: Hash
       opt :dir_map, type: Hash
-      opt :config_download_url
-      opt :config_skip_download, type: Array
       opt :verify_checksum
       opt :revision
       opt :dir
+      opt :meta_conf, type: MetaConfig
+    end
+
+    def meta_conf(&block)
+      conf = MetaConfig.new("config")
+      conf.instance_eval &block
+      config_map({
+        "meta.yml" => "meta_generated.yml"
+      })
+      set(:meta_conf, conf)
     end
 
     def default_config

data/lib/dply/meta_config.rb

@@ -0,0 +1,78 @@
+require_relative 'helper'
+require_relative 'ext/hash'
+module Dply
+  class MetaConfig
+
+    using HashExt
+
+    include Helper
+
+    def initialize(dir)
+      @sources = []
+      @dir = dir
+      @output_path = "#{dir}/meta_generated.yml"
+      @tmpfile = "#{dir}/meta.tmp"
+    end
+
+    def define(&block)
+      instance_eval &block
+    end
+
+    def generate
+      config = {}
+      @sources.each do |i|
+        path = i.fetch(:path)
+        url = i.fetch(:url)
+        auth = i.fetch(:auth)
+        optional = i.fetch(:optional)
+        deep_merge = i.fetch(:deep_merge)
+        block = i.fetch(:block)
+
+        if url
+          download(url, path, optional: optional)
+        end
+
+        if block
+          instance_exec path, optional, &block
+        end
+        
+        h = load_yml(path, optional: optional)
+        deep_merge ? config.deep_merge!(h) : config.merge!(h)
+      end
+      File.write @tmpfile, YAML.dump(config)
+      FileUtils.mv @tmpfile, @output_path
+    end
+
+    private
+
+    def config(path, url = nil, auth: nil, deep_merge: true, optional: false, &block)
+      path = "#{@dir}/#{path}"
+      @sources << { path: path, url: url, auth: auth, deep_merge: deep_merge,
+                    optional: optional, block: block }
+    end
+
+    def load_yml(path, optional:)
+      if not File.readable? path
+        return {} if optional
+        raise Error, "error reading file #{path}"
+      end
+      YAML.safe_load(File.read(path)) || {}
+    end
+
+    def download(url, path, optional:)
+      logger.bullet "downloading #{url}"
+      http_status = IO.popen(["curl", "-w", '%{http_code}', "-f", "-s", "-o", @tmpfile, url]) { |f| f.read }
+      exit_status = $?.exitstatus
+      if (http_status != "200" || exit_status != 0)
+        message = "failed to download #{path}, http status #{http_status}, exit_status #{exit_status}"
+        if optional
+          logger.warn message
+          return
+        end
+        error(message)
+      end
+      FileUtils.mv @tmpfile, path
+    end
+
+  end
+end

data/lib/dply/strategy/archive.rb

@@ -1,7 +1,6 @@
 require 'dply/helper'
 require 'dply/util'
 require 'dply/setup'
-require 'dply/config_downloader'
 require 'dply/yum'
 require 'dply/release'
 require 'dply/release_helper'
@@ -16,8 +15,7 @@ module Dply
 
       attr_reader :config, :options
       def_delegators :config, :target, :branch, :revision, :name,
-                     :config_map, :dir_map, :config_skip_download,
-                     :config_download_url, :build_url
+                     :config_map, :dir_map, :build_url, :meta_conf
 
       def initialize(config, options)
         @config = config
@@ -34,12 +32,12 @@ module Dply
           util.report_changes(current_version, previous_version)
           return
         end
-        download_configs if config_download_url
+        generate_meta_config
         install_release
         previous_version = get_release
         release.make_current
         Dir.chdir current_dir do
-          util.run "deploy:#{deploy_target}"
+          util.run "deploy:#{deploy_target}", render_config: true
         end
         release.record_deployment
         current_version = get_release
@@ -48,15 +46,19 @@ module Dply
       end
 
       def reload
-        download_configs if config_download_url
+        generate_meta_config
         Dir.chdir current_dir do
           link_all
-          util.run :reload
+          util.run :reload, render_config: true
         end
       end
 
       private
 
+      def generate_meta_config
+        meta_conf.generate if meta_conf
+      end
+
       def deploy_target
         @deploy_target ||= (target || :archive)
       end
@@ -70,13 +72,6 @@ module Dply
         File.basename (File.readlink current_dir)
       end
 
-      def download_configs
-        files = config_map.values.uniq
-        downloader = ConfigDownloader.new(files, config_download_url)
-        downloader.skip_download = config_skip_download if config_skip_download
-        downloader.download_all
-      end
-
       def release
         @release ||= Release.find_or_create(
           revision: revision,

data/lib/dply/strategy/git.rb

@@ -1,6 +1,5 @@
 require 'dply/helper'
 require 'dply/setup'
-require 'dply/config_downloader'
 require 'dply/yum'
 require 'dply/util'
 require 'forwardable'
@@ -14,8 +13,7 @@ module Dply
 
       attr_reader :config, :options
       def_delegators :config, :target, :branch,
-                     :config_map, :dir_map, :config_skip_download,
-                     :config_download_url
+                     :config_map, :dir_map, :meta_conf
 
       def initialize(config, options)
         @config = config
@@ -25,7 +23,7 @@ module Dply
       def deploy
         deploy_target = (target || :git)
         setup.git
-        download_configs if config_download_url
+        generate_meta_config
         Dir.chdir current_dir do
           previous_version = git.commit_id
           git_step
@@ -34,30 +32,27 @@ module Dply
           install_pkgs
           bundle.install
           bundle.clean
-          util.run "deploy:#{deploy_target}"
+          util.run "deploy:#{deploy_target}", render_config: true
           util.report_changes(previous_version, current_version)
         end
       end
 
       def reload
-        download_configs if config_download_url
+        generate_meta_config
         Dir.chdir current_dir do
           link_all
-          util.run :reload
+          util.run :reload, render_config: true
         end
       end
 
       private
 
-      def current_dir
-        @current_dir ||= "#{config.dir}/current"
+      def generate_meta_config
+        meta_conf.generate if meta_conf
       end
 
-      def download_configs
-        files = config_map.values.uniq
-        downloader = ConfigDownloader.new(files, config_download_url)
-        downloader.skip_download = config_skip_download if config_skip_download
-        downloader.download_all
+      def current_dir
+        @current_dir ||= "#{config.dir}/current"
       end
 
       def git_step

data/lib/dply/task_dsl.rb

@@ -18,8 +18,8 @@ module Dply
       super(command, env: extra_env, bundled_env: bundled_env, display: :arrow)
     end
 
-    def render_config(override_file: nil)
-      @app_config.render_config(override_file: override_file)
+    def render_config
+      @app_config.render_config
     end
 
     def set_env(key, value)

data/lib/dply/util.rb

@@ -38,9 +38,10 @@ module Dply
       linker.create_symlinks
     end
 
-    def run(task, optional: false)
+    def run(task, render_config: false, optional: false)
       app_config = AppConfig.new
       logger.arrow task
+      app_config.render_config if render_config
       app_config.run_task task, optional: optional
     end
 

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/integration/archive_flow_spec.rb

@@ -29,6 +29,11 @@ describe "archive flow" do
         "tmp" => "tmp",
         "log" => "log"
       })
+
+      meta_conf do
+        url = lambda { |name| "http://127.0.0.1:8000/config_repo/" + name }
+        config "app.yml", url["app.yml"]
+      end
     CONFIG
   end
 
@@ -43,6 +48,11 @@ describe "archive flow" do
         "\#{repo}/\#{name}-\#{revision}-\#{branch}.tar.gz"
       end
 
+      meta_conf do
+        url = lambda { |name| "http://127.0.0.1:8000/config_repo/" + name }
+        config "app.yml", url["app.yml"]
+      end
+
       dir_map ({
         "log" => "log",
          "tmp" => "tmp",

data/spec/integration/git_flow_spec.rb

@@ -31,6 +31,13 @@ describe "git flow" do
         "log" => "log",
         "tmp" => "tmp"
       })
+
+      meta_conf do
+        url = lambda { |name| "http://127.0.0.1:8000/config_repo/" + name }
+        config "app.yml", url["app.yml"]
+        config "custom.yml", url["custom.yml"]
+        config "host.yml", url["host.yml"], deep_merge: false
+      end
     CONFIG
   end
 
@@ -65,7 +72,7 @@ describe "git flow" do
     Dir.chdir @deploy_dir do
       expect(File).to exist("current/test.txt")
       data = File.read "current/test.txt"
-      expect(data).to eq("asdf-override\n5432\n")
+      expect(data).to eq("custom-host\napp-port\n")
     end
   end
 end

data/spec/test_data/config_repo/app.yml

@@ -0,0 +1,7 @@
+secret: app-value
+db:
+  host: app-host
+  port: app-port
+sv:
+  a: 1
+  b: 2

data/spec/test_data/config_repo/custom.yml

@@ -0,0 +1,2 @@
+db:
+  host: custom-host

data/spec/test_data/config_repo/host.yml

@@ -0,0 +1,2 @@
+sv:
+  b: 1

data/spec/test_data/sample_repo/dply/app.rb

@@ -8,6 +8,7 @@ test do
 end
 
 build do
+  render_config
   rake :a
   sh "ls"
   FileUtils.mkdir_p "vendor"
@@ -19,7 +20,6 @@ build do
 end
 
 deploy :git do
-  render_config override_file: "application-override.yml"
   set_env "MIX_ENV", "prod"
   sh "ls"
   puts "  git deployed"

data/spec/webserver.rb

@@ -7,7 +7,7 @@ port = 8000
 webserver = Thread.new do
   server = WEBrick::HTTPServer.new(
     :Port => port,
-    :DocumentRoot => "#{Dir.pwd}/test/sample_data",
+    :DocumentRoot => "#{Dir.pwd}/spec/test_data",
     Logger: WEBrick::Log.new("/dev/null"),
     AccessLog: []
   )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -96,7 +96,6 @@ files:
 - lib/dply/cli/task.rb
 - lib/dply/code_archive.rb
 - lib/dply/command.rb
-- lib/dply/config_downloader.rb
 - lib/dply/curl.rb
 - lib/dply/custom_logger.rb
 - lib/dply/deplist.rb
@@ -112,6 +111,7 @@ files:
 - lib/dply/linker.rb
 - lib/dply/lock.rb
 - lib/dply/logger.rb
+- lib/dply/meta_config.rb
 - lib/dply/pkgs.rb
 - lib/dply/release.rb
 - lib/dply/release_helper.rb
@@ -167,6 +167,9 @@ files:
 - spec/test_data/bundle/gems_not_installed/Gemfile
 - spec/test_data/bundle/no_gemfile/.gitkeep
 - spec/test_data/command/test.rb
+- spec/test_data/config_repo/app.yml
+- spec/test_data/config_repo/custom.yml
+- spec/test_data/config_repo/host.yml
 - spec/test_data/elf/elf
 - spec/test_data/elf/libecpg.so
 - spec/test_data/elf/libpgtypes.so.3
@@ -239,6 +242,9 @@ test_files:
 - spec/test_data/bundle/gems_not_installed/Gemfile
 - spec/test_data/bundle/no_gemfile/.gitkeep
 - spec/test_data/command/test.rb
+- spec/test_data/config_repo/app.yml
+- spec/test_data/config_repo/custom.yml
+- spec/test_data/config_repo/host.yml
 - spec/test_data/elf/elf
 - spec/test_data/elf/libecpg.so
 - spec/test_data/elf/libpgtypes.so.3

data/lib/dply/config_downloader.rb

@@ -1,35 +0,0 @@
-require 'dply/helper'
-require 'fileutils'
-require 'dply/curl'
-
-module Dply
-  class ConfigDownloader
-
-    include Helper
-    attr_writer :skip_download
-
-    def initialize(config_files , base_url, dir: "config")
-      @config_files = config_files
-      @base_url = base_url
-      @dir = dir
-      @skip_download = []
-    end
-
-    def download_all
-      @config_files.each do |f|
-        if @skip_download.include? f
-          logger.debug "skipping to download file #{f}"
-          next
-        end
-        curl.download "#{@base_url}/#{f}", "#{@dir}/#{f}"
-      end
-    end
-
-    private
-
-    def curl
-      @curl ||= Curl.new
-    end
-
-  end
-end