avmtrf1-tools 0.26.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc536ae35fea31a81dcf588d028a691b22ef255652395556e9d5df4b18f9a86
-  data.tar.gz: fe45a68ece7117513a30b34c9f52b842339a916b4f5d7c2aa4ab6632b4ee0762
+  metadata.gz: b61967bd7fdee216edfc174a67a238cb5f09fd625ae19c5bc029f0e13fc319ce
+  data.tar.gz: 4ecf717af9a51d39bda3ef107a5536ad97a27c4839cae2ff4255f89bccffa47e
 SHA512:
-  metadata.gz: 3bc133b27c48f0926c2b7afbc096313e5658f58a04bae3b32f9d9e9f1798a0463ecae8fcfab9f3a6a489f48a6675cfae2878a4f242798cbfcafcff0c283f4a61
-  data.tar.gz: 790921a5e68cc1731ddbe2f79569a983543b2d4f3db2a96e2a2d643004610f2aa90bc030bcd24a15bfa9bb66983afeb5f389676f17bb0bb5493aea1f841c7bb2
+  metadata.gz: f4dcd615dec9efc8824e9307a8673a409ef411e27c41e0b52b4df8f2bf613a66425fda3c13fe7550dc5347088d83b6e097360fb033e78ee100d84ed779715aa2
+  data.tar.gz: 788d8843f20252d25d86e79e327f16e71f2aa9a9de370e754b65a99eb7043dbbbc2a40ba02bfc244f0287af4bd96daf579ea7849dfcc61e61966122419f9f368

data/Gemfile

@@ -3,3 +3,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :oracle do
+  gem 'ruby-oci8'
+end

data/lib/avmtrf1/default_esosti.rb

@@ -6,8 +6,12 @@ require 'avmtrf1/ad_user'
 module Avmtrf1
   class << self
     def default_esosti
-      @default_esosti ||= ::Avmtrf1::Esosti::Instance.new(
-        'https://esosti.trf1.jus.br',
+      @default_esosti ||= trf1_esosti('https://esosti.trf1.jus.br')
+    end
+
+    def trf1_esosti(url)
+      ::Avmtrf1::Esosti::Instance.new(
+        url,
         "#{::Avmtrf1.ad_user.username}@#{::Avmtrf1.ad_user.domain.downcase}.gov.br",
         ::Avmtrf1.ad_user.password
       )

data/lib/avmtrf1/esosti/entities/issue.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/esosti/raw_data_sanitizer'
 require 'avmtrf1/rest_provider/entity'
 
 module Avmtrf1
@@ -7,42 +8,15 @@ module Avmtrf1
     module Entities
       class Issue < ::Avmtrf1::RestProvider::Entity
         class << self
-          def raw_data_to_data(raw_data)
-            sanitize_data(raw_data.fetch('QueryMS_RMTICKETResponse').fetch('MS_RMTICKETSet')
-                .fetch('TICKET'))
-          end
-
-          def sanitize_data(data)
-            if data.is_a?(Array)
-              sanitize_array_data(data)
-            elsif data.is_a?(Hash)
-              sanitize_hash_data(data)
-            else
-              data
-            end
-          end
-
-          private
-
-          def sanitize_array_data(data)
-            data.map { |v| sanitize_data(v) }
-          end
-
-          def sanitize_hash_data(data)
-            if content_hash?(data)
-              sanitize_data(data.fetch('content'))
-            else
-              data.transform_values { |v| sanitize_data(v) }
+          def parse_data(data)
+            data.fetch('QueryMS_RMTICKETResponse')['MS_RMTICKETSet'].if_present(nil) do |v|
+              ::Avmtrf1::Esosti::RawDataSanitizer.sanitize(v.fetch('TICKET'))
             end
           end
-
-          def content_hash?(data)
-            data.is_a?(Hash) && data.count == 1 && data.key?('content')
-          end
         end
 
         def initialize(instance, data)
-          super instance, self.class.raw_data_to_data(data)
+          super instance, data
         end
       end
     end

data/lib/avmtrf1/esosti/instance.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/esosti/entities/issue'
 require 'avmtrf1/rest_provider/instance'
 
 module Avmtrf1
   module Esosti
     class Instance < ::Avmtrf1::RestProvider::Instance
+      require_sub __FILE__
+      include ::Avmtrf1::Esosti::Instance::Changed
+
       def build_service_url(service_url_suffix)
         "#{root_url}/maxrest/rest#{service_url_suffix}"
       end

data/lib/avmtrf1/esosti/instance/changed.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/esosti/raw_data_sanitizer'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Esosti
+    class Instance < ::Avmtrf1::RestProvider::Instance
+      module Changed
+        def changed(since)
+          changed_request(since).response.body_data_or_raise
+        end
+
+        def changed_request(since)
+          request_json(changed_url_suffix(since)) do |data|
+            ::Avmtrf1::Esosti::RawDataSanitizer.sanitize(
+              data.fetch('TICKETMboSet').fetch('TICKET')
+            ).map { |ticket| ticket.fetch('Attributes').fetch('TICKETID').downcase }
+          end
+        end
+
+        def changed_url_suffix(since)
+          '/mbo/ticket?_includecols=ticketid&changedate=~gt~' +
+            ::CGI.escape(formatted_time(since))
+        end
+
+        def formatted_time(time)
+          time.strftime('%FT%T%:z')
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/esosti/raw_data_sanitizer.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Esosti
+    class RawDataSanitizer
+      class << self
+        def sanitize(raw_data)
+          new(raw_data).sanitized
+        end
+      end
+
+      CONTENT_KEY = 'content'
+
+      common_constructor :raw_data
+
+      def sanitized
+        if raw_data.is_a?(Array)
+          array_sanitized
+        elsif raw_data.is_a?(Hash)
+          hash_sanitized
+        else
+          raw_data
+        end
+      end
+
+      private
+
+      def array_sanitized
+        raw_data.map { |v| self.class.sanitize(v) }
+      end
+
+      def hash_sanitized
+        if content_hash?
+          self.class.sanitize(raw_data.fetch(CONTENT_KEY))
+        else
+          raw_data.transform_values { |v| self.class.sanitize(v) }
+        end
+      end
+
+      def content_hash?
+        raw_data.is_a?(Hash) && raw_data.count == 1 && raw_data.key?(CONTENT_KEY)
+      end
+    end
+  end
+end

data/lib/avmtrf1/oracle/connection/base.rb

@@ -12,6 +12,7 @@ module Avmtrf1
         delegate :exec, to: :connection
 
         def initialize(connection_string)
+          ::Avmtrf1::Oracle::Oci8.require_lib
           @connection = OCI8.new(connection_string)
         end
 

data/lib/avmtrf1/oracle/oci8.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/ruby/gems/dependency'
+
 module Avmtrf1
   module Oracle
     module Oci8
-      NLS_LANG_DEFAULT_VALUE = 'BRAZILIAN PORTUGUESE_BRAZIL.WE8ISO8859P1'
+      NLS_LANG_DEFAULT_VALUE = 'BRAZILIAN PORTUGUESE_BRAZIL.UTF8'
       NLS_LANG_ENVIRONMENT_KEY = 'NLS_LANG'
 
       class << self
+        def dependency
+          @dependency ||= ::Avmtrf1::Ruby::Gems::Dependency.new('ruby-oci8', 'oci8')
+        end
+
         def require_lib
           nls_lang_set
-          require 'oci8'
+          dependency.require_lib
         end
 
         def nls_lang_set
@@ -21,5 +27,3 @@ module Avmtrf1
     end
   end
 end
-
-::Avmtrf1::Oracle::Oci8.require_lib

data/lib/avmtrf1/redmine/instance.rb

@@ -31,7 +31,8 @@ module Avmtrf1
       private
 
       def issue_statuses
-        request('/issue_statuses').fetch('issue_statuses').map do |data|
+        request_json('/issue_statuses').response.body_data_or_raise.fetch('issue_statuses')
+                                       .map do |data|
           ::Avmtrf1::Redmine::Entities::IssueStatus.new(self, data)
         end
       end

data/lib/avmtrf1/rest_provider/instance.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/rest_provider/request'
 require 'curb'
-require 'json'
-require 'avmtrf1/jira/entities/issue'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module RestProvider
@@ -12,58 +11,19 @@ module Avmtrf1
     #   * self.build_service_url(service_url_suffix)
     #   * self.issue_get_url_suffix(provider_issue_id)
     class Instance
-      include ::EacRubyUtils::Console::Speaker
-
-      attr_reader :root_url, :username, :password
-
-      def initialize(root_url, username, password)
-        @root_url = root_url
-        @username = username
-        @password = password
-      end
-
-      def find_issue(global_issue_id)
-        parsed = self.class.parse_issue_id(global_issue_id)
-        parsed.present? ? issue(parsed.provider_issue_id) : nil
-      end
-
-      def issue(provider_issue_id)
-        issue_class.new(self, request(issue_get_url_suffix(provider_issue_id)))
-      end
-
-      def request(service_url_suffix)
-        url = build_service_url(service_url_suffix)
-        infov 'URL', url
-        c = ::Curl::Easy.new(url)
-        c.http_auth_types = :basic
-        c.username = username
-        c.password = password
-        c.headers['Accept'] = 'application/json'
-        curl_perform(c)
-      end
-
-      def issue_class
-        "#{self.class.name.deconstantize}::Entities::Issue".constantize
-      end
-
-      private
-
-      def curl_perform(curl)
-        raise 'Curl failed' unless curl.perform
-
-        infov 'Return status', curl.status
-        return JSON.parse(curl.body_str) if curl.status.to_i == 200
-
-        raise curl_raise_message(curl)
+      require_sub __FILE__, include_modules: true
+      common_constructor :root_url, :username, :password
+
+      def request(service_url_suffix, headers = {}, &body_data_proc)
+        r = Avmtrf1::RestProvider::Request.new(build_service_url(service_url_suffix),
+                                               body_data_proc)
+        headers.each { |name, value| r.header(name, value) }
+        r.autenticate(username, password)
+        r
       end
 
-      def curl_raise_message(curl)
-        raise <<~MESSAGE
-          "#{curl.url} returned #{curl.status.to_i}:
-          #{'=' * 10}
-          #{curl.body_str}
-          #{'=' * 10}"
-        MESSAGE
+      def request_json(service_url_suffix, headers = {}, &body_data_proc)
+        request(service_url_suffix, headers.merge('Accept' => 'application/json'), &body_data_proc)
       end
     end
   end

data/lib/avmtrf1/rest_provider/instance/issues.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module RestProvider
+    class Instance
+      module Issues
+        def find_issue(global_issue_id)
+          parsed = self.class.parse_issue_id(global_issue_id)
+          parsed.present? ? issue(parsed.provider_issue_id) : nil
+        end
+
+        def issue(provider_issue_id)
+          issue_request(provider_issue_id).response.body_data_or_raise
+        end
+
+        # @return [Avmtrf1::RestProvider::Request]
+        def issue_request(provider_issue_id)
+          request_json(issue_get_url_suffix(provider_issue_id)) do |data|
+            data = issue_class.parse_data(data) if issue_class.respond_to?(:parse_data)
+            data.present? ? issue_class.new(self, data) : nil
+          end
+        end
+
+        def issue_class
+          "#{self.class.name.deconstantize}::Entities::Issue".constantize
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/rest_provider/request.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/rest_provider/response'
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module Avmtrf1
+  module RestProvider
+    class Request
+      common_constructor :url, :body_data_proc, default: [nil]
+
+      def autenticate(username, password)
+        self.auth = ::OpenStruct.new(username: username, password: password)
+      end
+
+      def header(name, value)
+        headers[name.to_s] = value
+      end
+
+      def response
+        ::Avmtrf1::RestProvider::Response.new(build_curl, body_data_proc)
+      end
+
+      private
+
+      attr_accessor :auth
+
+      def build_curl
+        r = ::Curl::Easy.new(url)
+        auth.if_present do |a|
+          r.http_auth_types = :basic
+          r.username = a.username
+          r.password = a.password
+        end
+        r.headers.merge!(headers)
+        r
+      end
+
+      def headers
+        @headers ||= {}
+      end
+    end
+  end
+end

data/lib/avmtrf1/rest_provider/response.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/conversions'
+require 'eac_ruby_utils/core_ext'
+require 'json'
+
+module Avmtrf1
+  module RestProvider
+    class Response < ::StandardError
+      common_constructor :curl, :body_data_proc
+
+      def body_data
+        r = performed_curl.headers['Accept'].if_present(body_str) do |v|
+          send("body_data_from_#{v.parameterize.underscore}")
+        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
+
+      def body_str
+        performed_curl.body_str
+      end
+
+      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
+
+      def url
+        curl.url
+      end
+
+      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
+end

data/lib/avmtrf1/ruby.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Ruby
+    require_sub __FILE__
+  end
+end

data/lib/avmtrf1/ruby/gems.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Ruby
+    module Gems
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avmtrf1/ruby/gems/dependency.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/ruby/gems/not_found_error'
+
+module Avmtrf1
+  module Ruby
+    module Gems
+      class Dependency
+        common_constructor :gem_name, :lib_name
+
+        def require_lib
+          require lib_name
+        rescue LoadError
+          raise ::Avmtrf1::Ruby::Gems::NotFoundError, self
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/ruby/gems/not_found_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Ruby
+    module Gems
+      class NotFoundError < ::StandardError
+        attr_reader :dependency
+
+        def initialize(dependency)
+          @dependency = dependency
+          super("Gem \"#{dependency.gem_name}\" not found" \
+              " (Library required: \"#{dependency.lib_name}\")")
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner.rb

@@ -4,6 +4,7 @@ require 'aranha/selenium/driver_factory/base'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/require_sub'
 require 'avmtrf1/tools/version'
+require 'avmtrf1/ruby/gems/not_found_error'
 require 'eac_ruby_utils/console/speaker'
 
 module Avmtrf1
@@ -33,6 +34,17 @@ module Avmtrf1
         else
           run_with_subcommand
         end
+      rescue ::Avmtrf1::Ruby::Gems::NotFoundError => e
+        on_gem_not_found(e.dependency)
+      end
+
+      private
+
+      def on_gem_not_found(dependency)
+        fatal_error "A gem \"#{dependency.gem_name}\" foi requerida " \
+          "(Por \"require '#{dependency.lib_name}'\") e não encontrada. Para instalá-la:\n\n" \
+          "  gem install #{dependency.gem_name}\n\n" \
+          'Nota: procedimentos adicionais podem ser necessários.'
       end
     end
   end

data/lib/avmtrf1/tools/runner/esosti.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/default_esosti'
 require 'avmtrf1/ini'
 require 'avmtrf1/red/profile'
@@ -11,34 +10,28 @@ module Avmtrf1
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class Esosti < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::Console::Speaker
-        include ::EacRubyUtils::SimpleCache
+        require_sub __FILE__
+        enable_console_speaker
+        enable_simple_cache
 
         DOC = <<~DOCOPT
           Utilidades para e-Sosti (Control Desk).
 
             Usage:
-            __PROGRAM__ [options] fetch <solicitacao_id>
+            __PROGRAM__ [options] __SUBCOMMANDS__
             __PROGRAM__ -h | --help
 
           Options:
-            -h --help   Mostra esta ajuda.
-            -u --user   Usuário no e-Sosti.
+            -h --help       Mostra esta ajuda.
+            -U --url=<url>  Utiliza o Control Desk em <url>.
         DOCOPT
 
-        def run
-          if options.fetch('fetch')
-            fetch
-          else
-            fatal_error('Subcomando não mapeado (Isto é um defeito do software)')
-          end
-        end
+        private
 
-        def fetch
-          infom "Recuperando informações de #{options.fetch('<solicitacao_id>')}..."
-          issue = ::Avmtrf1.default_esosti.issue(options.fetch('<solicitacao_id>'))
-          fatal_error("Issue não encontrado: #{options.fetch('<solicitacao_id>')}") unless issue
-          out issue.data.to_yaml
+        def esosti_instance_uncached
+          options.fetch('--url').if_present(::Avmtrf1.default_esosti) do |url|
+            ::Avmtrf1.trf1_esosti(url)
+          end
         end
       end
     end

data/lib/avmtrf1/tools/runner/esosti/changed.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/default_esosti'
+require 'avmtrf1/ini'
+require 'avmtrf1/red/profile'
+
+module Avmtrf1
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Esosti < ::EacRubyUtils::Console::DocoptRunner
+        class Changed < ::EacRubyUtils::Console::DocoptRunner
+          enable_console_speaker
+          enable_simple_cache
+
+          DOC = <<~DOCOPT
+            Recupera o conteúdo de uma solicitação e-Sosti (Control Desk).
+
+            Usage:
+              __PROGRAM__ [options] <time>
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help       Mostra esta ajuda.
+          DOCOPT
+
+          def run
+            infov 'Time', time
+            infov 'URL', request.url
+            out data.to_yaml
+          end
+
+          private
+
+          def data_uncached
+            infom 'Recuperando informações...'
+            request.response.body_data_or_raise
+          end
+
+          def request_uncached
+            context(:esosti_instance).changed_request(time)
+          end
+
+          def time
+            ::Time.parse(options.fetch('<time>'))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/esosti/fetch.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/default_esosti'
+require 'avmtrf1/ini'
+require 'avmtrf1/red/profile'
+
+module Avmtrf1
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Esosti < ::EacRubyUtils::Console::DocoptRunner
+        class Fetch < ::EacRubyUtils::Console::DocoptRunner
+          enable_console_speaker
+          enable_simple_cache
+
+          DOC = <<~DOCOPT
+            Recupera o conteúdo de uma solicitação e-Sosti (Control Desk).
+
+            Usage:
+              __PROGRAM__ [options] <solicitacao_id>
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help       Mostra esta ajuda.
+          DOCOPT
+
+          def run
+            infov 'URL', request.url
+            fatal_error("Issue não encontrado: #{solicitacao_id}") unless issue
+            out issue.data.to_yaml
+          end
+
+          private
+
+          def request_uncached
+            context(:esosti_instance).issue_request(solicitacao_id)
+          end
+
+          def issue_uncached
+            infom "Recuperando informações de #{solicitacao_id}..."
+            request.response.body_data_or_raise
+          end
+
+          def solicitacao_id
+            options.fetch('<solicitacao_id>')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/esosti/request.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/default_esosti'
+require 'avmtrf1/ini'
+require 'avmtrf1/red/profile'
+
+module Avmtrf1
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Esosti < ::EacRubyUtils::Console::DocoptRunner
+        class Request < ::EacRubyUtils::Console::DocoptRunner
+          enable_console_speaker
+          enable_simple_cache
+
+          DOC = <<~DOCOPT
+            Requisições genéricas para e-Sosti (Control Desk).
+
+              Usage:
+              __PROGRAM__ [options] <url-suffix>
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help       Mostra esta ajuda.
+              -d --default    Opções --json e --yaml.
+              -j --json       Solicita resposta em JSON.
+              -x --xml        Solicita resposta em XML.
+              -y --yaml       Imprime saída em YAML.
+          DOCOPT
+
+          def run
+            start_banner
+            output_data
+          end
+
+          private
+
+          def json?
+            options.fetch('--json') || options.fetch('--default')
+          end
+
+          def start_banner
+            infov 'URL', request.url
+            infom 'Recuperando informações...'
+            infov 'Response status', response.status
+          end
+
+          def output_data
+            if yaml?
+              out ::YAML.dump(response.body_data)
+            else
+              out response.body_str
+            end
+          end
+
+          def request_uncached
+            context(:esosti_instance).request(url_suffix, request_headers)
+          end
+
+          def request_headers
+            r = {}
+            %w[json xml].each do |format|
+              r['Accept'] = "application/#{format}" if send("#{format}?")
+            end
+            r
+          end
+
+          def response_uncached
+            request.response
+          end
+
+          def url_suffix
+            options.fetch('<url-suffix>')
+          end
+
+          def xml?
+            options.fetch('--xml')
+          end
+
+          def yaml?
+            options.fetch('--yaml') || options.fetch('--default')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.26.0'
+    VERSION = '0.30.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +33,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +43,21 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -84,48 +78,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: eac_launcher
+  name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.32'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.32.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.32'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
-- !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.26'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +155,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -182,20 +165,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: ruby-oci8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +175,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -210,6 +185,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: 
 email: 
 executables:
@@ -236,7 +214,8 @@ files:
 - lib/avmtrf1/esosti/entities.rb
 - lib/avmtrf1/esosti/entities/issue.rb
 - lib/avmtrf1/esosti/instance.rb
-- lib/avmtrf1/esosti/parsers/solicitacao/main.rb
+- lib/avmtrf1/esosti/instance/changed.rb
+- lib/avmtrf1/esosti/raw_data_sanitizer.rb
 - lib/avmtrf1/esosti/session.rb
 - lib/avmtrf1/esosti/session/action_base.rb
 - lib/avmtrf1/esosti/session/atividades.rb
@@ -320,13 +299,23 @@ files:
 - lib/avmtrf1/rest_provider.rb
 - lib/avmtrf1/rest_provider/entity.rb
 - lib/avmtrf1/rest_provider/instance.rb
+- lib/avmtrf1/rest_provider/instance/issues.rb
+- lib/avmtrf1/rest_provider/request.rb
+- lib/avmtrf1/rest_provider/response.rb
 - lib/avmtrf1/result.rb
+- lib/avmtrf1/ruby.rb
+- lib/avmtrf1/ruby/gems.rb
+- lib/avmtrf1/ruby/gems/dependency.rb
+- lib/avmtrf1/ruby/gems/not_found_error.rb
 - lib/avmtrf1/template.rb
 - lib/avmtrf1/tools.rb
 - lib/avmtrf1/tools/runner.rb
 - lib/avmtrf1/tools/runner/check_point.rb
 - lib/avmtrf1/tools/runner/check_point/login.rb
 - lib/avmtrf1/tools/runner/esosti.rb
+- lib/avmtrf1/tools/runner/esosti/changed.rb
+- lib/avmtrf1/tools/runner/esosti/fetch.rb
+- lib/avmtrf1/tools/runner/esosti/request.rb
 - lib/avmtrf1/tools/runner/forponto.rb
 - lib/avmtrf1/tools/runner/forponto/espelho.rb
 - lib/avmtrf1/tools/runner/forponto/marcacoes.rb

data/lib/avmtrf1/esosti/parsers/solicitacao/main.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/object' # To-to: declare in gem "aranha"
-require 'active_support/core_ext/string' # To-to: declare in gem "aranha"
-require 'aranha/parsers/html/item'
-require 'nokogiri' # To-to: declare in gem "aranha"
-
-module Avmtrf1
-  module Esosti
-    module Parsers
-      module Solicitacao
-        class Main < ::Aranha::Parsers::Html::Item
-          field :pessoa_afetada_email, :string,
-                '//input[@type="text" and ' \
-                'following-sibling::img[contains(@aria-label, "Pessoa Afetada")]]/@value'
-
-          def item_xpath; end
-        end
-      end
-    end
-  end
-end