CiHelper 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 962fdd3ea07e2d9a2530b2f40d9f43adadfb34d6
-  data.tar.gz: 626d889374f8ea6da9583dc95c5eab5856da5dc8
+  metadata.gz: 73d51eac14784319039deefb54c51d159a437f9a
+  data.tar.gz: 6836e4a0bcb44526b874db4532dba84c0f0889df
 SHA512:
-  metadata.gz: 5aeebe913fe7012d7c34e10986e9e349d86ce6331f844e0dbec7715fe269758f3976a2bdebf3a7e7c555accf6cbf57bae304bc6a06f688cac47fa10b03eb1a2e
-  data.tar.gz: e9c3edf5026ba8f1e3ef84ba522eb2c5e08fa6b0c1e272984f20b44db41dcf214dbbb0b5feb21e948b2058c2dca5e56d9a81a8f18fb559cf6bc68c4e1f4b9217
+  metadata.gz: 352cf44afcf21ebf26d63bd533cb248a2a90c1914d2421eb367aaa5539599917f13efca306be4db9c908dfd4f01a1a5e1bbfa461b127c4008504008170b8789e
+  data.tar.gz: 70f0311cabca23c0e2b234d7ecaa3e6428966ea3ff993a65d46fcd892913b52486c4af1e313a2af80504f59c7e6eb4f7bf5be6695d695aab1feb0b9463185952

data/lib/ci_helper/bitbucket_procedure.rb

@@ -64,7 +64,7 @@ module CiHelper
     end
 
     def issue_numbers
-      branch_name.split('_').each { |name| name.delete!('t') }
+      branch_name.split('_').each { |name| name.delete!('t') }.delete_if { |name| name.to_i.zero?}
     end
 
     def branch_name=(name)

data/lib/ci_helper/functions/base.rb

@@ -10,8 +10,6 @@ module CiHelper
         @user_cli = CiHelper::UserCommandLineInterface.new
 
 
-
-        # @config   = YAML.load_file("#{target}/#{CiHelper::CONFIG_FILE_NAME}")
         @issue_monitor     = IssueMonitor.new(config.ci_ac, config.ci_pass)
         @bit_bucket_client = BitBucketProcedure.new(config.bit_ac, config.bit_pass)
         @redmine_client = RedmineProcedure.new(config.redmine_ac, config.redmine_pass)

data/lib/ci_helper/functions/jenkin.rb

@@ -18,17 +18,14 @@ module CiHelper
 
           if issue_monitor.success?
             print_console_link
-            get_redmine_info
-            ask_user_pull_request_information
+            start_pull_request_function
             # TODO: need to implement the updater_issue class, and then try auto update the issue status
             # update_issue
           else
             print_fails
             print_console_link
             if user_cli.force_create_pull_request?
-              redmine_client.issue_no = result.issue_number
-              get_redmine_info
-              ask_user_pull_request_information
+              start_pull_request_function
               # update_issue
             end
           end
@@ -44,19 +41,10 @@ module CiHelper
         end
       end
 
-      def ask_user_pull_request_information
-        bit_bucket_client.pf_title = redmine_client.issue.description
-        user_cli.print_target(redmine_client.target)
-        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
-        bit_bucket_client.result = result
-        user_cli.waiting_for_creation
-        bit_bucket_client.create_pull_request(result)
-        sleep(0.5)
-        bit_bucket_client.go_to_pull_request_page
-        sleep(0.5)
-        puts "this is your pull request page : #{CiHelper::BITBUCKET_DOMAIN}#{bit_bucket_client.pull_request_page.link_with(class: 'execute').href}"
+      def start_pull_request_function
+        pull_request = CiHelper::Functions::PullRequest.new(config)
+        pull_request.branch_name = result.branch_name
+        pull_request.run
       end
 
       def print_console_link

data/lib/ci_helper/functions/pull_request.rb

@@ -2,22 +2,25 @@ module CiHelper
   module Functions
     class PullRequest < Base
 
+      attr_reader :branch_name
+
       def run
-        bit_bucket_client.branch_name = user_cli.get_branch_name
+        bit_bucket_client.branch_name = branch_name || user_cli.get_branch_name
 
         if bit_bucket_client.multiple_issues?
           bit_bucket_client.pf_title = user_cli.customize_title
         else
-          get_redmine_info
+          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)
         end
 
         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
         user_cli.waiting_for_creation
-
         bit_bucket_client.create_pull_request
+
         sleep(0.5)
         bit_bucket_client.go_to_pull_request_page
         sleep(0.5)
@@ -25,13 +28,10 @@ module CiHelper
         puts "this is your pull request page : #{CiHelper::BITBUCKET_DOMAIN}#{bit_bucket_client.pull_request_page.link_with(class: 'execute').href}"
       end
 
-      private
-
-      def get_redmine_info
-        redmine_client.issue_no = bit_bucket_client.issue_numbers.first
-        redmine_client.login
-        redmine_client.set_issue_form
+      def branch_name=(name)
+        @branch_name = name
       end
+
     end
   end
 end

data/lib/ci_helper/main_process.rb

@@ -11,7 +11,6 @@ module CiHelper
                              :redmine_ac, :redmine_pass)
 
     attr_accessor :config, :user_cli
-    attr_reader :issue_monitor, :bit_bucket_client, :redmine_client
 
     def initialize(target)
       @config   = YAML.load_file("#{target}/#{CiHelper::CONFIG_FILE_NAME}")

data/lib/ci_helper/redmine/issue_updater.rb

@@ -50,7 +50,7 @@ module CiHelper
       end
 
       def target_version
-        target_version_select_list.options.select{ |option| option.value == target_version_select_list.value }
+        target_version_select_list.options.select{ |option| option.value == target_version_select_list.value }.first.text
       end
 
       def submit

data/lib/ci_helper/version.rb

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

metadata

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