ky 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e2cbbf671a3e7fd09fb7eac2e4b209cc2eccc5
-  data.tar.gz: aea2bbb6db0bde006fea255fdbbcc53bb502b79f
+  metadata.gz: b4e1439327b6aed61becdad4564dba6d626bc279
+  data.tar.gz: b9bc624a510108032079a2d5a53766e10e6ecc0a
 SHA512:
-  metadata.gz: a486fa1c392976cd44a83a5498728fb60f6ebd222432725537bc2b82609a6f035956a6a24fd1feaa583ed715168fa9af38a3b7e10787019eb409c22afb93f5dc
-  data.tar.gz: 0def538f73dcbbe5a574363911feff3b94e58f92646b8370074b375bdcfb3288b66424ca67f64eb87279934e7c7bd0356e121d927dce37db3d5cf77d236357ff
+  metadata.gz: 2fb56300523159011c8af092522a9590ceb4cae1493a63e10f843a17a88ac714815e2fb7c402803a27a0a64db19c4cc8c63cf83ef98787a40472a458b2d43e7e
+  data.tar.gz: eccefe9f0eb273c22ac337e4178bbf0c9941fa25080aa247f7fbc148905ad0919d712ef81dc7259133fe9a5e053fb043ad935e84c6ae602eb868d61883558a2a

data/examples/.ky.yml

@@ -20,4 +20,14 @@ merge:
         spec:
           containers:
             - ports:
-              - containerPort: 3000
+              - containerPort: 3000
+  migration: &job
+    apiVersion: batch/v1
+    kind: Job
+    spec:
+      replicas: --
+      template:
+        spec:
+          restartPolicy: Never
+  console:
+    <<: *job

data/lib/ky/cli.rb

@@ -38,11 +38,13 @@ module KY
     ConfigMap.yml file path may also be specified in configuration as config_path
     secrets.yml file path may also be specified in configuration as secret_path
     Output directory may also be specified in configuration as output_dir
+    Ky config (normally loaded from .ky) may be manually specified as ky_config_path
     DOC
     method_option :namespace, type: :string, aliases: "-n"
     method_option :environment, type: :string, aliases: "-e"
     method_option :image_tag, type: :string, aliases: "-t"
     method_option :procfile_path, type: :string, aliases: "-p"
+    method_option :ky_config_path, type: :string, aliases: "-k"
     def compile(config_or_secrets_path=nil, secrets_or_config_path=nil, output_dir=nil)
       instance = Compilation.new(options.with_indifferent_access)
       config_or_secrets_path  ||= instance.configuration['config_path'] || instance.configuration['secret_path']

data/lib/ky/configuration.rb

@@ -17,7 +17,9 @@ module KY
     end
 
     def build_configuration
-      config = if config_file_location
+      config = if ky_config_path = opts[:ky_config_path]
+        YAML.load(File.read(ky_config_path)).with_indifferent_access
+      elsif config_file_location
         YAML.load(File.read(config_file_location)).with_indifferent_access
       else
         DEFAULT_CONFIG

data/lib/ky/hash.rb

@@ -14,4 +14,14 @@ class Hash # specifically for HashWithIndifferentAccess < Hash, instead of plain
     end
     result
   end
+
+  def compact_blank(opts={})
+    inject({}) do |new_hash, (k,v)|
+      if !v.blank?
+        new_hash[k] = opts[:recurse] && v.class == Hash ? v.compact_blank(opts) : v
+      end
+      new_hash
+    end
+  end
+
 end

data/lib/ky/manipulation.rb

@@ -26,7 +26,7 @@ module KY
       end
 
       def merge_hash(hsh1, hsh2)
-        hsh1.deeper_merge!(hsh2, merge_hash_arrays: true, extend_existing_arrays: true)
+        hsh1.deeper_merge!(hsh2, merge_hash_arrays: true, extend_existing_arrays: true, knockout_prefix: "--").compact_blank(recurse: true)
       end
 
       def code_yaml(yaml_source, direction)

data/lib/ky/version.rb

@@ -1,3 +1,3 @@
 module KY
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/ky_bin_spec.rb

@@ -179,6 +179,23 @@ describe "ky cli" do
 
     end
 
+    describe "allows knocking out depoyment elements in merge" do
+
+      before do
+        instance = KY::Cli.new
+        instance.options = {namespace: fake_namespace, procfile_path: 'spec/support/Procfile', ky_config_path: 'examples/.ky.yml'}
+        instance.compile('spec/support/config.yml', 'spec/support/decoded.yml', tmpdir)
+      end
+
+
+      it "generated files (currently named as deployments indiscriminately)" do
+        expect(File.exists?("#{tmpdir}/migration.deployment.yml")).to be true
+        expect(YAML.load(File.read("#{tmpdir}/migration.deployment.yml"))['spec']['replicas']).to be_nil
+        expect(YAML.load(File.read("#{tmpdir}/migration.deployment.yml"))['kind']).to match("Job")
+      end
+
+    end
+
   end
 end
 

data/spec/support/Procfile

@@ -1,3 +1,5 @@
 web: bundle exec puma -C ./config/puma.rb
 jobs: bundle exec rake jobs:work
 worker: bundle exec toiler --rails -C config/toiler.yml
+migration: bundle exec rake db:migrate
+console: bundle exec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ky
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Brian Glusman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec