github_workflow 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c43f358a8c74c8327e181f1956672b811bfcb923862d5350011c5fabcbf1f3
-  data.tar.gz: cd35d8882cff58eaabbabc2882d41f4d6791b54e473ea81591c2fabfe43aee50
+  metadata.gz: 5ca781e1f4ca8c31e5bcb694f2d8985c35807fa5410107c8d1f0972c7bdf52c2
+  data.tar.gz: 2a9b9af7a96c2ddec30758458c704191d0ba3dae33cc2b4545cfc6a1ba2d5eee
 SHA512:
-  metadata.gz: 9d19bf2e55cfb19b25962839f721bbd7c0a6e551b0b7df02713a2d213550ba17b5beea445a60b00d30b4812ce26acbce2f9b5c2679a3b12c40eda36bfbd15726
-  data.tar.gz: 257e821d6816f3ae5b099437a5bb06e2871f420e5948aa8f97baa4b4cddb316749c8fcee09dfb293421e4e8d412b41275639a7d02e24eacf27e79095cc344c11
+  metadata.gz: 1c12e1aa74a8c5b8b8186834d6389ac3201ef5770c30685cd027b6be4845ae3acfafe84a883400b4cbddda32c8217fa14eff34bf7476f02925ea7c0e66562ff7
+  data.tar.gz: f61e626629fabea130fbe8bc5ec0a6e12f7d92546ae5dce0e09f345c7c3a460c5022be8dce190b6d5cff83711d5223700a0ebce5f4e5831e45abddc27363d821

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

@@ -12,7 +12,7 @@ module GithubWorkflow
 
     include Thor::Actions
 
-    default_task :start
+    default_task :trello
 
     desc "start", "Create branch named with issue number and issue title"
     method_option :issue_id, aliases: "-i", type: :string, required: true
@@ -20,8 +20,8 @@ module GithubWorkflow
     def start
       ensure_github_config_present
       stash
-      checkout_master
-      rebase_master
+      checkout_main
+      rebase_main
       create_branch
       stash_pop
     end
@@ -144,8 +144,8 @@ module GithubWorkflow
       set_trello_card
       create_issue_from_trello_card
       stash
-      checkout_master
-      rebase_master
+      checkout_main
+      rebase_main
       create_branch
       stash_pop
     end
@@ -182,7 +182,7 @@ module GithubWorkflow
           title: trello_card.name,
           body: issue_body_from_trello_card,
           assignees: [current_github_username],
-          labels: issue_labels_from_trello_card
+          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)
@@ -191,7 +191,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,29 +222,6 @@ module GithubWorkflow
         JSON.parse(github_client.get("user?access_token=#{oauth_token}").body)["login"]
       end
 
-      def issue_labels_from_trello_card
-        labels = trello_card.labels.map(&:name)
-
-        product_review_type = trello_card.custom_field_items.detect do |cfi|
-          cfi.custom_field.name == "Product Review"
-        end
-
-        if product_review_type && ["Review App", "Screenshot"].include?(product_review_type.option_value["text"])
-          labels << "Product Review Required"
-        end
-
-        priority = trello_card.custom_field_items.detect do |cfi|
-          cfi.custom_field.name == "Priority"
-        end
-
-        if priority && priority.option_value["text"].present?
-          priority_titleized = priority.option_value["text"]
-          labels << "Priority: #{priority_titleized}"
-        end
-
-        labels.compact
-      end
-
       def set_trello_card
         say_info("Fetching trello card")
         trello_board = Trello::Board.find(project_config["trello_board_id"])
@@ -316,7 +301,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
             }
           )
@@ -355,8 +340,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")
@@ -365,13 +350,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.4"
+  VERSION = "0.3.1"
 end

metadata

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