dply 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffaa634a168cfe8ccaab138bff92455a00ea17fab5ed722046add3e4ad9107f1
-  data.tar.gz: 9890f68e334f77d50bcef82fb1b508c137c52f26b5a39b4ff872cd4180f2e6ce
+  metadata.gz: 1f29d96cf7879f2fdeae544b8786fc31f791d6426c45d37d3c096adce397f2af
+  data.tar.gz: 3ea7b2f1e64fcef2f81a81eecc9eda6f6709866d5818869b16c7c3447bec9215
 SHA512:
-  metadata.gz: 3a2991743833049bb2ec714dbc3da301affae32812e0f8f806a9a96104b920291df9a1ee8563b2e71e304df89d5e1e8b68b426ec2a79e3033e315d46c9b2e7be
-  data.tar.gz: 2c99051eec06e0dbb9e25cd1c9d0ea804073db65f0355bf1931b13a8749911e51080e49008564b905202944b0e232afd3bbdade973ab80da3d413a782df3ed8f
+  metadata.gz: 99b236593f11eefae1d1ed9c0ad0d3c1a733662a6c2c2c4d3fe2e111fb3b8383bb21a5ea1b2ae926baa20a61ebe4459a446a938b7ad6f6b76823cc7b37fe20fa
+  data.tar.gz: 8327e1f35451fb78ec59a2d1acb8482eddf25cc75b5345af99df3e563bb9bd6299d33330158c8d258634e826e976ec58bdef75fe402c8e0c84a17069d17e0ac7

data/.gitignore

@@ -16,9 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 *.bundle
-*.so
-*.o
-*.a
 mkmf.log
 /.config
 /coverage/

data/lib/dply/app_config.rb

@@ -1,17 +1,26 @@
 require_relative 'task_dsl'
 require_relative 'error'
 require_relative 'logger'
+require_relative 'ext/hash'
+require 'erb'
+require 'fileutils'
 
 module Dply
   class AppConfig
 
+    using HashExt
     include Logger
 
     def initialize
       @tasks = {}
+      @config_map = {}
       @namespace = nil
       @inside_namespace = false
       @config_read = false
+      @dsl_methods = self.class.instance_methods(false) + self.class.private_instance_methods(false)
+      def self.singleton_method_added(name)
+        raise Error, "overriding dsl method: :#{name} not allowed" if @dsl_methods.include? name
+      end
     end
 
     def run_task(name, optional: false)
@@ -28,6 +37,23 @@ 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
+
+      tmp_file = "tmp/config_render.tmp"
+      @config_map.each do |dest, src|
+        raise Error, %(error dest "#{dest}" is a directory) if File.directory? dest
+        template = File.read "dply/config/#{src}"
+        contents = ERB.new(template).result_with_hash(config_data)
+        File.write tmp_file, contents
+        FileUtils.mv tmp_file, dest
+      end
+    end
+
     def load_config
       return if @config_read
       bundler_setup
@@ -66,6 +92,10 @@ module Dply
       @inside_namespace = false
     end
 
+    def config_map(map)
+      @config_map = map
+    end
+
     def read_config(file, optional: false)
       if not File.readable? file
         raise Error, "#{file} not found" if not optional
@@ -104,5 +134,13 @@ module Dply
       raise Error, "drakefile.rb or dply/ dir not present" if not exists
     end
 
+    def load_yml(path, optional: false)
+      if not File.readable? path
+        raise Error, "error reading file #{path}" if not optional
+        return {}
+      end
+      YAML.safe_load(File.read(path)) || {}
+    end
+
   end
 end

data/lib/dply/ext/hash.rb

@@ -0,0 +1,23 @@
+module Dply
+  module HashExt
+    refine Hash do
+
+      def deep_merge!(other_hash, &block)
+        merge!(other_hash) do |key, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            this_val.deep_merge(other_val, &block)
+          elsif block_given?
+            block.call(key, this_val, other_val)
+          else
+            other_val
+          end
+        end
+      end
+
+      def deep_merge(other_hash, &block)
+        dup.deep_merge!(other_hash, &block)
+      end
+
+    end
+  end
+end

data/lib/dply/task_dsl.rb

@@ -18,6 +18,10 @@ 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)
+    end
+
     def set_env(key, value)
       ENV[key.to_s] = value.to_s
       base_env[key.to_s] = value.to_s

data/lib/dply/version.rb

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

data/spec/dply/bundle_spec.rb

@@ -91,9 +91,9 @@ module Dply
       end
 
       it "writes the config and runs bundle clean" do
-        expect_config
         expect(bundle).to receive(:cmd).with("bundle clean")
         bundle.clean
+        expect_config
       end
     end
   end

data/spec/integration/git_flow_spec.rb

@@ -60,4 +60,12 @@ describe "git flow" do
       system! "#{@drake} reload"
     end
   end
+
+  specify "config renderer works" 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")
+    end
+  end
 end

data/spec/test_data/sample_repo/application-override.yml

@@ -0,0 +1,2 @@
+db:
+  host: asdf-override

data/spec/test_data/sample_repo/application.yml

@@ -0,0 +1,3 @@
+db:
+  host: asdf
+  port: 5432

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

@@ -1,3 +1,8 @@
+config_map({
+  "test.txt" => "test.erb"
+})
+
+
 test do
 
 end
@@ -14,6 +19,7 @@ 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/test_data/sample_repo/dply/config/test.erb

@@ -0,0 +1,2 @@
+<%= db.fetch("host") %>
+<%= db.fetch("port") %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -104,6 +104,7 @@ files:
 - lib/dply/elf.rb
 - lib/dply/env.rb
 - lib/dply/error.rb
+- lib/dply/ext/hash.rb
 - lib/dply/ext/string.rb
 - lib/dply/git.rb
 - lib/dply/helper.rb
@@ -167,13 +168,18 @@ files:
 - spec/test_data/bundle/no_gemfile/.gitkeep
 - spec/test_data/command/test.rb
 - spec/test_data/elf/elf
+- spec/test_data/elf/libecpg.so
 - spec/test_data/elf/libpgtypes.so.3
 - spec/test_data/elf/not_elf
+- spec/test_data/elf/rpath_libecpg.so
 - spec/test_data/sample_repo/.dply.lock
 - spec/test_data/sample_repo/Gemfile
 - spec/test_data/sample_repo/Rakefile
 - spec/test_data/sample_repo/app.rb
+- spec/test_data/sample_repo/application-override.yml
+- spec/test_data/sample_repo/application.yml
 - spec/test_data/sample_repo/dply/app.rb
+- spec/test_data/sample_repo/dply/config/test.erb
 - spec/test_data/sample_repo/lib/libacl.so.1
 - spec/test_data/sample_repo/pkgs.yml
 - spec/webserver.rb
@@ -203,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: rake based deploy tool
@@ -234,13 +240,18 @@ test_files:
 - spec/test_data/bundle/no_gemfile/.gitkeep
 - spec/test_data/command/test.rb
 - spec/test_data/elf/elf
+- spec/test_data/elf/libecpg.so
 - spec/test_data/elf/libpgtypes.so.3
 - spec/test_data/elf/not_elf
+- spec/test_data/elf/rpath_libecpg.so
 - spec/test_data/sample_repo/.dply.lock
 - spec/test_data/sample_repo/Gemfile
 - spec/test_data/sample_repo/Rakefile
 - spec/test_data/sample_repo/app.rb
+- spec/test_data/sample_repo/application-override.yml
+- spec/test_data/sample_repo/application.yml
 - spec/test_data/sample_repo/dply/app.rb
+- spec/test_data/sample_repo/dply/config/test.erb
 - spec/test_data/sample_repo/lib/libacl.so.1
 - spec/test_data/sample_repo/pkgs.yml
 - spec/webserver.rb