jenkins-builder 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4d6b880d68ab2944b3b897fc2e0a4211abaf0649ebb81184f33891ed96f6af3
-  data.tar.gz: 62622ae525c0c80d90e9385c5748126a5764e64a8ee93e6ea3ab7c05bb895b03
+  metadata.gz: c8539764b2a462cde75417d8d87ce5248ad38f1804dfafc29cda15d6f450c8ac
+  data.tar.gz: a54a9fc99b568d807f20394adfd4209f926b8da951ddb5fc961056261932d76f
 SHA512:
-  metadata.gz: 6b9a70fb62f8d6ad0c27b337af6a0a878506851be9a2206efc32c247ca57b2e97b9e7f8f21a9c5e0c95182c005dab522301aab5f1975e151f163d122d2703fa6
-  data.tar.gz: 240e6787b99afeb2b8f2d29dd47508a5bd791d23c0273a85230198aaeb3fb6b8dbaaa7d3e7fe2d59836eb5a3c8456d5153ad155294fb73d6fa028a786340c4a1
+  metadata.gz: aa33092a43f0d46d1a8ecad68b2db695674def411296a0e2616af5314c17088bfd84f93d29468c9690b411445e3c4b14ccefeac5279815f8a30bd0fbdaa432df
+  data.tar.gz: 81069b1a9c51907933babc709871e8fd00a98199c6bfaec38800971fea4cd9364421d7200995fb08e84bc4d5933b168da40ca52db21dadbc5cc2d309149ae863

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jenkins-builder (0.2.1)
+    jenkins-builder (0.2.2)
       jenkins_api_client (~> 1.5.3)
       pastel (~> 0.7.2)
       security (~> 0.1.3)
@@ -26,7 +26,7 @@ GEM
     method_source (0.9.1)
     mini_portile2 (2.4.0)
     mixlib-shellout (2.4.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -63,8 +63,8 @@ GEM
     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

data/exe/jk

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

data/lib/jenkins/builder/app.rb

@@ -1,6 +1,5 @@
 require 'jenkins/builder/cli'
 require 'jenkins/builder/config'
-require 'jenkins/builder/secret'
 require 'jenkins_api_client'
 require 'pastel'
 require 'tty-spinner'
@@ -24,47 +23,33 @@ module JenkinsApi
   end
 end
 
-$is_mac = `uname`.chomp == 'Darwin'
-
 module Jenkins
   module Builder
     class App
 
-      attr_accessor :config, :secret, :client, :options
+      attr_accessor :config, :client, :options
 
       def initialize(options={})
         @options = options
-        @config = Jenkins::Builder::Config.new
-        @secret = ($is_mac ? Jenkins::Builder::Secret.new : @config)
+        @service = @options[: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
 
@@ -74,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)
@@ -115,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
         }
@@ -127,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
@@ -173,7 +158,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]
@@ -213,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)

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)
@@ -26,19 +27,19 @@ module Jenkins
       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 +51,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 +67,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.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Liu Xiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor