firespring_dev_commands 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ab0dc4450826feb67e1f072fa18d3d0708151f9e6a36b9b8f76813a7f9276c
-  data.tar.gz: ab7dd713555030e929b7d6fa8166fd235aba8556bc28eca1de9e89d128c0b704
+  metadata.gz: 56b724b0a6f7c0ab20b780894cc5c312fe545efb7a0460801bdde3fd25ea5d0c
+  data.tar.gz: 940ff9bff43521dbc47be595adb02cc369ec7e0e1f70c0ea1361ecf0f32a796f
 SHA512:
-  metadata.gz: f717584922e1df9aafea9d36625f57c73b7c7573bc86eebc3cc08cf77252b7c93dde773fe4c7e9f6ab5d498b751b49520a0803112048e6628643997764cd473f
-  data.tar.gz: 4f0c6a5f3aefe93903d9a3c94bdd39bc12efcb53b316cc6358f6952ceb3466df85b66dfa12408fdbd68b84b558416cc77fcffffaa986aa513e367ff678fb3b72
+  metadata.gz: 3faa331db0c214a38e4d17c352f86c4978e2813985111b59b1e43fc7a775907e7bf1fe178ccfbd2df275933345a16fe4882c99ac6a9779e8dee877a66143b0e5
+  data.tar.gz: 0e5da5e49aa2664c7fb678cd4cd11c37d85a4787c3aa91210022f1d20f1084109815cb3e875729c81932eb074a1f81b3372eb9e5f21c41a3ddeb2caae921669e

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
@@ -378,7 +399,7 @@ module Dev
     # Clones the repo_name into the dir
     # Optionally specify a repo_org
     # Optionally specify a branch to check out (defaults to the repository default branch)
-    def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil)
+    def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil, depth: nil)
       if Dir.exist?("#{dir}/.git")
         puts "#{dir} already cloned".light_green
         return
@@ -390,6 +411,7 @@ module Dev
 
       opts = {}
       opts[:branch] = branch unless branch.to_s.strip.empty?
+      opts[:depth] = depth unless depth.to_s.strip.empty?
       g = ::Git.clone(ssh_repo_url(repo_name, repo_org), dir, opts)
       g.fetch('origin', prune: true)
     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.7'.freeze
+    VERSION = '2.1.8'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Firespring