github_workflow 0.2.6 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2078d82a92c19e8450d3d034843901c81f77805ed5906bc2b9d8ca4e3d7820d
-  data.tar.gz: 46a6c2b2c276b0536c5c2104d5bcb2fea0965bbdbca2238e02a4f361d95e0a0f
+  metadata.gz: 00fdf33b252e1cbb7f953e344f211cf8867c15005afddc99898416895b9b64cf
+  data.tar.gz: 53e614ac7ad8b0fcbab00cabfa4bdf02be7a122b1fe3886e98bdf16a63c709e4
 SHA512:
-  metadata.gz: 901559f80f10d7586c22b20df3b305fc4f7d620b4efdea287a21b7a9d9875c754b9a9e43979e2e4d3a5acd15e1332a267a34bf8d68e2e7aab83fc971a32538e0
-  data.tar.gz: bad7815466c7e482c5e1bb8b3e4a608e0ce18a5ce7fb24537ed81b0e18a1978a9d606d889098582dd39505bdf880dd5c101687cd4ecb47a3cf0efc5c62c8cf19
+  metadata.gz: b2356ab260a0829fe6010ee141794783eb75062896d93c6ba448af1716c6345605506b756c7ef921ad29779124b079239493b38b95d60ee02f0031d45a7d31be
+  data.tar.gz: 5c086664b84d3fe1013a76028d4308f338636d4c657991c8c2a7c1af37260bc075af46efff76b7b373e7acf094bfd3909ca501d7792df9bc66648c06237b253f

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.7.2

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,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 :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
+      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
@@ -134,22 +169,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)
@@ -164,7 +183,7 @@ module GithubWorkflow
       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
@@ -222,9 +241,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 +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` file containing:\n#{GITHUB_CONFIG}")
         end
       end
 
@@ -301,7 +317,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
             }
           )
@@ -340,26 +356,16 @@ 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")
+        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`
 

data/lib/github_workflow/version.rb

@@ -1,3 +1,3 @@
 module GithubWorkflow
-  VERSION = "0.2.6"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_workflow
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.3
 platform: ruby
 authors:
 - Ben Liscio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2021-04-26 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
@@ -144,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: DaisyBill's internal github workflows