CiHelper 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc97f3aa3f06feae56dc974ec5b64839a3b6208a
-  data.tar.gz: 1e9c71d13ec3bb145aec02c36f8b2d67ae19a268
+  metadata.gz: 552b3f86b048155b318564a7c0f8f1a0d7f29d99
+  data.tar.gz: 021e1fc98fd6f9cc251d3c7b952020c3f93cddac
 SHA512:
-  metadata.gz: 9add8d1bc3ccce686d0099ce923caa4804669bc9c55c521393a2aa8c3a03f3633d82a0d29f41affb28a0ccf4c922ce7c15e948f00185e734eb2e1c85b5a2a0b5
-  data.tar.gz: aaf22f4693d23a32f960453ffea9ce03d1359f5cf65ee73a8218b4db69e48801e283e3b75b54312c4be4d9ac2730fae081760277cd64a7d6f33c09dda7fe814f
+  metadata.gz: 80f619e46206226cef2be4f7c31ebc2c2cbd1f298a67b56ec553b0ced50de685a6a927c475724547c64592ed9c8d4c0b3626c07843e1cc01cd6559c237fd44c7
+  data.tar.gz: eaf0311b741bf17c71505d1e9dbf3d8efc15248b8a76279850c9fb54558cb4e83349facb1b08fadf804c8721b0a843f09617645f56b41148679ae96ea057f607

data/lib/ci_helper/bitbucket_procedure.rb

@@ -1,57 +1,70 @@
-
-
 class BitBucketProcedure
-BIT_BUCKET_LOGIN_URL = 'https://bitbucket.org/account/signin/'
-REDMINE_DOMAIN = 'http://redmine.raamsys.co.uk/issues/'
+  BIT_BUCKET_LOGIN_URL = 'https://bitbucket.org/account/signin/'
 
-attr_reader :account, :password, :client
+  attr_reader :account, :password, :client, :destination, :user_description, :title
+  attr_reader :pull_request_page, :repository_page
 
   def initialize(account, password)
     @account  = account
     @password = password
-    @client = Mechanize.new
+    @client   = Mechanize.new
   end
 
   def create_pull_request(result)
-    pull_request_page = login
-    create_pull_request_page = pull_request_page.link_with(href:'/vansys/vansys/pull-request/new').click
-    request_form = create_pull_request_page.form_with(action: '/vansys/vansys/pull-request/new')
+    login
+    go_to_repo_page
+    go_to_pull_request_page
 
-    request_form.field_with(name: 'title').value = 'This is auto create pull request'
-    # TODO: let user to choose the destination
-    request_form.field_with(name: 'dest').options.select { |option| option.text == 'develop'}.first.select
-    request_form.field_with(name: 'source').options.select { |option| option.text == result.issue_number }.first.select
+    create_pull_requcest_page = pull_request_page.link_with(href: '/vansys/vansys/pull-request/new').click
+    redirect_page = create_pull_request_page.form_with(action: '/vansys/vansys/pull-request/new') do |request_form|
 
+      request_form.field_with(name: 'title').value = "issue number #{result.issue_number.to_s} auto create pull request "
+      request_form.field_with(name: 'dest').options.select { |option| option.text == destination.to_s }.first.select
+      request_form.field_with(name: 'source').options.select { |option| option.text == result.branch_name }.first.select
+      description       = request_form.field_with(name: 'description')
+      description.value = "1. #{CiHelper::REDMINE_DOMAIN}#{result.issue_number.delete('t')}\n"
+      description.value += "2. #{result.console_link} \n"
+      description.value += "```\n"
+      description.value += "#!ruby \n"
 
-    description = request_form.field_with(name: 'description')
-    description.value =  "1. #{REDMINE_DOMAIN}#{result.issue_number.delete('t')}\n"
-    description.value += "2. #{result.console_link} \n"
-    description.value += "```\n"
-    description.value += "#!ruby \n"
+      result.failures.each do |failure|
+        description.value += "#{failure.to_s}\n"
+      end
 
-    result.failures.each do |failure|
-    description.value += "#{failure.to_s}\n"
-    end
+      description.value += "```\n"
 
-    description.value += '```'
-    request_form.click_button
+      description.value += user_description
+    end.click_button
+    redirect_page
+  end
 
+  def add_destination(destination)
+   @destination = destination
   end
 
-  private
+  def add_user_description(description)
+    @user_description = description
+  end
+
+  def add_pf_title(title)
+    @title = title
+  end
 
   def login
     login_page = client.get(BIT_BUCKET_LOGIN_URL)
 
-    response_page = login_page.form_with(action: '/account/signin/') do |f|
+    @response_page = login_page.form_with(action: '/account/signin/') do |f|
       f.field_with(name: 'username').value = account
       f.field_with(name: 'password').value = password
     end.click_button
+  end
 
-    respository_page = response_page.link_with(href: '/vansys/vansys').click
-    pull_request_page = respository_page.link_with(href: '/vansys/vansys/pull-requests').click
+  def go_to_repo_page
+    @repository_page = @response_page.link_with(href: '/vansys/vansys').click
+  end
 
-    pull_request_page
+  def go_to_pull_request_page
+    @pull_request_page = repository_page.link_with(href: '/vansys/vansys/pull-requests').click
   end
 end
 

data/lib/ci_helper/ci_procedure.rb

@@ -1,22 +1,23 @@
-# this class hardcoding the procedure to the result page
-
 require 'mechanize'
 
-
 class CiProcedure
+# this class hardcoding the procedure to the result page
 
   CI_LOGIN_URL = 'http://ci.raamsys.co.uk/login?from=%2F'
   CI_DOMAIN    = 'http://ci.raamsys.co.uk/'
   attr_accessor :result, :issue_page
-  attr_reader :account, :password, :mechanize, :issue_number, :console_page, :raam_page, :main_page
+  attr_reader :account, :password, :mechanize,
+              :console_page, :raam_page, :main_page,
+              :matching_strategy
+
 
   Result = Struct.new(:status, :failures)
 
-  def initialize(account, password, issue_number)
-    @account      = account
-    @password     = password
-    @mechanize    = Mechanize.new
-    @issue_number = issue_number
+  def initialize(account, password, matching_strategy)
+    @account           = account
+    @password          = password
+    @matching_strategy = matching_strategy
+    @mechanize         = Mechanize.new
   end
 
   def run
@@ -27,7 +28,8 @@ class CiProcedure
   end
 
   def re_get_console_output
-    @issue_page = go_to_issue
+    @issue_page   = go_to_issue
+    @console_page = go_to_console_output
     get_console_output
   end
 
@@ -35,6 +37,18 @@ class CiProcedure
     console_page.search("pre.console-output").text.split("\n")
   end
 
+  def issue_number
+    branch_name[1..4]
+  end
+
+  def branch_name
+    issue_link.text.split(' ')[1]
+  end
+
+  def commit_hash
+    issue_link.text.split(' ')[2]
+  end
+
   private
 
   def login
@@ -58,17 +72,17 @@ class CiProcedure
   end
 
   def go_to_issue
-    link = match_link(raam_page.links)
-    fail CiHelper::Exceptions::IssueNotFound, 'you may be enter wrong ticket number ' unless link
-    link.click
+    fail CiHelper::Exceptions::IssueNotFound, 'you may be enter wrong ticket number ' unless issue_link
+    issue_link.click
   end
 
   def go_to_console_output
     issue_page ? issue_page.link_with(text: 'Console Output').click : false
   end
 
-  def match_link(links)
-    links.select { |link| link.text.match(issue_number) }.first
+  def issue_link
+    links = raam_page.links
+    @link ||= links.select { |link| link.text.match(matching_strategy) }.first
   end
 end
 

data/lib/ci_helper/constants.rb

@@ -1,11 +1,13 @@
 module CiHelper
-  HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+  HOME             = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
   CONFIG_FILE_NAME = '.ci_helper_config.yml'
   # HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook')
-  REPO_URL = 'https://github.com/alan2112000/ci_helper'
-  BUG_REPORT_URL = "#{REPO_URL}/issues"
-  WAITING_TIME = 60
-  HELLO_MSG = "Hello Everybody, Congratulation You finished a issue,
+  REPO_URL         = 'https://github.com/alan2112000/ci_helper'
+  BUG_REPORT_URL   = "#{REPO_URL}/issues"
+  WAITING_TIME     = 60
+  HELLO_MSG        = "Hello Everybody, Congratulation You finished a issue,
 unfortunately you need to pass the ci and you can get a UT passed >.^ '\n"
-  CI_URL       = 'http://ci.raamsys.co.uk/job/RAAM/'
+  CI_URL           = 'http://ci.raamsys.co.uk/job/RAAM/'
+  REDMINE_DOMAIN   = 'http://redmine.raamsys.co.uk/issues/'
+  BITBUCKET_DOMAIN = 'https://bitbucket.org'
 end

data/lib/ci_helper/issue_monitor.rb

@@ -1,13 +1,14 @@
 class IssueMonitor
 
-  attr_accessor :issue_number, :issue_status
+  attr_accessor :issue_status
   attr_reader :fail_examples, :ci_procedure, :result, :status
 
-  Result = Struct.new(:status, :failures, :console_link, :issue_number)
+  Result = Struct.new(:status, :failures,
+                      :console_link, :issue_number,
+                      :branch_name, :commit_hash)
 
-  def initialize(account, password, ticked_number)
-    @issue_number = "t#{ticked_number}"
-    @ci_procedure = CiProcedure.new(account, password, ticked_number)
+  def initialize(account, password, match_strategy)
+    @ci_procedure = CiProcedure.new(account, password, match_strategy)
   end
 
   def goto_monitor_page
@@ -29,8 +30,8 @@ class IssueMonitor
 
   def finish_test?
     begin
-    output = ci_procedure.re_get_console_output
-    output.empty? ? false : true
+      output = ci_procedure.re_get_console_output
+      output.empty? ? false : true
     rescue CiHelper::Exception::IssueNotFound => e
       puts "#{e.message} #{issue_number}"
       false
@@ -42,7 +43,9 @@ class IssueMonitor
   end
 
   def content
-    Result.new(success?, fail_examples, "#{ci_procedure.console_page.uri.host}/#{ci_procedure.console_page.uri.request_uri}", issue_number)
+    Result.new(success?, fail_examples,
+               "#{ci_procedure.console_page.uri.host}/#{ci_procedure.console_page.uri.request_uri}", ci_procedure.issue_number,
+               ci_procedure.branch_name, ci_procedure.commit_hash)
   end
 
   private
@@ -55,7 +58,7 @@ class IssueMonitor
 
     console_output.each_index do |index|
 
-      if  console_output[index].match('Finished in')
+      if console_output[index].match('Finished in')
         start_index = index
       elsif console_output[index].match('Failed examples:')
         fail_example_start_index = index
@@ -64,7 +67,6 @@ class IssueMonitor
       elsif console_output[index].match('Finished: ')
         result_index = index
       end
-
     end
 
     @status        = console_output[start_index, start_index + 1]

data/lib/ci_helper/main_process.rb

@@ -1,7 +1,5 @@
 require 'yaml'
-require_relative 'issue_monitor'
-require_relative 'bitbucket_procedure'
-
+require 'byebug'
 # TODO: need to refactor this class
 class MainProcess
 
@@ -19,10 +17,9 @@ class MainProcess
     puts CiHelper::HELLO_MSG
     while true
       @issue_is_queued_in_ci = false
-      puts 'Please Input your next ticked number '
-      ticket_no     = gets.chop
-      issue_monitor = IssueMonitor.new(config.ci_ac, config.ci_pass, ticket_no)
-
+      puts 'Please Input your next ticked number or commit hash to specifiy the multi test result in the CI'
+      match_strategy = gets.chop
+      issue_monitor = IssueMonitor.new(config.ci_ac, config.ci_pass, match_strategy)
 
       unless issue_monitor.goto_monitor_page # no issue pull request found
         # ask user to wait this issue or not
@@ -57,9 +54,17 @@ class MainProcess
         user_input = gets.chop
         if user_input == 'y' || user_input == 'Y'
           bit_bucket_client = BitBucketProcedure.new(config.bit_ac, config.bit_pass)
+          puts 'Please Provide the destination'
+          destination = gets.chop
+          puts 'Please Provide the more description you want add in the text box'
+          user_description =gets.chop
+          bit_bucket_client.add_destination(destination)
+          bit_bucket_client.add_user_description(user_description)
           bit_bucket_client.create_pull_request(issue_monitor.content)
-        else
-
+          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}"
         end
       end
     end

data/lib/ci_helper/version.rb

@@ -1,3 +1,3 @@
 module CiHelper
-  VERSION = '0.0.2'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CiHelper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Alan Yu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: '2.7'
 description: In house tool only for JCM team
 email: alan21120000@gmail.com
 executables:
@@ -45,6 +45,7 @@ files:
 - lib/ci_helper/redmine_procedure.rb
 - lib/ci_helper/result_parser.rb
 - lib/ci_helper/user_command_line_interface.rb
+- lib/ci_helper/user_intercation_interface.rb
 - lib/ci_helper/utils.rb
 - lib/ci_helper/version.rb
 homepage: http://rubygems.org/gems/ci_helper