ky 0.3.0beta1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff2da2223846540c4f8bb47a3bb59684215b698
-  data.tar.gz: 793e1b97792108e5feada8ec4969cec526a73875
+  metadata.gz: 3a1450afbdf79d14f2d16fde12d7776a3f902c88
+  data.tar.gz: 0251fb3c63c8ec51aad1a5e3dd0d793344a204d7
 SHA512:
-  metadata.gz: 1e02009691a0503ff6d92af8799577792fd9fac9205cfb3c2f7fd9ca88b58c0d2ca38547c95689ee1c646f900488008e534181b1ddf176368fcc337c8a2fe460
-  data.tar.gz: 21727d8f5bbec27b5278b7db6837c508517784c37d33d5300956d85912a53b5318656c150060a122fd2529621f5c8234afae791860139da494a54e81e8283924
+  metadata.gz: aa0d08b5c026b6a20f41220fa9967a1e7230b01e40b0eb43fb25926444de55df527574bfded3c0249040d857f7fb4ef79613ac64472de36effc1dc5e49ef8d68
+  data.tar.gz: 2067a16f3f92c53091db6346de4e7b41eb10b4c9e8a66a8a6d6b90995f4878faacf19f6944f5395dca598e8a4fe82a32f9cad77bc2ba4537155a3ceedf706ff6

data/examples/.ky.yml

@@ -13,3 +13,11 @@ config_path: "spec/support/config.yml"
 secret_path: "spec/support/decoded.yml"
 output_dir: "namespaces"
 procfile_path: "spec/support/Procfile"
+merge:
+  web:
+    spec:
+      template:
+        spec:
+          containers:
+            - ports:
+              - containerPort: 3000

data/lib/ky.rb

@@ -67,8 +67,9 @@ module KY
     end
   end
 
-  def current_deployment
-    current_environment_hash["deployment"]
+  def deploy_merge(id)
+    return {} unless configuration["merge"]
+    configuration["merge"][id].to_h
   end
 
   def current_environment_hash(partial_config=nil)

data/lib/ky/deploy_generation.rb

@@ -19,7 +19,7 @@ module KY
 
     def to_h
       proc_commands.map do |id, command_array|
-        ["#{full_output_dir}/#{id}.yml", template_hash(id, command_array)]
+        ["#{full_output_dir}/#{id}-deployment.yml", template_hash(id, command_array)]
       end.to_h
     end
 
@@ -41,7 +41,12 @@ module KY
     def template_hash(id, command_array)
       app_name =  KY.configuration['app_name'] || "#{project_name}-#{id}"
       template_context = Template.context(app_name: app_name, id: id, command_array: command_array)
-      YAML.load(ERB.new(deployment_yaml).result(template_context))
+      Manipulation.merge_hash(
+        YAML.load(
+          ERB.new(deployment_yaml).result(template_context)
+        ),
+        KY.deploy_merge(id)
+      )
     end
   end
 end

data/lib/ky/manipulation.rb

@@ -52,7 +52,7 @@ module KY
         else
           File.write("#{output_path}/secret.yml", code_yaml(StringIO.new(secret_hsh.to_yaml), :encode))
         end
-        File.write("#{output_path}/config.yml", config_hsh.to_yaml)
+        File.write("#{output_path}/configmap.yml", config_hsh.to_yaml)
       end
 
     end

data/lib/ky/version.rb

@@ -1,3 +1,3 @@
 module KY
-  VERSION = "0.3.0beta1"
+  VERSION = "0.3.0"
 end

data/spec/ky_bin_spec.rb

@@ -68,9 +68,9 @@ describe "cli commands" do
     let(:tmpdir) { 'spec/support/tmpdir' }
     it "to directory" do
       KY::Cli.new.compile('spec/support/Procfile', 'spec/support/config.yml', 'spec/support/decoded.yml', tmpdir)
-      expect(File.exists?("#{tmpdir}/web.yml")).to be true
-      expect(File.exists?("#{tmpdir}/worker.yml")).to be true
-      expect(File.exists?("#{tmpdir}/jobs.yml")).to be true
+      expect(File.exists?("#{tmpdir}/web-deployment.yml")).to be true
+      expect(File.exists?("#{tmpdir}/worker-deployment.yml")).to be true
+      expect(File.exists?("#{tmpdir}/jobs-deployment.yml")).to be true
       `rm -r #{tmpdir}`
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ky
 version: !ruby/object:Gem::Version
-  version: 0.3.0beta1
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Glusman
@@ -119,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: ky
 rubygems_version: 2.5.1