firespring_dev_commands 1.5.0.pre.alpha.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab48cd629fcaed00fe12f7510cc46ccc82940ec0b635d5f4023e7b9d1f861a7
-  data.tar.gz: 8cfc0a4dab1a338f13017dba85fee7050bc986fc7c44ed0e5c8b72ff8531bf4a
+  metadata.gz: e7cf8825c5665c98f8394203026bba4791b5daf5c8b9e685de30813caba92732
+  data.tar.gz: 57f2d6e7c8a53bdadc3c7eea75a0f2d7d843bfb2f23582b6774abbae836b65d2
 SHA512:
-  metadata.gz: a217867d07089b746be82d69a754288ccadd0bc363e04a62e533820849d06a3f586a0e94d242d00118c218f5d2e56a1d9ea6aa51dd26e05a6801767a2437d594
-  data.tar.gz: 7784f48a51cdaed6e328b4fd91ee16de0cb9f9ee40483a3915ded2c9e2345b245cfd8826993981d9a3ead0a54b7573694b42bb74a0fca09eb07fd89c06be7500
+  metadata.gz: e53587125e8d12f27cd3c69a7ac3fcf7361509e36569c5faf3621b7926fcf064663724a7cde1e5b625da7101bd964ec1ff7db7b38320a55de67973c740b22a1d
+  data.tar.gz: 4764d0f877a3fce2812ac1e3a487e5c7bce028a6f88a1b54f554d16ce990081a56952c8bc2e620bb2072457d83f3cccaac30f7e6c044b79c830fe5fddffdf5ac

data/lib/firespring_dev_commands/aws/account.rb

@@ -85,8 +85,8 @@ module Dev
         #       it made it much more difficult to switch between different root accounts.
         mfa_name_default = defaultini['mfa_serial']&.split(%r{mfa/})&.last || ENV['AWS_MFA_ARN']&.split(%r{mfa/})&.last || ENV.fetch('USERNAME', nil)
         defaultini['mfa_serial_name'] = Dev::Common.new.ask('Default mfa name', mfa_name_default)
-        # TODO: Eventually, we should delete the mfa_serial entry from the config. Leaving it for now because some projects
-        #       may be using older versions of the dev_commands library
+        # TODO: mfa_serial is deprecated. Eventually, we should delete the mfa_serial entry from the config. Leaving it for now
+        #       because some projects may be using older versions of the dev_commands library
         # defaultini.delete('mfa_serial')
 
         session_name_default = defaultini['role_session_name'] || "#{ENV.fetch('USERNAME', nil)}_cli"
@@ -128,8 +128,8 @@ module Dev
         #       it made it much more difficult to switch between different accounts.
         role_name_default = profileini['role_name'] || profileini['role_arn']&.split(%r{role/})&.last || self.class.config.default_login_role_name
         profileini['role_name'] = Dev::Common.new.ask('Default role name', role_name_default)
-        # TODO: Eventually, we should delete the role_arn entry from the config. Leaving it for now because some projects
-        #       may be using older versions of the dev_commands library
+        # TODO: role_arn is deprecated. Eventually, we should delete the role_arn entry from the config. Leaving it for now
+        #       because some projects may be using older versions of the dev_commands library
         # profileini.delete('role_arn')
 
         cfgini.write

data/lib/firespring_dev_commands/aws/credentials.rb

@@ -75,8 +75,6 @@ module Dev
         credini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/credentials", default: 'default')
         defaultini = credini['default']
 
-        # TODO: Should we allow for multiple sets of base credentials? How do I use this for both FDP and SBF?
-
         access_key_default = defaultini['aws_access_key_id']
         defaultini['aws_access_key_id'] = Dev::Common.new.ask('AWS Access Key ID', access_key_default)
 

data/lib/firespring_dev_commands/aws/login.rb

@@ -82,7 +82,8 @@ module Dev
 
       # Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
       # Authroizes the docker ruby library to pull/push images from the Aws container registry
-      def registry_logins!(registry_ids: Dev::Aws::Account.new.ecr_registry_ids, region: nil)
+      def registry_logins!(registry_ids: nil, region: nil)
+        registry_ids ||= Dev::Aws::Account.new.ecr_registry_ids
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         return if registry_ids.empty?
 
@@ -93,7 +94,8 @@ module Dev
 
       # Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
       # Authroizes the docker ruby library to pull/push images from the Aws container registry
-      def registry_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, region: nil)
+      def registry_login!(registry_id: nil, region: nil)
+        registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         raise 'registry_id is required' if registry_id.to_s.strip.empty?
         raise 'region is required' if region.to_s.strip.empty?
@@ -109,7 +111,8 @@ module Dev
       # Authroizes the docker cli to pull/push images from the Aws container registry
       # (e.g. if docker compose needs to pull an image)
       # @deprecated Please use {Dev::Aws::Login#registry_login!} instead
-      def docker_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, region: nil)
+      def docker_login!(registry_id: nil, region: nil)
+        registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         warn '[DEPRECATION] `Dev::Aws::Login#docker_login!` is deprecated. Please use `Dev::Aws::Login#registry_login!` instead.'
         docker_cli_login!(registry: "#{registry_id}.dkr.ecr.#{region}.amazonaws.com", region: region)
@@ -128,7 +131,8 @@ module Dev
 
       # Authroizes the docker ruby library to pull/push images from the Aws container registry
       # @deprecated Please use {Dev::Aws::Login#registry_login!} instead
-      def ecr_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, region: nil)
+      def ecr_login!(registry_id: nil, region: nil)
+        registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         warn '[DEPRECATION] `Dev::Aws::Login#ecr_login!` is deprecated. Please use `Dev::Aws::Login#registry_login!` instead.'
         docker_lib_login!(registry_id: registry_id, region: region)

data/lib/firespring_dev_commands/docker.rb

@@ -70,8 +70,11 @@ module Dev
     end
 
     # Prunes/removes all unused volumes
+    # Specify ALL_VOLUMES=false in your environment to only clean anonymous volumes (docker version 23.x+)
     def prune_volumes
-      _prune('volumes')
+      opts = {}
+      opts[:filters] = {all: ['true']}.to_json if Dev::Common.new.version_greater_than('22.9999.0', self.class.version) && ENV['ALL_VOLUMES'].to_s.strip != 'false'
+      _prune('volumes', opts: opts)
     end
 
     # Prunes/removes all unused images
@@ -80,8 +83,8 @@ module Dev
     end
 
     # Private method which actually calls the prune endpoint on the docker api connection
-    private def _prune(type)
-      response = ::Docker.connection.post("/#{type.downcase}/prune", {})
+    private def _prune(type, opts: {})
+      response = ::Docker.connection.post("/#{type.downcase}/prune", opts)
       format_prune(type, response)
     rescue ::Docker::Error::ServerError => e
       # Specifically check for 'prune already running' error and retry if found

data/lib/firespring_dev_commands/templates/docker/php/application.rb

@@ -137,7 +137,7 @@ module Dev
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
               namespace application do
                 namespace :php do
-                  desc 'Install all npm packages'
+                  desc 'Install all composer packages'
                   task install: %w(init_docker up_no_deps) do
                     Dev::Docker::Compose.new(services: application).exec(*php.install_command)
                   end

data/lib/firespring_dev_commands/templates/docker/ruby/application.rb

@@ -93,7 +93,7 @@ module Dev
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
               namespace application do
                 namespace :ruby do
-                  desc 'Install all npm packages'
+                  desc 'Install all bundled gems'
                   task install: %w(init_docker up_no_deps) do
                     Dev::Docker::Compose.new(services: application).exec(*ruby.install_command)
                   end

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '1.5.0.pre.alpha.3'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.alpha.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -453,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: