firespring_dev_commands 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d3d669c29312665a6b6149c065e363d583f06dc71cee74f32afdd90b90fe02
-  data.tar.gz: 8afcc297e1cfb716b2ecde123a8ce844d667f5b5eebed7f1381b8ef184aa5b54
+  metadata.gz: 70070678129ffdda3267e54d13f9021b4e577d8ec1b48191ad45776aaf166658
+  data.tar.gz: e46d2399cfbaac2e906e9829a49586afbe019d95b78709d2f4aacb09810a0ea2
 SHA512:
-  metadata.gz: 9e49babaef1561dd8677316d3a0b503e16366524337bf8e5daa44dc27048a73a996f75e4d0fb8359f2457efe139c398b383b842d3c986f9d80d583a050d2e799
-  data.tar.gz: 4ae19938da453756bef33502ac9af8d47c5361e76f4c676882ebe10e70df7ef77bc792c81d49131086a52d10d465038a520c82958b55fdd4b3a8fbde339fbd64
+  metadata.gz: e25f8ebe3e368a49ec73392028a398943b9b84a78cc1663935f2a025668ca5ab847230cdd60a4c4697abf6e6e79eee9c92ab9155e34b3435986441eba4b1d148
+  data.tar.gz: fa2e963ab14b0f899a93aef2e2f2b070dfd99f4541e9af2f67aed849e09412a0327cd0f1882ffb5deb73df6bb1236237fcb736647091af4bfbfa349d2e702963

data/lib/firespring_dev_commands/aws/login.rb

@@ -61,15 +61,15 @@ module Dev
         puts "  Logging in to #{account} in #{region} as #{role}".light_yellow
         puts
 
-        code = ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', 'no_username_found')} user serial #{serial}")
+        code = mfa_code(serial)
         raise 'MFA is required' unless code.to_s.strip
 
         sts = ::Aws::STS::Client.new(profile: 'default', region:)
         creds = sts.assume_role(
-          serial_number: serial,
+          serial_number: mfa_serial || serial,
           role_arn: role,
           role_session_name: session_name,
-          token_code: code,
+          token_code: code.to_s.strip,
           duration_seconds: session_duration
         ).credentials
         puts
@@ -77,6 +77,32 @@ module Dev
         Dev::Aws::Credentials.new.write!(account, creds)
       end
 
+      # The custom local file where target information is stored.
+      CUSTOM_CONFIG_FILE = "#{Dir.home}/.bash_profile.d/config/.main".freeze
+
+      # Targets a custom ini config.
+      def custom_config_ini
+        IniFile.new(filename: CUSTOM_CONFIG_FILE, default: 'default')['default']
+      end
+
+      def mfa_serial
+        return unless !ENV.fetch('OP_LOGIN', nil).nil? && File.exist?(CUSTOM_CONFIG_FILE)
+
+        custom_config_ini['aws_1pass_mfa_serial']
+      end
+
+      # Handles the MFA code logic.
+      def mfa_code(serial)
+        # Note, OP_LOGIN likely not needed. Available as feature flag.
+        # Checks if OnePassword CLI is installed and the custom config file exist.
+        if !ENV.fetch('OP_LOGIN', nil).nil? && system('op --version', out: '/dev/null') && File.exist?(CUSTOM_CONFIG_FILE)
+          cmd = "op item get #{custom_config_ini['aws_uuid']} --otp"
+          `#{cmd}`
+        else
+          ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', 'no_username_found')} user serial #{serial}")
+        end
+      end
+
       # Returns the config ini file
       # Runs the setup for our current account if it's not already setup
       def setup_cfgini(account)
@@ -88,8 +114,8 @@ module Dev
         cfgini
       end
 
-      # 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
+      # Authorizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
+      # Authorizes the docker ruby library to pull/push images from the Aws container registry
       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
@@ -100,8 +126,8 @@ module Dev
         puts
       end
 
-      # 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
+      # Authorizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
+      # Authorizes the docker ruby library to pull/push images from the Aws container registry
       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

data/lib/firespring_dev_commands/docker/compose.rb

@@ -238,7 +238,8 @@ module Dev
 
       # Merges two arrays removing nested structure and duplicate keys
       private def merge_options(*opts)
-        @options = (@options + Array(opts)).flatten.uniq
+        puts 'WARNING: merging options disabled' if @options.any? { |it| it.include?('--build-arg') }
+        @options = (@options + Array(opts)).flatten.uniq unless @options.any? { |it| it.include?('--build-arg') }
       end
 
       # Build the compose command with the given inputs

data/lib/firespring_dev_commands/env.rb

@@ -34,5 +34,28 @@ module Dev
         end
       end
     end
+
+    def containerized?
+      # Fast path: common flags files
+      return true if File.exist?('/.dockerenv')            # Docker
+      return true if File.exist?('/run/.containerenv')     # Podman / some runtimes
+
+      # Env flags some images set
+      return true if ENV['DOCKER_CONTAINER'] == 'true'
+      return true if ENV['container']&.match?(/docker|podman|lxc|containerd/i)
+
+      # cgroup hints (docker, containerd, kubernetes, podman)
+      %w(/proc/1/cgroup /proc/self/cgroup).any? do |p|
+        next false unless File.readable?(p)
+
+        File.read(p).match?(/docker|containerd|kubepods|podman|libpod/i)
+      end
+    rescue
+      false
+    end
+
+    def on_host
+      yield unless containerized?
+    end
   end
 end

data/lib/firespring_dev_commands/eol/product_version.rb

@@ -53,7 +53,7 @@ module Dev
         detail = JSON.parse(response.body) if response.is_a?(Net::HTTPSuccess)
 
         # If EOL info is a boolean or missing from the current details, overwrite with the manual date (if present)
-        manual_date = Dev::EndOfLife.config.manual_dates["#{product}_#{cycle.tr('.', '_')}".to_sym]
+        manual_date = Dev::EndOfLife.config.manual_dates[:"#{product}_#{cycle.tr('.', '_')}"]
         detail['eol'] = manual_date if manual_date && (detail['eol'].boolean? || detail['eol'].nil?)
         detail['eol'] = '1979-01-01' if detail.empty?
         detail

data/lib/firespring_dev_commands/git.rb

@@ -185,7 +185,7 @@ module Dev
     end
 
     # Checks out the given branch in all repositories with some additional formatting
-    def checkout_all(branch)
+    def checkout_all(branch, default)
       @success = true
       puts
       puts "Checking out #{branch} in each repo".light_yellow if project_dirs.length > 1
@@ -194,7 +194,7 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         puts Dev::Common.new.center_pad(repo_basename).light_green
-        @success &= checkout(branch, dir: project_dir)
+        @success &= checkout(branch, default, dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
       end
       puts
@@ -203,9 +203,10 @@ module Dev
     end
 
     # Checks out the given branch in the given repo
+    # If the given branch isn't found, falls back to default branch, then staging, then main
     # Defaults to the current directory
     # optionally raise errors
-    def checkout(branch, dir: default_project_dir, raise_errors: false)
+    def checkout(branch, default, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       return unless File.exist?(dir)
 
@@ -215,10 +216,11 @@ module Dev
       g = ::Git.open(dir)
       g.fetch('origin', prune: true)
 
-      # If the branch we are checking out doesn't exist, check out either the staging branch or the main branch
+      # If the branch we are checking out doesn't exist,
+      # check out either the default branch, staging branch, or the main branch
       actual_branch = branch
       unless branch_exists?(dir, branch)
-        actual_branch = [staging_branch, main_branch].uniq.find { |it| branch_exists?(dir, it) }
+        actual_branch = [default, staging_branch, main_branch].uniq.find { |it| branch_exists?(dir, it) }
         puts "Branch #{branch} not found, checking out #{actual_branch} instead".light_yellow
       end
 

data/lib/firespring_dev_commands/jira/project.rb

@@ -6,7 +6,7 @@ module Dev
 
       def initialize(data)
         @name = data.project.name
-        @name = @name << ' DevOps' if /devops/i.match?(data.issuetype.name)
+        @name <<= ' DevOps' if /devops/i.match?(data.issuetype.name)
       end
     end
   end

data/lib/firespring_dev_commands/ruby.rb

@@ -95,7 +95,9 @@ module Dev
     # Build the bundle lint command
     def lint_command
       lint = base_command
-      lint << 'exec' << 'rake' << 'lint'
+      target_lint = Dev::Env.new.containerized? ? %w(rake lint) : ['rubocop']
+      lint << 'exec'
+      lint.concat(target_lint)
       lint.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint
     end
@@ -103,7 +105,9 @@ module Dev
     # Build the bundle lint fix command
     def lint_fix_command
       lint_fix = base_command
-      lint_fix << 'exec' << 'rake' << 'lint:fix'
+      target_lint = Dev::Env.new.containerized? ? %w(rake lint:fix) : %w(rubocop -A)
+      lint_fix << 'exec'
+      lint_fix.concat(target_lint)
       lint_fix.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint_fix
     end
@@ -111,7 +115,9 @@ module Dev
     # Build the bundle test command
     def test_command
       test = base_command
-      test << 'exec' << 'rake' << 'test'
+      target_test = Dev::Env.new.containerized? ? %w(rake test) : ['rspec']
+      test << 'exec'
+      test.concat(target_test)
       test.concat(coverage.ruby_options) if coverage
       test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       test

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

@@ -74,7 +74,7 @@ module Dev
                     # Run the lint command
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    environment = ['OPTS']
+                    environment = %w(OPTS)
                     Dev::Docker::Compose.new(services: application, options:, environment:).exec(*ruby.lint_command)
                   ensure
                     # Copy any defined artifacts back
@@ -92,7 +92,7 @@ module Dev
                       # Run the lint fix command
                       options = []
                       options << '-T' if Dev::Common.new.running_codebuild?
-                      environment = ['OPTS']
+                      environment = %w(OPTS)
                       Dev::Docker::Compose.new(services: application, options:, environment:).exec(*ruby.lint_fix_command)
                     end
                   end
@@ -190,7 +190,7 @@ module Dev
                 namespace :ruby do
                   desc 'Install all bundled gems'
                   task install: %w(init_docker up_no_deps) do
-                    environment = ['OPTS']
+                    environment = %w(OPTS)
                     Dev::Docker::Compose.new(services: application, environment:).exec(*ruby.install_command)
                   end
                 end

data/lib/firespring_dev_commands/templates/git.rb

@@ -31,13 +31,15 @@ module Dev
             return if exclude.include?(:checkout)
 
             desc 'Checks out a branch for each repo (alias: git:co)' \
-                 "\n\tuse BRANCH=abc123 to specify the branch of code you with to switch to (required)" \
-                 "\n\tIf the branch does not exist, the configured staging or main branch will be checked out"
+                 "\n\tuse BRANCH=abc123 to specify the branch of code you wish to switch to (required)" \
+                 "\n\tuse DEFAULT=abc456 to specify the branch of code to fall back to" \
+                 "\n\tIf branch and default do not exist, the configured staging or main branch will be checked out"
             task checkout: %w(init) do
               branch = ENV['BRANCH'].to_s.strip
+              default = ENV['DEFAULT'].to_s.strip
               raise 'branch is required' if branch.empty?
 
-              Dev::Git.new.checkout_all(branch)
+              Dev::Git.new.checkout_all(branch, default)
             end
 
             task co: %w(init checkout) do
@@ -48,7 +50,7 @@ module Dev
             [d.main_branch, d.staging_branch].uniq.each do |it|
               desc "Checks out the #{it} branch for each repo (alias: git:co:#{it})"
               task "checkout:#{it}": %w(init) do
-                Dev::Git.new.checkout_all(it)
+                Dev::Git.new.checkout_all(it, '')
               end
 
               task "co:#{it}": %W(init checkout:#{it}) do

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 = '3.1.6'.freeze
+    VERSION = '3.1.7'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2025-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport