gaf 0.1.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a34556af458822ef7eb344c2e35e974d79b846906b7b49578f31de73acfc07
-  data.tar.gz: 68f37dea2c2f943acec9cc4feeb30de618ad201c828754d2f9726d8e3e689f9b
+  metadata.gz: d7e7785b4b8995025577b5f92db805750159e67fe005bce157345d5e0903666a
+  data.tar.gz: 9ff876cad54a7d02c716e8a5ecab53da7c4d59c355b360ac780d3fd8931dfec9
 SHA512:
-  metadata.gz: d4a88467ecfe330144d0127833f07e51af22e5bd1828fb9c01499abd3e38377f3fbf484ea95b219fe33adf19c614effc47e72089d559a8820fb0e90704f1d9ee
-  data.tar.gz: 9e4a08dc67e6ab09a946a06c82cc8427ef26e713435168f50e32b2058c6de9426e5c4334a3a8cd15c0c8295b5241ba02c2c124dd640ef1998b35898c55f41935
+  metadata.gz: fc9280553eaa668502e22c112fd63468b47ccc4a85332e3d851a127f317a6fb8f8c1545632cbcd7741bd39241eedd3cb4c11c2c4e3110c5e1ece07461477cb38
+  data.tar.gz: 9b6afdf01e66902d9a2aee87a90aef2b7df5efaf3da03a12b36bc10be9934de40366f340d0863d1bedf2e7586eff93ca9b7a5eb41834f297de2633fa7180f79f

data/lib/gaf/processor.rb

@@ -1,17 +1,12 @@
+require "pry"
+require_relative "worksheet/update_worksheet"
+
 module Gaf
   module Processor
-    extend ActiveSupport::Concern
-    include Worksheet::LoadWorksheet
-
-    included do
-      attr_reader :branch, :pull_request_link, :sprint, :user
-      before_action :load_branch, :load_pull_request_link, only: :hook_event_github
-    end
-
     def hook_event_github
       return if request.headers["X-GitHub-Event"] != "pull_request"
       init_or_create_user
-      update_ws
+      Gaf::Worksheet::UpdateWorksheet.new(params).update_ws
     end
 
     private
@@ -20,108 +15,5 @@ module Gaf
       user_params = params["pull_request"]["user"]
       @user = User.find_or_create_by(name: user_params["login"], github_id: user_params["id"])
     end
-
-    def pull_request?
-      request.headers["X-GitHub-Event"] == "pull_request" && params["hook_github"]["action"] == "opened"
-    end
-
-    def merged?
-      request.headers["X-GitHub-Event"] == "pull_request" && params["hook_github"]["action"] == "closed" &&
-        params["pull_request"]["merged_at"].present?
-    end
-
-
-    array_main_branchs.each do |branch|
-      define_method("pr_merge_to_#{branch}?") do
-        pull_request? && params_branch == branch
-      end
-
-      define_method("merged_pull_#{branch}?") do
-        merged? && params_branch == branch
-      end
-
-      define_method("pull_merge_to_#{branch}") do |row, ws|
-        col_pr_merged = hash_row_title["pr_merge_#{branch}"]
-        pr_present = ws[row, col_pr_merged].present?
-        ws[row, col_pr_merged]  = format_pull_request_link pr_present, ws[row, col_pr_merged]
-        ws.save
-      end
-
-      define_method("update_status_merged_to_#{branch}") do |row, ws|
-        col_merged = hash_row_title["merged_#{branch}"]
-        ws[row, col_merged]  = "Done"
-        ws.save
-      end
-    end
-
-    def update_ws
-      ref_branch_merge = params["pull_request"]["title"][/\[(.*?)\]/, 1]
-      (1..worksheet.num_rows).each do |row|
-        if [branch, ref_branch_merge].include? worksheet[row, 2].delete("\n")
-          array_main_branchs.each do |branch|
-            send("update_status_merged_to_#{branch}", row, worksheet) if send("merged_pull_#{branch}?")
-            send("pull_merge_to_#{branch}", row, worksheet) if send("pr_merge_to_#{branch}?")
-          end
-          update_pull_request_for_branch(row, worksheet) if pr_merge_to_branch?
-          update_status_merged_to_ticket(row, worksheet) if merged_pr?
-          break
-        end
-      end
-    end
-
-    def update_pull_request_for_branch row, ws
-      col_pr = hash_row_title["PR"]
-      ticket = params["pull_request"]["head"]["ref"][/([0-9]+)(?=[^\/]*$)/,1]
-      array_main_branchs.each do |branch|
-        col_merged = hash_row_title["merged_#{branch}"]
-        col_deployed = hash_row_title["deployed_#{branch}"]
-        ws[row, col_merged]  = "N/A"
-        ws[row, col_deployed]  = "N/A"
-      end
-      col_ticket = hash_row_title["Ticket"]
-      pr_present = ws[row, col_pr].present?
-      ws[row, col_pr] = format_pull_request_link pr_present, ws[row, col_pr]
-      ws[row, col_ticket]  = col_ticket.present? ? ws[row, col_ticket] + "\n#{ticket}" : ticket
-      ticket_by_user ticket
-      ws.save
-    end
-
-    def ticket_by_user ticket
-      Ticket.create user_id: user.id, sprint_id: sprint.id, ticket_id: ticket
-    end
-
-    def format_pull_request_link pr_present, previous_prs_link
-      return previous_prs_link + "\n\n#{pull_request_link}" if pr_present
-
-      pull_request_link
-    end
-
-    def update_status_merged_to_ticket row, ws
-      col_ticket = hash_row_title["Ticket"]
-      ticket = params["pull_request"]["head"]["ref"][/([0-9]+)(?=[^\/]*$)/,1]
-      arr_ticket = ws[row, col_ticket].split("\n").map{|tick| tick == ticket ? tick + "(merged)" : tick}
-      ws[row, col_ticket] = arr_ticket.join("\n")
-      ws.save
-    end
-
-    def pr_merge_to_branch?
-      pull_request? && array_main_branchs.exclude?(params_branch)
-    end
-
-    def merged_pr?
-      merged? && array_main_branchs.exclude?(params_branch)
-    end
-
-    def params_branch
-      params["pull_request"]["base"]["ref"]
-    end
-
-    def load_pull_request_link
-      @pull_request_link = params["pull_request"]["html_url"]
-    end
-
-    def load_branch
-      @branch = params["pull_request"]["base"]["ref"]
-    end
   end
 end

data/lib/gaf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gaf
-  VERSION = "0.1.2"
+  VERSION = "1.1.1"
 end

data/lib/gaf/worksheet/create_worksheet.rb

@@ -1,20 +1,17 @@
 module Gaf
   module Worksheet
     class CreateWorksheet
-      ROWS = ["STT", "Feature Branch", "Note", "Note Release", "PR feature branch", "Ticket"].freeze
-      def initialize
-        @array_main_branchs = Gaf.config.array_main_branchs
-        arr_rows
-      end
+      ROWS = ["STT", "Feature Branch", "Note", "Note Release", "PR feature branch", "Ticket"]
 
-      def self.create
+      def create
+        arr_rows
         session = GoogleDrive::Session.from_config(Gaf.config.google_application_credential)
         spreadsheet = session.spreadsheet_by_title(Gaf.config.title_worksheet)
-        @worksheet = spreadsheet.worksheets.first
+        worksheet = spreadsheet.worksheets.first
         rows.each_with_index do |row, index |
-          @worksheet[1, index] = row
+          worksheet[1, index+1] = row
         end
-        @worksheet.save
+        worksheet.save
       end
 
       private
@@ -22,6 +19,7 @@ module Gaf
 
       def arr_rows
         @rows = ROWS
+        @array_main_branchs = Gaf.config.array_main_branchs
         array_main_branchs.each do |main_branch|
           need_rows = ["pr_merge_#{main_branch}", "merged_#{main_branch}", "deployed_#{main_branch}"]
           rows << need_rows

data/lib/gaf/worksheet/load_worksheet.rb

@@ -1,19 +1,11 @@
 module Gaf
   module Worksheet
     module LoadWorksheet
-      extend ActiveSupport::Concern
-      attr_reader :worksheet, :hash_row_title
-
-      included do
-        before_action :worksheet, :get_first_row
-      end
-
-      private
-      def worksheet
+      def load_worksheet
         session = GoogleDrive::Session.from_config(Gaf.config.google_application_credential)
         spreadsheet = session.spreadsheet_by_title(Gaf.config.title_worksheet)
-        @worksheet = spreadsheet.worksheets.last
-        @sprint = Sprint.find_or_create_by name: worksheet.title
+        @worksheet ||= spreadsheet.worksheets.last
+        @sprint ||= Sprint.find_or_create_by name: worksheet.title
       end
 
       def get_first_row
@@ -25,3 +17,4 @@ module Gaf
     end
   end
 end
+

data/lib/gaf.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "gaf/version"
-require "gaf/worksheet/create_worksheet"
-require "gaf/worksheet/load_worksheet"
-require "gaf/processor"
 require "gaf/config"
+require "gaf/version"
 
 
 module Gaf
+  autoload :Processor, "gaf/processor"
+
   class Error < StandardError; end
 
   def self.configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gaf
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.1.1
 platform: ruby
 authors:
 - DiHu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Create githook webhook and management pull request on worksheet