github_workflow 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca781e1f4ca8c31e5bcb694f2d8985c35807fa5410107c8d1f0972c7bdf52c2
-  data.tar.gz: 2a9b9af7a96c2ddec30758458c704191d0ba3dae33cc2b4545cfc6a1ba2d5eee
+  metadata.gz: bb2523c0111941efa0cc2ae28dc02f50f3ae1dd3c2ddd0d15346ab62373e71a1
+  data.tar.gz: b15ee34fd36a63141439d1cafe92ddbcb48d25651741cffe1e46c04072a23fbe
 SHA512:
-  metadata.gz: 1c12e1aa74a8c5b8b8186834d6389ac3201ef5770c30685cd027b6be4845ae3acfafe84a883400b4cbddda32c8217fa14eff34bf7476f02925ea7c0e66562ff7
-  data.tar.gz: f61e626629fabea130fbe8bc5ec0a6e12f7d92546ae5dce0e09f345c7c3a460c5022be8dce190b6d5cff83711d5223700a0ebce5f4e5831e45abddc27363d821
+  metadata.gz: 41d5404c59ed86163d888b7e22c7d2657af520ddbc40d67d5e8c46591cc723dd15d85a7330c0fff110e63c60d228e25b07e192296160be6f4f47c3ed9e72aef2
+  data.tar.gz: 4e2941bec61a523b28112989de6589dabfa220f1a7813c6e06af8bead84d45a2f0d4b63408a899e1e827631af843f1607c9b37a06bb086b90c1aae4cb1bd4cf5

data/lib/github_workflow/cli.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "pry"
 require "faraday"
 require "thor"
 require "open3"
@@ -10,13 +11,51 @@ 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
+      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
@@ -28,7 +67,6 @@ module GithubWorkflow
 
     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_main
-      rebase_main
-      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)
@@ -222,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
 
@@ -233,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
 

data/lib/github_workflow/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_workflow
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben Liscio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor