firespring_dev_commands 2.2.9.pre.alpha.0 → 2.3.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082cd5a36d24e2f5ad43c9e5cf4e4826c28d204f41d7c473045f6d0f0a81d77e'
-  data.tar.gz: b58035949eccbdbbb45145379c7502d347261370bbb4ba5b739da3a8b605354f
+  metadata.gz: 0bdbb0bfa35836490090703ca0c1fc24367de88d4d6539ee09b3424090d4c46f
+  data.tar.gz: 7a2838eaf1a764e643c8290bb7d921cac80d042b21f9ba2cf697af9f737f3065
 SHA512:
-  metadata.gz: c0679cfc6454455ad132eb0f05adba5cd6a9041001a40923673fd9f6e356bd752c5f29a073d47e7980ed0f7f6fa52c4c9854dfb36a8d8e62ae9d31861af5f773
-  data.tar.gz: 7aad107e9bc5b2272de65a7032f94b7dc1686828d04034e029fa619bfd4621ab7a3b0b084a77076dd4c75b8a4da9d45f779dff94dc6753ff23c4c3606acd12a5
+  metadata.gz: 163658ffa6d4a2b493abe51905aae489ec1955670f6bfc0da65cf81802cfa08a5b833b732d966a0e2f74fd454817c7086cbabfbf3d3998cc51619218cfde5f49
+  data.tar.gz: 8e107996750229780c086c3cf40d54ce996d25d84d662193575851e2f04a625469d9e8e163c38d4395034ffbb7fe6d61e7754bd8cc027b7508adbbd96ff016c2

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 = mfa_code(serial)
+        code = ENV['AWS_TOKEN_CODE'] || Dev::Common.new.ask("Enter the MFA code for the #{ENV.fetch('USERNAME', 'no_username_found')} user serial #{serial}")
         raise 'MFA is required' unless code.to_s.strip
 
         sts = ::Aws::STS::Client.new(profile: 'default', region:)
         creds = sts.assume_role(
-          serial_number: mfa_serial || serial,
+          serial_number: serial,
           role_arn: role,
           role_session_name: session_name,
-          token_code: code.to_s.strip,
+          token_code: code,
           duration_seconds: session_duration
         ).credentials
         puts
@@ -77,32 +77,6 @@ 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)
@@ -114,8 +88,8 @@ module Dev
         cfgini
       end
 
-      # 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
+      # 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: nil, region: nil)
         registry_ids ||= Dev::Aws::Account.new.ecr_registry_ids
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
@@ -126,8 +100,8 @@ module Dev
         puts
       end
 
-      # 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
+      # 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: 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
@@ -142,7 +116,7 @@ module Dev
         ENV['ECR_REGISTRY'] ||= registry
       end
 
-      # Authorizes the docker cli to pull/push images from the Aws container registry
+      # 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: nil, region: nil)
@@ -153,7 +127,7 @@ module Dev
         puts
       end
 
-      # Authorizes the docker cli to pull/push images from the Aws container registry
+      # Authroizes the docker cli to pull/push images from the Aws container registry
       # (e.g. if docker compose needs to pull an image)
       private def docker_cli_login!(registry:, region:)
         print("  Logging in to #{registry} in docker... ")
@@ -163,7 +137,7 @@ module Dev
         Dev::Common.new.run_command([login_cmd])
       end
 
-      # Authorizes the docker ruby library to pull/push images from the Aws container registry
+      # 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: nil, region: nil)
         registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
@@ -172,7 +146,7 @@ module Dev
         docker_lib_login!(registry_id:, region:)
       end
 
-      # Authorizes the docker ruby library to pull/push images from the Aws container registry
+      # 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:)

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/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

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 = '2.2.9.pre.alpha.0'.freeze
+    VERSION = '2.3.0.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.2.9.pre.alpha.0
+  version: 2.3.0.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport