CiHelper 2.0.1 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d51eac14784319039deefb54c51d159a437f9a
-  data.tar.gz: 6836e4a0bcb44526b874db4532dba84c0f0889df
+  metadata.gz: aad5fddb4944394ae717fc8eb203d5ef7c390270
+  data.tar.gz: b321528c4c31345d7a054bf877a01342c5595f6b
 SHA512:
-  metadata.gz: 352cf44afcf21ebf26d63bd533cb248a2a90c1914d2421eb367aaa5539599917f13efca306be4db9c908dfd4f01a1a5e1bbfa461b127c4008504008170b8789e
-  data.tar.gz: 70f0311cabca23c0e2b234d7ecaa3e6428966ea3ff993a65d46fcd892913b52486c4af1e313a2af80504f59c7e6eb4f7bf5be6695d695aab1feb0b9463185952
+  metadata.gz: 8abec7a049dd5ecaeb052b5748cfcf6b68c89c3004143da5fa09e103b63e7f015eca5b5963ec5eb172937304a692b19553176b43cd82a2f0b914782ad6452c89
+  data.tar.gz: 5ec021b00aef2415fd9fc7fb8e72d0baf83f622096b3535458c1b39196f2731c7ea1bb7f95e1fa2c5ebde6cbb3361823a28f8f4f5d6e9fbecdcec1d21fa8fbdc

data/lib/ci_helper/bitbucket_procedure.rb

@@ -63,6 +63,7 @@ module CiHelper
       issue_numbers.size > 1
     end
 
+    # transform the user input branch name t3001 t3001_reopen or t3001_t3002_t3003 to [3001], [3001] or [3001,3002,3003]
     def issue_numbers
       branch_name.split('_').each { |name| name.delete!('t') }.delete_if { |name| name.to_i.zero?}
     end

data/lib/ci_helper/constants.rb

@@ -17,4 +17,6 @@ unfortunately you need to pass the ci and you can get a UT passed >.^ '\n"
                '4' => 'normal',
                '5' => 'low'}
   DANGEROUS = 6
+  UTPASSED = '8'
+  RESOLVED = '3'
 end

data/lib/ci_helper/functions/base.rb

@@ -8,7 +8,7 @@ module CiHelper
 
       def initialize(config)
         @user_cli = CiHelper::UserCommandLineInterface.new
-
+        @config = config
 
         @issue_monitor     = IssueMonitor.new(config.ci_ac, config.ci_pass)
         @bit_bucket_client = BitBucketProcedure.new(config.bit_ac, config.bit_pass)

data/lib/ci_helper/functions/jenkin.rb

@@ -19,14 +19,13 @@ module CiHelper
           if issue_monitor.success?
             print_console_link
             start_pull_request_function
-            # TODO: need to implement the updater_issue class, and then try auto update the issue status
-            # update_issue
+            update_issue_status if user_cli.update_issue?
           else
             print_fails
             print_console_link
             if user_cli.force_create_pull_request?
               start_pull_request_function
-              # update_issue
+              update_issue_status if user_cli.update_issue?
             end
           end
         end
@@ -51,6 +50,15 @@ module CiHelper
         puts "Console link: #{result.console_link}"
       end
 
+      def update_issue_status
+        redmine_updater               = CiHelper::Functions::Redmine.new(config)
+        redmine_updater.issue_numbers = bit_bucket_client.issue_numbers
+        redmine_updater.status        = CiHelper::RESOLVED
+        redmine_updater.text_box      = "pull request : #{CiHelper::BITBUCKET_DOMAIN}#{bit_bucket_client.pull_request_page.link_with(class: 'execute').href}   \n"
+        redmine_updater.text_box      += "\n CiHelper :#{CiHelper::VERSION}"
+        redmine_updater.run
+      end
+
       def result
         @result ||= issue_monitor.content
       end

data/lib/ci_helper/functions/pull_request.rb

@@ -1,6 +1,9 @@
+require 'ci_helper/constants'
+require 'ci_helper/version'
 module CiHelper
   module Functions
     class PullRequest < Base
+      # This class is responsible for creating pull request for user
 
       attr_reader :branch_name
 
@@ -15,6 +18,18 @@ module CiHelper
           user_cli.print_target(redmine_client.issue.target_version)
         end
 
+        create_pull_request
+        update_issue_status
+      end
+
+      # API for outside to set the branch name, normally it accept the params from jenkin function
+      def branch_name=(name)
+        @branch_name = name
+      end
+
+      private
+
+      def create_pull_request
         bit_bucket_client.add_destination(user_cli.get_destination)
         bit_bucket_client.add_user_description(user_cli.get_more_info)
         bit_bucket_client.reviewers = user_cli.get_reviewers
@@ -28,10 +43,16 @@ module CiHelper
         puts "this is your pull request page : #{CiHelper::BITBUCKET_DOMAIN}#{bit_bucket_client.pull_request_page.link_with(class: 'execute').href}"
       end
 
-      def branch_name=(name)
-        @branch_name = name
+      def update_issue_status
+        if user_cli.update_issue?
+          redmine_updater = CiHelper::Functions::Redmine.new(config)
+          redmine_updater.issue_numbers = bit_bucket_client.issue_numbers
+          redmine_updater.status = CiHelper::UTPASSED
+          redmine_updater.text_box = "pull request : #{CiHelper::BITBUCKET_DOMAIN}#{bit_bucket_client.pull_request_page.link_with(class: 'execute').href}   \n"
+          redmine_updater.text_box += "\n CiHelper :#{CiHelper::VERSION}"
+          redmine_updater.run
+        end
       end
-
     end
   end
 end

data/lib/ci_helper/functions/redmine.rb

@@ -1,32 +1,51 @@
 module CiHelper
   module Functions
     class Redmine < Base
+      attr_reader :status, :text_box
+
+      # This class responsible for update issue in redmine for one issue or multiple issue
       def run
-        @issue_numbers = user_cli.get_issue_numbers
-
-        if multiple_issues?
-          # TODO: handle multiple issue situation
-          # This feature need to wait the issue to handle the status which is not exists
-          # automaticly change the status for user
-          #
-          puts 'sorry now we can not handle this situation '
-        else
-          redmine_client.issue_no = @issue_numbers
+        @issue_numbers = issue_numbers || user_cli.get_issue_numbers
+
+        issue_numbers.each do |issue_number|
           redmine_client.issue_setting do |config|
 
+            redmine_client.issue_no = issue_number
+            puts "issue number : #{issue_number}"
+
             redmine_client.issue.print_all_status
-            config.status = user_cli.get_status
-            config.text_box = user_cli.get_more_info
+            config.status           = status || user_cli.get_status
+            config.text_box         = text_box || user_cli.get_more_info
+            redmine_client.issue.submit
           end
-
-          redmine_client.issue.submit
         end
+
+      end
+
+      def status=(value)
+        @status = value
+      end
+
+      def text_box=(value)
+        @text_box = value
+      end
+
+      def issue_numbers=(value)
+        @issue_numbers = value
       end
 
       private
 
       def multiple_issues?
-        @issue_numbers.split(' ').size > 1
+        issue_numbers.size > 1
+      end
+
+      def issue_numbers
+        if @issue_numbers.is_a? String
+          @issue_numbers.split(' ')
+        else
+          @issue_numbers
+        end
       end
     end
   end

data/lib/ci_helper/main_process.rb

@@ -21,7 +21,9 @@ module CiHelper
     end
 
     def run
+
       while true
+        begin
         @option = user_cli.get_user_choose
 
         if ci_monitor?
@@ -33,6 +35,11 @@ module CiHelper
         else
           puts 'Please dont act like a monkey'
         end
+        rescue => e
+          puts 'You may enter wrong ticket, branch name or face a internet problem'
+          puts e.message
+          puts "If you think is a bug please go to create a issue for me #{CiHelper::BUG_REPORT_URL}"
+        end
       end
     end
 

data/lib/ci_helper/user_command_line_interface.rb

@@ -46,6 +46,15 @@ module CiHelper
       user_answer?
     end
 
+    def update_issue?
+      self.user_answer = get_user_input do
+        puts update_issue_question
+        puts 'y/n'
+      end
+
+      user_answer?
+    end
+
     def user_answer?
       user_answer == 'y' || user_answer == 'Y'
     end
@@ -192,5 +201,9 @@ please input 1, 2 or 3"
     def issue_number_question
       'please input your ticket number you want to update'
     end
+
+    def update_issue_question
+      'Do you want me update the issue for you to ut passed ?'
+    end
   end
 end

data/lib/ci_helper/version.rb

@@ -1,3 +1,3 @@
 module CiHelper
-  VERSION = '2.0.1'
+  VERSION = '2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CiHelper
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: '2.1'
 platform: ruby
 authors:
 - Alan Yu