jenkins-builder 0.1.5 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6853704b49650d7fcc0aea65472c83d73caa2021b395ce4bbc76c5702bd5be
-  data.tar.gz: 61a216a6375e66a00ab6054a8a7a2f55bd67846449dd774bb12579df4bae1af1
+  metadata.gz: 4344c5bd63933b7a95d76310f4aca60aa7f8b8914bb85519f9de589ed60956f4
+  data.tar.gz: 7cd18dd16185f3650d85103f075bd45d43a6db4142232fedb554ecc1b9cf7ed4
 SHA512:
-  metadata.gz: 858baeb43ab21458cb942f7d74cf94198af95b6625ec1270ad15fc5b7be890c8a585e6f19bfb05ca4ce0215d87002db54122b647b9e151e16b1f4940fb44fbb6
-  data.tar.gz: 870b366c39210fd66a31d7ea2518116c7588c186b1906abf2cfa94eba4ff50cf6fcc230aed17c317ae9033c262037bd104a082f925fd8eecee3c13ca8958c523
+  metadata.gz: 6efc476422ddc43a5f408f5b12c9cfc67d8a2297a3e62958e4fe540f0204afb6e8186f38cf50fec42cc134dba8a5a55c7f7d37f9fa221086a23265de973c36c1
+  data.tar.gz: b4e38a74ed226ca256849ee306d6c907810cf2089014d24780d4b866ebeb39745d0bf6248a38a361528ee3f6167988b069c217ac7be06ab6f834d2d0a2a018b9

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source "https://gems.ruby-china.com"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jenkins-builder (0.1.5)
+    jenkins-builder (0.2.2)
       jenkins_api_client (~> 1.5.3)
       pastel (~> 0.7.2)
       security (~> 0.1.3)
@@ -9,7 +9,7 @@ PATH
       tty-spinner (~> 0.8.0)
 
 GEM
-  remote: https://rubygems.org/
+  remote: https://gems.ruby-china.com/
   specs:
     byebug (10.0.2)
     coderay (1.1.2)
@@ -22,12 +22,12 @@ GEM
       socksify (>= 1.7.0)
       terminal-table (>= 1.4.0)
       thor (>= 0.16.0)
-    json (2.1.0)
+    json (2.3.0)
     method_source (0.9.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     mixlib-shellout (2.4.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
@@ -58,19 +58,19 @@ GEM
     socksify (1.7.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.0)
+    thor (0.20.3)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
     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)
+    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 +79,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.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

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pastel', '~> 0.7.2'
   spec.add_dependency 'tty-spinner', '~> 0.8.0'
 
-  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,50 +1,55 @@
 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'
+
+
+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 = Jenkins::Builder::Secret.new
+        @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
 
@@ -54,7 +59,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)
@@ -95,11 +100,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
         }
@@ -107,8 +112,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
@@ -153,12 +158,12 @@ module Jenkins
         all_console_output = ''
 
         loop do
-          console_output = @client.job.get_console_output(job_name, build_no, printed_size, 'text')
-          all_console_output << console_output['output']
-          print console_output['output'].gsub("\r", '') unless @options[:silent]
-          printed_size += console_output['size'].to_i
+          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]
+          printed_size = console_output['output'].size
           break unless console_output['more']
-          sleep 2
+          sleep 0.5
         end
         if @options[:silent]
           spinner.stop
@@ -192,16 +197,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,12 +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['services'][@service]['password']
+      end
+
+      def password=(passwd)
+        @config['services'][@service]['password'] = passwd
       end
 
       def aliases
@@ -42,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
@@ -58,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/secret.rb

@@ -1,4 +1,5 @@
-require 'security'
+$is_mac = `uname`.chomp == 'Darwin'
+require 'security' if $is_mac
 
 module Jenkins
   module Builder

data/lib/jenkins/builder/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   module Builder
-    VERSION = "0.1.5"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.3
 platform: ruby
 authors:
 - Liu Xiang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,14 +86,14 @@ dependencies:
     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 +196,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,9 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Build Jenkins Jobs
 test_files: []