jenkins-builder 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b745c7d55f5fb2257c81035e59a6c92fd10cbb608b2e273bf5f155de4ffca550
-  data.tar.gz: 69aae1ed249d03a1ea767258746d76df5f8b7c4b0ef2daf31254603732eead11
+  metadata.gz: b3d8b25fd6d3fd82e3fb04b58038f3d536d907510def01ae42ecb6d09ad8bb9b
+  data.tar.gz: 9e623633692b17797b3ac2fc3ee425f7b6da70ca1e7ae9acd119d00cfb2e34ce
 SHA512:
-  metadata.gz: 04e55dfc6976959a3970c53098b7b24744023bd335ecf69cd7d5740a7ea3583e4eae02926950d2f83ebe2236cee701b27d83dc7e263522b9ef6af556f4cfb9a9
-  data.tar.gz: ed860533a48ceb4d54a0f226a143e76094240e1b4c658c5a285ef6854c5e571f09fb7b976a99d9a7c415171a144b2b1e259d57eb7e02490a21ab9a57094135f2
+  metadata.gz: 562efc35d87d9e2e3786ee18f994e2445c5927d9349da8c47edbe53a902010345756e2b986d98e03ed287fbdb8b9a6dafe77292ee3fb2b6dce17c0785876db1a
+  data.tar.gz: 17350f8058207c60c647767ac91392777a756111cf401b6d9ad4ab8e91fc02374771c469c05057e18cdc3eea47ff6a52f82971ee97fe484fc68cf88baccd6eae

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    jenkins-builder (0.1.6)
+    jenkins-builder (0.2.5)
+      ferrum (~> 0.9)
       jenkins_api_client (~> 1.5.3)
       pastel (~> 0.7.2)
       security (~> 0.1.3)
@@ -11,10 +12,20 @@ PATH
 GEM
   remote: https://gems.ruby-china.com/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     byebug (10.0.2)
+    chef-utils (16.3.38)
+    cliver (0.3.2)
     coderay (1.1.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    equatable (0.5.0)
+    equatable (0.6.1)
+    ferrum (0.9)
+      addressable (~> 2.5)
+      cliver (~> 0.3)
+      concurrent-ruby (~> 1.1)
+      websocket-driver (>= 0.6, < 0.8)
     jenkins_api_client (1.5.3)
       json (>= 1.0)
       mixlib-shellout (>= 1.1.0)
@@ -22,15 +33,16 @@ GEM
       socksify (>= 1.7.0)
       terminal-table (>= 1.4.0)
       thor (>= 0.16.0)
-    json (2.1.0)
+    json (2.3.1)
     method_source (0.9.1)
     mini_portile2 (2.4.0)
-    mixlib-shellout (2.4.0)
-    nokogiri (1.10.3)
+    mixlib-shellout (3.1.2)
+      chef-utils
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
+    pastel (0.7.4)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -40,6 +52,7 @@ GEM
     pry-doc (0.13.4)
       pry (~> 0.11)
       yard (~> 0.9.11)
+    public_suffix (4.0.5)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -59,18 +72,21 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    tty-color (0.4.3)
-    tty-cursor (0.6.0)
+    tty-color (0.5.1)
+    tty-cursor (0.7.1)
     tty-spinner (0.8.0)
       tty-cursor (>= 0.5.0)
-    unicode-display_width (1.4.0)
-    yard (0.9.16)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1.2)
   jenkins-builder!
   pry (~> 0.11.3)
   pry-byebug (~> 3.6.0)
@@ -79,4 +95,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.2

data/exe/jk

@@ -2,4 +2,4 @@
 
 require 'jenkins/builder'
 
-Jenkins::Builder::App.new.main(ARGV)
+Jenkins::Builder::CLI.main(ARGV)

data/jenkins-builder.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'security', '~> 0.1.3'
   spec.add_dependency 'pastel', '~> 0.7.2'
   spec.add_dependency 'tty-spinner', '~> 0.8.0'
+  spec.add_dependency 'ferrum', '~> 0.9'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.11.3"

data/lib/jenkins/builder/app.rb

@@ -1,52 +1,56 @@
 require 'jenkins/builder/cli'
 require 'jenkins/builder/config'
-require 'jenkins/builder/secret'
 require 'jenkins_api_client'
 require 'pastel'
 require 'tty-spinner'
 require 'time'
+require 'cgi'
+require 'ferrum'
 
-$is_mac = `uname`.chomp == 'Darwin'
+
+module JenkinsApi
+  module UriHelper
+    # Encode a string for using in the query part of an URL
+    #
+    def form_encode(string)
+      URI.encode_www_form_component string.encode(Encoding::UTF_8)
+    end
+
+    # Encode a string for use in the hiearchical part of an URL
+    #
+    def path_encode(path)
+      CGI.escape(path.encode(Encoding::UTF_8))
+    end
+  end
+end
 
 module Jenkins
   module Builder
     class App
 
-      attr_accessor :config, :secret, :client, :options
+      attr_accessor :config, :client, :options
 
-      def initialize(options={})
+      def initialize(service, options={})
         @options = options
-        @config = Jenkins::Builder::Config.new
-        @secret = ($is_mac ? Jenkins::Builder::Secret.new : @config)
+        @service = service
+        @config = Jenkins::Builder::Config.new(@service)
 
-        if @config.url && @config.username && @secret.password
+        if @config.url && @config.username && @config.password
           @client = JenkinsApi::Client.new(server_url: @config.url,
                                           username: @config.username,
-                                          password: @secret.password)
+                                          password: @config.password)
         end
       end
 
-      def main(args)
-        # validate_os!
-        validate_fzf!
-        Jenkins::Builder::CLI.create_alias_commands(@config.aliases || [])
-        Jenkins::Builder::CLI.start(args)
-      rescue => e
-        STDERR.puts(e.message)
-      end
-
       def setup(options)
         validate_credentials!(options)
 
         config.url = options[:url]
         config.username = options[:username]
         config.branches = options[:branches]
+        config.password = options[:password]
         config.save!
 
-        secret.username = options[:username]
-        secret.password = options[:password]
-        secret.save!
-
         puts 'Credentials setup successfully.'
       end
 
@@ -56,7 +60,7 @@ module Jenkins
         Username: #{@config.username}
         INFO
 
-        puts "Password: #{@secret.password}" if options[:password]
+        puts "Password: #{@config.password}" if options[:password]
       end
 
       def create_alias(name, command)
@@ -82,9 +86,19 @@ module Jenkins
 
       def build_each(jobs)
         if @options[:failfast]
-          jobs.find { |job| build(job).nil? }
+          failed_job = jobs.find { |job| build(job).nil? }
+          if failed_job
+            exit 1
+          else
+            exit 0
+          end
         else
-          jobs.each { |job| build(job) }
+          results = jobs.map { |job| build(job) }
+          if results.any? { |r| r.nil? }
+            exit 1
+          else
+            exit 0
+          end
         end
       end
 
@@ -97,11 +111,11 @@ module Jenkins
 
       def fetch_all_jobs
         refresh_jobs_cache unless validate_jobs_cache
-        @config['jobs-cache']['jobs']
+        @config['services'][@service]['jobs-cache']['jobs']
       end
 
       def refresh_jobs_cache
-        @config['jobs-cache'] = {
+        @config['services'][@service]['jobs-cache'] = {
           'expire' => (Time.now + 86400*30).strftime('%F %T'),
           'jobs' => all_jobs
         }
@@ -109,8 +123,8 @@ module Jenkins
       end
 
       def validate_jobs_cache
-        @config['jobs-cache'] && !@config['jobs-cache'].empty? && \
-          Time.parse(@config['jobs-cache']['expire']) > Time.now
+        @config['services'][@service]['jobs-cache'] && !@config['services'][@service]['jobs-cache'].empty? && \
+          Time.parse(@config['services'][@service]['jobs-cache']['expire']) > Time.now
       end
 
       def all_jobs
@@ -134,14 +148,42 @@ module Jenkins
           msg = "#{job_name} with branch #{branch}"
           mbranch_param = {name: 'mbranch', value: branch}
           params = mbranch_param.merge(json: {parameter: mbranch_param}.to_json)
-          @client.api_post_request("/job/#{job_name}/build?delay=0sec", params, true)
+          begin
+            @client.api_post_request("/job/#{job_name}/build?delay=0sec", params, true)
+          rescue JenkinsApi::Exceptions::ForbiddenWithCrumb => e
+            start_build_use_ferrum(job_name, branch)
+          end
         else
           msg = job_name
-          @client.api_post_request("/job/#{job_name}/build?delay=0sec")
+          begin
+            @client.api_post_request("/job/#{job_name}/build?delay=0sec")
+          rescue JenkinsApi::Exceptions::ForbiddenWithCrumb => e
+            start_build_use_ferrum(job_name, nil)
+          end
         end
         puts Pastel.new.cyan.bold("\n%s%s  %s  %s%s\n" % [' '*30, '★ '*5, msg, '★ '*5, ' '*30])
       end
 
+      def start_build_use_ferrum(job_name, branch)
+        browser = Ferrum::Browser.new(headless: false)
+        browser.goto("#{config.url}/login")
+        username_input = browser.at_css('input[name=j_username]')
+        password_input = browser.at_css('input[name=j_password]')
+        username_input.focus.type(config.username)
+        password_input.focus.type(config.password)
+        browser.at_css('input[name=Submit]').click
+        if branch
+          browser.goto("#{config.url}/job/#{job_name}/build?delay=0sec")
+          sleep(2)
+          browser.evaluate("document.querySelector('#gitParameterSelect').value = '#{branch}'")
+          browser.at_css('#yui-gen1-button').click
+        else
+          browser.goto("#{config.url}/job/#{job_name}/")
+          browser.at_xpath('#tasks a.task-link').click
+        end
+        browser.quit
+      end
+
       def check_and_show_result(job_name, latest_build_no)
         while (build_no = @client.job.get_current_build_number(job_name)) <= latest_build_no
           sleep 1
@@ -155,7 +197,6 @@ module Jenkins
         all_console_output = ''
 
         loop do
-          # require 'pry'; binding.pry;
           console_output = @client.job.get_console_output(job_name, build_no, 0, 'text')
           all_console_output = console_output['output']
           print console_output['output'][printed_size..-1] unless @options[:silent]
@@ -195,16 +236,6 @@ module Jenkins
 
       private
 
-      def validate_os!
-        raise 'Darwin is the only supported OS now.' unless `uname`.chomp == 'Darwin'
-      end
-
-      def validate_fzf!
-        `fzf --version`
-      rescue Errno::ENOENT
-        raise 'Required command fzf is not installed.'
-      end
-
       def validate_credentials!(options)
         @client = JenkinsApi::Client.new(server_url: options[:url],
                                          username: options[:username],

data/lib/jenkins/builder/cli.rb

@@ -7,6 +7,12 @@ module Jenkins
     class CLI < ::Thor
 
       class << self
+        def main(args)
+          validate_fzf!
+          @config = Jenkins::Builder::Config.new
+          create_alias_commands(@config.aliases || [])
+          start(args)
+        end
         def create_alias_commands(aliases)
           aliases.each do |name, command|
             desc "#{name}", "Alias for: `#{command}'"
@@ -15,8 +21,17 @@ module Jenkins
             end
           end
         end
+
+        def validate_fzf!
+          `fzf --version`
+        rescue Errno::ENOENT
+          raise 'Required command fzf is not installed.'
+        end
+
       end
 
+      class_option :service, type: :string, aliases: ['-s'], desc: 'Specify service name'
+
       desc 'setup [-e]', 'Setup URL, username and password, or open config file in an editor when -e specified.'
       option :edit, type: :boolean, aliases: ['-e'], desc: 'open config file in an editor'
       def setup
@@ -39,8 +54,8 @@ module Jenkins
         Jenkins::Builder::App.new.print_info(options)
       end
 
-      desc 'build [-s] [-f] <JOB_IDENTIFIERS>', 'Build jobs'
-      option :silent, type: :boolean, aliases: ['-s'], desc: 'suppress console output.'
+      desc 'build [-q] [-f] <JOB_IDENTIFIERS>', 'Build jobs'
+      option :quiet, type: :boolean, aliases: ['-q'], desc: 'suppress console output.'
       option :failfast, type: :boolean, aliases: ['-f'], desc: 'stop immediately when building fails.'
       option :version, type: :boolean, aliases: ['-v'], desc: 'Show version.'
       def build(*jobs)
@@ -48,7 +63,13 @@ module Jenkins
           puts Jenkins::Builder::VERSION
           exit
         end
-        app = Jenkins::Builder::App.new(options)
+        if options.service.nil?
+          service = fzf(Config.new().services).first
+          exit if service.nil?
+        else
+          service = options.service
+        end
+        app = Jenkins::Builder::App.new(service, options)
         if jobs.empty?
           jobs = fzf(app.fetch_all_jobs)
           exit if jobs.empty?

data/lib/jenkins/builder/config.rb

@@ -4,10 +4,11 @@ module Jenkins
   module Builder
     class Config
 
-      attr_accessor :file, :config
+      attr_accessor :file, :config, :service
 
-      def initialize
+      def initialize(service = nil)
 
+        @service = service
         @file = File.expand_path('~/.jenkins-builder.yaml')
 
         if File.exist?(@file)
@@ -25,20 +26,24 @@ module Jenkins
         @config[k] = v
       end
 
+      def services
+        @config['services'].keys
+      end
+
       def username
-        @config['username']
+        @config['services'][@service]['username']
       end
 
       def username=(name)
-        @config['username'] = name
+        @config['services'][@service]['username'] = name
       end
 
       def password
-        @config['password']
+        @config['services'][@service]['password']
       end
 
       def password=(passwd)
-        @config['password'] = passwd
+        @config['services'][@service]['password'] = passwd
       end
 
       def aliases
@@ -50,11 +55,11 @@ module Jenkins
       end
 
       def url
-        @config['url']
+        @config['services'][@service]['url']
       end
 
       def url=(url)
-        @config['url'] = url
+        @config['services'][@service]['url'] = url
       end
 
       def branches
@@ -66,7 +71,7 @@ module Jenkins
       end
 
       def hooks_of(job)
-        hooks = @config['hooks'] && @config['hooks'][job]
+        hooks = @config['services'][@service]['hooks'] && @config['services'][@service]['hooks'][job]
         hooks = [hooks] if hooks.is_a?(String)
         hooks
       end

data/lib/jenkins/builder/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   module Builder
-    VERSION = "0.2.0"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Liu Xiang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,20 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: ferrum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +210,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Build Jenkins Jobs
 test_files: []