firespring_dev_commands 2.3.1 → 2.3.3.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc3db9cef00a1d1fc8df7b3e37156e1bf4bf2c1b4e609af6b493ffe73eb8c8e
-  data.tar.gz: cd49faeb589c8a0344351b37bfd717dd3f78a173091f651468fac148a05c00cc
+  metadata.gz: 1c59c7b748aeb32cdff246ebcdcc26a13d01e11beb03c27c809b3d471b97edee
+  data.tar.gz: 48477613a03f5440e4410d06208aa35886e3f54069c0a5f5f40dff4c3fb32441
 SHA512:
-  metadata.gz: dfa84cbf2a6bd1d7ba4dffac839e2f8c01536f0321bd104916909283a85720038457a8cbff3acd7c4acafb38e0cdd0c1ff4c5dcf97a6f87c57bddd06ac8d9b0c
-  data.tar.gz: de18614349ca0a9f4fdde9318f6f0bc55e66f7cdd338aeed854873a7b1edb191c2c55f72f5a99147c3a89aa6b2638de40cd01c3785cd0ae4a863f457de53783f
+  metadata.gz: aaaec52c9a4b8ab6eaa253cd40a3f65232e804ef5e240ec460194db7158d4dbec42baa066bf274b22c121f6b7a57cf9fc5e3b4f21391ebae8d8d76913ee1d6ff
+  data.tar.gz: 6734191c80e197200b0cdef1d62020013190cdf27062bbd55f51fdbcad0f50356074b7bdcffb53a683808ba92844bf531a1b5af0b8cc4c8168fae047c512707f

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
@@ -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 = '2.3.1'.freeze
+    VERSION = '2.3.3.pre.alpha.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -475,9 +475,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: