ci(pm): add project-manager preset

.env.default

@@ -1,5 +1,5 @@
 PROJECT=puzzlez
-VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+')
+#VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+')
 SDK_PATH=$HOME/sdk
 PUBLISH_PATH=$HOME/public/$PROJECT
 BUILD_PATH=./build
@@ -8,7 +8,7 @@ KEY_STORE=<keystore.jks>
 KEY_PASS=<passphrase>
 
 # publish
-REPO=https://git.shmyga.ru/api/packages/InfernalGames
+PUBLISH_REPO=https://git.shmyga.ru/api/packages/InfernalGames
 PUBLISH_USER=<username>
 PUBLISH_PASSWORD=<passphrase>
 

.gitignore

@@ -1,4 +1,4 @@
-/build/
+build/
 target/
 src-gen/
 out/
@@ -10,8 +10,8 @@ out/
 .idea/
 .ideaDataSources/
 config.json
-/node_modules
-/log
-/ansible/*.retry
+node_modules
+log
+ansible/*.retry
 .npmrc
 .env

.pm.toml

@@ -0,0 +1,23 @@
+modules = ["."]
+
+[presets.docker]
+variables.docker_target = "web"
+variables.docker_name = "{{ project_name }}-web"
+
+[presets.docker.tasks.build.compose]
+priority = 1
+variables.sdk_path = "{{ 'SDK_PATH' | env('$HOME/sdk') }}"
+variables.publish_path = "{{ 'PUBLISH_PATH' | env('$HOME/public/' + project_name) }}"
+variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}"
+variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}"
+commands = [
+  "mkdir -p \"{{ sdk_path }}\" \"{{ publish_path }}\" \"{{ build_path }}\" \"{{ target_path }}\" \"src-gen\"",
+  "docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder",
+]
+
+[presets.gitea]
+variables.publish_artefacts.debian = "target/app/debian/{{ project_name }}_{{ project_version }}_all.deb"
+variables.publish_artefacts.android = "target/app/android/{{ project_name }}_{{ project_version }}.apk"
+variables.publish_artefacts.archive_linux = "target/app/archive/{{ project_name }}_{{ project_version }}_linux.tar.gz"
+variables.publish_artefacts.archive_win = "target/app/archive/{{ project_name }}_{{ project_version }}_win.zip"
+variables.publish_artefacts.installer = "target/app/installer/{{ project_name }}_{{ project_version }}.exe"

Dockerfile

@@ -12,7 +12,8 @@ FROM base AS builder
 ENV GRADLE_USER_HOME=/sdk/gradle
 WORKDIR /app
 COPY package.json package-lock.json ./
-RUN npm ci
+RUN --mount=type=cache,target=/root/.npm \
+  npm ci
 COPY gulpfile.js protohx.json ./
 COPY tasks ./tasks
 COPY config.example.json ./config.example.json

ansible/ansible.cfg

@@ -1,11 +0,0 @@
-[defaults]
-hash_behaviour = merge
-host_key_checking = False
-#callback_whitelist = profile_tasks
-display_skipped_hosts = False
-stdout_callback = yaml
-bin_ansible_callbacks = True
-
-[ssh_connection]
-pipelining = True
-ssh_args = -o ForwardAgent=yes

ansible/deploy.yml

@@ -1,11 +0,0 @@
----
-- hosts: all
-  vars:
-    ansible_user: "{{ deploy_user }}"
-  roles:
-    - ansible-deploy
-    - build
-  post_tasks:
-    - include_role:
-        name: ansible-deploy
-        tasks_from: complete.yml

ansible/dev/inventory.yml

@@ -1,2 +0,0 @@
-all:
-  hosts: localhost

ansible/group_vars/all.yml

@@ -1,9 +0,0 @@
----
-project_name: puzzlez
-project_user: holop
-
-deploy_user: "{{ project_user }}"
-deploy_project: "{{ project_name }}"
-deploy_repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git"
-deploy_repo_version: master
-deploy_npm: yes

ansible/prod/inventory.yml

@@ -1,4 +0,0 @@
-all:
-  hosts: shmyga.ru
-  vars:
-    config_src: "/home/holop/puzzlez/config.json"

ansible/requirements.yml

@@ -1,5 +0,0 @@
----
-- name: ansible-deploy
-  src: git@bitbucket.org:shmyga/ansible-deploy.git
-  version: master
-  scm: git

ansible/roles/build/defaults/main.yml

@@ -1,2 +0,0 @@
-config_src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
-config_dest: "{{ deploy_release_dir }}/config.json"

ansible/roles/build/tasks/main.yml

@@ -1,11 +0,0 @@
----
-- name: "Copy config"
-  copy:
-    src: "{{ config_src }}"
-    dest: "{{ config_dest }}"
-    remote_src: true
-
-- name: "Gulp build"
-  command: "{{ deploy_release_dir }}/node_modules/.bin/gulp default"
-  args:
-    chdir: "{{ deploy_release_dir }}"

config.example.json

@@ -1,7 +1,7 @@
 {
-  "SdkDir": "C:\\sdk",
+  "SdkDir": "$HOME/sdk",
   "BuildDir": null,
-  "PublishDir": "",
+  "PublishDir": "$HOME/public/puzzlez",
   "PublishUrl": "https://shmyga.ru/repo/puzzlez",
   "Develop": false,
   "Key": {

gulpfile.js

@@ -5,17 +5,20 @@ const packageInfo = require("./package.json");
 const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
 const dateformat = require("dateformat");
 const publish = require("./tasks/gulp-publish");
+const os = require("os");
+
+const resolvePath = (path) => path.replace("$HOME", os.homedir());
 
 if (packageInfo.haxe) {
   Haxe.VERSION = packageInfo.haxe;
 }
 
 if (Config.SdkDir) {
-  Sdk.dir = Config.SdkDir;
+  Sdk.dir = resolvePath(Config.SdkDir);
 }
 
 if (Config.BuildDir) {
-  Haxe.buildDir = Config.BuildDir;
+  Haxe.buildDir = resolvePath(Config.BuildDir);
 }
 
 exports.clean = function clean() {
@@ -104,7 +107,7 @@ const server = new Project(
 module.exports.publish = publish(
   packageInfo.name,
   packageInfo.version,
-  Config.PublishDir,
+  resolvePath(Config.PublishDir),
   Config.PublishUrl,
 );
 

package.json

@@ -1,7 +1,10 @@
 {
   "name": "puzzlez",
   "version": "0.6.1",
-  "private": true,
+  "scripts": {
+    "build": "gulp",
+    "dev": "gulp app:flash:test"
+  },
   "devDependencies": {
     "dateformat": "^3.0.3",
     "fs-extra": "^10.0.0",

src/app/haxe/ru/m/puzzlez/source/NginxImageSource.hx

@@ -25,7 +25,6 @@ class NginxImageSource implements ImageSource {
   public var id(default, never):String = "nginx";
 
   private var baseUrl:String;
-  private var cache:Map<String, Promise<NginxResponse>> = new Map();
 
   public function new(baseUrl:String) {
     this.baseUrl = baseUrl;
@@ -37,11 +36,8 @@ class NginxImageSource implements ImageSource {
 
   public function getPage(page:Page):Promise<DataPage<ImageId>> {
     var category = page.filter.get("category");
-    var url = category != null ? this.baseUrl + category + "/" : this.baseUrl;
-    if (!this.cache.exists(url)) {
-      this.cache.set(url, new JsonLoader<NginxResponse>().GET(url));
-    }
-    return this.cache.get(url).then((response:NginxResponse) -> {
+    return new JsonLoader<NginxResponse>().GET(category != null ? this.baseUrl + category + "/" : this.baseUrl)
+      .then((response:NginxResponse) -> {
         var data:Array<ImageId> = [];
         for (item in response) {
           if (item.type == NginxResponseItemType.FILE) {
@@ -49,7 +45,6 @@ class NginxImageSource implements ImageSource {
             data.push(new ImageId().setSource(id).setId(itemId));
           }
         }
-      data = data.slice(page.index * page.count, (page.index + 1) * page.count);
         return {
           page: page,
           data: data,
@@ -60,12 +55,12 @@ class NginxImageSource implements ImageSource {
 
   public function load(id:String, thumb:Bool = false):Promise<ImageValue> {
     var url = this.baseUrl + StringTools.replace(id, "@", "/");
-    // TODO: default size by screen width?
-    var width = thumb ? 360 : 1920;
+    if (thumb) {
       var parts = url.split(".");
       var index = parts.length - 2;
-    parts[index] = parts[index] + '-w${width}';
+      parts[index] = parts[index] + "-thumbnail";
       url = parts.join(".");
+    }
     return Promise.promise(ImageValue.URL(url));
   }