eac_tools 0.61.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b13d61ea11ac15cc3677a1cf5ec17f1381f8f87ab25074f8cf7be2804e0679
-  data.tar.gz: 4432b02f679cabc7aa8ac455599e2bdfa653a02c973a05f02315a7992b50665e
+  metadata.gz: c6015e5a017d606e064cf4b1672653826b286f9677550ef552af41178d4815ea
+  data.tar.gz: 210b3d6290d05b251ba3ab7706475f488f1509142007ebd5f4928af0d22fa4ff
 SHA512:
-  metadata.gz: 0e4a6b279e9e1ee080a4fdf0f390187330bf84b36b022816cb807fa2274bf338c7c894587bd2938f9d71b72b45da42d2df6de2609ef9c783a42a4d063642685a
-  data.tar.gz: 2731fdeb08a1110cabba28cab3ccc98a60d8530e5d8a16c08a91459524952c98cccf7550cbcb6f21ccfcbdff8917c083d4911418ad91d6dc843e6e9f02fff58f
+  metadata.gz: e6f47cb1544b15c17c3bcf6b4f989886616bf84b9df34b47b6efbbb2ab954bc33c2db5cc2a8ecf58398370f775453212325de74cfd127d7ee417499cc8594788
+  data.tar.gz: 6cd049e9d7d17c35b136f25c70ce638e7a5e4375230c948b39afc1ca3238751337320b3abead82684b327e561a787ef9e3054784d4056842c5387c4ffc16d97e

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.61.0)
-      avm (~> 0.67, >= 0.67.1)
+    eac_tools (0.62.0)
+      avm (~> 0.68)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -11,12 +11,12 @@ PATH
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.1)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
-      avm-eac_redmine_base0 (~> 0.19, >= 0.19.2)
+      avm-eac_redmine_base0 (~> 0.20)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
       avm-eac_webapp_base0 (~> 0.15)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
-      avm-git (~> 0.13, >= 0.13.1)
+      avm-git (~> 0.13, >= 0.13.2)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_ruby_utils (~> 0.112)
 
@@ -97,14 +97,14 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.19.2)
-      avm (~> 0.67)
+    avm-eac_redmine_base0 (0.20.0)
+      avm (~> 0.68)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
-      eac_rest (~> 0.7, >= 0.7.3)
+      eac_rest (~> 0.9)
       eac_ruby_utils (~> 0.112)
 
 PATH
@@ -153,19 +153,19 @@ PATH
 PATH
   remote: sub/avm-files
   specs:
-    avm-files (0.6.1)
+    avm-files (0.6.2)
       avm (~> 0.67, >= 0.67.1)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.4)
+      eac_templates (~> 0.5)
 
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.13.1)
-      avm (~> 0.64, >= 0.64.2)
-      avm-files (~> 0.6)
+    avm-git (0.13.2)
+      avm (~> 0.67, >= 0.67.1)
+      avm-files (~> 0.6, >= 0.6.2)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
       git (~> 1.18)
@@ -191,15 +191,15 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.67.1)
+    avm (0.68.0)
       aranha-parsers (~> 0.17, >= 0.17.1)
-      eac_cli (~> 0.30, >= 0.30.1)
+      eac_cli (~> 0.31)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.4)
+      eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
@@ -207,7 +207,7 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.30.1)
+    eac_cli (0.31.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
       eac_ruby_utils (~> 0.112)
@@ -241,12 +241,20 @@ PATH
       eac_ruby_utils (~> 0.112)
       parseconfig (~> 1.1, >= 1.1.2)
 
+PATH
+  remote: sub/eac_rest
+  specs:
+    eac_rest (0.9.0)
+      eac_envs-http (~> 0.3, >= 0.3.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.112)
+
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.17.3)
-      avm-eac_ruby_base1 (~> 0.29)
-      eac_cli (~> 0.30, >= 0.30.1)
+    eac_ruby_base0 (0.18.0)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
+      eac_cli (~> 0.31)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
 
@@ -263,7 +271,7 @@ PATH
 PATH
   remote: sub/eac_templates
   specs:
-    eac_templates (0.4.0)
+    eac_templates (0.5.0)
       eac_config (~> 0.12)
       eac_ruby_utils (~> 0.112)
 
@@ -295,10 +303,6 @@ GEM
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
       faraday-retry (~> 2.1)
-    eac_rest (0.8.0)
-      eac_envs-http (~> 0.3, >= 0.3.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
@@ -411,6 +415,7 @@ DEPENDENCIES
   eac_docker!
   eac_fs!
   eac_git!
+  eac_rest!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
   eac_ruby_utils!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.61.0'
+  VERSION = '0.62.0'
 end

data/sub/avm/avm.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
+  s.add_dependency 'eac_cli', '~> 0.31'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'eac_templates', '~> 0.4'
+  s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.67.1'
+  VERSION = '0.68.0'
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67'
+  s.add_dependency 'avm', '~> 0.68'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.3'
+  s.add_dependency 'eac_rest', '~> 0.9'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

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

data/sub/avm-files/avm-files.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'eac_templates', '~> 0.4'
+  s.add_dependency 'eac_templates', '~> 0.5'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-files/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.64', '>= 0.64.2'
-  s.add_dependency 'avm-files', '~> 0.6'
+  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'git', '~> 1.18'

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.13.1'
+    VERSION = '0.13.2'
   end
 end

data/sub/{eac_ruby_base0/lib/eac_ruby_base0 → eac_cli/lib/eac_cli}/runner_with/confirmation.rb

@@ -3,7 +3,7 @@
 require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
 
-module EacRubyBase0
+module EacCli
   module RunnerWith
     module Confirmation
       DEFAULT_CONFIRM_QUESTION_TEXT = 'Confirm?'
@@ -26,6 +26,8 @@ module EacRubyBase0
           message || setting_value(:confirm_question_text, default: DEFAULT_CONFIRM_QUESTION_TEXT),
           bool: true
         )
+      rescue ::EacCli::Speaker::InputRequested => e
+        fatal_error e.message
       end
 
       def run_confirm(message = nil)

data/sub/{eac_ruby_base0/lib/eac_ruby_base0 → eac_cli/lib/eac_cli}/runner_with/input.rb

@@ -4,7 +4,7 @@ require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/abstract_methods'
 
-module EacRubyBase0
+module EacCli
   module RunnerWith
     module Input
       STDIN_OPTION = '-'

data/sub/{eac_ruby_base0/lib/eac_ruby_base0 → eac_cli/lib/eac_cli}/runner_with/output.rb

@@ -4,7 +4,7 @@ require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/abstract_methods'
 
-module EacRubyBase0
+module EacCli
   module RunnerWith
     module Output
       STDOUT_OPTION = '-'

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.30.1'
+  VERSION = '0.31.0'
 end

data/sub/{eac_ruby_base0/spec/lib/eac_ruby_base0 → eac_cli/spec/lib/eac_cli}/runner_with/confirmation_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_base0/runner_with/confirmation'
+require 'eac_cli/runner_with/confirmation'
 
-::RSpec.describe ::EacRubyBase0::RunnerWith::Confirmation do
+::RSpec.describe ::EacCli::RunnerWith::Confirmation do
   let(:runner) do
     the_module = described_class
     Class.new do

data/sub/{eac_ruby_base0/spec/lib/eac_ruby_base0 → eac_cli/spec/lib/eac_cli}/runner_with/output_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_base0/runner_with/output'
+require 'eac_cli/runner_with/output'
 require 'eac_ruby_utils/fs/temp'
 
-RSpec.describe ::EacRubyBase0::RunnerWith::Output do
+RSpec.describe ::EacCli::RunnerWith::Output do
   let(:runner) do
     the_module = described_class
     Class.new do
@@ -49,7 +49,7 @@ RSpec.describe ::EacRubyBase0::RunnerWith::Output do
   end
 
   context 'without --output option as to stdout' do
-    let(:runner_argv) { ['--output', ::EacRubyBase0::RunnerWith::Output::STDOUT_OPTION, stub_text] }
+    let(:runner_argv) { ['--output', ::EacCli::RunnerWith::Output::STDOUT_OPTION, stub_text] }
 
     it do
       expect { instance.run }.to output(stub_text).to_stdout_from_any_process
@@ -59,7 +59,7 @@ RSpec.describe ::EacRubyBase0::RunnerWith::Output do
   context 'without --output option as to default file' do
     let(:output_file) { temp_dir.join('default_file') }
     let(:runner_argv) do
-      ['--output', ::EacRubyBase0::RunnerWith::Output::DEFAULT_FILE_OPTION,
+      ['--output', ::EacCli::RunnerWith::Output::DEFAULT_FILE_OPTION,
        stub_text]
     end