github_workflow 0.2.5 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f210cca3f44897bd54fb6ed988e72f637d3cc85637d0baedb7821564ef2ee4c
-  data.tar.gz: c0f39c4470755c32137953edcff685cc9dd65bcedaa7a5747a4d79b4d72fc064
+  metadata.gz: bb2523c0111941efa0cc2ae28dc02f50f3ae1dd3c2ddd0d15346ab62373e71a1
+  data.tar.gz: b15ee34fd36a63141439d1cafe92ddbcb48d25651741cffe1e46c04072a23fbe
 SHA512:
-  metadata.gz: 90ba0abb0418ad2a88e0f134d5a0145c414935c0c757315b0b6ea2e6cc7aad6d8d6ac5f6849126e309deec89f59f811fd2ea8a4295666ee2f425eabd4e34b40b
-  data.tar.gz: 92ca0ca758462f0337c150a368090fb1e150ad446a274f17b1a81e603089c01c92f1dca2b336ee08dcd965edfb842b10d9f9574e5e40b7831d08d2c316cd6692
+  metadata.gz: 41d5404c59ed86163d888b7e22c7d2657af520ddbc40d67d5e8c46591cc723dd15d85a7330c0fff110e63c60d228e25b07e192296160be6f4f47c3ed9e72aef2
+  data.tar.gz: 4e2941bec61a523b28112989de6589dabfa220f1a7813c6e06af8bead84d45a2f0d4b63408a899e1e827631af843f1607c9b37a06bb086b90c1aae4cb1bd4cf5

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.7.1

data/github_workflow.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "faraday", "~> 0.11"
+  spec.add_dependency "thor", "~> 1.0.1"
+  spec.add_dependency "faraday", "~> 0.11", "< 2.0"
   spec.add_dependency "terminal-table", "~> 1.5"
   spec.add_dependency "ruby-trello", "~> 2.1"
 

data/lib/github_workflow/cli.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "pry"
 require "faraday"
 require "thor"
 require "open3"
@@ -10,25 +11,62 @@ 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 :start
+    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
+      checkout_main
+      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
+      checkout_main
+      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
+      checkout_main
+      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
@@ -134,22 +172,6 @@ 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)
@@ -191,7 +213,15 @@ module GithubWorkflow
       end
 
       def issue_body_from_trello_card
-        [trello_card.desc, trello_deploy_note, trello_product_review_type].compact.join("\n\n")
+        [trello_card.desc, trello_deploy_note, trello_product_review_type, trello_pm].compact.join("\n\n")
+      end
+
+      def trello_pm
+        custom_field = trello_card.custom_field_items.detect { |cfi| cfi.custom_field.name == "PM" }
+
+        if custom_field.present?
+          "**Responsible:** #{custom_field.option_value['text']}"
+        end
       end
 
       def trello_deploy_note
@@ -214,9 +244,16 @@ module GithubWorkflow
         JSON.parse(github_client.get("user?access_token=#{oauth_token}").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
 
@@ -225,18 +262,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` file containing:\n#{GITHUB_CONFIG}")
         end
       end
 
@@ -293,7 +320,7 @@ module GithubWorkflow
           JSON.generate(
             {
               head: current_branch,
-              base: options[:base_branch] || "master",
+              base: options[:base_branch] || "main",
               issue: issue_number_from_branch.to_i
             }
           )
@@ -332,8 +359,8 @@ module GithubWorkflow
         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")
           pass("Fetched and rebased")
@@ -342,13 +369,13 @@ module GithubWorkflow
         end
       end
 
-      def checkout_master
-        say_info("Checking out master")
+      def checkout_main
+        say_info("Checking out main")
 
-        if success?("git checkout master")
-          pass("Checked out master")
+        if success?("git checkout main")
+          pass("Checked out main")
         else
-          failure("Failed to checkout master")
+          failure("Failed to checkout main")
         end
       end
 

data/lib/github_workflow/version.rb

@@ -1,3 +1,3 @@
 module GithubWorkflow
-  VERSION = "0.2.5"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_workflow
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben Liscio
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: 
+description:
 email:
 - bliscio@daisybill.com
 executables:
@@ -129,7 +135,7 @@ homepage: https://github.com/daisybill/github_workflow
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,9 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: DaisyBill's internal github workflows
 test_files: []