firespring_dev_commands 2.1.6.pre.alpha.1 → 2.1.6.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451ceb21b24126c1eb8ebd4635902c06daabd16ca85612f9ee0145ccefa49abf
-  data.tar.gz: bf53af68e42f2cc71404eca2f2f94171b3769526d113acce4178359e64ccd61e
+  metadata.gz: 17a02c0b5521ca1da3efb1b8374529732d7dde86060a9864f1d75be1ba070f6f
+  data.tar.gz: 9264d32211c1d1da7726215e8bf2c4f5df187f915ed9c38c29cdf336675b7e8b
 SHA512:
-  metadata.gz: c6935ea8724be8a8951c87df3f95bce474b89c8c1b196983f8b7f065245c393dd3a09328a36b8daabc7bcd28f8c670d245e539087fa1df4b3b739c965f60b4c7
-  data.tar.gz: da345d11a73d39e46beedffbf7522f9770b15310a7cf9be4911d2576ab78d951d915912a20e377b5467f66bbae83ddf5c7a34cdd1556cce443aca9264e39a8c7
+  metadata.gz: 436338662d1889eec74a3c5fac8ca50427fa0f58ec2a6a256f7689015217bc8738618e26b14260d3648e650d93bfa4ce64d9fc49ec974204815fb49d2ec09a6b
+  data.tar.gz: 30158eb11227b227d711011bd77db61b1dc8bac6a8fda0760a89e21b8d60434a3f443162499313312d285ccf8c3cac751a5ad106f80c1bfa0e9139d973662028

data/lib/firespring_dev_commands/common.rb

@@ -41,7 +41,7 @@ module Dev
     # If the user answers 'y' then the block is executed.
     # If the user answers 'n' then the block is skipped.
     def with_confirmation(message, default = 'y', color_message: true)
-      message = "\n  #{message}? "
+      message = "\n  #{message}" << '? '.light_green
       message = message.light_green if color_message
       print message
       print '('.light_green << 'y'.light_yellow << '/'.light_green << 'n'.light_yellow << ') '.light_green

data/lib/firespring_dev_commands/git.rb

@@ -203,7 +203,7 @@ module Dev
 
     # Checks out the given branch in the given repo
     # Defaults to the current directory
-    def checkout(branch, dir: default_project_dir)
+    def checkout(branch, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       return unless File.exist?(dir)
 
@@ -224,12 +224,14 @@ module Dev
       indent g.pull('origin', actual_branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
 
     # Create the given branch in the given repo
-    def create_branch(branch, dir: default_project_dir)
+    def create_branch(branch, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       raise "refusing to create protected branch '#{branch}'" if %w(master develop).any?(branch.to_s.strip)
       return unless File.exist?(dir)
@@ -240,7 +242,7 @@ module Dev
       g = ::Git.open(dir)
       g.fetch('origin', prune: true)
 
-      puts "Fetching the latest changes for base branch #{staging_branch}"
+      puts "Fetching the latest changes for base branch \"#{staging_branch}\""
       g.checkout(staging_branch)
       g.pull('origin', staging_branch)
 
@@ -251,6 +253,19 @@ module Dev
       g.config("branch.#{branch}.merge", "refs/heads/#{branch}")
       puts
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
+      print_errors(e.message)
+      false
+    end
+
+    def add(*paths, dir: default_project_dir, raise_errors: false)
+      g = ::Git.open(dir)
+      indent g.add(paths)
+      true
+    rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -277,7 +292,7 @@ module Dev
     end
 
     # Merge the given branch into the given repo
-    def merge(branch, dir: default_project_dir)
+    def merge(branch, dir: default_project_dir, raise_errors: false)
       raise 'branch is required' if branch.to_s.strip.empty?
       return unless File.exist?(dir)
 
@@ -296,6 +311,8 @@ module Dev
       indent g.merge(branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -320,7 +337,7 @@ module Dev
     end
 
     # Pull the given repo
-    def pull(dir: default_project_dir)
+    def pull(dir: default_project_dir, raise_errors: false)
       return unless File.exist?(dir)
 
       g = ::Git.open(dir)
@@ -331,6 +348,8 @@ module Dev
       indent g.pull('origin', branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     end
@@ -355,7 +374,7 @@ module Dev
     end
 
     # Push the given repo
-    def push(dir: default_project_dir)
+    def push(dir: default_project_dir, raise_errors: false)
       return unless File.exist?(dir)
 
       g = ::Git.open(dir)
@@ -366,6 +385,8 @@ module Dev
       indent g.push('origin', branch)
       true
     rescue ::Git::GitExecuteError => e
+      raise e if raise_errors
+
       print_errors(e.message)
       false
     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 = '2.1.6.pre.alpha.1'.freeze
+    VERSION = '2.1.6.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.1.6.pre.alpha.1
+  version: 2.1.6.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport