github_workflow 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd46613c2e0f1ff3275713640c8e5752d7bc3d0bcd01b3368c22f7909107ba2
-  data.tar.gz: 98988775af47addfbc43a3cd5d393884e02d67d5a06b01b5b9aa9bc9d40302b9
+  metadata.gz: 6bcca8d3fca22bc0cf07160f662201e0908833c9070e2cb2b97403bf82d2419e
+  data.tar.gz: f0b4be844e856e5548ecbafd9b8a2dff22c3f70670ada6d3528575bf61379d10
 SHA512:
-  metadata.gz: 65e5b2f17ecbc581627bebeeb1b22bdecf44a525cee027d649ad562c590f2956c65dd1c65adb8ee9395fc197f31c061d4468f33b58342f61d0e1e579885b3520
-  data.tar.gz: 5753a8dfb0252fc48c4625e024d417d3a086979079bd4ea1375a9fb3662b2072603bbcd9c5428d79b7cb3486c0c00a03fd43ca98f97cb530ff90e10039f23ed6
+  metadata.gz: 5094dc1f9323c9b29d901b01929d132a83fc948bfdca53d3acdb367afdc3a7c4a965227e45a4ae52f36a2291defde01be718a96815bc99ef42f54351146f12c5
+  data.tar.gz: d90d5ff5f4cc9617712186a8f07fb65f62b9c0bdb1e270809fbd47d429e5c075497189d2c113513791aadcca8e85613d273fa55cd16bb91ce4b072023ef068d1

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.2

data/lib/github_workflow/cli.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "pry"
 require "faraday"
 require "thor"
 require "open3"
@@ -10,25 +11,59 @@ module GithubWorkflow
   class Cli < Thor
     PROCEED_TEXT = "Proceed? [y,yes]: ".freeze
 
+    GITHUB_CONFIG = <<~TEXT
+      {
+        "oauth_token":              "TOKEN",
+        "user_and_repo":            "ORG/REPO",
+        "trello_key":               "KEY",
+        "trello_token":             "TOKEN",
+        "trello_board_id":          "BOARD_ID",
+        "trello_platform_board_id": "BOARD_ID"
+      }
+    TEXT
+
     include Thor::Actions
 
     default_task :trello
 
+    desc "trello", "Create issue from card"
+    method_option :card_number, aliases: "-i", type: :string, required: true
+    def trello
+      ensure_github_config_present
+      init_trello
+      set_trello_card(type: nil)
+      create_issue_from_trello_card
+      stash
+      rebase_main
+      create_branch
+      stash_pop
+    end
+
+    desc "platform", "Create issue from card"
+    method_option :card_number, aliases: "-i", type: :string, required: true
+    def platform
+      ensure_github_config_present
+      init_trello
+      set_trello_card(type: :platform)
+      create_issue_from_trello_card
+      stash
+      rebase_main
+      create_branch
+      stash_pop
+    end
+
     desc "start", "Create branch named with issue number and issue title"
     method_option :issue_id, aliases: "-i", type: :string, required: true
-
     def start
       ensure_github_config_present
       stash
-      checkout_master
-      rebase_master
+      rebase_main
       create_branch
       stash_pop
     end
 
     desc "create_pr", "Convert Issue to Pull Request"
     method_option :base_branch, aliases: "-b", type: :string
-
     def create_pr
       ensure_github_config_present
       ensure_origin_exists
@@ -47,7 +82,7 @@ module GithubWorkflow
     def status
       ensure_github_config_present
       ensure_origin_exists
-      response = JSON.parse(github_client.get("repos/#{user_and_repo}/statuses/#{current_branch}?access_token=#{oauth_token}").body)
+      response = JSON.parse(github_client.get("repos/#{user_and_repo}/statuses/#{current_branch}").body)
 
       if response.empty?
         alert "No statuses yet.  Have you pushed your branch?"
@@ -76,7 +111,7 @@ module GithubWorkflow
     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)
+      response = JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{issue_number_from_branch}").body)
       `/usr/bin/open -a "/Applications/Google Chrome.app" '#{response["html_url"]}'`
     end
 
@@ -134,37 +169,21 @@ module GithubWorkflow
       puts formatted_deploy_notes
     end
 
-    desc "trello", "Create issue from card"
-    method_option :card_number, aliases: "-i", type: :string, required: true
-
-    def trello
-      ensure_github_config_present
-      ensure_trello_config_present
-      init_trello
-      set_trello_card
-      create_issue_from_trello_card
-      stash
-      checkout_master
-      rebase_master
-      create_branch
-      stash_pop
-    end
-
     no_tasks do
       def get_issue(id)
-        JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{id}?access_token=#{oauth_token}").body)
+        JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{id}").body)
       end
 
       def get_pr(id)
-        JSON.parse(github_client.get("repos/#{user_and_repo}/pulls/#{id}?access_token=#{oauth_token}").body)
+        JSON.parse(github_client.get("repos/#{user_and_repo}/pulls/#{id}").body)
       end
 
       def get_prs_list
-        JSON.parse(github_client.get("repos/#{user_and_repo}/pulls?access_token=#{oauth_token}&per_page=100").body)
+        JSON.parse(github_client.get("repos/#{user_and_repo}/pulls&per_page=100").body)
       end
 
       def create_branch
-        `git checkout -b #{branch_name_for_issue_number}`
+        `git checkout -b #{branch_name_for_issue_number} main`
       end
 
       def ensure_origin_exists
@@ -185,7 +204,7 @@ module GithubWorkflow
           labels: trello_card.labels.map(&:name)
         }
 
-        response = JSON.parse(github_client.post("repos/#{user_and_repo}/issues?access_token=#{oauth_token}", issue_params.to_json).body)
+        response = JSON.parse(github_client.post("repos/#{user_and_repo}/issues", issue_params.to_json).body)
 
         @issue_id = response["number"]
       end
@@ -219,12 +238,19 @@ module GithubWorkflow
       end
 
       def current_github_username
-        JSON.parse(github_client.get("user?access_token=#{oauth_token}").body)["login"]
+        JSON.parse(github_client.get("user").body)["login"]
       end
 
-      def set_trello_card
+      def set_trello_card(type:)
         say_info("Fetching trello card")
-        trello_board = Trello::Board.find(project_config["trello_board_id"])
+
+        trello_board =
+          if type
+            Trello::Board.find(project_config["trello_#{type}_board_id"])
+          else
+            Trello::Board.find(project_config["trello_board_id"])
+          end
+
         @trello_card = trello_board.cards.detect { |card| card.short_id == options["card_number"].to_i }
       end
 
@@ -233,18 +259,8 @@ module GithubWorkflow
       end
 
       def ensure_github_config_present
-        unless project_config && project_config["oauth_token"] && project_config["user_and_repo"]
-          failure('Please add `.github` file containing `{ "oauth_token": "TOKEN", "user_and_repo": "user/repo" }`')
-        end
-      end
-
-      def ensure_trello_config_present
-        unless project_config &&
-            project_config["trello_board_id"] &&
-            project_config["trello_key"] &&
-            project_config["trello_token"]
-
-          failure('Please add `.github` file containing `{ "trello_key": "KEY", "trello_token": "TOKEN" }`')
+        if project_config.nil? || (JSON.parse(GITHUB_CONFIG).keys - project_config.keys).any?
+          failure("Please add `.github_workflow` file containing:\n#{GITHUB_CONFIG}")
         end
       end
 
@@ -256,7 +272,7 @@ module GithubWorkflow
       end
 
       def project_config
-        @project_config ||= JSON.parse(File.read(".github")) rescue nil
+        @project_config ||= JSON.parse(File.read(".github_workflow")) rescue nil
       end
 
       def oauth_token
@@ -273,7 +289,7 @@ module GithubWorkflow
 
       def create_issue
         github_client.post(
-          "repos/#{user_and_repo}/issues?access_token=#{oauth_token}",
+          "repos/#{user_and_repo}/issues",
           JSON.generate(
             {
               title: options[:name]
@@ -297,11 +313,11 @@ module GithubWorkflow
 
       def convert_issue_to_pr
         github_client.post(
-          "repos/#{user_and_repo}/pulls?access_token=#{oauth_token}",
+          "repos/#{user_and_repo}/pulls",
           JSON.generate(
             {
               head: current_branch,
-              base: options[:base_branch] || "master",
+              base: options[:base_branch] || "main",
               issue: issue_number_from_branch.to_i
             }
           )
@@ -329,7 +345,7 @@ module GithubWorkflow
       end
 
       def branch_name_for_issue_number
-        issue = JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{issue_id}?access_token=#{oauth_token}").body)
+        issue = JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{issue_id}").body)
         "#{issue['number']}_#{issue['title'].strip.downcase.gsub(/[^a-zA-Z0-9]/, '_').squeeze("_")}"
       end
 
@@ -337,29 +353,20 @@ module GithubWorkflow
         Faraday.new(url: "https://api.github.com") do |faraday|
           faraday.request   :url_encoded
           faraday.adapter   Faraday.default_adapter
+          faraday.authorization :Bearer, oauth_token
         end
       end
 
-      def rebase_master
-        say_info("Fetching changes and rebasing master")
+      def rebase_main
+        say_info("Fetching changes and rebasing main")
 
-        if success?("git pull --rebase")
+        if success?("git pull origin main:main --rebase")
           pass("Fetched and rebased")
         else
           failure("Failed to fetch or rebase")
         end
       end
 
-      def checkout_master
-        say_info("Checking out master")
-
-        if success?("git checkout master")
-          pass("Checked out master")
-        else
-          failure("Failed to checkout master")
-        end
-      end
-
       def stash
         `git diff --quiet`
 
@@ -393,7 +400,7 @@ module GithubWorkflow
       end
 
       def commits_for_range
-        JSON.parse(github_client.get("repos/#{user_and_repo}/compare/#{options[:commit_range]}?access_token=#{oauth_token}").body)
+        JSON.parse(github_client.get("repos/#{user_and_repo}/compare/#{options[:commit_range]}").body)
       end
 
       def pull_request_in_commit_range
@@ -403,10 +410,10 @@ module GithubWorkflow
 
         prs = pr_ids.map do |id|
           say_info("Fetching Pull Request ##{id}")
-          pr = github_client.get("repos/#{user_and_repo}/pulls/#{id}?access_token=#{oauth_token}")
+          pr = github_client.get("repos/#{user_and_repo}/pulls/#{id}")
 
           if pr.status == 404
-            JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{id}?access_token=#{oauth_token}").body)
+            JSON.parse(github_client.get("repos/#{user_and_repo}/issues/#{id}").body)
           else
             JSON.parse(pr.body)
           end

data/lib/github_workflow/version.rb

@@ -1,3 +1,3 @@
 module GithubWorkflow
-  VERSION = "0.3.0"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_workflow
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Ben Liscio
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description:
+description: 
 email:
 - bliscio@daisybill.com
 executables:
@@ -135,7 +135,7 @@ homepage: https://github.com/daisybill/github_workflow
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: DaisyBill's internal github workflows
 test_files: []