cpl 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2392653f1a75e0dc398590cc5c0e9d89d4769a50af3432b2861e01ff794e8cda
-  data.tar.gz: 13c33cc6465394b90b1fd8e94f711c98135bfdcb25756db7d3b7b0c8bfc819fa
+  metadata.gz: 940fc95a21ea2771a453b12e646d182ed42ef448fd83081ac822af26d1820ad3
+  data.tar.gz: 4405dd3555275a1bbe135d52abaf072ed683cb183d0ee36e0060c38262ca8017
 SHA512:
-  metadata.gz: bc2b5f2555b8f329ad8d5b2be9f5762e6f265f499baaa035e65c24257b47c26459842f2611ee8d352af65b3dcabf4f0e6570007c59f5ca543f3edb382ed04747
-  data.tar.gz: 904028e00550311c8b9327fb3a17a8a00c75b4806e81ca8359d5b3f6ae55b19f8a89efbc3ccc087e4f62e2243930587df1f693ebbbac9470377b0e6905e0dd19
+  metadata.gz: 579a48aff74172dfe8ac8652e3538006d897ad2ce82459869227889d1e294595c0a698f846f2fe9db3970950e1f0372a6149f75ce06f6a2ab526fa451fea6649
+  data.tar.gz: 26581dbe132fea73f6066ba4a030738a1b08978e17d02fe6ba95ebed74d879f25a103ce5ddbeff8ba33c4508d7b302fc9f28c0d822f77c423c74c07cdf95006b

data/.github/workflows/{ci.yml → rspec.yml}

@@ -1,4 +1,4 @@
-name: CI
+name: RSpec
 
 on:
   push:
@@ -7,29 +7,7 @@ on:
   pull_request:
 
 jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    name: Rubocop
-    strategy:
-      matrix:
-        ruby:
-          - "2.7"
-          - "3.0"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          rubygems: latest
-      - name: Install dependencies
-        run: bundle install
-      - name: Analyze code
-        run: bundle exec rubocop
-
   rspec:
-    needs: rubocop
     runs-on: ubuntu-latest
     name: RSpec
     env:
@@ -46,8 +24,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          rubygems: latest
-          bundler-cache: false
+          bundler-cache: true
       - name: Install dependencies
         run: bundle install
       - name: Run tests

data/.github/workflows/rubocop.yml

@@ -0,0 +1,29 @@
+name: Rubocop
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    name: Rubocop
+    strategy:
+      matrix:
+        ruby:
+          - "2.7"
+          - "3.0"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Analyze code
+        run: bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,9 @@
-## [Unreleased]
+# Changelog
 
-## [0.1.0] - 2023-02-08
+## 0.1.1 - 2023-03-09
+
+- Fixed issue with default gems for older Ruby versions (#14)
+
+## 0.1.0 - 2023-02-19
 
 - Initial release

data/CONTRIBUTING.md

@@ -1,5 +1,21 @@
 # Contributing
 
+## Installation
+Rather than installing `cpl` as a Ruby gem, install this repo locally and alias `cpl` command globally for easier access, e.g.:
+
+```sh
+git clone https://github.com/shakacode/heroku-to-control-plane
+
+# Create an alias in some local shell startup script, e.g., `.profile`, `.bashrc`, etc.
+alias cpl="~/projects/heroku-to-control-plane/cpl"
+```
+
+Or set the path of the Ruby gem in your Gemfile.
+
+```ruby
+gem 'cpl', path: '~/projects/heroku-to-control-plane'
+```
+
 ## Linting
 Be sure to run `rubocop -a` before committing code.
 

data/Gemfile.lock

@@ -1,23 +1,16 @@
 PATH
   remote: .
   specs:
-    cpl (0.1.0)
-      cgi (~> 0.3.6)
+    cpl (0.1.1)
       debug (~> 1.7.1)
       dotenv (~> 2.8.1)
-      json (~> 2.6.3)
-      net-http (~> 0.3.2)
-      pathname (~> 0.2.1)
       psych (~> 5.1.0)
-      tempfile (~> 0.1.3)
       thor (~> 1.2.1)
-      yaml (~> 0.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    cgi (0.3.6)
     debug (1.7.1)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
@@ -28,12 +21,9 @@ GEM
     irb (1.6.2)
       reline (>= 0.3.0)
     json (2.6.3)
-    net-http (0.3.2)
-      uri
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
-    pathname (0.2.1)
     psych (5.1.0)
       stringio
     rainbow (3.1.1)
@@ -82,11 +72,8 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stringio (3.0.5)
-    tempfile (0.1.3)
     thor (1.2.1)
     unicode-display_width (2.4.2)
-    uri (0.12.0)
-    yaml (0.2.1)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -1,7 +1,12 @@
-# Heroku to Control Plane
+# Heroku to Control Plane `cpl` CLI
 
 _A playbook for migrating from [Heroku](https://heroku.com) to [Control Plane](https://controlplane.com)_
 
+[![RSpec](https://github.com/shakacode/heroku-to-control-plane/actions/workflows/rspec.yml/badge.svg)](https://github.com/shakacode/heroku-to-control-plane/actions/workflows/rspec.yml)
+[![Rubocop](https://github.com/shakacode/heroku-to-control-plane/actions/workflows/rubocop.yml/badge.svg)](https://github.com/shakacode/heroku-to-control-plane/actions/workflows/rubocop.yml)
+
+[![Gem](https://badge.fury.io/rb/cpl.svg)](https://badge.fury.io/rb/cpl)
+
 This playbook shows how to move "Heroku apps" to "Control Plane workloads" via an open-source `cpl` CLI on top of Control Plane's `cpln` CLI.
 
 Heroku provides a UX and CLI that enables easy publishing of Ruby on Rails and other apps. This ease of use comes via many "Heroku" abstractions and naming conventions.
@@ -20,8 +25,8 @@ To simplify migration to and usage of Control Plane for Heroku users, this repos
 9. [CLI commands reference](#cli-commands-reference)
 10. [Mapping of Heroku Commands to `cpl` and `cpln`](#mapping-of-heroku-commands-to-cpl-and-cpln)
 11. [Examples](#examples)
-12. [Migrating Postgres database from Heroku infrastructure](/postgres.md)
-13. [Migrating Redis database from Heroku infrastructure](/redis.md)
+12. [Migrating Postgres database from Heroku infrastructure](/docs/postgres.md)
+13. [Migrating Redis database from Heroku infrastructure](/docs/redis.md)
 
 ## Key features
 
@@ -69,25 +74,20 @@ For the typical Rails app, this means:
 
 ## Installation
 
-**Note:** `cpl` CLI is configured via a local clone clone of this repo. We may publish it later as a Ruby gem or Node package.
+**Note:** `cpl` CLI is configured either a Ruby gem, [`cpl`](https://rubygems.org/gems/cpl) install or a local clone clone. For information on the latter, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 1. Install `node` (required for Control Plane CLI).
 2. Install `ruby` (required for these helpers).
-3. Install Control Plane CLI (adds `cpln` command) and configure credentials.
+3. Install Control Plane CLI (adds `cpln` command) and configure credentials by running command `cpln login`.
 
 ```sh
 npm install -g @controlplane/cli
 cpln login
 ```
 
-4. Install this repo locally and alias `cpl` command globally for easier access, e.g.:
+## Tips
+Do not confuse the `cpl` CLI with the `cpln` CLI. The `cpl` CLI is the Heroku to Control Plane playbook CLI. The `cpln` CLI is the Control Plane CLI.
 
-```sh
-git clone https://github.com/shakacode/heroku-to-control-plane
-
-# Create an alias in some local shell startup script, e.g., `.profile`, `.bashrc`, etc.
-alias cpl="~/projects/heroku-to-control-plane/cpl"
-```
 
 - For each Git project that you want to deploy to Control Plane, copy project-specific configs to a `.controlplane` directory at the top of your project. `cpl` will pick those up depending on which project
   folder tree it runs. Thus, this automates running several projects with different configs without explicitly switching configs.
@@ -101,6 +101,8 @@ alias cpl="~/projects/heroku-to-control-plane/cpl"
 1. `myapp` is an app name defined in the `.controlplane/controlplane.yml` file, such as `ror-tutorial` in [this `controlplane.yml` file](https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/.controlplane/controlplane.yml).
 2. Other files in the `.controlplane/templates` directory are used by the `cpl setup` command.
 
+### Initial Setup and Deployment
+
 ```sh
 # Provision infrastructure (one-time-only for new apps) using templates.
 # Note how the arguments correspond to files in the `.controlplane/templates` directory.
@@ -119,6 +121,26 @@ cpl promote-image -a myapp
 cpl open -a myapp
 ```
 
+### Promoting code upgrades
+
+```sh
+# Build and push new image with sequential image tagging, e.g. 'ror-tutorial_123'
+cpl build-image -a ror-tutorial
+
+# OR
+# Build and push with sequential image tagging and commit SHA, e.g. 'ror-tutorial_123_ABCD'
+cpl build-image -a ror-tutorial --commit ABCD
+
+# Run database migrations (or other release tasks) with latest image,
+# while app is still running on previous image.
+# This is analogous to the release phase.
+cpl runner rails db:migrate -a ror-tutorial --image latest
+
+# Pomote latest image to app
+cpl promote-image -a ror-tutorial
+```
+
+
 ## Example project modifications for Control Plane
 
 _See this for a complete example._
@@ -300,17 +322,17 @@ cpl --help
 
 **`[WIP]`**
 
-| Heroku Command                                                                                                   | `cpl` or `cpln` |
-| ---------------------------------------------------------------------------------------------------------------- | --------------- |
-| `[heroku ps](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-ps-type-type)`                     | `cpl ps`        |
-| `[heroku config](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-config)`                       | ?               |
-| `[heroku maintenance](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-maintenance)`             | ?               |
-| `[heroku logs](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-logs)`                           | `cpl logs`      |
-| `[heroku pg](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-pg-database)`                      | ?               |
-| `[heroku pipelines:promote](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-pipelines-promote)` | `cpl promote`   |
-| `[heroku psql](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-psql-database)`                  | ?               |
-| `[heroku redis](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-redis-database)`                | ?               |
-| `[heroku releases](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-releases)`                   | ?               |
+| Heroku Command                                                                                                 | `cpl` or `cpln` |
+| -------------------------------------------------------------------------------------------------------------- | --------------- |
+| [heroku ps](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-ps-type-type)                     | `cpl ps`        |
+| [heroku config](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-config)                       | ?               |
+| [heroku maintenance](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-maintenance)             | ?               |
+| [heroku logs](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-logs)                           | `cpl logs`      |
+| [heroku pg](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-pg-database)                      | ?               |
+| [heroku pipelines:promote](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-pipelines-promote) | `cpl promote`   |
+| [heroku psql](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-psql-database)                  | ?               |
+| [heroku redis](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-redis-database)                | ?               |
+| [heroku releases](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-releases)                   | ?               |
 
 ## Examples
 

data/Rakefile

@@ -9,3 +9,8 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
+
+desc "Updates commands.md file"
+task :command_docs do
+  sh "./script/generate_commands_docs"
+end

data/cpl.gemspec

@@ -15,16 +15,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "cgi",      "~> 0.3.6"
   spec.add_dependency "debug",    "~> 1.7.1"
   spec.add_dependency "dotenv",   "~> 2.8.1"
-  spec.add_dependency "json",     "~> 2.6.3"
-  spec.add_dependency "net-http", "~> 0.3.2"
-  spec.add_dependency "pathname", "~> 0.2.1"
   spec.add_dependency "psych",    "~> 5.1.0"
-  spec.add_dependency "tempfile", "~> 0.1.3"
   spec.add_dependency "thor",     "~> 1.2.1"
-  spec.add_dependency "yaml",     "~> 0.2.1"
 
   spec.add_development_dependency "rspec",         "~> 3.12.0"
   spec.add_development_dependency "rubocop",       "~> 1.45.0"

data/docs/commands.md

@@ -21,6 +21,29 @@ This `-a` option is used in most of the commands and will pick all other app con
 cpl build-image -a $APP_NAME
 ```
 
+### `cleanup-old-images`
+
+- Deletes all images for an app that are older than the specified amount of days
+- Specify the amount of days through `old_image_retention_days` in the `.controlplane/controlplane.yml` file
+- Will ask for explicit user confirmation
+- Does not affect the latest image, regardless of how old it is
+
+```sh
+cpl cleanup-old-images -a $APP_NAME
+```
+
+### `cleanup-stale-apps`
+
+- Deletes the whole app (GVC with all workloads and all images) for all stale apps
+- Stale apps are identified based on the creation date of the latest image
+- Specify the amount of days after an app should be considered stale through `stale_app_image_deployed_days` in the `.controlplane/controlplane.yml` file
+- If `match_if_app_name_starts_with` is `true` in the `.controlplane/controlplane.yml` file, it will delete all stale apps that start with the name
+- Will ask for explicit user confirmation
+
+```sh
+cpl cleanup-stale-apps -a $APP_NAME
+```
+
 ### `config`
 
 - Displays current configs (global and app-specific)

data/lib/command/base.rb

@@ -2,7 +2,7 @@
 
 module Command
   class Base # rubocop:disable Metrics/ClassLength
-    attr_reader :config
+    attr_reader :thor_shell, :config
 
     # Used to call the command (`cpl NAME`)
     # NAME = ""
@@ -27,6 +27,7 @@ module Command
     NO_IMAGE_AVAILABLE = "NO_IMAGE_AVAILABLE"
 
     def initialize(config)
+      @thor_shell = Thor::Shell::Color.new
       @config = config
     end
 
@@ -90,14 +91,27 @@ module Command
       }
     end
 
+    def self.skip_confirm_option(required: false)
+      {
+        name: :yes,
+        params: {
+          aliases: ["-y"],
+          banner: "SKIP_CONFIRM",
+          desc: "Skip confirmation",
+          type: :boolean,
+          required: required
+        }
+      }
+    end
+
     def self.all_options
       methods.grep(/_option$/).map { |method| send(method.to_s) }
     end
 
-    def self.all_options_key_name
+    def self.all_options_by_key_name
       all_options.each_with_object({}) do |option, result|
-        option[:params][:aliases].each { |current_alias| result[current_alias.to_s] = option[:name] }
-        result["--#{option[:name]}"] = option[:name]
+        option[:params][:aliases].each { |current_alias| result[current_alias.to_s] = option }
+        result["--#{option[:name]}"] = option
       end
     end
 
@@ -125,20 +139,23 @@ module Command
       cp.workload_delete(workload, no_raise: true)
     end
 
-    def latest_image # rubocop:disable Metrics/MethodLength
+    def latest_image_from(items, app_name: config.app, name_only: true)
+      matching_items = items.filter { |item| item["name"].start_with?("#{app_name}:") }
+
+      # Or special string to indicate no image available
+      if matching_items.empty?
+        "#{app_name}:#{NO_IMAGE_AVAILABLE}"
+      else
+        latest_item = matching_items.max_by { |item| extract_image_number(item["name"]) }
+        name_only ? latest_item["name"] : latest_item
+      end
+    end
+
+    def latest_image
       @latest_image ||=
         begin
           items = cp.image_query["items"]
-          matching_items = items.filter_map do |item|
-            item["name"] if item["name"].start_with?("#{config.app}:")
-          end
-
-          # Or special string to indicate no image available
-          if matching_items.empty?
-            "#{config.app}:#{NO_IMAGE_AVAILABLE}"
-          else
-            matching_items.max_by { |item| extract_image_number(item) }
-          end
+          latest_image_from(items)
         end
     end
 

data/lib/command/cleanup_old_images.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Command
+  class CleanupOldImages < Base
+    NAME = "cleanup-old-images"
+    OPTIONS = [
+      app_option(required: true),
+      skip_confirm_option
+    ].freeze
+    DESCRIPTION = "Deletes all images for an app that are older than the specified amount of days"
+    LONG_DESCRIPTION = <<~HEREDOC
+      - Deletes all images for an app that are older than the specified amount of days
+      - Specify the amount of days through `old_image_retention_days` in the `.controlplane/controlplane.yml` file
+      - Will ask for explicit user confirmation
+      - Does not affect the latest image, regardless of how old it is
+    HEREDOC
+
+    def call
+      return progress.puts "No old images found" if old_images.empty?
+
+      progress.puts "Old images:"
+      old_images.each do |image|
+        progress.puts "  #{image[:name]} (#{thor_shell.set_color((image[:date]).to_s, :red)})"
+      end
+
+      return unless confirm_delete
+
+      progress.puts
+      delete_images
+    end
+
+    private
+
+    def old_images # rubocop:disable Metrics/MethodLength
+      @old_images ||=
+        begin
+          result_images = []
+
+          now = DateTime.now
+          old_image_retention_days = config[:old_image_retention_days]
+
+          images = cp.image_query["items"].filter { |item| item["name"].start_with?("#{config.app}:")	}
+
+          # Remove latest image, because we don't want to delete the image that is currently deployed
+          latest_image_name = latest_image_from(images)
+          images = images.filter { |item| item["name"] != latest_image_name }
+
+          images.each do |image|
+            created_date = DateTime.parse(image["created"])
+            diff_in_days = (now - created_date).to_i
+            next unless diff_in_days >= old_image_retention_days
+
+            result_images.push({
+                                 name: image["name"],
+                                 date: created_date
+                               })
+          end
+
+          result_images
+        end
+    end
+
+    def confirm_delete
+      return true if config.options[:yes]
+
+      thor_shell.yes?("\nAre you sure you want to delete these #{old_images.length} images (y/n)?")
+    end
+
+    def delete_images
+      old_images.each do |image|
+        cp.image_delete(image[:name])
+        progress.puts "#{image[:name]} deleted"
+      end
+    end
+  end
+end

data/lib/command/cleanup_stale_apps.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "date"
+
+module Command
+  class CleanupStaleApps < Base
+    NAME = "cleanup-stale-apps"
+    OPTIONS = [
+      app_option(required: true),
+      skip_confirm_option
+    ].freeze
+    DESCRIPTION = "Deletes the whole app (GVC with all workloads and all images) for all stale apps"
+    LONG_DESCRIPTION = <<~HEREDOC
+      - Deletes the whole app (GVC with all workloads and all images) for all stale apps
+      - Stale apps are identified based on the creation date of the latest image
+      - Specify the amount of days after an app should be considered stale through `stale_app_image_deployed_days` in the `.controlplane/controlplane.yml` file
+      - If `match_if_app_name_starts_with` is `true` in the `.controlplane/controlplane.yml` file, it will delete all stale apps that start with the name
+      - Will ask for explicit user confirmation
+    HEREDOC
+
+    def call # rubocop:disable Metrics/MethodLength
+      return progress.puts "No stale apps found" if stale_apps.empty?
+
+      progress.puts "Stale apps:"
+      stale_apps.each do |app|
+        progress.puts "  #{app[:name]} (#{thor_shell.set_color((app[:date]).to_s, :red)})"
+      end
+
+      return unless confirm_delete
+
+      progress.puts
+      stale_apps.each do |app|
+        delete_gvc(app)
+        delete_images(app)
+      end
+    end
+
+    private
+
+    def stale_apps # rubocop:disable Metrics/MethodLength
+      @stale_apps ||=
+        begin
+          apps = []
+
+          now = DateTime.now
+          stale_app_image_deployed_days = config[:stale_app_image_deployed_days]
+
+          gvcs = cp.gvc_query(config.app)["items"]
+          gvcs.each do |gvc|
+            app_name = gvc["name"]
+
+            images = cp.image_query(app_name)["items"].filter { |item| item["name"].start_with?("#{app_name}:") }
+            image = latest_image_from(images, app_name: app_name, name_only: false)
+
+            created_date = DateTime.parse(image["created"])
+            diff_in_days = (now - created_date).to_i
+            next unless diff_in_days >= stale_app_image_deployed_days
+
+            apps.push({
+                        name: app_name,
+                        date: created_date,
+                        images: images.map { |current_image| current_image["name"] }
+                      })
+          end
+
+          apps
+        end
+    end
+
+    def confirm_delete
+      return true if config.options[:yes]
+
+      thor_shell.yes?("\nAre you sure you want to delete these #{stale_apps.length} apps (y/n)?")
+    end
+
+    def delete_gvc(app)
+      cp.gvc_delete(app[:name])
+      progress.puts "#{app[:name]} deleted"
+    end
+
+    def delete_images(app)
+      app[:images].each do |image|
+        cp.image_delete(image)
+        progress.puts "#{image} deleted"
+      end
+    end
+  end
+end

data/lib/command/delete.rb

@@ -4,7 +4,8 @@ module Command
   class Delete < Base
     NAME = "delete"
     OPTIONS = [
-      app_option(required: true)
+      app_option(required: true),
+      skip_confirm_option
     ].freeze
     DESCRIPTION = "Deletes the whole app (GVC with all workloads and all images)"
     LONG_DESCRIPTION = <<~HEREDOC
@@ -13,10 +14,7 @@ module Command
     HEREDOC
 
     def call
-      progress.puts "Type 'delete' to delete #{config.app} and images"
-      progress.print "> "
-
-      return progress.puts "Not confirmed" unless $stdin.gets.chomp == "delete"
+      return unless confirm_delete
 
       delete_gvc
       delete_images
@@ -24,6 +22,16 @@ module Command
 
     private
 
+    def confirm_delete
+      return true if config.options[:yes]
+
+      confirmed = thor_shell.yes?("Are you sure you want to delete '#{config.app}' (y/n)?")
+      return false unless confirmed
+
+      progress.puts
+      true
+    end
+
     def delete_gvc
       progress.puts "- Deleting gvc:"
 

data/lib/core/controlplane.rb

@@ -18,8 +18,8 @@ class Controlplane
     perform(cmd)
   end
 
-  def image_query
-    cmd = "cpln image query --org #{org} -o yaml --max -1 --prop repository=#{config.app}"
+  def image_query(app_name = config.app)
+    cmd = "cpln image query --org #{org} -o yaml --max -1 --prop repository=#{app_name}"
     perform_yaml(cmd)
   end
 
@@ -29,6 +29,15 @@ class Controlplane
 
   # gvc
 
+  def gvc_query(app_name = config.app)
+    # When `match_if_app_name_starts_with` is `true`, we query for any gvc containing the name,
+    # otherwise we query for a gvc with the exact name.
+    op = config.current[:match_if_app_name_starts_with] ? "~" : "="
+
+    cmd = "cpln gvc query --org #{org} -o yaml --prop name#{op}#{app_name}"
+    perform_yaml(cmd)
+  end
+
   def gvc_get(a_gvc = gvc)
     api.gvc_get(gvc: a_gvc, org: org)
   end

data/lib/cpl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cpl
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Gordon
@@ -9,22 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: cgi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -53,48 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.3
-- !ruby/object:Gem::Dependency
-  name: net-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: pathname
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.0
-- !ruby/object:Gem::Dependency
-  name: tempfile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -137,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +146,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
+- ".github/workflows/rspec.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -245,11 +162,15 @@ files:
 - cpl
 - cpl.gemspec
 - docs/commands.md
+- docs/postgres.md
+- docs/redis.md
 - docs/troubleshooting.md
 - examples/circleci.yml
 - examples/controlplane.yml
 - lib/command/base.rb
 - lib/command/build_image.rb
+- lib/command/cleanup_old_images.rb
+- lib/command/cleanup_stale_apps.rb
 - lib/command/config.rb
 - lib/command/delete.rb
 - lib/command/env.rb
@@ -275,8 +196,6 @@ files:
 - lib/cpl.rb
 - lib/cpl/version.rb
 - lib/main.rb
-- postgres.md
-- redis.md
 - script/generate_commands_docs
 - templates/gvc.yml
 - templates/identity.yml