up: update some for custom dir, update jenkins lib

inhere · Nov 17, 2022 · 5925a4c · 5925a4c
1 parent ddece39
commit 5925a4c
Show file tree

Hide file tree

Showing 17 changed files with 326 additions and 159 deletions.
diff --git a/app/Concern/InitApplicationTrait.php b/app/Concern/InitApplicationTrait.php
@@ -5,7 +5,7 @@
 use Inhere\Kite\Common\GitAPI\GitHubV3API;
 use Inhere\Kite\Common\GitAPI\GitLabV4API;
 use Inhere\Kite\Kite;
-use Inhere\Kite\Lib\Jenkins\JenkinsClient;
+use Inhere\Kite\Lib\Jenkins\JenkinsFactory;
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 use PhpPkg\Config\ConfigBox;
@@ -129,7 +129,7 @@ protected function registerComServices(ObjectBox $box): void
 
         $box->set('jenkins', function () {
             $config = $this->config()->getArray('jenkins');
-            return new JenkinsClient($config);
+            return new JenkinsFactory($config);
         });
     }
 

diff --git a/app/Helper/KiteUtil.php b/app/Helper/KiteUtil.php
@@ -20,18 +20,20 @@
  */
 class KiteUtil
 {
-
     public const NL_CHAR    = 'NL';
+    public const TAB_CHAR   = 'TAB';
     public const SPACE_CHAR = 'SPACE';
 
     public const STDIN_ALIAS = [
         '@i',
+        '@si',
         '@stdin',
         'stdin',
     ];
 
     public const STDOUT_ALIAS = [
         '@o',
+        '@so',
         '@stdout',
         'stdout',
     ];

diff --git a/app/Kite.php b/app/Kite.php
@@ -10,14 +10,13 @@
 namespace Inhere\Kite;
 
 use BadMethodCallException;
-use Composer\Autoload\ClassLoader;
 use Inhere\Kite\Component\ScriptRunner;
 use Inhere\Kite\Concern\StaticPathAliasTrait;
 use Inhere\Kite\Console\CliApplication;
 use Inhere\Kite\Console\Component\AutoSetProxyEnv;
 use Inhere\Kite\Console\Plugin\PluginManager;
 use Inhere\Kite\Http\WebApplication;
-use Inhere\Kite\Lib\Jenkins\JenkinsClient;
+use Inhere\Kite\Lib\Jenkins\JenkinsFactory;
 use Inhere\Kite\Lib\Jump\QuickJump;
 use Inhere\Route\Dispatcher\Dispatcher;
 use Inhere\Route\Router;
@@ -39,7 +38,7 @@
  * @method static Router webRouter()
  * @method static Dispatcher dispatcher()
  * @method static ScriptRunner scriptRunner()
- * @method static JenkinsClient jenkins()
+ * @method static JenkinsFactory jenkins()
  *
  * @see Kite::__callStatic() for quick get object
  */
@@ -76,7 +75,7 @@ class Kite
      */
     private static WebApplication $webApp;
 
-    /**
+    /*
      * @var ClassLoader
      */
     // public static ClassLoader $loader;

diff --git a/app/Lib/Jenkins/JenkinsClient.php b/app/Lib/Jenkins/JenkinsClient.php
diff --git a/app/Lib/Jenkins/JenkinsConfig.php b/app/Lib/Jenkins/JenkinsConfig.php
@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Kite\Lib\Jenkins;
+
+use Toolkit\Stdlib\Obj\AbstractObj;
+
+/**
+ * class JenkinsConfig
+ *
+ * @author inhere
+ * @date 2022/11/16
+ */
+class JenkinsConfig extends AbstractObj
+{
+    /**
+     * @var string
+     */
+    public string $hostUrl = '';
+
+    /**
+     * Jenkins username
+     *
+     * @var string
+     */
+    public string $username = '';
+
+    /**
+     * Jenkins user password
+     *
+     * @var string
+     */
+    public string $password = '';
+
+    /**
+     * @var string
+     */
+    public string $apiToken = '';
+
+    /**
+     * @param string $jobName
+     *
+     * @return string
+     */
+    public function jobPageUrl(string $jobName): string
+    {
+        return $this->hostUrl . '/job/' . $jobName;
+    }
+
+    /**
+     * @param string $viewName
+     *
+     * @return string
+     */
+    public function viewPageUrl(string $viewName): string
+    {
+        return $this->hostUrl . '/view/' . $viewName;
+    }
+
+}