aptible-cli 0.25.0 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c07b217cf8ee2a23f5823638e205e780d43b3adf57397a4ecb01c8aff5998b7
-  data.tar.gz: aefbe672ac77da98c9fd445b6ee0ffbbc044f531a97f36bc6d7bf48db46a1b4c
+  metadata.gz: 800b50ac57828f37560b0a291a280fbf4e9bbf121b35fd812d662e45ef39bd45
+  data.tar.gz: e0c70006be582d93f6e5648fae3894a481bde9cc9b43042ee399e745790aac95
 SHA512:
-  metadata.gz: 3710b7014df38552ebce0b5780921be9020227a965fd6d67e0a5718f1ac223fde476f59c3a7e3289c268a7cf24d96c8057fe87b553b30941102028106e00d54c
-  data.tar.gz: c2122ad6901292782834cdaedcda8b3b2638a0bcac815dec175e9fa4704282955953fa94b02f6c322daf9e47584eb944416071d907ffcd301b65d7b4f08470c8
+  metadata.gz: 3653523bd6b9f944e5f88128a63c058aee80722288a44f5886393059f8b1ca2f7c506c45a7df06e0794ba75814574e36372ff02c73ee1efcd1c20ee803b1d0a1
+  data.tar.gz: a47e8d8f71c9ac07d5001ad65616ac123884ac97ed5ab151d6d8895564bffffa623e1ef055b32fc3d4d0c661a9e71b72859b84480bde108f645f7ce33252e81f

data/.github/workflows/release.yml

@@ -0,0 +1,27 @@
+on:
+  release:
+    types: [published]
+
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions: 
+        id-token: write
+        contents: write
+
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+        with:
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@211ffaaa5f8dda97e9e8bca4e70d0fbaf2f8c41c
+        with:
+          bundler-cache: false
+          ruby-version: "3.3"
+
+      - run: bundle install
+
+      - uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b
+

data/.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7]
+        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
     steps:
       - name: Check out code
         uses: actions/checkout@v4

data/Dockerfile

@@ -1,8 +1,11 @@
-FROM ruby:2.7.8
+ARG RUBY_VERSION=2.3.1
+FROM ruby:${RUBY_VERSION}
 
-# Install and use an compatible bundler
-ENV BUNDLER_VERSION=1.17.3
-RUN gem install bundler -v "${BUNDLER_VERSION}"
+ARG BUNDLER_VERSION=1.17.3
+ENV BUNDLER_VERSION=${BUNDLER_VERSION}
+RUN if [ "${BUNDLER_VERSION}" != "" ] ; then \
+      gem install bundler -v "${BUNDLER_VERSION}" ; \
+    fi
 
 # Install required gems before copying in code
 # to avoid re-installing gems when developing
@@ -12,7 +15,7 @@ COPY Gemfile.lock /app
 COPY aptible-cli.gemspec /app
 
 # We reference the version, so copy that in, too
-CMD mkdir -p /app/lib/aptible/cli/
+RUN mkdir -p /app/lib/aptible/cli/
 COPY lib/aptible/cli/version.rb /app/lib/aptible/cli/
 
 RUN bundle install

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    aptible-cli (0.25.0)
+    aptible-cli (0.26.2)
       activesupport (>= 4.0, < 6.0)
-      aptible-api (~> 1.8.0)
-      aptible-auth (~> 1.2.5)
+      aptible-api (~> 1.12)
+      aptible-auth (~> 1.4)
       aptible-billing (~> 1.0)
       aptible-resource (~> 1.1)
       aws-eventstream (~> 1.1.1)
@@ -35,21 +35,21 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aptible-api (1.8.1)
+    aptible-api (1.12.2)
       aptible-auth
       aptible-resource
       gem_config
       multipart-post (< 2.2.0)
-    aptible-auth (1.2.5)
+    aptible-auth (1.5.0)
       aptible-resource (~> 1.0)
       gem_config
       multipart-post (= 2.1.1)
-      oauth2 (= 1.4.7)
+      oauth2 (= 2.0.9)
     aptible-billing (1.0.1)
       activesupport (>= 4.0, < 6.0)
       aptible-resource (~> 1.0)
       stripe (>= 1.13.0)
-    aptible-resource (1.1.3)
+    aptible-resource (1.1.4)
       activesupport
       fridge
       gem_config (~> 0.3.1)
@@ -71,7 +71,7 @@ GEM
     aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
     bigdecimal (1.3.5)
-    cbor (0.5.9.8)
+    cbor (0.5.10.1)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     climate_control (0.0.3)
@@ -86,37 +86,41 @@ GEM
     fabrication (2.15.2)
     faraday (0.17.6)
       multipart-post (>= 1.2, < 3)
-    fridge (1.0.0)
+    fridge (1.0.1)
       gem_config
       jwt (~> 2.3.0)
     gem_config (0.3.2)
     git (1.7.0)
       rchardet (~> 1.8)
     hashdiff (1.1.1)
+    hashie (5.0.0)
     httpclient (2.8.3)
+    httplog (1.5.0)
+      rack (>= 1.0)
+      rainbow (>= 2.0.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.5.1)
     jwt (2.3.0)
     method_source (1.1.0)
-    minitest (5.12.0)
-    multi_json (1.15.0)
+    minitest (5.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     numerizer (0.1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     powerpack (0.1.3)
-    pry (0.14.2)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (3.1.1)
@@ -146,6 +150,9 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.13.0)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
     stripe (4.24.0)
       faraday (~> 0.13)
       net-http-persistent (~> 3.0)
@@ -154,13 +161,14 @@ GEM
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tins (1.38.0)
+    tins (1.43.0)
       bigdecimal
       sync
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
     unicode-display_width (1.8.0)
     uri_template (0.7.0)
+    version_gem (1.1.9)
     webmock (3.16.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -176,6 +184,9 @@ DEPENDENCIES
   bundler (~> 1.3)
   climate_control (= 0.0.3)
   fabrication (~> 2.15.2)
+  hashie (< 5.1)
+  httplog (< 1.6)
+  minitest (< 5.16)
   pry
   rack (~> 1.0)
   rake

data/Makefile

@@ -1,10 +1,61 @@
+
+export COMPOSE_IGNORE_ORPHANS ?= true
+export RUBY_VERSION ?= 2.3.1
+RUBY_VERSION_MAJOR = $(word 1,$(subst ., ,$(RUBY_VERSION)))
+export BUNDLER_VERSION ?=
+ifeq ($(BUNDLER_VERSION),)
+ifeq ($(RUBY_VERSION_MAJOR),2)
+export BUNDLER_VERSION = 1.17.3
+endif
+endif
+export COMPOSE_PROJECT_NAME ?= aptible-cli-$(subst .,_,$(RUBY_VERSION))
+
+## Build and pull docker compose images
 build:
 	docker compose build --pull
 
+## Open shell in a docker container, supports CMD=
 bash: build
-	docker compose run cli bash
+	$(MAKE) run CMD=bash
+
+CMD ?= bash
+## Run command in a docker container, supports CMD=
+run:
+	docker compose run cli $(CMD)
 
+## Run tests in a docker container, supports ARGS=
 test: build
-	docker compose run cli bundle exec rake
+	$(MAKE) test-direct ARGS="$(ARGS)"
+
+## Run tests in a docker container without building, supports ARGS=
+test-direct:
+	docker compose run cli bundle exec rake $(ARGS)
+
+## Run rubocop in a docker container, supports ARGS=
+lint: build
+	$(MAKE) lint-direct ARGS="$(ARGS)"
+
+## Run rubocop in a docker container without building, supports ARGS=
+lint-direct:
+	docker compose run cli bundle exec rake rubocop $(ARGS)
+
+## Clean up docker compose resources
+clean:
+	docker compose down --remove-orphans --volumes
+
+## Alias for clean
+down: clean
+
+sync-readme: build
+	docker compose run cli bundle exec script/sync-readme-usage
+
+## Show this help message
+help:
+	@echo "\n\033[1;34mAvailable targets:\033[0m\n"
+	@awk 'BEGIN {FS = ":"; prev = ""} \
+					/^## / {prev = substr($$0, 4); next} \
+					/^[a-zA-Z_-]+:/ {if (prev != "") printf "  \033[1;36m%-20s\033[0m %s\n", $$1, prev; prev = ""} \
+					{prev = ""}' $(MAKEFILE_LIST) | sort
+	@echo
 
 .PHONY: build bash test