ky 0.5.1 → 0.5.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 666a1f9df164ebe18972f49effbeddcbbb3faec9
-  data.tar.gz: 518729830dd9260892cf782ade1fc58aae77fa7f
+  metadata.gz: 79b89255c18ce526eae627c708a5bc265777ff53
+  data.tar.gz: 90ec88c86756ae65599f3005b4480e4312bce855
 SHA512:
-  metadata.gz: 45f7949edf594ffb2345567b3b25588b5332c89c471636ae9514e91fd5017f9d2e9cea00045592b5233eb760bc0d742abb0393ddc729275e8edd22f300e25a0a
-  data.tar.gz: 5823a7f1ef34db3ac32b5a2335e6ba7d9d02989602139320e1eb305c6592e5d481c91169993a58640db6943e9ab51da04e2a100fccec2510c91e89999e8eb53f
+  metadata.gz: 7a059e29f0cfc7b31c5873bf662e427abd8f676a697c5a15f3332efc2c9cf01c487b39b5f9eeb3063475975589b8eda2da69464d69b0558345e0335cecacdea5
+  data.tar.gz: 83d2f6d350fec0028d7d3a8804ef316621bb2939eb968a50fc63f9abc607696ca9254d69233dcbbdec19592a51babf811ee7f64f5331a1d41cb4f59ccb17eec6

data/lib/ky.rb

@@ -4,6 +4,7 @@ require 'open-uri'
 require 'fileutils'
 require 'pathname'
 require 'random_username'
+require_relative 'ky/api'
 require_relative 'ky/configuration'
 require_relative 'ky/compilation'
 require_relative 'ky/manipulation'

data/lib/ky/api.rb

@@ -0,0 +1,62 @@
+module KY
+  module API
+    MissingParametersError = Class.new(StandardError)
+
+    def self.encode(input_source, output_source)
+      input_output(input_source, output_source) do |input_object, output_object|
+        Manipulation.encode(output_object, input_object)
+      end
+    end
+
+    def self.decode(input_source, output_source)
+      input_output(input_source, output_source) do |input_object, output_object|
+        Manipulation.decode(output_object, input_object)
+      end
+    end
+
+
+    def self.merge(input_source1, input_source2, output_source)
+      input_output(input_source1, output_source) do |input_object1, output_object|
+        with(input_source2, 'r') {|input_object2| Manipulation.merge(output_object, input_object1, input_object2) }
+      end
+    end
+
+    def self.env(input_source1, input_source2, output_source)
+      input_output(input_source1, output_source) do |input_object1, output_object|
+        with(input_source2, 'r') {|input_object2| EnvGeneration.env(output_object, input_object1, input_object2) }
+      end
+    end
+
+    def self.compile(config_or_secrets_path, secrets_or_config_path, output_dir, options={})
+      Compilation.new(options.with_indifferent_access).tap do |instance|
+        config_or_secrets_path  ||= instance.configuration['config_path'] || instance.configuration['secret_path']
+        secrets_or_config_path  ||= instance.configuration['secret_path'] || instance.configuration['config_path']
+        output_dir ||= instance.configuration['output_dir']
+        raise MissingParametersError unless config_or_secrets_path && secrets_or_config_path && output_dir && instance.configuration['procfile_path']
+        input_input(config_or_secrets_path, secrets_or_config_path) do |input1, input2|
+          instance.compile(input1, input2, output_dir)
+        end
+      end
+    end
+
+    private
+
+    def self.input_output(input1, output1)
+      with(input1, 'r') {|input_object| with(output1, 'w+') { |output_object| yield(input_object, output_object)  } }
+    end
+
+    def self.input_input(input1, input2)
+      with(input1, 'r') {|input_object1| with(input2, 'r') { |input_object2| yield(input_object1, input_object2)  } }
+    end
+
+    def self.with(output, mode)
+      if output.kind_of?(IO)
+        yield output
+      else
+        open(output, mode) do |f|
+          yield f
+        end
+      end
+    end
+  end
+end

data/lib/ky/cli.rb

@@ -2,33 +2,24 @@ require_relative '../ky'
 require 'thor'
 module KY
   class Cli < Thor
-    MissingParametersError = Class.new(StandardError)
     desc "encode secrets.yml", "base64 encoded yaml version of data attributes in secrets.yml"
     def encode(input_source=$stdin, output_source=$stdout)
-      input_output(input_source, output_source) do |input_object, output_object|
-        Manipulation.encode(output_object, input_object)
-      end
+      API.encode(input_source, output_source)
     end
 
     desc "decode secrets.yml", "decoded yaml version of secrets.yml with base64 encoded data attributes"
     def decode(input_source=$stdin, output_source=$stdout)
-      input_output(input_source, output_source) do |input_object, output_object|
-        Manipulation.decode(output_object, input_object)
-      end
+      API.decode(input_source, output_source)
     end
 
     desc "merge base.yml env.yml", "deep merged/combined yaml of two seperate files"
     def merge(input_source1, input_source2=$stdin, output_source=$stdout)
-      input_output(input_source1, output_source) do |input_object1, output_object|
-        with(input_source2, 'r') {|input_object2| Manipulation.merge(output_object, input_object1, input_object2) }
-      end
+      API.merge(input_source1, input_source2, output_source)
     end
 
     desc "env config.yml secrets.yml", "generate env variables section of a deployment from a config and a secrets file"
     def env(input_source1, input_source2=$stdin, output_source=$stdout)
-      input_output(input_source1, output_source) do |input_object1, output_object|
-        with(input_source2, 'r') {|input_object2| EnvGeneration.env(output_object, input_object1, input_object2) }
-      end
+      API.env(input_source1, input_source2, output_source)
     end
 
     desc "compile (config.yml secrets.yml output)", <<-DOC.strip_heredoc
@@ -46,14 +37,7 @@ module KY
     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']
-      secrets_or_config_path  ||= instance.configuration['secret_path'] || instance.configuration['config_path']
-      output_dir ||= instance.configuration['output_dir']
-      raise MissingParametersError unless config_or_secrets_path && secrets_or_config_path && output_dir && instance.configuration['procfile_path']
-      input_input(config_or_secrets_path, secrets_or_config_path) do |input1, input2|
-        instance.compile(input1, input2, output_dir)
-      end
+      API.compile(config_or_secrets_path, secrets_or_config_path, output_dir, options)
     end
 
     desc "example", "copy example configuration and environment override file to current directory"
@@ -68,25 +52,5 @@ module KY
       `cp #{__dir__}/../../examples/dev.deployment.yml .`
     end
 
-    private
-
-    def input_output(input1, output1)
-      with(input1, 'r') {|input_object| with(output1, 'w+') { |output_object| yield(input_object, output_object)  } }
-    end
-
-    def input_input(input1, input2)
-      with(input1, 'r') {|input_object1| with(input2, 'r') { |input_object2| yield(input_object1, input_object2)  } }
-    end
-
-    def with(output, mode)
-      if output.kind_of?(IO)
-        yield output
-      else
-        open(output, mode) do |f|
-          yield f
-        end
-      end
-    end
-
   end
 end

data/lib/ky/compilation.rb

@@ -1,6 +1,6 @@
 module KY
   class Compilation
-    attr_reader :configuration
+    attr_reader :configuration, :deploy_generation
 
     def initialize(opts={})
       @configuration = Configuration.new(opts)
@@ -10,7 +10,8 @@ module KY
       full_output_dir = Pathname.new(base_output_dir).join(configuration[:environment].to_s).to_s
       FileUtils.mkdir_p(full_output_dir)
       env_obj = EnvGeneration.new(env1path, env2path, configuration)
-      deploys_hash = DeployGeneration.new(full_output_dir, env_obj.immutable_project_name, configuration).to_h
+      @deploy_generation =  DeployGeneration.new(full_output_dir, env_obj.immutable_project_name, configuration)
+      deploys_hash = deploy_generation.to_h
       deploys_hash.each do |file_path, deploy_hash|
         File.write(file_path, Manipulation.merge_hash(deploy_hash, env_obj.to_h).to_plain_yaml)
       end

data/lib/ky/deploy_generation.rb

@@ -23,9 +23,10 @@ module KY
       end.to_h
     end
 
-    private
     attr_reader :proc_commands, :full_output_dir, :project_name, :deployment_yaml, :configuration
 
+    private
+
     def read_deployment_yaml
       if configuration['deployment']
         File.read(configuration['deployment'])

data/lib/ky/version.rb

@@ -1,3 +1,3 @@
 module KY
-  VERSION = "0.5.1"
+  VERSION = "0.5.2.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ky
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2.pre1
 platform: ruby
 authors:
 - Brian Glusman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,6 +130,7 @@ files:
 - examples/dev.yml
 - ky.gemspec
 - lib/ky.rb
+- lib/ky/api.rb
 - lib/ky/cli.rb
 - lib/ky/compilation.rb
 - lib/ky/configuration.rb
@@ -166,9 +167,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ky
 rubygems_version: 2.6.8
@@ -176,3 +177,4 @@ signing_key:
 specification_version: 4
 summary: Kubernetes Yaml utilities and lubricant
 test_files: []
+has_rdoc: