avm-eac_redmine_base0 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b27527dc74e72e965df3c22833d830e38db777b978c51029724bc0a6ed9f4e8d
-  data.tar.gz: 6b9d3b228d2b45ee20a62a2870f8f20a81bbce3a6d64c13c3fe5030e6a305880
+  metadata.gz: '074843787a7e86e7a312cc98d9d87a408273fc0e25a3eee3c8059d5829dcce5a'
+  data.tar.gz: 121135debacd00cd742479585954e8b19b1676fb5e7307d232744ab1f2ad793c
 SHA512:
-  metadata.gz: 2fb910a6048022cdc49c0abe2a5f75808a616ae15c92fd5d3b71f694bd254b55c86d02fe9dd378b5477bdc83fcc9d32fe2901b81a0694cfa26c8d93549fef715
-  data.tar.gz: 4b81fbff0ad9dc1465f564e28859a20ebabc2a93374812bebc9d719d6fa4ed635669994eeb43bb2b45520596d32aeae93111ee0ccab12be217dc5c13d9fdda01
+  metadata.gz: 4f3be7cf0501d9986a2fdca8697a2b3ae550258ad32a83dd4ccb1e78d380e8b0695b8616115af413f6e40734a4090e4d44b5c6959622091fc3bfabcfef448fe9
+  data.tar.gz: 7ac2da04bc3cd9a1ae0d73b527f30f29707aac7aec6caf8c4c86835c02a31ceaf02e2aec799f9b0be87e1a076945a68792bc7a373d5c3b36f961fc5e1e2892ab

data/lib/avm/eac_redmine_base0/instances/base.rb

@@ -49,7 +49,7 @@ module Avm
         # @return [Avm::EacRedmineBase0::Instances::RestApi]
         def rest_api_uncached
           url = root_url
-          url.query_values = { key: read_entry('api.key') }
+          url.query_values = { key: admin_api_key }
           ::Avm::EacRedmineBase0::Instances::RestApi.new(url)
         end
       end

data/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -12,6 +12,8 @@ module Avm
       class DockerImage < ::Avm::Instances::DockerImage
         enable_simple_cache
 
+        APACHE_HOST_DOCKERFILE_SUBPATH = 'apache_host_dockerfile'
+        APACHE_PATH_DOCKERFILE_SUBPATH = 'apache_path_dockerfile'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
@@ -23,9 +25,12 @@ module Avm
         end
 
         def apache_setup
-          return '' if web_path_present?
+          template.child(apache_setup_dockerfile).apply(self)
+        end
 
-          template.child('Dockerfile_apache_setup').apply(self)
+        # @return [String]
+        def apache_setup_dockerfile
+          web_path_present? ? APACHE_PATH_DOCKERFILE_SUBPATH : APACHE_HOST_DOCKERFILE_SUBPATH
         end
 
         def base_image

data/lib/avm/eac_redmine_base0/instances/rest_api/entity_base.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_rest/api'
+require 'eac_rest/entity'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class RestApi < ::EacRest::Api
+        class EntityBase < ::EacRest::Entity
+          def build_request(url_suffix)
+            api.request_json("#{url_suffix}.json")
+          end
+
+          def data_from_response(response)
+            raise "\"#{response.url}\" returned non-ok status: #{response.status}" unless
+            response.status.to_s.start_with?('2')
+
+            return {} if response.body_str.blank?
+
+            response.body_data
+          rescue ::JSON::ParserError
+            raise "\"#{response.url}\" returned invalid JSON: \"#{response.body_str}\"" \
+              " (Status: #{response.status})"
+          end
+
+          def fetch_data(url_suffix)
+            data_from_response(build_request(url_suffix).response)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/rest_api/project.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instances/rest_api/entity_base'
+require 'avm/eac_redmine_base0/instances/rest_api/wiki_page'
+require 'eac_rest/api'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class RestApi < ::EacRest::Api
+        class Project < ::Avm::EacRedmineBase0::Instances::RestApi::EntityBase
+          # @return [String]
+          def prefix
+            "/projects/#{id}"
+          end
+
+          # @return [Avm::EacRedmineBase0::Instances::RestApi::WikiPage]
+          def wiki_page(name)
+            child_entity(::Avm::EacRedmineBase0::Instances::RestApi::WikiPage, name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/rest_api/root.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instances/rest_api/entity_base'
+require 'eac_rest/api'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class RestApi < ::EacRest::Api
+        class Root < ::Avm::EacRedmineBase0::Instances::RestApi::EntityBase
+          # @param id_or_identifier [String]
+          # @return [Avm::EacRedmineBase0::Instances::RestApi::Project]
+          def project(id_or_identifier)
+            api.entity(::Avm::EacRedmineBase0::Instances::RestApi::Project, id_or_identifier)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/rest_api/wiki_page.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instances/rest_api/entity_base'
+require 'eac_rest/api'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class RestApi < ::EacRest::Api
+        class WikiPage < ::Avm::EacRedmineBase0::Instances::RestApi::EntityBase
+          enable_simple_cache
+
+          # @return [Hash]
+          def data_from_id
+            fetch_data(prefix)
+          end
+
+          # @return [String]
+          def data_root
+            'wiki_page'
+          end
+
+          # @return [String]
+          def prefix
+            "#{parent_entity.prefix}/wiki/#{id}"
+          end
+
+          # @return [String]
+          def read
+            data.fetch(data_root).fetch('text')
+          end
+
+          # @param content [String]
+          # @return [+self+]
+          def write(text)
+            data_from_response(
+              build_request(prefix).verb(:put).header('Content-type', 'application/json')
+              .body_data(write_data(text).to_json).response
+            )
+          end
+
+          # @param text [String]
+          # @return [Hash]
+          def write_data(text)
+            {
+              data_root => { 'text' => text }
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/rest_api.rb

@@ -7,6 +7,7 @@ module Avm
   module EacRedmineBase0
     module Instances
       class RestApi < ::EacRest::Api
+        require_sub __FILE__
       end
     end
   end

data/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/read.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      module Runners
+        class Project
+          class WikiPage
+            class Read
+              runner_with :help, :output
+
+              def run
+                run_output
+              end
+
+              def output_content
+                runner_context.call(:wiki_page_content)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/write.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      module Runners
+        class Project
+          class WikiPage
+            class Write
+              runner_with :help, :confirmation, :input do
+                bool_opt '-f', '--force'
+              end
+              delegate :force?, to: :parsed
+
+              def run
+                start_banner
+                if write?
+                  run_write
+                else
+                  success 'Content unchanged, no further action will be taken'
+                end
+              end
+
+              def start_banner
+                infov 'Content'
+                infov '  * Current', current_content
+                infov '  * New', new_content
+                infov '  * Changed?', content_changed?
+              end
+
+              # @return [Boolean]
+              def content_changed?
+                new_content != current_content
+              end
+
+              def run_write
+                if confirm?('Write?')
+                  infom 'Writing...'
+                  runner_context.call(:wiki_page).write(new_content)
+                  success('Writed!')
+                else
+                  success('Unconfirmed, no further action will be taken')
+                end
+              end
+
+              # @return [Boolean]
+              def write?
+                parsed.force? || content_changed?
+              end
+
+              private
+
+              # @return [String]
+              def current_content_uncached
+                runner_context.call(:wiki_page_content)
+              end
+
+              # @return [String]
+              def new_content_uncached
+                input_content
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      module Runners
+        class Project
+          class WikiPage
+            runner_with :help, :subcommands do
+              pos_arg :name
+              subcommands
+            end
+
+            def wiki_page
+              runner_context.call(:project).wiki_page(parsed.name)
+            end
+
+            def wiki_page_content
+              wiki_page.read
+            end
+
+            require_sub __FILE__
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/runners/project.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      module Runners
+        class Project
+          runner_with :help, :subcommands do
+            pos_arg :id_or_identifier
+            subcommands
+          end
+
+          private
+
+          def project_uncached
+            runner_context.call(:instance).rest_api.root_entity.project(parsed.id_or_identifier)
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.19.1'
+    VERSION = '0.20.0'
   end
 end

data/template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile

@@ -0,0 +1,5 @@
+USER root
+RUN a2ensite 000-default
+RUN a2ensite default-ssl
+RUN a2enmod ssl
+RUN service apache2 restart

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.68'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.68'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -118,20 +118,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -179,8 +173,16 @@ files:
 - lib/avm/eac_redmine_base0/instances/deploy.rb
 - lib/avm/eac_redmine_base0/instances/docker_image.rb
 - lib/avm/eac_redmine_base0/instances/rest_api.rb
+- lib/avm/eac_redmine_base0/instances/rest_api/entity_base.rb
+- lib/avm/eac_redmine_base0/instances/rest_api/project.rb
+- lib/avm/eac_redmine_base0/instances/rest_api/root.rb
+- lib/avm/eac_redmine_base0/instances/rest_api/wiki_page.rb
 - lib/avm/eac_redmine_base0/instances/runners.rb
 - lib/avm/eac_redmine_base0/instances/runners/docker.rb
+- lib/avm/eac_redmine_base0/instances/runners/project.rb
+- lib/avm/eac_redmine_base0/instances/runners/project/wiki_page.rb
+- lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/read.rb
+- lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/write.rb
 - lib/avm/eac_redmine_base0/instances/runners/project_rename.rb
 - lib/avm/eac_redmine_base0/sources.rb
 - lib/avm/eac_redmine_base0/sources/base.rb
@@ -194,9 +196,10 @@ files:
 - template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/instances/deploy/config/secrets.yml
 - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template
-- template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
+- template/avm/eac_redmine_base0/instances/docker_image/apache_host_dockerfile
 - template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
 - template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
+- template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile
 - template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
 homepage: 
 licenses: []