rops 1.0.3 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba9a816bbbd95902a7ceae4ef3f8d8d15f11f85161feb5a4440b9d07bbb4fdd
-  data.tar.gz: 725ebdc57f82b4149a2355270c744d2407de307b65884edf78977ec1dff6763e
+  metadata.gz: 78cb1cdfa255b9f24c33cce2dafaaad811526e980fb28df95939024e04ec8324
+  data.tar.gz: c20c8891b751fa8d7a75103d3ed4516920fbbb7ac91e52020f8a35cdb3fddbe7
 SHA512:
-  metadata.gz: ce727f9be89ea5138ad03c7692fab3776e6d3a0217e4a9ee355e45b24ad813a6def6472e7866adbc9ec4664fc1b3b09d41c3aafa964bd77c98f82576e86d14f9
-  data.tar.gz: ee365fa57fd2fe145ac5d5d38385f2c2cdb5300280768e7c049fc386431369d171150954010104f8acf20d39a92969668cde10e1ed0c14e65fb5f90de4d9977b
+  metadata.gz: 2add816686a5d4a0e2a94ca1d342af659ba0963e8df4fb2b7e167a4d774ce3696697bfd9467793bb65c14b7c58285516ba6c717891c9a5c58257bc23bf85d7c7
+  data.tar.gz: 1697452d48bbd3cd5ed1501380ba5cb7956474b0aca3b4c2c0a15b2d86d28fa592a2f7a5baf3958e1411d2d5cf81ad30886fe3da21baf6735fb61692b6832049

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rops (1.0.2)
+    rops (1.0.7)
       activesupport (~> 6.1.4)
       dry-cli (~> 0.7.0)
       git (~> 1.9.1)

data/README.md

@@ -2,26 +2,23 @@
 
 The Record360 Operations tool - checkout, build, deploy
 
-## Usage
+## Description
 
 This tool implements the Record360 Best Practices for building and deploying projects.  It interfaces with Git (for source control), Docker/Podman (for container images), and Kubernetes (cluster deployments).
 
-### Installation
+## Installation
 
-Add `rops` to your Gemfile and then run `bundle install`.
+Download and install with:
 
-```ruby
-# Gemfile
-group :development do
-  gem 'rops', github: 'Record360/rops'
-end
+```shell
+gem install rops
 ```
 
-### Configuration
+## Configuration
 
 `rops` has several opinionated defaults, which can be overridden by command line options or a configuration file.
 
-#### Project Root Directory
+### Project Root Directory
   By default, the current working directory when `rops` runs.  It can be overridden with the `--root=<DIR>` option.
 
   The project root directory must contain:
@@ -34,7 +31,7 @@ end
   * `./platform/rops.yaml`
   * `./config/rops.yaml`
 
-#### Docker Container Images
+### Docker Container Images
   By default, a single image named from the the Project root directory and built from `./Dockerfile`.  May be overridden by setting the `images` array in the configuration file, e.g.:
 
 ```yaml
@@ -45,23 +42,22 @@ images:
   dockerfile: dockerfiles/second.Dockerfile
 ```
 
-#### Git Default Branch
+### Git Default Branch
   The Git branch to build, by default `master`.  Overridden with the `default_branch` field in the configuration file.
 
-#### Docker Registry
+### Docker Registry
   The Docker registry to push container images.  By default, `r360`, which is probably not what you want and should be overridden by setting the `registry` field in the configuration file.
 
-#### Kubernetes Context
+### Kubernetes Context
   The name of the Kubernetes context to deploy to (as listed in `~/.kube/config`).  Defaults to `staging` and overridden with the `default_context` field in the configuration file.
 
   There are extra safety features when deploying to the production context, which defaults to `production` and may be overridden with the `production_context` field in the configuration file.
 
   Kubernetes configuration is organized by Kubernetes context name, under the `./platform` directory.  For example, the Kubernetes configuration for the default contexts (`staging` and `production`) is stored under `./platform/staging` and `./platform/production` respectively.
 
-### Operations
+## Operations
 
 ### Status
-
 Arguments: 
 * `context`: Kubernetes context (default `staging`, or the value of `staging_context`)
 
@@ -80,7 +76,6 @@ Currently running (staging):
 ```
 
 ### Build
-
 Arguments: 
 * `branch`: Git branch/commit (default `master`, or the value of `default_branch`)
 
@@ -105,7 +100,6 @@ Successfully tagged localhost/web:gfc50028b-feature
 ```
 
 ### Push
-
 Arguments: 
 * `branch`: Git branch/commit (default `master`, or the value of `default_branch`)
 
@@ -120,7 +114,6 @@ Storing signatures
 ```
 
 ### Deploy
-
 Arguments: 
 * `branch`: Git branch/commit (default `master`, or the value of `default_branch`)
 * `context`: Kubernetes context (default `staging`, or the value of `default_context`)

data/bin/rops

@@ -150,8 +150,8 @@ module Record360
     end
 
     class BuildImage < Dry::CLI::Command
-      desc "Build the docker image" #" (COMMIT=#{DEFAULT_COMMIT})"
-      argument :branch, desc: "Branch (or commit) to build" #, default: DEFAULT_COMMIT
+      desc "Build the docker image"
+      argument :branch, desc: "Branch (or commit) to build"
       include Common
 
       def call(**)
@@ -222,10 +222,10 @@ module Record360
         end
 
         if $stdout.tty?
-          print "Deploy #{branch} (#{image_tag}) to #{context}? (y/N): "
+          print "Deploy #{deployer.branch} (#{image_tag}) to #{context}? (y/N): "
           exit(-1)  unless $stdin.gets&.chomp == 'y'
         else
-          puts "Deploying #{branch} (#{image_tag}) to #{context}"
+          puts "Deploying #{deployer.branch} (#{image_tag}) to #{context}"
         end
 
         deployer.deploy!(context)

data/lib/deployer.rb

@@ -44,8 +44,8 @@ class Deployer
 
     short_id = @commit[0, 8]
     @image_tag = "g#{short_id}"
-    if branch.present? && (branch != default_branch) && !branch.start_with?(short_id)
-      @image_tag += "-#{branch}"
+    if (@branch != default_branch) && !@branch.start_with?(short_id)
+      @image_tag += "-#{@branch}"
     end
     images.each do |image|
       image.commit = commit
@@ -68,7 +68,7 @@ class Deployer
     end
 
     statuses, stderr, success = kubectl(context, cmd)
-    unless success || stderr.match(/not found/)
+    unless (success || stderr.match(/not found/)) && statuses.present?
       puts stderr  if stderr.present?
       return nil
     end
@@ -135,7 +135,7 @@ class Deployer
     cmd = "kubectl --context #{context} #{cmd}"
 
     if ssh_host.blank?
-      stdout, stderr, cmd_status = Open3.capture3(cmd)
+      stdout, stderr, cmd_status = Open3.capture3(cmd, stdin_data: data)
       [ stdout, stderr, cmd_status.success? ]
     else
       require 'net/ssh'

data/lib/image.rb

@@ -54,7 +54,9 @@ class Image
   end
 
   def local_exists?
-    system("#{Deployer.docker} image exists #{local_image}")
+    if @local_exists.nil?
+      @local_exists = system("#{Deployer.docker} image exists #{local_image}")
+    end
   end
 
   def remote_image
@@ -68,7 +70,7 @@ class Image
       if status.success? || stderr.include?('error parsing manifest blob')
         @remote_exists = true
       else
-        puts stderr  if stderr.present? && !stderr.include?('manifest unknown')
+        puts stderr  if stderr.present? && !stderr.include?('manifest unknown') && !stderr.include?('no such manifest')
         @remote_exists = false
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rops
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.7
 platform: ruby
 authors:
 - Steve Sloan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli