firespring_dev_commands 1.5.4 → 2.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78decb68edca360ca267232996476a6a1d4e1c2e02ed415bf6efc8c72c1df729
-  data.tar.gz: 90c624acb2d76ccb53b61c264d652771f5ae90b8f93bc18df3a0d7f46ee52095
+  metadata.gz: 0b0b0b93719ba8c6b8ddb34f39777bf1f2e4ee5eb95e85c1a1eb0f45e78a9441
+  data.tar.gz: '08d558e6e2b846d266b158ebf8b6b8eba3e620e3e2002ab77a7876dec65189ec'
 SHA512:
-  metadata.gz: 1f8ccdbcb9994d2be9c7140c083711f28f40f2451e2d1adfb3ca17feefd93896014d991b8870d5d88bb2a775fac6900fc24977cf7077aa343a366761844612e1
-  data.tar.gz: f61c95e4317077e6a3384e9e6fbdc850a57e0e99739f17cfd6e1d7145376b4c837318c7e861f559b1c779de782d1fd0bec95f7179afd7c4cdf855c93aeb0da4c
+  metadata.gz: 5065bf94f9f4f0492794b4b944a01c017f31eab27d659827fa82c1512bec2c91b9da331e3fa114a49ba9afab75bcce94375955a55d4f00d0066a6149b960beb5
+  data.tar.gz: 3accee26e593d454a1c87f2cdcb865a723ab5cd12be8b3da1960b86fc5aa12eff6303f2fcc1f8f69e280e14487be132f2b2b27c879d33699ed92e193900a38e9

data/lib/firespring_dev_commands/audit/report.rb

@@ -31,7 +31,7 @@ module Dev
       # Output the text of the filtered report items
       # Exit with a non-zero status if any vulnerabilities were found
       def check
-        puts(to_s)
+        puts(self)
         return if filtered_items.empty?
 
         at_exit { exit(1) }

data/lib/firespring_dev_commands/aws/account.rb

@@ -23,10 +23,6 @@ module Dev
       # The name of the file containing the Aws settings
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/config".freeze
 
-      def self.config_ini
-        IniFile.new(filename: CONFIG_FILE, default: 'default')
-      end
-
       # TODO: registry is deprecated and should be removed on the next major release
       attr_accessor :root, :children, :default, :registry, :ecr_registry_ids
 
@@ -79,7 +75,7 @@ module Dev
         puts 'Configuring default login values'
 
         # Write region and mfa serial to config file
-        cfgini = self.class.config_ini
+        cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
         defaultini = cfgini['default']
 
         region_default = defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
@@ -105,7 +101,7 @@ module Dev
       # Setup Aws account specific settings
       def setup!(account)
         # Run base setup if it doesn't exist
-        Rake::Task['aws:configure:default'].invoke unless File.exist?(CONFIG_FILE) && self.class.config_ini.has_section?('default')
+        Rake::Task['aws:configure:default'].invoke unless File.exist?(CONFIG_FILE)
 
         puts
         puts "Configuring #{account} login values"
@@ -119,7 +115,7 @@ module Dev
         raise 'Configure default account settings first (rake aws:configure:default)' unless File.exist?(CONFIG_FILE)
 
         # Parse the ini file and load values
-        cfgini = self.class.config_ini
+        cfgini = IniFile.new(filename: CONFIG_FILE, default: 'default')
         defaultini = cfgini['default']
         profileini = cfgini["profile #{account}"]
 
@@ -128,21 +124,13 @@ module Dev
         region_default = profileini['region'] || defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
         profileini['region'] = Dev::Common.new.ask('Default region name', region_default)
 
-        # NOTE: Turns out the role_arn is needed by the aws cli so we are changing directions here. Eventually we should remove the role_name
-        #       from the ini files and only store the role arn. However we need to still keep the functinoality so that the user is only asked
-        #       for the role name - not the entire arn
-        role_name_default = if profileini['role_name']
-                              profileini['role_name']
-                            elsif profileini['role_arn']
-                              profileini['role_arn']&.split(%r{role/})&.last
-                            else
-                              self.class.config.default_login_role_name
-                            end
-        role_name = Dev::Common.new.ask('Default role name', role_name_default)
-        profileini['role_arn'] = "arn:aws:iam::#{account}:role/#{role_name}"
-        # TODO: role_name is deprecated. Eventually, we should delete the role_name entry from the config. Leaving it for now
+        # NOTE: We had an old config for "role_arn" which included the entire arn. We deprecated that config since
+        #       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: 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_name')
+        # profileini.delete('role_arn')
 
         cfgini.write
       end

data/lib/firespring_dev_commands/aws/cloudformation.rb

@@ -49,9 +49,9 @@ module Dev
         # Create the cloudformation stack
         client.create_stack(
           stack_name: name,
-          template_url: template_url,
+          template_url:,
           parameters: parameters.default,
-          capabilities: capabilities,
+          capabilities:,
           on_failure: failure_behavior
         )
         @state = STARTED
@@ -77,9 +77,9 @@ module Dev
         # Update the cloudformation stack
         client.update_stack(
           stack_name: name,
-          template_url: template_url,
+          template_url:,
           parameters: parameters.preserve,
-          capabilities: capabilities
+          capabilities:
         )
         @state = STARTED
         LOG.info "#{name} stack update started at #{Time.now.to_s.light_yellow}"
@@ -144,8 +144,8 @@ module Dev
 
         client.wait_until(
           :"stack_#{type}",
-          {stack_name: stack_name},
-          {max_attempts: max_attempts, delay: delay}
+          {stack_name:},
+          {max_attempts:, delay:}
         )
       rescue ::Aws::Waiters::Errors::WaiterFailed => e
         raise "Action failed to complete: #{e.message}"
@@ -181,7 +181,7 @@ module Dev
         s3 = Dev::Aws::S3.new
         template_bucket = s3.cf_bucket.name
         key = "#{File.basename(filename)}/#{SecureRandom.uuid}"
-        s3.put(bucket: template_bucket, key: key, filename: filename)
+        s3.put(bucket: template_bucket, key:, filename:)
       end
     end
   end

data/lib/firespring_dev_commands/aws/codepipeline.rb

@@ -39,7 +39,7 @@ module Dev
 
       # Find all pipelines matching the regex_match and find the status for each of them
       def status(name)
-        pipeline = client.get_pipeline_state(name: name)
+        pipeline = client.get_pipeline_state(name:)
         print_pipeline_information(pipeline)
       rescue ::Aws::CodePipeline::Errors::PipelineNotFoundException
         LOG.error "No pipeline found with name #{name}".light_yellow

data/lib/firespring_dev_commands/aws/credentials.rb

@@ -11,10 +11,6 @@ module Dev
       # The local file where temporary credentials are stored
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/credentials".freeze
 
-      def self.config_ini
-        IniFile.new(filename: CONFIG_FILE, default: 'default')
-      end
-
       # The account the profile is currently logged in to
       def logged_in_account
         ::Aws::STS::Client.new.get_caller_identity.account
@@ -49,7 +45,7 @@ module Dev
 
         # Check for expired credentials
         begin
-          ::Aws::STS::Client.new(profile: profile).get_caller_identity
+          ::Aws::STS::Client.new(profile:).get_caller_identity
         rescue
           return false
         end
@@ -57,7 +53,7 @@ module Dev
         # Check for invalid credentials
         begin
           # TODO: Is there a better check we can do here?
-          ::Aws::SSM::Client.new(profile: profile).describe_parameters(max_results: 1)
+          ::Aws::SSM::Client.new(profile:).describe_parameters(max_results: 1)
         rescue
           return false
         end
@@ -76,7 +72,7 @@ module Dev
         puts 'Configuring default credential values'
 
         # Write access key / secret key in the credentials file
-        credini = self.class.config_ini
+        credini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/credentials", default: 'default')
         defaultini = credini['default']
 
         access_key_default = defaultini['aws_access_key_id']
@@ -91,7 +87,7 @@ module Dev
       # Write Aws account specific settings to the credentials file
       def write!(account, creds)
         # Write access key / secret key / session token in the credentials file
-        credini = self.class.config_ini
+        credini = IniFile.new(filename: CONFIG_FILE, default: 'default')
         defaultini = credini[account]
 
         defaultini['aws_access_key_id'] = creds.access_key_id
@@ -136,7 +132,7 @@ module Dev
         return unless File.exist?(CONFIG_FILE)
 
         # Otherwise load access key / secret key / session token from the credentials file into the environment
-        credini = self.class.config_ini
+        credini = IniFile.new(filename: CONFIG_FILE, default: 'default')
         profile_credentials = credini[Dev::Aws::Profile.new.current]
         return unless profile_credentials
 

data/lib/firespring_dev_commands/aws/login.rb

@@ -42,11 +42,9 @@ module Dev
         serial = "arn:aws:iam::#{Dev::Aws::Account.new.root.id}:mfa/#{serial}" if serial
         serial ||= profileini['mfa_serial'] || defaultini['mfa_serial']
 
-        role = profileini['role_arn'] || defaultini['role_arn']
-        # NOTE: We supported role name for a period of time but we are switching back to role_arn.
-        #       Leaving this here for a period of time until it can be deprecated
-        role ||= "arn:aws:iam::#{account}:role/#{profileini['role_name'] || defaultini['role_name']}"
-        # TODO: role_name is deprecated. Eventually, we should remove the above line
+        role = profileini['role_name'] || defaultini['role_name']
+        role = "arn:aws:iam::#{account}:role/#{role}" if role
+        role ||= profileini['role_arn'] || defaultini['role_arn']
 
         session_name = profileini['role_session_name'] || defaultini['role_session_name']
         session_duration = profileini['session_duration'] || defaultini['session_duration']
@@ -58,7 +56,7 @@ module Dev
         code = ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', '')} user serial #{serial}")
         raise 'MFA is required' unless code.to_s.strip
 
-        sts = ::Aws::STS::Client.new(profile: 'default', region: region)
+        sts = ::Aws::STS::Client.new(profile: 'default', region:)
         creds = sts.assume_role(
           serial_number: serial,
           role_arn: role,
@@ -74,10 +72,10 @@ module Dev
       # Returns the config ini file
       # Runs the setup for our current account if it's not already setup
       def setup_cfgini(account)
-        cfgini = Dev::Aws::Account.config_ini
+        cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
         unless cfgini.has_section?("profile #{account}")
           Dev::Aws::Account.new.write!(account)
-          cfgini = Dev::Aws::Account.config_ini
+          cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
         end
         cfgini
       end
@@ -90,7 +88,7 @@ module Dev
         return if registry_ids.empty?
 
         puts
-        registry_ids.each { |id| registry_login!(registry_id: id, region: region) }
+        registry_ids.each { |id| registry_login!(registry_id: id, region:) }
         puts
       end
 
@@ -103,8 +101,8 @@ module Dev
         raise 'region is required' if region.to_s.strip.empty?
 
         registry = "#{registry_id}.dkr.ecr.#{region}.amazonaws.com"
-        docker_cli_login!(registry: registry, region: region)
-        docker_lib_login!(registry_id: registry_id, region: region)
+        docker_cli_login!(registry:, region:)
+        docker_lib_login!(registry_id:, region:)
 
         ENV['ECR_REGISTRY_ID'] ||= registry_id
         ENV['ECR_REGISTRY'] ||= registry
@@ -117,7 +115,7 @@ module Dev
         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)
+        docker_cli_login!(registry: "#{registry_id}.dkr.ecr.#{region}.amazonaws.com", region:)
         puts
       end
 
@@ -137,13 +135,13 @@ module Dev
         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)
+        docker_lib_login!(registry_id:, region:)
       end
 
       # Authroizes the docker ruby library to pull/push images from the Aws container registry
       private def docker_lib_login!(registry_id:, region:)
         # Grab your authentication token from AWS ECR
-        ecr_client = ::Aws::ECR::Client.new(region: region)
+        ecr_client = ::Aws::ECR::Client.new(region:)
         tokens = ecr_client.get_authorization_token(registry_ids: Array(registry_id)).authorization_data
         tokens.each do |token|
           # Remove the https:// to authenticate

data/lib/firespring_dev_commands/aws/parameter.rb

@@ -18,12 +18,12 @@ module Dev
 
       # Get the value of the given parameter name
       def get_value(name, with_decryption: true)
-        get(name, with_decryption: with_decryption)&.value
+        get(name, with_decryption:)&.value
       end
 
       # Retrieve the ssm parameter object with the given name
       def get(name, with_decryption: true)
-        client.get_parameter(name: name, with_decryption: with_decryption)&.parameter
+        client.get_parameter(name:, with_decryption:)&.parameter
       rescue ::Aws::SSM::Errors::ParameterNotFound
         raise "parameter #{name} does not exist in #{Dev::Aws::Profile.new.current}"
       end

data/lib/firespring_dev_commands/aws/s3.rb

@@ -22,7 +22,7 @@ module Dev
       def put(bucket:, key:, filename:, acl: 'private')
         begin
           File.open(filename, 'rb') do |file|
-            client.put_object(bucket: bucket, key: key, body: file, acl: acl)
+            client.put_object(bucket:, key:, body: file, acl:)
           end
         rescue => e
           raise "s3 file upload failed: #{e.message}"

data/lib/firespring_dev_commands/docker/compose.rb

@@ -8,8 +8,9 @@ module Dev
     # Class containing methods for interfacing with the docker compose cli
     class Compose
       # Config object for setting top level docker compose config options
-      Config = Struct.new(:project_dir, :project_name, :compose_files, :min_version, :max_version) do
+      Config = Struct.new(:executable_name, :project_dir, :project_name, :compose_files, :min_version, :max_version) do
         def initialize
+          self.executable_name = EXECUTABLE_NAME
           self.project_dir = DEV_COMMANDS_ROOT_DIR
           self.project_name = DEV_COMMANDS_PROJECT_NAME
           self.compose_files = ["#{DEV_COMMANDS_ROOT_DIR}/docker-compose.yml"]
@@ -69,12 +70,12 @@ module Dev
       # Checks the min and max version against the current docker version if they have been configured
       def check_version
         min_version = self.class.config.min_version
-        raise "requires #{EXECUTABLE_NAME} version >= #{min_version} (found #{self.class.version})" if min_version &&
-                                                                                                       !Dev::Common.new.version_greater_than(min_version, self.class.version)
+        version_too_low = min_version && !Dev::Common.new.version_greater_than(min_version, self.class.version)
+        raise "requires #{self.class.config.executable_name} version >= #{min_version} (found #{self.class.version})" if version_too_low
 
         max_version = self.class.config.max_version
-        raise "requires #{EXECUTABLE_NAME} version < #{max_version} (found #{self.class.version})" if max_version &&
-                                                                                                      Dev::Common.new.version_greater_than(max_version, self.class.version)
+        version_too_high = max_version && Dev::Common.new.version_greater_than(max_version, self.class.version)
+        raise "requires #{self.class.config.executable_name} version < #{max_version} (found #{self.class.version})" if version_too_high
       end
 
       # Pull in supported env settings and call build
@@ -83,6 +84,7 @@ module Dev
       def build
         merge_options('--parallel')
         merge_env_pull_option
+        merge_env_push_option
         merge_env_cache_option
         execute_command(build_command('build'))
       end
@@ -181,6 +183,13 @@ module Dev
         merge_options('--pull') if ENV['PULL'].to_s.strip == 'true'
       end
 
+      # Merge --push option if PUSH is set to true and no existing push options are present
+      private def merge_env_push_option
+        return if @options.any? { |it| it.include?('push') }
+
+        merge_options('--push') if ENV['PUSH'].to_s.strip == 'true'
+      end
+
       # Merge --no-build option unless BUILD is set to true and no existing build options are present
       private def merge_env_build_option
         return if @options.any? { |it| it.include?('build') }
@@ -230,7 +239,7 @@ module Dev
 
       # Build the compose command with the given inputs
       private def build_command(action, *cmd)
-        command = [EXECUTABLE_NAME]
+        command = self.class.config.executable_name.split(/\s+/)
         command << '--project-directory' << project_dir
         command << '-p' << project_name if project_name
         Array(compose_files).compact.each { |file| command << '-f' << file }
@@ -264,7 +273,7 @@ module Dev
       # Print the compose command that will be executed and then execute it
       private def execute_command(command)
         LOG.debug " > #{command.join(' ')}"
-        ::Dev::Common.new.run_command(command, capture: capture)
+        ::Dev::Common.new.run_command(command, capture:)
       end
     end
   end

data/lib/firespring_dev_commands/docker.rb

@@ -74,7 +74,7 @@ module Dev
     def 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)
+      _prune('volumes', opts:)
     end
 
     # Prunes/removes all unused images
@@ -88,7 +88,7 @@ module Dev
       format_prune(type, response)
     rescue ::Docker::Error::ServerError => e
       # Specifically check for 'prune already running' error and retry if found
-      if /already running/.match?(e.to_s)
+      if e.to_s.include?('already running')
         sleep 2
         retry
       end
@@ -201,8 +201,6 @@ module Dev
     private def image_info(image)
       [].tap do |ary|
         arch = image.json&.dig('Architecture')
-        variant = image.json&.dig('Variant')
-        arch = "#{arch}/#{variant}" if variant
         id = image.info&.dig('id')&.split(':')&.last&.slice(0..11)
         created = timesince(Time.at(image.info&.dig('Created')))
         size = filesize(image.info&.dig('Size'))
@@ -255,10 +253,7 @@ module Dev
     private def container_info(container)
       id = container.id&.slice(0..11)
       image = container.info&.dig('Image')
-      image_json = ::Docker::Image.get(image).json
-      arch = image_json&.dig('Architecture')
-      variant = image_json&.dig('Variant')
-      arch = "#{arch}/#{variant}" if variant
+      arch = ::Docker::Image.get(image).json&.dig('Architecture')
       command = container.info&.dig('Command')
       created = timesince(Time.at(container.info&.dig('Created')))
       status = container.info&.dig('Status')

data/lib/firespring_dev_commands/git.rb

@@ -289,7 +289,7 @@ module Dev
       raise 'branch does not exist' unless branch_exists?(dir, branch)
 
       # No need to merge into ourself
-      current_branch = branch_name(dir: dir)
+      current_branch = branch_name(dir:)
       return true if current_branch == branch
 
       indent "Merging #{branch} into #{current_branch}"
@@ -326,7 +326,7 @@ module Dev
       g = ::Git.open(dir)
       g.fetch('origin', prune: true)
 
-      branch = branch_name(dir: dir)
+      branch = branch_name(dir:)
       indent "Pulling branch #{branch} from origin"
       indent g.pull('origin', branch)
       true
@@ -361,7 +361,7 @@ module Dev
       g = ::Git.open(dir)
       g.fetch('origin', prune: true)
 
-      branch = branch_name(dir: dir)
+      branch = branch_name(dir:)
       indent "Pushing branch #{branch} to origin"
       indent g.push('origin', branch)
       true

data/lib/firespring_dev_commands/jira/user.rb

@@ -23,7 +23,7 @@ module Dev
       # If none is found, it returns a Jira user object with only the id set
       def self.lookup(id)
         user = Dev::Jira.config.user_lookup_list&.find { |it| it.id == id }
-        user ||= new(name: '', email: '', id: id)
+        user ||= new(name: '', email: '', id:)
         user
       end
     end

data/lib/firespring_dev_commands/jira.rb

@@ -59,19 +59,19 @@ module Dev
     end
 
     # Query jira using the given jql and yield each matching result
-    def issues(jql, &block)
+    def issues(jql, &)
       start_at = 0
       max_results = 100
 
       # Query Jira and yield all issues it returns
-      issues = @client.Issue.jql(jql, start_at: start_at, max_results: max_results)
-      issues.map { |data| Issue.new(data) }.each(&block)
+      issues = @client.Issue.jql(jql, start_at:, max_results:)
+      issues.map { |data| Issue.new(data) }.each(&)
 
       # If we returned the max_results then there may be more - add the max results to where we start at and query again
       while issues.length >= max_results
         start_at += max_results
-        issues = @client.Issue.jql(jql, start_at: start_at, max_results: max_results)
-        issues.map { |data| Issue.new(data) }.each(&block)
+        issues = @client.Issue.jql(jql, start_at:, max_results:)
+        issues.map { |data| Issue.new(data) }.each(&)
       end
     end
   end

data/lib/firespring_dev_commands/node/audit.rb

@@ -23,7 +23,7 @@ module Dev
 
               ids << id
               Dev::Audit::Report::Item.new(
-                id: id,
+                id:,
                 name: vulnerability['name'],
                 title: it['title'],
                 url: it['url'],

data/lib/firespring_dev_commands/templates/aws.rb

@@ -1,4 +1,4 @@
-require_relative './base_interface'
+require_relative 'base_interface'
 
 module Dev
   module Template

data/lib/firespring_dev_commands/templates/base_interface.rb

@@ -38,7 +38,7 @@ module Dev
 
       def initialize(name, exclude: [])
         @name = name
-        super(exclude: exclude)
+        super(exclude:)
       end
     end
   end

data/lib/firespring_dev_commands/templates/ci.rb

@@ -1,4 +1,4 @@
-require_relative './base_interface'
+require_relative 'base_interface'
 
 module Dev
   module Template
@@ -12,7 +12,7 @@ module Dev
           @cloudformations = Array(cloudformation).sort_by(&:name)
           raise 'must specify an arry of cloudformation objects' unless @cloudformations.all?(Dev::Aws::Cloudformation)
 
-          super(exclude: exclude)
+          super(exclude:)
         end
 
         # Create the rake task for creating the codepipeline

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

@@ -11,8 +11,8 @@ module Dev
 
           # Allow for custom container path for the application
           def initialize(application, container_path: nil, local_path: nil, exclude: [])
-            @node = Dev::Node.new(container_path: container_path, local_path: local_path)
-            super(application, exclude: exclude)
+            @node = Dev::Node.new(container_path:, local_path:)
+            super(application, exclude:)
           end
 
           # Create the rake task which runs linting for the application name
@@ -36,7 +36,7 @@ module Dev
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options: options).exec(*node.lint_command)
+                    Dev::Docker::Compose.new(services: application, options:).exec(*node.lint_command)
                   end
 
                   namespace :lint do
@@ -46,7 +46,7 @@ module Dev
 
                       options = []
                       options << '-T' if Dev::Common.new.running_codebuild?
-                      Dev::Docker::Compose.new(services: application, options: options).exec(*node.lint_fix_command)
+                      Dev::Docker::Compose.new(services: application, options:).exec(*node.lint_fix_command)
                     end
                   end
                 end
@@ -75,7 +75,7 @@ module Dev
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options: options).exec(*node.test_command)
+                    Dev::Docker::Compose.new(services: application, options:).exec(*node.test_command)
                   end
                 end
               end

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

@@ -11,8 +11,8 @@ module Dev
 
           # Allow for custom container path for the application
           def initialize(application, container_path: nil, local_path: nil, exclude: [])
-            @php = Dev::Php.new(container_path: container_path, local_path: local_path)
-            super(application, exclude: exclude)
+            @php = Dev::Php.new(container_path:, local_path:)
+            super(application, exclude:)
           end
 
           # Create the rake task which downloads the vendor directory to your local system for the given application name
@@ -80,7 +80,7 @@ module Dev
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options: options).exec(*php.lint_command)
+                    Dev::Docker::Compose.new(services: application, options:).exec(*php.lint_command)
                   end
 
                   namespace :lint do
@@ -90,7 +90,7 @@ module Dev
 
                       options = []
                       options << '-T' if Dev::Common.new.running_codebuild?
-                      Dev::Docker::Compose.new(services: application, options: options).exec(*php.lint_fix_command)
+                      Dev::Docker::Compose.new(services: application, options:).exec(*php.lint_fix_command)
                     end
                   end
                 end
@@ -119,7 +119,7 @@ module Dev
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options: options).exec(*php.test_command)
+                    Dev::Docker::Compose.new(services: application, options:).exec(*php.test_command)
                   end
                 end
               end

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

@@ -11,8 +11,8 @@ module Dev
 
           # Allow for custom container path for the application
           def initialize(application, container_path: nil, local_path: nil, exclude: [])
-            @ruby = Dev::Ruby.new(container_path: container_path, local_path: local_path)
-            super(application, exclude: exclude)
+            @ruby = Dev::Ruby.new(container_path:, local_path:)
+            super(application, exclude:)
           end
 
           # Create the rake task which runs linting for the application name
@@ -36,7 +36,7 @@ module Dev
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options: options).exec(*ruby.lint_command)
+                    Dev::Docker::Compose.new(services: application, options:).exec(*ruby.lint_command)
                   end
 
                   namespace :lint do
@@ -46,7 +46,7 @@ module Dev
 
                       options = []
                       options << '-T' if Dev::Common.new.running_codebuild?
-                      Dev::Docker::Compose.new(services: application, options: options).exec(*ruby.lint_fix_command)
+                      Dev::Docker::Compose.new(services: application, options:).exec(*ruby.lint_fix_command)
                     end
                   end
                 end
@@ -75,7 +75,7 @@ module Dev
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options: options).exec(*ruby.test_command)
+                    Dev::Docker::Compose.new(services: application, options:).exec(*ruby.test_command)
                   end
                 end
               end

data/lib/firespring_dev_commands/templates/eol.rb

@@ -1,4 +1,4 @@
-require_relative './base_interface'
+require_relative 'base_interface'
 
 module Dev
   module Template

data/lib/firespring_dev_commands/templates/git.rb

@@ -1,4 +1,4 @@
-require_relative './base_interface'
+require_relative 'base_interface'
 
 module Dev
   module Template

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.4'.freeze
+    VERSION = '2.0.0.pre.alpha.1'.freeze
   end
 end

data/lib/firespring_dev_commands.rb

@@ -18,4 +18,6 @@ rootdir = File.realpath(File.dirname(libdir))
 $LOAD_PATH.unshift rootdir
 
 # Load all ruby files
+# rubocop:disable Lint/RedundantDirGlobSort
 Dir.glob("#{libdir}/**/*.rb").sort.each { |file| require file }
+# rubocop:enable Lint/RedundantDirGlobSort

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 2.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,112 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.4.0
+        version: 7.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.4.0
+        version: 7.0.6
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.73.0
+        version: 1.83.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.73.0
+        version: 1.83.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codepipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.0
+        version: 1.59.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.0
+        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.56.0
+        version: 1.61.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.56.0
+        version: 1.61.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.117.0
+        version: 1.127.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.117.0
+        version: 1.127.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.141.0
+        version: 1.154.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.141.0
+        version: 1.154.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -198,98 +198,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-- !ruby/object:Gem::Dependency
-  name: slack-ruby-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.4
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -297,97 +227,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.6
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.36.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.36.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.28
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.28
 description: Ruby library for creating/maintaining your development environment
 email: opensource@firespring.com
 executables: []
@@ -437,8 +283,6 @@ files:
 - lib/firespring_dev_commands/ruby.rb
 - lib/firespring_dev_commands/ruby/audit.rb
 - lib/firespring_dev_commands/second.rb
-- lib/firespring_dev_commands/slack.rb
-- lib/firespring_dev_commands/slack/global.rb
 - lib/firespring_dev_commands/tar.rb
 - lib/firespring_dev_commands/tar/pax_header.rb
 - lib/firespring_dev_commands/tar/type_flag.rb
@@ -466,14 +310,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Development environment maintenance command library

data/lib/firespring_dev_commands/slack/global.rb

@@ -1,32 +0,0 @@
-# Load any existing slack auth if we haven't set one in the environment
-require 'dotenv'
-
-module Dev
-  class Slack
-    class Global
-      # The filename where we store the local auth information
-      CONFIG_FILE = "#{Dir.home}/.env.slack".freeze
-
-      SLACK_API_TOKEN = 'SLACK_API_TOKEN'.freeze
-
-      def configure
-        # Always load the env slack auth
-        Dotenv.load(CONFIG_FILE) if File.exist?(CONFIG_FILE)
-
-        ::Slack.configure do |c|
-          c.token = ENV.fetch('SLACK_API_TOKEN', nil)
-          c.logger = LOG if ENV['ENABLE_SLACK_DEBUG'].to_s.strip == 'true'
-        end
-      end
-      new.configure
-
-      # Write the new slack auth value to the env file
-      def write!(api_token)
-        override = Dev::Env.new(CONFIG_FILE)
-        override.set(SLACK_API_TOKEN, api_token)
-        override.write
-        configure
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/slack.rb

@@ -1,23 +0,0 @@
-require 'slack'
-
-module Dev
-  class Slack
-    attr_accessor :client
-
-    def initialize
-      @client = ::Slack::Web::Client.new
-      @client.auth_test
-    end
-
-    def post(channel:, text:)
-      client.chat_postMessage(channel: channel, text: text)
-    end
-
-    def upload_text(channel:, text:, title: 'Text File', filename: 'file.txt')
-      raise 'text should be a string' unless text.is_a?(String)
-
-      file = Faraday::UploadIO.new(StringIO.new(text), 'text/plain')
-      client.files_upload(channels: channel, title: title, file: file, filename: filename, filetype: 'text')
-    end
-  end
-end