From 22267b1b6e65f4657c3adbb1b6d0213e394c9130 Mon Sep 17 00:00:00 2001 From: David Sterry Date: Sat, 4 Dec 2021 14:38:00 -0800 Subject: [PATCH 1/5] change dashes in date-based version to dots --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f11a75a..62a8cec 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Dynamic fork of diaspora*'s federated social network, est. Aug 2021.", "fr": "Fourche dynamique du réseau social fédéré de diaspora*, créé en août 2021." }, - "version": "2021-12-02~ynh1", + "version": "2021.12.02~ynh1", "url": "https://github.com/magicstone-dev/acropolis", "upstream": { "license": "free", From ce0e729a25f0288dbe92325484a365080a186c45 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 4 Dec 2021 22:39:12 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab9afae..982093c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Shipped version:** 2021-12-02~ynh1 +**Shipped version:** 2021.12.02~ynh1 diff --git a/README_fr.md b/README_fr.md index afc61cf..d88be2c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Version incluse :** 2021-12-02~ynh1 +**Version incluse :** 2021.12.02~ynh1 From a72a6e3b4f8debe619d70155da127be37f76b369 Mon Sep 17 00:00:00 2001 From: David Sterry Date: Sat, 4 Dec 2021 14:42:54 -0800 Subject: [PATCH 3/5] Add bump-version script and dot-separated date-based version (#17) * add bump_version.rb from ecko_ynh and bump the version * change date-based version separator to dot * Auto-update README Co-authored-by: Yunohost-Bot <> --- README.md | 2 +- README_fr.md | 2 +- bump-version.rb | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ conf/app.src | 8 +++--- manifest.json | 9 ++++--- 5 files changed, 84 insertions(+), 9 deletions(-) create mode 100755 bump-version.rb diff --git a/README.md b/README.md index 5f191db..982093c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Shipped version:** 1.0~ynh1 +**Shipped version:** 2021.12.02~ynh1 diff --git a/README_fr.md b/README_fr.md index b703d6d..d88be2c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Version incluse :** 1.0~ynh1 +**Version incluse :** 2021.12.02~ynh1 diff --git a/bump-version.rb b/bump-version.rb new file mode 100755 index 0000000..b2a5c65 --- /dev/null +++ b/bump-version.rb @@ -0,0 +1,72 @@ +#!/usr/bin/env ruby + +# [For package maintainers] +# Edit the conf/app.src files with the latest commit +# +# Usage: +# ./bump-version.rb + +require 'digest' +require 'json' +require 'open-uri' + +module Yunohost + class AppSrcFile + def initialize(path = 'conf/app.src') + @path = path + end + + def update(url, sum) + src = File.read(@path) + replace_src_setting!(src, 'SOURCE_URL', url) + replace_src_setting!(src, 'SOURCE_SUM', sum) + replace_src_setting!(src, 'SOURCE_FILENAME', File.basename(URI.parse(url).path)) + File.write(@path, src) + end + + private + + def replace_src_setting!(str, setting, value) + str.gsub!(/^#{setting}=.*$/, "#{setting}=#{value}") + end + end + + class ManifestFile + def initialize(path = 'manifest.json') + @path = path + end + + def update_with_version(version) + manifest_file = File.read(@path) + manifest = JSON.parse(manifest_file) + + if manifest['version'].start_with? version + i = manifest['version'].scan(/~ynh(\d)/).flatten.first.to_i + 1 + manifest['version'] = "#{version}~ynh#{i}" + else + manifest['version'] = "#{version}~ynh1" + end + + manifest_file = JSON.pretty_generate(manifest, indent: ' ') + "\n" + File.write(@path, manifest_file) + end + end +end + +github = JSON.parse(URI.parse('https://api.github.com/repos/magicstone-dev/acropolis/branches/main').read) +last_commit = github["commit"]["sha"] +version = Date.parse(github["commit"]["commit"]["author"]["date"]).to_s.gsub '-', '.' + +url = "https://github.com/magicstone-dev/acropolis/archive/#{last_commit}.tar.gz" + +puts "Downloading last commit at #{url}" +release_file = URI.parse(url).read +sum = Digest::SHA256.hexdigest(release_file) + +# Update source file +Yunohost::AppSrcFile.new().update(url, sum) + +# Update manifest file +Yunohost::ManifestFile.new().update_with_version(version) + +puts "Done!" diff --git a/conf/app.src b/conf/app.src index 5d91071..42744a5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/magicstone-dev/acropolis/archive/refs/tags/v0.7.15.0.tar.gz -SOURCE_SUM=0cfc5f10ec8859280c95cb5db95846381621da0306cd4100f12691f18efa36be +SOURCE_URL=https://github.com/magicstone-dev/acropolis/archive/2b1c78ae680abcf42aa6a859139009defda61c1c.tar.gz +SOURCE_SUM=552c3564085fbb6acb8a330477bdda5ab43535969651b5076f92e4036499dcbf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true +SOURCE_FILENAME=2b1c78ae680abcf42aa6a859139009defda61c1c.tar.gz +SOURCE_EXTRACT=true \ No newline at end of file diff --git a/manifest.json b/manifest.json index d36c7b8..62a8cec 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Dynamic fork of diaspora*'s federated social network, est. Aug 2021.", "fr": "Fourche dynamique du réseau social fédéré de diaspora*, créé en août 2021." }, - "version": "1.0~ynh1", + "version": "2021.12.02~ynh1", "url": "https://github.com/magicstone-dev/acropolis", "upstream": { "license": "free", @@ -25,7 +25,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -52,7 +52,10 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["fr", "en"], + "choices": [ + "fr", + "en" + ], "default": "fr" }, { From 49054713c3686f0afaa734eaf4d70732869e617c Mon Sep 17 00:00:00 2001 From: David Sterry Date: Sun, 5 Dec 2021 18:29:19 -0800 Subject: [PATCH 4/5] add description and disclaimer (#18) --- doc/DESCRIPTION.md | 10 +--------- doc/DISCLAIMER.md | 18 +++++++----------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 0685205..42f2a82 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,9 +1 @@ -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - -### Features - -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." +Acropolis was forked from diaspora* in August 2021. The idea for the fork is to optimize toward community, that is making it as easy as possible to contribute. We're following a protocol that basically says if you are addressing a valid problem, your code gets merged. Everything else follows from that. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index aded581..5caef20 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,12 +1,8 @@ -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... +Acropolis is beta software, and under active development. Use at your own risk! -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* This app require a dedicated domain or subdomain. +* No admin user is created during installation so you will need to sign up and follow manual steps to promote your user to admin. +* Configuration of the instance requires editing one or more config files which must also be done manually. +* Single sign-on doesn't work. + +You may wish to close or limit registration for your instance of Ecko, so that the instance stays small. We invite you to block remote malicious instances from the administration interface. From 7a77877730372e1081c2750bab34195270d4f948 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 6 Dec 2021 02:29:22 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 28 ++++++++-------------------- README_fr.md | 28 ++++++++-------------------- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 982093c..717e8e2 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - -### Features - -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." +Acropolis was forked from diaspora* in August 2021. The idea for the fork is to optimize toward community, that is making it as easy as possible to contribute. We're following a protocol that basically says if you are addressing a valid problem, your code gets merged. Everything else follows from that. **Shipped version:** 2021.12.02~ynh1 @@ -36,18 +28,14 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Disclaimers / important information -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... +Acropolis is beta software, and under active development. Use at your own risk! -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* This app require a dedicated domain or subdomain. +* No admin user is created during installation so you will need to sign up and follow manual steps to promote your user to admin. +* Configuration of the instance requires editing one or more config files which must also be done manually. +* Single sign-on doesn't work. + +You may wish to close or limit registration for your instance of Ecko, so that the instance stays small. We invite you to block remote malicious instances from the administration interface. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index d88be2c..f7d808e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,15 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - -### Features - -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." +Acropolis was forked from diaspora* in August 2021. The idea for the fork is to optimize toward community, that is making it as easy as possible to contribute. We're following a protocol that basically says if you are addressing a valid problem, your code gets merged. Everything else follows from that. **Version incluse :** 2021.12.02~ynh1 @@ -32,18 +24,14 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Avertissements / informations importantes -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... +Acropolis is beta software, and under active development. Use at your own risk! -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* This app require a dedicated domain or subdomain. +* No admin user is created during installation so you will need to sign up and follow manual steps to promote your user to admin. +* Configuration of the instance requires editing one or more config files which must also be done manually. +* Single sign-on doesn't work. + +You may wish to close or limit registration for your instance of Ecko, so that the instance stays small. We invite you to block remote malicious instances from the administration interface. ## Documentations et ressources