CiHelper 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aacf21fd288b3f175986474b464199f1f166763c
-  data.tar.gz: 6d4ccfec41b48e53dbf54daa5367a61879e70cf3
+  metadata.gz: d735063c261bde7b5a4e178da68be89e7bcabee8
+  data.tar.gz: c45bf59c95be4bba48e4c5ad484b7253e94d91d1
 SHA512:
-  metadata.gz: 8835873dfa3e81049ec90e86d35dda7fe301f0fe1c3d079be31f965ae563967882e07a5b2c7f03b85bc5463cdfe6e94d3e64cdddba46478158240bdb0ebcbc87
-  data.tar.gz: 4417f5b08c7969e491b73ecc3e0abfc56c2cc8059aa7894d9045393c6e9472ef6b53b535e91d631f5db40e9beaf367523952e657e92cf015d4fca541593a7a02
+  metadata.gz: b3931544d48068c8c0eaf68a2b34eb903d22cebcd50f825d56da74c46ca1358129c6a46dcd5a49c3a0c467ce099d125e45a4902dcbb1ee776d474e3eee482f6a
+  data.tar.gz: 3391b1eb896c6e38e4144e1290e939199150092b76c709dbf51df91d2f2733c0829d9645fee861cdca252bd07aa83fc0e4d391f59f71b8bce0c8ddd851e7b14c

data/lib/ci_helper.rb

@@ -12,3 +12,4 @@ require 'ci_helper/constants'
 require 'ci_helper/exceptions'
 require 'ci_helper/redmine_procedure'
 require 'ci_helper/functions'
+

data/lib/ci_helper/bitbucket_procedure.rb

@@ -40,7 +40,6 @@ module CiHelper
           end
         end
 
-
         config.append_description = user_description
       end
 

data/lib/ci_helper/functions/pull_request.rb

@@ -15,7 +15,7 @@ module CiHelper
         else
           redmine_client.issue_no = bit_bucket_client.issue_numbers.first
           bit_bucket_client.pf_title = redmine_client.issue.description
-          user_cli.print_target(redmine_client.issue.target_version)
+          user_cli.print_target(redmine_client.issue.target_branch)
         end
 
         create_pull_request

data/lib/ci_helper/functions/redmine.rb

@@ -15,6 +15,7 @@ module CiHelper
 
             redmine_client.issue.print_all_status
             config.status           = status || user_cli.get_status
+            config.spend_time       =  user_cli.get_spent_time
             config.text_box         = text_box || user_cli.get_more_info
             redmine_client.issue.submit
           end

data/lib/ci_helper/main_process.rb

@@ -23,7 +23,7 @@ module CiHelper
     def run
 
       while true
-        begin
+        # begin
         @option = user_cli.get_user_choose
 
         if ci_monitor?
@@ -35,11 +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
+        # 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/redmine/issue_updater.rb

@@ -53,6 +53,14 @@ module CiHelper
         target_version_select_list.options.select{ |option| option.value == target_version_select_list.value }.first.text
       end
 
+      def target_branch
+        target_branch_select_list.options.select{ |option| option.value == target_branch_select_list.value }.first.text
+      end
+
+      def spend_time=(time)
+        time_entry_hours.value = time
+      end
+
       def submit
         # need to handle the submit success or not
         fail Exceptions::SettingError, 'Please set your form before use it'  unless form
@@ -78,6 +86,14 @@ module CiHelper
         form.field_with(name: 'issue[fixed_version_id]')
       end
 
+      def target_branch_select_list
+        form.field_with(name: 'issue[custom_field_values][8]')
+      end
+
+      def time_entry_hours
+        form.field_with(name: 'time_entry[hours]')
+      end
+
       private
 
       # TODO: not implement yet

data/lib/ci_helper/user_command_line_interface.rb

@@ -1,7 +1,6 @@
-require 'ci_helper/formatter/common'
 module CiHelper
   class UserCommandLineInterface
-    include CiHelper::Formatter::Common
+
 
     # TODO : need to move to bitbucket related setting to let user set
     REVIEWERS = ['anna_ho_2014', 'cherylyu_jcm',
@@ -110,12 +109,18 @@ module CiHelper
       end
     end
 
+    def get_spent_time
+      get_user_input do
+        puts spend_time_question
+      end
+    end
+
     def waiting_for_creation
       puts 'Please move your finger away from the enter, and dont keep pushing the fuckkkkkkking enter, I am creating the pf >.^  '
     end
 
     def print_target(target)
-      puts "This is your target version #{target}\n"
+      puts "This is your target branch #{target}\n"
     end
 
     private
@@ -133,10 +138,7 @@ module CiHelper
       reviewer = []
       choosen_key.each do |value|
         if value.to_i == CiHelper::DANGEROUS
-
           print_ngyan_cat
-          puts "\n"
-          print_horse_format
           fail Exceptions::SettingError, 'Please dont choose Ciao Bao its dangerous !!!!!!!'
         end
 
@@ -209,5 +211,9 @@ please input 1, 2 or 3"
     def update_issue_question
       'Do you want me update the issue for you to ut passed ?'
     end
+
+    def spend_time_question
+      'Please input your spent time'
+    end
   end
 end

data/lib/ci_helper/version.rb

@@ -1,3 +1,3 @@
 module CiHelper
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CiHelper
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Alan Yu
@@ -14,42 +14,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
 description: In house tool only for JCM team
@@ -68,7 +68,6 @@ files:
 - lib/ci_helper/cli.rb
 - lib/ci_helper/constants.rb
 - lib/ci_helper/exceptions.rb
-- lib/ci_helper/formatter/common.rb
 - lib/ci_helper/functions.rb
 - lib/ci_helper/functions/base.rb
 - lib/ci_helper/functions/jenkin.rb
@@ -97,12 +96,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -112,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: A crawler to get the result form CI
 test_files: []
+has_rdoc: 

data/lib/ci_helper/formatter/common.rb

@@ -1,51 +0,0 @@
-module CiHelper
-  module Formatter
-    module Common
-      def budddha
-       #
-       # [
-       #   "                                 _oo8oo_",
-       #   "                                o8888888o",
-       #   "                                88' . '88",
-       #   "                                (| -_- |)",
-       #   "                                0\  =  /0",
-       #   "                              ___/'==='\___        where is my mom mom ? ",
-       #   "                             ' \\|     | '.",
-       #   "                           / \\|||  :  ||| \"",
-       #   "                          / _||||| -:- |||||_ \"",
-       #   "                         |   | \\\  -  / |   | "",
-       #   "                         | \_|  ''\---/ ''  |_/ |",
-       #   "                         \  .-\__  '-'  __/-.  /"",
-       #                              ___'. .'  /--.--\  '. .'___
-       #                       ."" '<  '.___\_<|>_/___.'  >' "".
-       #                          | | :  `- \`.:`\ _ /`:.`/ -`  : | |
-       #                \  \ `-.   \_ __\ /__ _/   .-` /  /
-       #            =====`-.____`.___ \_____/ ___.`____.-`=====
-       #                              `=---=`
-       #
-       #
-       #
-      end
-
-      def print_horse_format
-        puts horse_formatter.join("\n")
-      end
-
-      def horse_formatter
-        [
-            " where is my mommom ?",
-            "\\",
-            "\\     ^___^",
-            " \\    (O O) \\______________",
-            "       (___) \\              ) \\/\\",
-            "             || -----------w | ",
-            "             ||              | |",
-            "             ||              | \\",
-            "   #########                          ########"
-        ]
-
-      end
-    end
-  end
-end
-