kuber_kit 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8321dfb87de00ef987aa2c826e5310fd721664135b90e194562a9c9f26ad044e
-  data.tar.gz: dccbfdc6df8ed8bedd6e6d30ddfd576c42c1a12ec36aa465769a1fcc207d38af
+  metadata.gz: ed4a9c2ac89b73ddd0b9d7c0c95845318c46e6389869f4b3a876af67b2d122f6
+  data.tar.gz: 5fb51bb82cc685ee370e880c255ec87e957f5b75c929baf256188582e63fb13f
 SHA512:
-  metadata.gz: cde945512a525f1ef577f540ae3919bc602d442fb44eb14505fe2a4761ad1c15061f9bab1540b9b8de2592cf4d4f4f7396bfe451499af45cd6198659ad7cfaeb
-  data.tar.gz: cca667290f77ff94934ce302666655d1bdefc414f074915c8a6d091590786b20ff2aa26a04c02f9d07b5e3c88f2e48439c3cbe71add7d374ea255deda753e125
+  metadata.gz: df0ceafb8c37a8c216f08eb5c8692fcc6eb2f909bbcc929beb9725fdaea0a73976b5a462d5904361e20c01b121dd5efa16185c6e8f388fe01a9ae7b2c55531f8
+  data.tar.gz: 56a8bdf92b31851078a50c679fc1680adb8f598d3a33ca0010de4789e338a7047a3a34e030cbc186f6b59da7899f64291eec44c34eb18c520e1cc04019414958

data/.github/workflows/rspec.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Rspec
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.7']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec spec/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.3.9)
+    kuber_kit (0.3.10)
       cli-ui
       contracts-lite
       dry-auto_inject

data/README.md

@@ -1,6 +1,6 @@
 # KuberKit
 
-[![Codeship Status for ArtStation/kuber_kit](https://app.codeship.com/projects/1286f0a6-3f90-4c1b-b426-721ed8a6571b/status?branch=master)](https://app.codeship.com/projects/417264)
+[![Rspec](https://github.com/ArtStation/kuber_kit/workflows/Rspec/badge.svg)](https://github.com/ArtStation/kuber_kit/actions?query=workflow%3ARspec)
 
 Solution for building & deploying applications on Kubernetes, written in Ruby.
 

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -1,6 +1,4 @@
 class KuberKit::Actions::ConfigurationLoader
-  APP_CONFIG_FILENAME = "config.rb".freeze
-
   include KuberKit::Import[
     "core.registry_store",
     "core.image_store",
@@ -16,13 +14,6 @@ class KuberKit::Actions::ConfigurationLoader
   Contract Hash => Any
   def call(options)
     root_path     = options[:path] || File.join(Dir.pwd, configs.kuber_kit_dirname)
-
-    # require config file first, in case if other dirs are overriden in config
-    config_file_path = File.join(root_path, APP_CONFIG_FILENAME)
-    if File.exists?(config_file_path)
-      require config_file_path
-    end
-
     images_path   = options[:images_path] || File.join(root_path, configs.images_dirname)
     services_path = options[:services_path] || File.join(root_path, configs.services_dirname)
     infra_path    = options[:infra_path]  || File.join(root_path, configs.infra_dirname)
@@ -37,6 +28,8 @@ class KuberKit::Actions::ConfigurationLoader
     logger.info "  Configurations path: #{configurations_path.to_s.yellow}"
     logger.info "  Configuration name: #{configuration_name.to_s.yellow}"
 
+    ui.print_info("Logs", "See logs at: #{configs.log_file_path}")
+
     unless File.exists?(root_path)
       ui.print_warning "WARNING", "KuberKit root path #{root_path} doesn't exist. You may want to pass it --path parameter."
     end

data/lib/kuber_kit/cli.rb

@@ -1,6 +1,8 @@
 require 'thor'
 
 class KuberKit::CLI < Thor
+  APP_CONFIG_FILENAME = "config.rb".freeze
+
   class_option :path, :type => :string
   class_option :images_path, :type => :string
   class_option :infra_path, :type => :string
@@ -10,7 +12,7 @@ class KuberKit::CLI < Thor
 
   desc "compile IMAGE_NAMES", "Compile image with IMAGE_NAMES (comma-separated)"
   def compile(image_names_str)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
     
     image_names = image_names_str.split(",").map(&:strip).map(&:to_sym)
 
@@ -35,7 +37,7 @@ class KuberKit::CLI < Thor
   method_option :tags,          :type => :array,    aliases: ["-t"]
   method_option :skip_compile,  :type => :boolean,  aliases: ["-B"]
   def deploy
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       result = KuberKit::Container['actions.service_deployer'].call(
@@ -59,7 +61,7 @@ class KuberKit::CLI < Thor
 
   desc "env ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"
   def env(env_file_name)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.env_file_reader'].call(env_file_name.to_sym, options)
@@ -68,7 +70,7 @@ class KuberKit::CLI < Thor
 
   desc "template TEMPLATE_NAME", "Return content of Template TEMPLATE_NAME"
   def template(template_name)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.template_reader'].call(template_name.to_sym, options)
@@ -77,7 +79,7 @@ class KuberKit::CLI < Thor
 
   desc "service SERVICE_NAME", "Return content of Service SERVICE_NAME"
   def service(service_name)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.service_reader'].call(service_name.to_sym, options)
@@ -86,7 +88,7 @@ class KuberKit::CLI < Thor
 
   desc "apply FILE_PATH", "Apply FILE_PATH with kubectl"
   def apply(file_path)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.kubectl_applier'].call(File.expand_path(file_path), options)
@@ -95,26 +97,26 @@ class KuberKit::CLI < Thor
 
   desc "attach POD_NAME", "Attach to POD_NAME using kubectl"
   def attach(pod_name = nil)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.kubectl_attacher'].call(pod_name, options)
     end
   end
 
-  desc "launch console in POD_NAME", "Attach to POD_NAME using kubectl & launch bin/console"
+  desc "console POD_NAME", "Attach to POD_NAME using kubectl & launch bin/console"
   def console(pod_name = nil)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.kubectl_console'].call(pod_name, options)
     end
   end
 
-  desc "show logs for POD_NAME", "Show logs for POD_NAME using kubectl"
+  desc "logs POD_NAME", "Show logs for POD_NAME using kubectl"
   method_option :follow,  :type => :boolean,  aliases: ["-f"]
   def logs(pod_name = nil)
-    KuberKit.set_debug_mode(options[:debug])
+    setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       KuberKit::Container['actions.kubectl_logs'].call(pod_name, options)
@@ -129,4 +131,16 @@ class KuberKit::CLI < Thor
   def self.exit_on_failure?
     true
   end
+
+  private
+    def setup(options)
+      KuberKit.set_debug_mode(options[:debug])
+
+      # We should load config before loading any bean, to make sure that bean won't be built with default config
+      root_path     = options[:path] || File.join(Dir.pwd, KuberKit::Container['configs'].kuber_kit_dirname)
+      config_file_path = File.join(root_path, APP_CONFIG_FILENAME)
+      if File.exists?(config_file_path)
+        require config_file_path
+      end
+    end
 end

data/lib/kuber_kit/service_deployer/strategies/docker.rb

@@ -37,6 +37,11 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       docker_commands.delete_container(shell, container_name)
     end
 
+    command_args = Array(command_args)
+    if container_name
+      command_args << "-n #{container_name}"
+    end
+
     docker_commands.run(
       shell, image.remote_registry_url, 
       command:    command_name,

data/lib/kuber_kit/shell/commands/docker_commands.rb

@@ -18,7 +18,7 @@ class KuberKit::Shell::Commands::DockerCommands
     command_parts = []
     command_parts << "docker run"
     command_parts << "-d" if detached
-    command_parts << args if args
+    command_parts << Array(args).join(" ") if args
     command_parts << image_name
     command_parts << command if command
 

data/lib/kuber_kit/shell/commands/docker_compose_commands.rb

@@ -8,7 +8,7 @@ class KuberKit::Shell::Commands::DockerComposeCommands
     
 
     command_parts << "-d" if detached
-    command_parts << args if args
+    command_parts << Array(args).join(" ") if args
     command_parts << service
     command_parts << command if command
     

data/lib/kuber_kit/shell/local_shell.rb

@@ -76,7 +76,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
 
   def recursive_list_files(path, name: nil)
     command = %Q{find -L #{path}  -type f}
-    command += " -name #{name}" if name
+    command += " -name '#{name}'" if name
     exec!(command).split(/[\r\n]+/)
   rescue => e
     if e.message.include?("No such file or directory")

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -145,6 +145,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -293,7 +294,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -308,8 +309,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []