github_workflow 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2acbeaea7ef1702cbba7fe6faac3aafac225f964
-  data.tar.gz: 3b99436e66d84ecc2064dbae8630a486675b6e49
+  metadata.gz: 841c480ec29b5078ab1c744ff47f4a90a86294d9
+  data.tar.gz: 65d669c742921894020f471129538bd906c15dd7
 SHA512:
-  metadata.gz: aa3ef7a77775f0c6ab062f452cbe1c31226187beeb2d67c723208cba95a509e707c83f21774a51e7b55afa3c743bcf3ee81278ece31eca530f772a1c8d0a6143
-  data.tar.gz: ff00ad848f3235710e104465a344f5ff0763f3ce117bbe7f19c95633c871f4d6a820a67994190970019b0e8ccdbc13c51f24e421928b597662996978a7c61b0d
+  metadata.gz: 651f25d8f43973820c995c9c8f5d1242ffa2533d682d724d7fc714d91d899f1effcf17933b9ca9f1fb6f42a819cde933c634593a1e44c944abc1b4c6fc96a35f
+  data.tar.gz: 5e76c09c4f3d29d3cc5138f264f4d2630230b9cec51199d60f46af041ca563e12cd2fe79bf30b9d41d22f21896801ac7f5c6b79ed3833a9a34435ad73622c659

data/lib/github_workflow/cli.rb

@@ -7,6 +7,8 @@ require "terminal-table"
 
 module GithubWorkflow
   class Cli < Thor
+    PROCEED_TEXT = "Proceed? [y,yes]: ".freeze
+
     include Thor::Actions
 
     default_task :start
@@ -24,7 +26,6 @@ module GithubWorkflow
     end
 
     desc "create_pr", "Convert Issue to Pull Request"
-
     method_option :base_branch, aliases: "-b", type: :string
 
     def create_pr
@@ -34,9 +35,7 @@ module GithubWorkflow
     end
 
     desc "push_and_pr", "Push branch to origin and convert Issue to Pull Request"
-
     method_option :base_branch, aliases: "-b", type: :string
-
     def push_and_pr
       ensure_github_config_present
       push_and_set_upstream
@@ -44,7 +43,6 @@ module GithubWorkflow
     end
 
     desc "status", "Check PR CI status"
-
     def status
       ensure_github_config_present
       ensure_origin_exists
@@ -69,15 +67,12 @@ module GithubWorkflow
     end
 
     desc "info", "Print out issue description"
-
     def info
       ensure_github_config_present
-      response = JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{issue_number_from_branch}?access_token=#{oauth_token}").body)
-      puts response["body"]
+      puts get_issue(issue_number_from_branch)["body"]
     end
 
     desc "open", "Open issue or PR in browser"
-
     def open
       ensure_github_config_present
       response = JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{issue_number_from_branch}?access_token=#{oauth_token}").body)
@@ -85,15 +80,44 @@ module GithubWorkflow
     end
 
     desc "create_and_start", "Create and start issue"
-
     method_option :name, aliases: "-m", type: :string, required: true
-
     def create_and_start
       ensure_github_config_present
       create_issue
     end
 
+    desc "cleanup", "Remove merged PR branches"
+    def cleanup
+      say_info("Checking merge status")
+      merged_pr_branches
+      puts "\n"
+
+      if merged_pr_branches.any?
+        say_info("Are you sure you want to delete the branches with checkmarks?")
+
+        if yes?(PROCEED_TEXT)
+          pass("Deleting Branches")
+
+          merged_pr_branches.each do |branch|
+            `git branch -D #{branch}`
+          end
+        else
+          failure("Cleanup aborted")
+        end
+      else
+        failure("No merged branches to delete")
+      end
+    end
+
     no_tasks do
+      def get_issue(id)
+        JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{id}?access_token=#{oauth_token}").body)
+      end
+
+      def get_pr(id)
+        JSON.parse(github_client.get("repos/#{user_and_repo}/pulls/#{id}?access_token=#{oauth_token}").body)
+      end
+
       def create_branch
         `git checkout -b #{branch_name_for_issue_number}`
       end
@@ -234,6 +258,21 @@ module GithubWorkflow
         end
       end
 
+      def merged_pr_branches
+        @merged_pr_branches ||=
+          pr_branches.map do |branch|
+            id = branch.split("_")[0].to_i
+            merged = !!get_pr(id)["merged"]
+            print merged ? "✅ " : "❌ "
+            puts " #{branch}"
+            merged ? branch : nil
+          end.compact
+      end
+
+      def pr_branches
+        `git branch`.gsub(" ", "").split("\n").select { |br| br.match /^[0-9]/ }
+      end
+
       def success?(command)
         IO.popen(command) do |output|
           output.each { |line| puts line }

data/lib/github_workflow/version.rb

@@ -1,3 +1,3 @@
 module GithubWorkflow
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Ben Liscio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor