update some git command logic

inhere · Dec 8, 2021 · 0638978 · 0638978
1 parent 7f20d90
commit 0638978
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 23 deletions.
diff --git a/app/Common/GitAPI/AbstractGitAPI.php b/app/Common/GitAPI/AbstractGitAPI.php
@@ -3,9 +3,9 @@
 namespace Inhere\Kite\Common\GitAPI;
 
 use JsonException;
-use PhpComp\Http\Client\AbstractClient;
-use PhpComp\Http\Client\Client;
-use PhpComp\Http\Client\ClientInterface;
+use PhpPkg\Http\Client\AbstractClient;
+use PhpPkg\Http\Client\Client;
+use PhpPkg\Http\Client\ClientInterface;
 use Toolkit\Stdlib\Helper\JsonHelper;
 use Toolkit\Stdlib\Obj\AbstractObj;
 use function explode;

diff --git a/app/Component/CliMarkdown.php b/app/Component/CliMarkdown.php
@@ -41,8 +41,8 @@ class CliMarkdown extends GithubMarkdown
         'headline'   => 'lightBlue',
         'paragraph'  => '',
         'list'       => '',
-        'link'       => 'underscore',
         'image'      => 'info',
+        'link'       => 'underscore',
         'code'       => 'brown',
         'quote'      => 'cyan',
         'strong'     => 'bold',
@@ -322,7 +322,7 @@ protected function renderStrong($block): string
 
         return ColorTag::add("**$text**", $this->theme['strong']);
 
-        return self::NL . ColorTag::add("**$text**", $this->theme['strong']) . self::NL;
+        // return self::NL . ColorTag::add("**$text**", $this->theme['strong']) . self::NL;
     }
 
     /**
@@ -332,7 +332,6 @@ protected function renderStrong($block): string
      */
     protected function renderText($block): string
     {
-        // vdump($block);
         return $block[1];
     }
 

diff --git a/app/Console/Command/CheatCommand.php b/app/Console/Command/CheatCommand.php
@@ -14,9 +14,9 @@
 use Inhere\Console\IO\Output;
 use Inhere\Kite\Kite;
 use InvalidArgumentException;
-use PhpComp\Http\Client\AbstractClient;
-use PhpComp\Http\Client\Client;
-use PhpComp\Http\Client\ClientConst;
+use PhpPkg\Http\Client\AbstractClient;
+use PhpPkg\Http\Client\Client;
+use PhpPkg\Http\Client\ClientConst;
 use Toolkit\Cli\Cli;
 use Toolkit\Cli\Color;
 use Toolkit\FsUtil\Dir;

diff --git a/app/Console/Controller/GitController.php b/app/Console/Controller/GitController.php
@@ -746,14 +746,14 @@ public function acpCommand(FlagsParser $fs, Output $output): void
      *  maxCommit       int;Max display how many commits;;15
      *
      * @options
-     *  --abbrev-commit     Only display the abbrev commit ID
-     *  --exclude           Exclude contains given sub-string. multi by comma split.
-     *  --file              Export changelog message to file
-     *  --format            The git log option `--pretty` value.
-     *                      can be one of oneline, short, medium, full, fuller, reference, email, raw, format:<string> and tformat:<string>.
-     *  --max-commit        int;Max display how many commits
-     *  --no-color          bool;Dont use color render git output
-     *  --no-merges         bool;No contains merge request logs
+     *  --ac, --abbrev-commit     bool;Only display the abbrev commit ID
+     *  --exclude                 Exclude contains given sub-string. multi by comma split.
+     *  --file                    Export changelog message to file
+     *  --format                  The git log option `--pretty` value.
+     *                            can be one of oneline, short, medium, full, fuller, reference, email, raw, format:<string> and tformat:<string>.
+     *  --mc, --max-commit        int;Max display how many commits
+     *  --nc, --no-color          bool;Dont use color render git output
+     *  --nm, --no-merges         bool;No contains merge request logs
      *
      * @param FlagsParser $fs
      * @param Output $output

diff --git a/app/Console/Controller/GitHubController.php b/app/Console/Controller/GitHubController.php
@@ -17,7 +17,7 @@
 use Inhere\Kite\Common\GitLocal\GitHub;
 use Inhere\Kite\Console\Component\RedirectToGitGroup;
 use Inhere\Kite\Helper\AppHelper;
-use PhpComp\Http\Client\Client;
+use PhpPkg\Http\Client\Client;
 use Throwable;
 use Toolkit\PFlag\FlagsParser;
 use function strpos;

diff --git a/app/Console/Controller/GitLabController.php b/app/Console/Controller/GitLabController.php
@@ -882,6 +882,7 @@ public function updateCommand(FlagsParser $fs, Output $output): void
         $gitlab = $this->getGitlab();
 
         $curBranch = $gitlab->getCurBranch();
+        $output->info('Current Branch: ' . $curBranch);
 
         $runner = CmdRunner::new();
         $runner->setDryRun($this->flags->getOpt('dry-run'));

diff --git a/composer.json b/composer.json
@@ -17,19 +17,19 @@
     "inhere/console": "dev-master",
     "inhere/sroute": "dev-master",
     "cebe/markdown": "^1.2",
+    "colinodell/json5": "^2.2",
+    "gitonomy/gitlib": "^1.3",
     "psr/log": "^3.0",
     "psr/container": "^1.1",
-    "php-comp/http-client": "dev-master",
-    "php-comp/http-message": "^1.4",
-    "gitonomy/gitlib": "^1.3",
+    "phppkg/http-client": "dev-master",
+    "phppkg/http-message": "^2.0",
     "phppkg/easytpl": "dev-main",
     "phppkg/config": "dev-master",
     "phppkg/ini": "~0.1",
     "phppkg/hucron": "dev-master",
     "phppkg/phpgit": "dev-master",
-    "phppkg/cli-markdown": "^1.0",
+    "phppkg/cli-markdown": "^2.0",
     "toolkit/fsutil": "^2.0",
-    "colinodell/json5": "^2.2",
     "laktak/hjson": "^2.1",
     "knplabs/github-api": "^3.3",
     "guzzlehttp/guzzle": "^7.4",

diff --git a/script/fnmatch.php b/script/fnmatch.php
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 
+
 $path = '/usr/local/lib/node_modules/parcel/node_modules/_svgo@1.2.2@svgo/plugins';
 
 var_dump(

diff --git a/script/list-dir-files.gry b/script/list-dir-files.gry
@@ -0,0 +1,6 @@
+#!/usr/bin/env groovy
+
+// kite list-dir-files.gry
+new File(".").eachFile() {
+    file -> println file.getAbsolutePath()
+}
diff --git a/script/ls.php b/script/ls.php
@@ -0,0 +1,6 @@
+<?php
+
+if ($kiteDir = getenv('KITE_PATH')) {
+    require $kiteDir. '/app/boot.php';
+}
+