avm-tools 0.114.1 → 0.114.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c54ac1c77f2c1db81cb6e2fa45e97ff5bd9ffad83054e33d8baeb94ff682dea
-  data.tar.gz: 842806c80c5fa0fa93f1b6207f498831e833a94147ad9015e2717ebf9e3ec01b
+  metadata.gz: 7e2a7df849fd040b8e6fddad4e1c8507139926f0b587ceab796c1416fb9af873
+  data.tar.gz: 70eb055f94b37d37e05510563a654350137d0358283ad7d33a4d895110f1f2cc
 SHA512:
-  metadata.gz: 7d026169d9ce0ef808fb38cad55a307eabdd023f7585dd42a6d61e6aa66ca1b7cb203a75aeaa25675e24c4267564dbc4d423dba6902be83d279b3234f6514459
-  data.tar.gz: ebc64d8a3e11ab4eee57147b797b2f69fa7816be26d8621383822d1180f7f6ea8c4d9570d19ef21dbb844c25aa41ee3ef4cca0a48efcb30483114d092978810a
+  metadata.gz: 90be4e12df6cda16ffc88680a42a6d3dd118e96f97840cfb4a49b4418b76df1826485065ca069e3105d942136ed9273f03e9e15b340c4913abfeacae01ce1eba
+  data.tar.gz: 262a63d17a298911bef85e025b678779e8d7795e2376349128999fc50442275a0303bde419921e2799a3f8a9923366d3996c655ea032d909ca555f6b7d6892a5

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.114.1'
+    VERSION = '0.114.2'
   end
 end

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

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_fs', '~> 0.4'
+  s.add_dependency 'eac_rest', '~> 0.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/data_unit.rb

@@ -10,11 +10,13 @@ module Avm
     class DataUnit < ::Avm::Data::Instance::Unit
       common_constructor :instance
 
+      EXPORT_PATH = '/backup/export'
       EXTENSION = '.tar'
+      IMPORT_PATH = '/backup/import.json'
 
       def do_dump(data_path)
         ::File.open(data_path, 'wb') do |file|
-          file << URI.parse(export_url).read
+          file << export_request.response.body_data_or_raise
         end
       end
 
@@ -37,18 +39,12 @@ module Avm
         true
       end
 
-      def export_url
-        url('/backup/export')
+      def export_request
+        instance.rest_api.request(EXPORT_PATH)
       end
 
       def import_url
-        url('/backup/import.json')
-      end
-
-      def url(path)
-        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + path
-        uri.query_values = { key: instance.read_entry('admin.api_key') }
-        uri.to_s
+        instance.rest_api.build_service_url(IMPORT_PATH).to_s
       end
     end
   end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
+require 'addressable/uri'
 require 'avm/eac_redmine_base0/data_unit'
 require 'avm/eac_redmine_base0/instances/docker_image'
+require 'avm/eac_redmine_base0/rest_api'
 require 'avm/eac_webapp_base0/instance'
 require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRedmineBase0
     class Instance < ::Avm::EacRailsBase1::Instance
+      enable_simple_cache
+
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
@@ -32,6 +36,22 @@ module Avm
           }
         )
       end
+
+      # @return [Addressable::URI]
+      def root_url
+        r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
+        r.query_values = nil
+        r
+      end
+
+      private
+
+      # @return [Avm::EacRedmineBase0::RestApi]
+      def rest_api_uncached
+        url = root_url
+        url.query_values = { key: read_entry('api.key') }
+        ::Avm::EacRedmineBase0::RestApi.new(url)
+      end
     end
   end
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_rest/api'
+
+module Avm
+  module EacRedmineBase0
+    class RestApi < ::EacRest::Api
+    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.3.1'
+    VERSION = '0.4.0'
   end
 end

data/sub/eac_rest/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/sub/eac_rest/eac_rest.gemspec

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_rest/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_rest'
+  s.version     = EacRest::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'A REST helper for Ruby.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/sub/eac_rest/lib/eac_rest/api.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_rest/request'
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  # Abstract methods
+  #   * self.issue_get_url_suffix(provider_issue_id)
+  class Api
+    require_sub __FILE__, include_modules: true
+    common_constructor :root_url, :username, :password, default: [nil, nil]
+
+    def request(service_url_suffix, headers = {}, &body_data_proc)
+      r = ::EacRest::Request.new(build_service_url(service_url_suffix),
+                                 body_data_proc)
+      headers.each { |name, value| r = r.header(name, value) }
+      r = r.autenticate(username, password) if username.present?
+      r
+    end
+
+    def request_json(service_url_suffix, headers = {}, &body_data_proc)
+      request(service_url_suffix, headers.merge('Accept' => 'application/json')) do |body_data|
+        r = ::JSON.parse(body_data)
+        r = body_data_proc.call(r) if body_data_proc
+        r
+      end
+    end
+
+    # @return [Addressable::URI]
+    def build_service_url(suffix)
+      s = ::Addressable::URI.parse(suffix)
+      r = ::Addressable::URI.parse(root_url)
+      r.path += s.path
+      r.query_values = r.query_values(::Array).if_present([]) +
+                       s.query_values(::Array).if_present([])
+      r
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/entity.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  class Entity
+    enable_simple_cache
+    common_constructor :api, :data
+
+    class << self
+      def from_array_data(api, array_data, *args)
+        array_data.map { |item_data| new(api, item_data, *args) }
+      end
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/request.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'curb'
+require 'eac_rest/response'
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module EacRest
+  class Request
+    COMMON_MODIFIERS = %w[auth body_data verb].freeze
+    HASH_MODIFIERS = %w[header].freeze
+    MODIFIERS = COMMON_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
+
+    enable_immutable
+    immutable_accessor(*COMMON_MODIFIERS, type: :common)
+    immutable_accessor(*HASH_MODIFIERS, type: :hash)
+
+    enable_listable
+    lists.add_symbol :verb, :get, :delete, :options, :post, :put
+
+    common_constructor :url, :body_data_proc, default: [nil]
+
+    def autenticate(username, password)
+      auth(::OpenStruct.new(username: username, password: password))
+    end
+
+    def immutable_constructor_args
+      [url, body_data_proc]
+    end
+
+    def response
+      ::EacRest::Response.new(build_curl, body_data_proc)
+    end
+
+    private
+
+    def build_curl
+      r = ::Curl::Easy.new(url)
+      MODIFIERS.each { |suffix| send("build_curl_#{suffix}", r) }
+      r
+    end
+
+    def build_curl_auth(curl)
+      auth.if_present do |a|
+        curl.http_auth_types = :basic
+        curl.username = a.username
+        curl.password = a.password
+      end
+    end
+
+    def build_curl_body_data(curl)
+      www_form_body_data_encoded.if_present { |v| curl.post_body = v }
+    end
+
+    def build_curl_headers(curl)
+      curl.headers.merge!(headers)
+    end
+
+    def build_curl_verb(curl)
+      curl.set(
+        :customrequest,
+        verb.if_present(VERB_GET) { |v| self.class.lists.verb.value_validate!(v) }.to_s.upcase
+      )
+    end
+
+    def www_form_body_data_encoded
+      body_data.if_present do |v|
+        v = v.map { |k, vv| [k, vv] } if v.is_a?(::Hash)
+        v = URI.encode_www_form(v) if v.is_a?(::Array)
+        v.to_s
+      end
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/response.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/conversions'
+require 'eac_ruby_utils/core_ext'
+require 'json'
+
+module EacRest
+  class Response < ::StandardError
+    common_constructor :curl, :body_data_proc
+
+    def body_data
+      r = performed_curl.headers['Accept'].if_present(body_str) do |v|
+        method_name = "body_data_from_#{v.parameterize.underscore}"
+        respond_to?(method_name) ? send(method_name) : body_str
+      end
+      r = body_data_proc.call(r) if body_data_proc.present?
+      r
+    end
+
+    def body_data_or_raise
+      raise_unless_200
+
+      body_data
+    end
+
+    delegate :body_str, :headers, to: :performed_curl
+
+    def body_str_or_raise
+      raise_unless_200
+
+      body_str
+    end
+
+    def raise_unless_200
+      return nil if status == 200
+
+      raise self
+    end
+
+    def status
+      performed_curl.status.to_i
+    end
+
+    delegate :url, to: :curl
+
+    def to_s
+      "URL: #{url}\nStatus: #{status}\nBody:\n\n#{body_str}"
+    end
+
+    private
+
+    def body_data_from_application_json
+      ::JSON.parse(body_str)
+    end
+
+    def body_data_from_application_xml
+      Hash.from_xml(body_str)
+    end
+
+    def perform
+      @perform ||= begin
+        curl.perform || raise("CURL perform failed for #{url}")
+        true
+      end
+    end
+
+    def performed_curl
+      perform
+      curl
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module EacRest
+  VERSION = '0.4.0'
+end

data/sub/eac_rest/lib/eac_rest.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  require_sub __FILE__
+end

data/sub/eac_rest/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/eac_rest/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.114.1
+  version: 0.114.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -510,6 +510,7 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb
 - sub/avm-eac_redmine_base0/spec/rubocop_spec.rb
 - sub/avm-eac_redmine_base0/spec/spec_helper.rb
@@ -1124,6 +1125,16 @@ files:
 - sub/eac_git/vendor/git-subrepo/test/setup
 - sub/eac_git/vendor/git-subrepo/test/status.t
 - sub/eac_git/vendor/git-subrepo/test/submodule.t
+- sub/eac_rest/Gemfile
+- sub/eac_rest/eac_rest.gemspec
+- sub/eac_rest/lib/eac_rest.rb
+- sub/eac_rest/lib/eac_rest/api.rb
+- sub/eac_rest/lib/eac_rest/entity.rb
+- sub/eac_rest/lib/eac_rest/request.rb
+- sub/eac_rest/lib/eac_rest/response.rb
+- sub/eac_rest/lib/eac_rest/version.rb
+- sub/eac_rest/spec/rubocop_spec.rb
+- sub/eac_rest/spec/spec_helper.rb
 - sub/eac_ruby_base0/Gemfile
 - sub/eac_ruby_base0/eac_ruby_base0.gemspec
 - sub/eac_ruby_base0/lib/eac_ruby_base0.rb