.gitea/workflows/build_composer.yaml

@@ -1,28 +0,0 @@
-name: Publish PHP Package
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Get tag name
-      run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-    - name: zip and send
-      run: |
-        ls -la
-        apt-get update -y
-        apt-get install -y zip
-        cd ../
-        zip -r ${{ gitea.event.repository.name }}.zip ${{ gitea.event.repository.name }} -x '*.git*'
-        curl -v \
-        --user composer-pbl:${{ secrets.COMPOSER_PSWD }} \
-        --upload-file ${{ gitea.event.repository.name }}.zip \
-        https://git.bit5.ru/api/packages/bit/composer?version=${{ env.TAG }}  

composer.inc.php

@@ -2,55 +2,52 @@
 namespace taskman;
 use Exception;
 
-task('composer_update', ['alias' => 'deps_update'], function()
-{
-  composer_update(true);
-});
-
-task('composer_reset', function()
-{
+task('composer', function($args) {
   global $GAME_ROOT;
 
-  echo "Going to reset composer package manager...\n";
+  $composer_dir = $GAME_ROOT . '/composer/';
 
-  are_you_sure();
+  $files = glob($composer_dir . '/composer-*.phar');
+  $PHAR = basename($files[0]);
 
-  ensure_rm("$GAME_ROOT/composer/vendor/");
-  ensure_rm("$GAME_ROOT/composer/composer.last");
+  $cmd = "cd $composer_dir && "; 
+  if(PHP_OS_FAMILY === 'Darwin')
+  {
+    $cmd .= "DYLD_LIBRARY_PATH='" . getenv("DYLD_LIBRARY_PATH") .  "' " .
+            "PHP_INI_SCAN_DIR='" . getenv("PHP_INI_SCAN_DIR") . "' "; 
+    $cmd .= PHP_BINARY . " -c '". getenv("PHP_INI") . "' ";
+    $ext_dir = realpath(ini_get('extension_dir'));
+    $cmd .= " -d extension_dir='$ext_dir' ";
+  }
+  else
+    $cmd .= PHP_BINARY . ' ';
+
+  $cmd .= "$PHAR " . implode(' ', $args);
+
+  shell($cmd);
 });
 
-task('composer', function(array $args) {
-  composer_run($args);
-});
-
-task('composer_vendor_push', function(array $args) {
+task('composer_vendor_push', function($args) {
 
   $usage = "Usage: ./gamectl composer_vendor_push <path/to/repo> <commit message> [^[^[^]]]\n";
-
-  $dry_run = arg_opt($args, '--dry-run', false);
-  arg_opt_check_no_trailing($args);
-
   if(count($args) < 2) 
     throw new Exception($usage);
 
-  $force_new_tag = '';
   $up_mode = 1;
   if(count($args) > 2)
   {
-    $tmp_arg = array_pop($args);
-
-    if($tmp_arg === '^')
+    if($args[2] === '^')
       $up_mode = 1;
-    else if($tmp_arg === '^^')
+    else if($args[2] === '^^')
       $up_mode = 2;
-    else if($tmp_arg === '^^^')
+    else if($args[2] === '^^^')
       $up_mode = 3;
-    else 
-      $force_new_tag = $tmp_arg;
+    else
+      throw new Exception("Invalid up mode: {$args[2]} (supported ^, ^^ and ^^^)");
   }
 
-  $relpath = array_shift($args);
-  $commit_msg = array_shift($args);
+  $relpath = $args[0];
+  $commit_msg = $args[1];
   $repo = realpath("composer" .DIRECTORY_SEPARATOR. "vendor" .DIRECTORY_SEPARATOR. $relpath) ?: realpath($relpath);
 
   if(!$repo)
@@ -58,7 +55,7 @@ task('composer_vendor_push', function(array $args) {
 
   echo "Detected folder: '$repo'\n";
 
-  if(!git_is_repo($repo, true))
+  if(!git_is_repo($repo))
     throw new Exception("'$repo' is not a valid Git repo!\n");
 
   echo "It's a valid Git repo\n";
@@ -70,63 +67,13 @@ task('composer_vendor_push', function(array $args) {
   echo "========\n";
 
   $last_remote_tag = get_git_last_remote_tag($repo);
-  if($last_remote_tag === false)
-    throw new Exception("Could not retrieve last remote tag");
   echo "The last remote Git tag: $last_remote_tag\n";
+  $last_remote_version = GitVersion::parse($last_remote_tag);
 
-  if(empty($force_new_tag))
-  {
-    $last_remote_version = GitVersion::parse($last_remote_tag);
-    $last_remote_version->bump($up_mode);
-    $new_tag = $last_remote_version->encode();
-  }
-  else
-    $new_tag = $force_new_tag;
+  $last_remote_version->bump($up_mode);
+  echo "New version expected to be: {$last_remote_version->encode()}\n";
 
-  echo "Commit message: {$commit_msg}\n";
-  echo "New version expected to be: {$new_tag}\n";
-
-  if($dry_run === false)
-    are_you_sure();
-
-  $is_upm = file_exists("$repo/package.json");
-  if($is_upm)
-  {
-    echo "This looks like an UPM package, let's update the package.json?\n";
-    if(are_you_sure_ask())
-    {
-      if(!function_exists('taskman\upm_get_package_info'))
-      {
-        echo "Can't proceed, composer 'bit/taskman_upm' package is missing\n";
-        exit(1);
-      }
-
-      $upm_info = upm_get_package_info($repo);
-      if(!isset($upm_info['name']))
-        throw new Exception("'name' is not present in package.json");
-      if(!isset($upm_info['version']))
-        throw new Exception("'version' is not present in package.json");
-      $upm_version = $upm_info['version'];
-
-      echo "Current package.json version is: {$upm_version}\n";
-      $upm_new_version = ltrim($new_tag, 'v');
-      echo "New package.json expected to be: {$upm_new_version}\n";
-
-      if($dry_run === false)
-      {
-        are_you_sure();
-
-        $upm_info['version'] = $upm_new_version;
-        upm_set_package_info($repo, $upm_info);
-      }
-    }
-  }
-
-  if($dry_run !== false)
-  {
-    echo "Dry run is done.\n";
-    return;
-  }
+  are_you_sure();
 
   git_do($repo, 'add .');
   git_do($repo, "commit -am \"$commit_msg\"", $commit_output);
@@ -152,14 +99,9 @@ task('composer_vendor_push', function(array $args) {
   $last_tag = _get_last_version_tag($tags);
   echo "Last tag: $last_tag\n";
 
-  if(empty($force_new_tag))
-  {
-    $last_version = GitVersion::parse($last_tag);
-    $last_version->bump($up_mode);
-    $new_tag = $last_version->encode();
-  }
-  else
-    $new_tag = $force_new_tag;
+  $last_version = GitVersion::parse($last_tag);
+  $last_version->bump($up_mode);
+  $new_tag = $last_version->encode();
 
   echo "New tag: $new_tag\n";
 
@@ -173,13 +115,7 @@ task('composer_vendor_push', function(array $args) {
   git_do($repo, 'push --tags');
 
   git_do($repo, 'rev-parse HEAD', $output);
-  if(composer_try_update_lock_entry($relpath, trim($output[0]), $new_tag))
-    return;
-  
-  echo "composer.lock file was not updated, run 'composer update $relpath'?\n";
-  are_you_sure();
-
-  composer_run(['update', $relpath]);
+  composer_try_update_lock_entry($relpath, trim($output[0]), $new_tag);
 });
 
 task('composer_vendor_status', function(array $args) {
@@ -207,11 +143,7 @@ task('composer_vendor_status', function(array $args) {
       if($status)
       {
         $package = str_replace(normalize_path("$GAME_ROOT/composer/vendor/"), '', normalize_path($item));
-        $last_remote_tag = get_git_last_remote_tag($item);
-        echo "==== Vendor package '$package'[$last_remote_tag] changes";
-        if(is_file($item . '/package.json'))
-          echo " (UPM package?)";
-        echo ":\n";
+        echo "==== Vendor package '$package' changes:\n";
         echo implode("\n", $status) . "\n";
       }
     }
@@ -219,6 +151,7 @@ task('composer_vendor_status', function(array $args) {
   
 });
 
+
 function composer_try_update_lock_entry($package, $rev, $new_tag)
 {
   global $GAME_ROOT;
@@ -261,19 +194,3 @@ function composer_try_update_lock_entry($package, $rev, $new_tag)
   return $changed;
 }
 
-function composer_run(array $args)
-{
-  global $GAME_ROOT;
-  putenv('COMPOSER_RUN='.implode(' ', $args));
-  include("$GAME_ROOT/composer/update.php");
-}
-
-//NOTE: keeping this function for BC
-function composer_update($update = false)
-{
-  if($update)
-    composer_run(['update']);
-  else
-    composer_run(['install']);
-}
-

composer.json

@@ -1,9 +1,11 @@
 {
     "name": "bit/taskman_composer",
     "description": "taskman composer utils",
-    "homepage": "https://git.bit5.ru/bit/taskman_composer",
+    "homepage": "https://git.bit5.ru/composer/taskman_composer",
     "require": {
-        "php": ">=7.4",
-        "bit/taskman_git" : "^v1.0.0"
+        "php": ">=7.4"
+    },
+    "autoload": {
+        "classmap": ["composer.inc.php"]
     }
 }