firespring_dev_commands 2.2.1.pre.alpha.2 → 2.2.1.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80f7cbb7c7fd0fa661779ae3693d16d3b2a9be96f836c998eac45b9163282212
-  data.tar.gz: 6633fe3fe43c94b4da08743e629c7e7a16c92376f8350b0bf121ab79fc7f08e8
+  metadata.gz: 7f7ee4edb84fcf55633780edce93e62119ba287da59fd45ce4a7b06109ce9e75
+  data.tar.gz: 3344e8910159e5b5df252b807b006c366956ce0220b2b65d6e5a92be9e958484
 SHA512:
-  metadata.gz: e7c4cf41cbf9dd669c9c2cc05550335e33d873105b3e37a1099a95560f16e9d920719b170de3719c67f5981c42d7e48f445e18cf35aed4dd1bd00194d6b00c26
-  data.tar.gz: 9e0f0898fad325bd3903fd773584ce5e4ef16114a8fd4fb60530db07a585a2b4cedd4900b53e43d4e74fd42ec0db0d3040770d7d836f7555500d0a39b8ac3f59
+  metadata.gz: 6f93bd21df947af3689c965be24f664fe23841c522ab2a90c2fe0b1b4642f774805426da93ffab856c03ec99e77bd06e4b5af5a83d40c833fb217826c991566a
+  data.tar.gz: 80cd78d0f4f92c7334c2908d317596782b2bec357d556983388ee6cf97e623f9210853a928f1e4823fa2536cbec0dd97af3f9243ecb3e48ee8bb244569e68bbf

data/lib/firespring_dev_commands/git.rb

@@ -409,7 +409,10 @@ 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, depth: nil)
+    def clone_repo(dir:, repo_name:, repo_org: nil, branch: nil, depth: nil)
+      # TODO: Split out the default of 'firespring' into a configuration variable
+      repo_org = 'firespring' if repo_org.to_s.strip.empty?
+
       if Dir.exist?("#{dir}/.git")
         puts "#{dir} already cloned".light_green
         return
@@ -426,12 +429,15 @@ module Dev
       g.fetch('origin', prune: true)
     end
 
-    def commit_status(token:, repository:, branch:, status:, organization: 'firespring', options: {})
+    def commit_status(token:, repo_name:, branch:, status:, repo_org: nil, options: {})
+      # TODO: Split out the default of 'firespring' into a configuration variable
+      repo_org = 'firespring' if repo_org.to_s.strip.empty?
+
       # Set up the GitHub client
       client = Octokit::Client.new(access_token: token)
 
       # Fetch the latest commit SHA for the given branch
-      repo = "#{organization}/#{repository}"
+      repo = "#{repo_org}/#{repo_name}"
       ref = "heads/#{branch}"
       sha = client.ref(repo, ref).object.sha
 

data/lib/firespring_dev_commands/templates/git.rb

@@ -160,57 +160,153 @@ module Dev
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
-      # Create the rake task for the git commit status task.
-      def create_commit_status_task!
+      # Create the rake task for the git commit status pending task.
+      def create_commit_status_pending_task!
         # Have to set a local variable to be accessible inside of the instance_eval block
         exclude = @exclude
+
         DEV_COMMANDS_TOP_LEVEL.instance_eval do
           namespace :git do
             return if exclude.include?(:commit_status)
 
-            desc 'Add status to PR' \
-                 "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
-                 "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
-                 "\n\tuse BRANCH=abc123 to specify the branch of code (required)" \
-                 "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
-                 "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
+            namespace :commit_status do
+              desc 'Add pending status to commit' \
+                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
+                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
+                   "\n\tuse BRANCH=abc123 to specify the branch of code (required)" \
+                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
+                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
+              task :pending do
+                status = 'pending'
+                token = ENV['GITHUB_TOKEN'].to_s.strip
+                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
+                branch = ENV['BRANCH'].to_s.strip
 
-            # Key Values
-            token = ENV['GITHUB_TOKEN'].to_s.strip
-            repository = ENV['REPOSITORY'].to_s.strip
-            branch = ENV['BRANCH'].to_s.strip
+                raise 'GITHUB_TOKEN is required' unless token
+                raise 'Repository name is required' unless repo_name
+                raise 'Branch name is required' unless branch
 
-            raise 'GITHUB_TOKEN is required' unless token
-            raise 'Repository name is required' unless repository
-            raise 'Branch name is required' unless branch
+                options = {}
+                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
+                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
 
-            options = {}
-            options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
-            options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
+                Dev::Git.new.commit_status(token:, repo_name:, branch:, status:, repo_org:, options:)
+              end
+            end
+          end
+        end
+      end
+
+      # Create the rake task for the git commit status success task.
+      def create_commit_status_success_task!
+        # Have to set a local variable to be accessible inside of the instance_eval block
+        exclude = @exclude
+
+        DEV_COMMANDS_TOP_LEVEL.instance_eval do
+          namespace :git do
+            return if exclude.include?(:commit_status)
 
             namespace :commit_status do
-              desc 'Add status success'
+              desc 'Add success status to commit' \
+                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
+                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
+                   "\n\tuse BRANCH=abc123 to specify the branch of code (required)" \
+                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
+                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
               task :success do
-                Dev::Git.new.commit_status(token:, repository:, branch:, status: 'success', options:)
-              end
-              desc 'Add status pending'
-              task :pending do
-                Dev::Git.new.commit_status(token:, repository:, branch:, status: 'pending', options:)
+                status = 'success'
+                token = ENV['GITHUB_TOKEN'].to_s.strip
+                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
+                branch = ENV['BRANCH'].to_s.strip
+
+                raise 'GITHUB_TOKEN is required' unless token
+                raise 'Repository name is required' unless repo_name
+                raise 'Branch name is required' unless branch
+
+                options = {}
+                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
+                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
+
+                Dev::Git.new.commit_status(token:, repo_name:, branch:, status:, repo_org:, options:)
               end
-              desc 'Add status error'
+            end
+          end
+        end
+      end
+
+      # Create the rake task for the git commit status error task.
+      def create_commit_status_error_task!
+        # Have to set a local variable to be accessible inside of the instance_eval block
+        exclude = @exclude
+
+        DEV_COMMANDS_TOP_LEVEL.instance_eval do
+          namespace :git do
+            return if exclude.include?(:commit_status)
+
+            namespace :commit_status do
+              desc 'Add error status to commit' \
+                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
+                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
+                   "\n\tuse BRANCH=abc123 to specify the branch of code (required)" \
+                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
+                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
               task :error do
-                Dev::Git.new.commit_status(token:, repository:, branch:, status: 'error', options:)
+                status = 'error'
+                token = ENV['GITHUB_TOKEN'].to_s.strip
+                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
+                branch = ENV['BRANCH'].to_s.strip
+
+                raise 'GITHUB_TOKEN is required' unless token
+                raise 'Repository name is required' unless repo_name
+                raise 'Branch name is required' unless branch
+
+                options = {}
+                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
+                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
+
+                Dev::Git.new.commit_status(token:, repo_name:, branch:, status:, repo_org:, options:)
               end
-              desc 'Add status failure'
+            end
+          end
+        end
+      end
+
+      # Create the rake task for the git commit status failure task.
+      def create_commit_status_failure_task!
+        # Have to set a local variable to be accessible inside of the instance_eval block
+        exclude = @exclude
+
+        DEV_COMMANDS_TOP_LEVEL.instance_eval do
+          namespace :git do
+            return if exclude.include?(:commit_status)
+
+            namespace :commit_status do
+              desc 'Add failure status to commit' \
+                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
+                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
+                   "\n\tuse BRANCH=abc123 to specify the branch of code (required)" \
+                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
+                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
               task :failure do
-                Dev::Git.new.commit_status(token:, repository:, branch:, status: 'failure', options:)
+                status = 'failure'
+                token = ENV['GITHUB_TOKEN'].to_s.strip
+                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
+                branch = ENV['BRANCH'].to_s.strip
+
+                raise 'GITHUB_TOKEN is required' unless token
+                raise 'Repository name is required' unless repo_name
+                raise 'Branch name is required' unless branch
+
+                options = {}
+                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
+                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
+
+                Dev::Git.new.commit_status(token:, repo_name:, branch:, status:, repo_org:, options:)
               end
             end
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 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.2.1.pre.alpha.2'.freeze
+    VERSION = '2.2.1.pre.alpha.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.2.1.pre.alpha.2
+  version: 2.2.1.pre.alpha.3
 platform: ruby
 authors:
 - Firespring