github_workflow 0.3.2 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2523c0111941efa0cc2ae28dc02f50f3ae1dd3c2ddd0d15346ab62373e71a1
-  data.tar.gz: b15ee34fd36a63141439d1cafe92ddbcb48d25651741cffe1e46c04072a23fbe
+  metadata.gz: 8271e322b33f74a9d09a2ddb73493a177954b367dfb2b4ead132dbe72874ffad
+  data.tar.gz: ba726efdd702aa7021637ef2d03f9975fbb7e9cbe21ccfe3b825c34fad7fd888
 SHA512:
-  metadata.gz: 41d5404c59ed86163d888b7e22c7d2657af520ddbc40d67d5e8c46591cc723dd15d85a7330c0fff110e63c60d228e25b07e192296160be6f4f47c3ed9e72aef2
-  data.tar.gz: 4e2941bec61a523b28112989de6589dabfa220f1a7813c6e06af8bead84d45a2f0d4b63408a899e1e827631af843f1607c9b37a06bb086b90c1aae4cb1bd4cf5
+  metadata.gz: e38c3753cab0d496d407c1fa2f9afcd32f8f78c823013ded75d9ca0dfb8418d02ac837dbabc7910c4d73be9a97aecdf60b8cfa5691c5624e863f5dbbe05a61f1
+  data.tar.gz: 3477e960a0b6b08ed0350ca2e7e498ea0262dc95c314ddc0834b87d18dec4c09b366249da6d887746dfba4e6253d7551489503f3ac93991d3f26a08077c4db74

data/.ruby-version

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

data/lib/github_workflow/cli.rb

@@ -34,7 +34,6 @@ module GithubWorkflow
       set_trello_card(type: nil)
       create_issue_from_trello_card
       stash
-      checkout_main
       rebase_main
       create_branch
       stash_pop
@@ -48,7 +47,6 @@ module GithubWorkflow
       set_trello_card(type: :platform)
       create_issue_from_trello_card
       stash
-      checkout_main
       rebase_main
       create_branch
       stash_pop
@@ -59,7 +57,6 @@ module GithubWorkflow
     def start
       ensure_github_config_present
       stash
-      checkout_main
       rebase_main
       create_branch
       stash_pop
@@ -85,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?"
@@ -114,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
 
@@ -174,19 +171,19 @@ module GithubWorkflow
 
     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
@@ -207,9 +204,12 @@ 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"]
+
+        github_client.post("/repos/#{user_and_repo}/issues/#{@issue_id}/comments", { body: trello_card.short_url }.to_json)
+        trello_card.add_attachment response["html_url"]
       end
 
       def issue_body_from_trello_card
@@ -241,7 +241,7 @@ 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(type:)
@@ -254,7 +254,7 @@ module GithubWorkflow
             Trello::Board.find(project_config["trello_board_id"])
           end
 
-        @trello_card = trello_board.cards.detect { |card| card.short_id == options["card_number"].to_i }
+        @trello_card = trello_board.find_card(options["card_number"].to_i)
       end
 
       def trello_card
@@ -263,7 +263,7 @@ module GithubWorkflow
 
       def ensure_github_config_present
         if project_config.nil? || (JSON.parse(GITHUB_CONFIG).keys - project_config.keys).any?
-          failure("Please add `.github` file containing:\n#{GITHUB_CONFIG}")
+          failure("Please add `.github_workflow` file containing:\n#{GITHUB_CONFIG}")
         end
       end
 
@@ -275,7 +275,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
@@ -292,7 +292,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]
@@ -316,7 +316,7 @@ 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,
@@ -348,7 +348,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
 
@@ -356,29 +356,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_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_main
-        say_info("Checking out main")
-
-        if success?("git checkout main")
-          pass("Checked out main")
-        else
-          failure("Failed to checkout main")
-        end
-      end
-
       def stash
         `git diff --quiet`
 
@@ -392,7 +383,8 @@ module GithubWorkflow
       def stash_pop
         if @stashed
           say_info("Stash pop")
-          `git stash pop --quiet`
+          `git stash pop`
+          nil
         end
       end
 
@@ -412,7 +404,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
@@ -422,10 +414,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.2"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_workflow
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.7
 platform: ruby
 authors:
 - Ben Liscio
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-06-15 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: []