avmtrf1-tools 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d8d6c82baf32fce3a7b2cd8e524019d91de52e3d7df1396e8e7e5017177310d
-  data.tar.gz: 2816f7f03a19c4b87c076beda3ef0ba9330799a9e0ce2a2589a2ea773457594a
+  metadata.gz: '087a54a4caf473fa94935484dad0a43c184c15789ba50177e8c0613a581cf78f'
+  data.tar.gz: 9694989db13cf4858b41dc451b27c028ab9bee39439926775f956693fb248a10
 SHA512:
-  metadata.gz: 54b6265302b285dfb26724fad9ba7243e2838437ad95dc59e27290df16deb7b04db47414c110d704ff58892026d674d272108bf4e4524852369097f2eddfd08c
-  data.tar.gz: 7a041075a270a408e89bce071c2af63b3c374ba759d16be55b8529b5da080631ea7ddfa48bc51993cbb5fa24da38aebb9c67c634977821d450d60f3ebf9fceb7
+  metadata.gz: 8d3911fda72f48d6bea4b636983907c843ee1bf20572fc5125981559ba2dce197cbabb76e3ea5cecdfbe10400656daf6adb334ec0cd80007637ce00017d0f177
+  data.tar.gz: cd1b31974108d9cae30b962b4fd6d078703900e7e40c6f1c50550a36673d82e3925c9557c7162bcf3f264a4a4fdd682157d208572de300be0490be478c20c326

data/lib/avmtrf1/default_esosti.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/esosti/session'
+require 'avmtrf1/ad_user'
+
+module Avmtrf1
+  class << self
+    def default_esosti
+      @default_esosti ||= ::Avmtrf1::Esosti::Session.new(
+        'https://esosti.trf1.jus.br',
+        ::Avmtrf1.ad_user.username,
+        ::Avmtrf1.ad_user.password,
+        ::Avmtrf1.ad_user.domain.upcase
+      )
+    end
+  end
+end

data/lib/avmtrf1/default_redmine.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/ad_user'
+require 'avmtrf1/redmine/instance'
+
+module Avmtrf1
+  class << self
+    def default_redmine
+      @default_redmine ||= ::Avmtrf1::Redmine::Instance.new(
+        'http://redmine.trf1.gov.br',
+        ::Avmtrf1.ad_user.username,
+        ::Avmtrf1.ad_user.password
+      )
+    end
+  end
+end

data/lib/avmtrf1/git/issue_on_repository.rb

@@ -50,9 +50,9 @@ module Avmtrf1
         return nil if issue.present?
 
         if tag_ref.present?
-          ::Avmtrf1::Result.ok('demanda não encontrada e Git fechado')
+          ::Avmtrf1::Result.neutral('demanda não encontrada e Git fechado')
         else
-          ::Avmtrf1::Result.error('demanda não encontrada e Git aberto')
+          ::Avmtrf1::Result.neutral('demanda não encontrada e Git aberto')
         end
       end
 
@@ -71,13 +71,13 @@ module Avmtrf1
       def issue_open_git_open_check
         return nil unless !issue.closed? && !git_closed?
 
-        ::Avmtrf1::Result.ok('demanda aberta e Git aberto')
+        ::Avmtrf1::Result.success('demanda aberta e Git aberto')
       end
 
       def issue_closed_git_closed_check
         return nil unless issue.closed? && git_closed?
 
-        ::Avmtrf1::Result.ok('demanda fechada e Git fechado')
+        ::Avmtrf1::Result.success('demanda fechada e Git fechado')
       end
 
       def git_closed?

data/lib/avmtrf1/issues/factory.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/default_jira'
+require 'avmtrf1/default_redmine'
 
 module AvmTrf1
   class IssueFactory
@@ -14,7 +15,7 @@ module AvmTrf1
       end
 
       def factories
-        [::Avmtrf1.default_jira]
+        [::Avmtrf1.default_jira, ::Avmtrf1.default_redmine]
       end
     end
   end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/jira/entities/base'
+require 'avmtrf1/rest_provider/entity'
 
 module Avmtrf1
   module Jira
     module Entities
-      class Issue < ::Avmtrf1::Jira::Entities::Base
+      class Issue < ::Avmtrf1::RestProvider::Entity
         CATEGORY_CLOSED_STATUSES = %w[Pendências Concluído].freeze
         CATEGORY_OPEN_STATUSES = ['Em andamento'].freeze
 

data/lib/avmtrf1/jira/entities.rb

@@ -3,7 +3,6 @@
 module Avmtrf1
   module Jira
     module Entities
-      require 'avmtrf1/jira/entities/base'
       require 'avmtrf1/jira/entities/issue'
     end
   end

data/lib/avmtrf1/jira/instance.rb

@@ -1,56 +1,28 @@
 # frozen_string_literal: true
 
-require 'curb'
-require 'json'
+require 'avmtrf1/rest_provider/instance'
 
 module Avmtrf1
   module Jira
-    class Instance
+    class Instance < ::Avmtrf1::RestProvider::Instance
       ISSUE_ID_PATTERN = /\A([a-z][a-z0-9]+)\-(\d+)\z/i.freeze
 
       class << self
-        def parse_issue_id(issue_id)
-          m = ISSUE_ID_PATTERN.match(issue_id)
+        def parse_issue_id(global_issue_id)
+          m = ISSUE_ID_PATTERN.match(global_issue_id)
           return nil unless m
 
-          ::OpenStruct.new(project_id: m[1], project_issue_id: m[2])
+          ::OpenStruct.new(provider_issue_id: m[0], project_id: m[1], project_issue_id: m[2])
         end
       end
 
-      attr_reader :root_url, :username
-
-      def initialize(root_url, username, password)
-        @root_url = root_url
-        @username = username
-        @password = password
-      end
-
-      def find_issue(issue_id)
-        parsed = self.class.parse_issue_id(issue_id)
-        parsed.present? ? issue(issue_id) : nil
-      end
-
-      def issue(issue_id)
-        ::Avmtrf1::Jira::Entities::Issue.new(self, request("/issue/#{issue_id}"))
-      end
-
-      def request(service_url_suffix)
-        c = ::Curl::Easy.new(build_service_url(service_url_suffix))
-        c.http_auth_types = :basic
-        c.username = username
-        c.password = password
-        raise 'Curl failed' unless c.perform
-
-        JSON.parse(c.body_str)
-      end
-
-      private
-
-      attr_reader :password
-
       def build_service_url(service_url_suffix)
         "#{root_url}/rest/api/latest#{service_url_suffix}"
       end
+
+      def issue_get_url_suffix(provider_issue_id)
+        "/issue/#{provider_issue_id}"
+      end
     end
   end
 end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/rest_provider/entity'
+
+module Avmtrf1
+  module Redmine
+    module Entities
+      class Issue < ::Avmtrf1::RestProvider::Entity
+        def closed?
+          status.closed?
+        end
+
+        def data
+          super.fetch('issue')
+        end
+
+        def status
+          @status ||= instance.issue_status(status_id)
+        end
+
+        def status_name
+          data.fetch('status').fetch('name')
+        end
+
+        def status_id
+          data.fetch('status').fetch('id')
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/redmine/entities/issue_status.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/rest_provider/entity'
+
+module Avmtrf1
+  module Redmine
+    module Entities
+      class IssueStatus < ::Avmtrf1::RestProvider::Entity
+        def id
+          data.fetch('id')
+        end
+
+        def name
+          data.fetch('name')
+        end
+
+        def closed?
+          data.fetch('is_closed')
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/redmine/entities.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Redmine
+    module Entities
+      require 'avmtrf1/redmine/entities/issue'
+      require 'avmtrf1/redmine/entities/issue_status'
+    end
+  end
+end

data/lib/avmtrf1/redmine/instance.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/redmine/entities/issue'
+require 'avmtrf1/redmine/entities/issue_status'
+require 'avmtrf1/rest_provider/instance'
+
+module Avmtrf1
+  module Redmine
+    class Instance < ::Avmtrf1::RestProvider::Instance
+      ISSUE_ID_PATTERN = /\Aredmine_(\d+)\z/i.freeze
+
+      class << self
+        def parse_issue_id(issue_id)
+          m = ISSUE_ID_PATTERN.match(issue_id)
+          m ? ::OpenStruct.new(provider_issue_id: m[1]) : nil
+        end
+      end
+
+      def build_service_url(service_url_suffix)
+        "#{root_url}#{service_url_suffix}.json"
+      end
+
+      def issue_get_url_suffix(provider_issue_id)
+        "/issues/#{provider_issue_id}"
+      end
+
+      def issue_status(issue_status_id)
+        issue_statuses.find { |issue_status| issue_status.id == issue_status_id }
+      end
+
+      private
+
+      def issue_statuses
+        request('/issue_statuses').fetch('issue_statuses').map do |data|
+          ::Avmtrf1::Redmine::Entities::IssueStatus.new(self, data)
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/redmine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Redmine
+    require 'avmtrf1/redmine/entities'
+  end
+end

data/lib/avmtrf1/rest_provider/entity.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/simple_cache'
+
+module Avmtrf1
+  module RestProvider
+    class Entity
+      include ::EacRubyUtils::SimpleCache
+
+      attr_reader :instance, :data
+
+      def initialize(instance, data)
+        @instance = instance
+        @data = data
+      end
+    end
+  end
+end

data/lib/avmtrf1/rest_provider/instance.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'curb'
+require 'json'
+require 'avmtrf1/jira/entities/issue'
+
+module Avmtrf1
+  module RestProvider
+    # Abstract methods
+    #   * parse_issue_id(global_issue_id)
+    #   * self.build_service_url(service_url_suffix)
+    #   * self.issue_get_url_suffix(provider_issue_id)
+    class Instance
+      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)
+        c = ::Curl::Easy.new(build_service_url(service_url_suffix))
+        c.http_auth_types = :basic
+        c.username = username
+        c.password = password
+        raise 'Curl failed' unless c.perform
+
+        JSON.parse(c.body_str)
+      end
+
+      def issue_class
+        "#{self.class.name.deconstantize}::Entities::Issue".constantize
+      end
+    end
+  end
+end

data/lib/avmtrf1/rest_provider.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module RestProvider
+    require 'avmtrf1/rest_provider/instance'
+  end
+end

data/lib/avmtrf1/result.rb

@@ -1,32 +1,44 @@
 # frozen_string_literal: true
 
 require 'colorize'
+require 'eac_ruby_utils/listable'
 
 module Avmtrf1
   class Result
-    class << self
-      def ok(output)
-        new(true, output)
-      end
-
-      def error(output)
-        new(false, output)
-      end
+    include ::EacRubyUtils::Listable
+
+    lists.add_string :type, :success, :error, :neutral
+
+    lists.type.values.each do |type|
+      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+        def self.#{type}(output)
+          new(TYPE_#{type.upcase}, output)
+        end
+      RUBY_EVAL
     end
 
-    attr_reader :output
+    TYPE_SUCCESS_COLOR = 'green'
+    TYPE_ERROR_COLOR = 'red'
+    TYPE_NEUTRAL_COLOR = 'white'
 
-    def initialize(is_ok, output)
-      @ok = is_ok
+    attr_reader :type, :output
+
+    def initialize(type, output)
+      validate_type(type)
+      @type = type
       @output = output
     end
 
-    def ok?
-      @ok ? true : false
+    def label
+      output.send(self.class.const_get("type_#{type}_color".upcase))
     end
 
-    def label
-      ok? ? output.green : output.red
+    private
+
+    def validate_type(type)
+      return if self.class.lists.type.values.include?(type)
+
+      raise "Tipo desconhecido: \"#{type}\" (Válido: #{self.class.lists.type.values.join(', ')})"
     end
   end
 end

data/lib/avmtrf1/tools/runner/check_point/login.rb

@@ -23,7 +23,6 @@ module Avmtrf1
 
             Options:
               -h --help       Mostra esta ajuda.
-              -H --headless   Não mostra a interface gráfica do navegador web.
           DOCOPT
 
           def run
@@ -38,7 +37,7 @@ module Avmtrf1
           end
 
           def session_uncached
-            ::Avmtrf1::CheckPoint::Session.by_default_ad_user(headless: options.fetch('--headless'))
+            ::Avmtrf1::CheckPoint::Session.by_default_ad_user
           end
         end
       end

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

@@ -48,12 +48,7 @@ module Avmtrf1
         end
 
         def session_uncached
-          ::Avmtrf1::Esosti::Session.new(
-            'https://esosti.trf1.jus.br',
-            ENV.fetch('ESOSTI_USER'),
-            ENV.fetch('ESOSTI_PASSWORD'),
-            ENV.fetch('ESOSTI_UF')
-          )
+          ::Avmtrf1.default_esosti
         end
       end
     end

data/lib/avmtrf1/tools/runner.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'aranha/selenium/driver_factory/base'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'avmtrf1/tools/runner/check_point'
 require 'avmtrf1/tools/runner/esosti'
@@ -18,8 +19,14 @@ module Avmtrf1
           __PROGRAM__ -h | --help
 
         Options:
-          -h --help             Show this screen.
+          -h --help       Show this screen.
+          -H --headless   Quando usando Selenium não mostra a interface gráfica do navegador web.
       DOCOPT
+
+      def run
+        ::Aranha::Selenium::DriverFactory::Base.default_headless = options.fetch('--headless')
+        run_with_subcommand
+      end
     end
   end
 end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.5.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/avmtrf1.rb

@@ -4,7 +4,9 @@ module Avmtrf1
   require 'avmtrf1/active_directory'
   require 'avmtrf1/ad_user'
   require 'avmtrf1/configs'
+  require 'avmtrf1/default_esosti'
   require 'avmtrf1/default_jira'
+  require 'avmtrf1/default_redmine'
   require 'avmtrf1/git'
   require 'avmtrf1/ini'
   require 'avmtrf1/issues'
@@ -12,6 +14,8 @@ module Avmtrf1
   require 'avmtrf1/oracle'
   require 'avmtrf1/patches'
   require 'avmtrf1/red'
+  require 'avmtrf1/redmine'
+  require 'avmtrf1/rest_provider'
   require 'avmtrf1/result'
   require 'avmtrf1/tools'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,9 @@ files:
 - lib/avmtrf1/check_point/session.rb
 - lib/avmtrf1/check_point/session/login.rb
 - lib/avmtrf1/configs.rb
+- lib/avmtrf1/default_esosti.rb
 - lib/avmtrf1/default_jira.rb
+- lib/avmtrf1/default_redmine.rb
 - lib/avmtrf1/esosti/parsers/solicitacao/main.rb
 - lib/avmtrf1/esosti/session.rb
 - lib/avmtrf1/esosti/session/action_base.rb
@@ -191,7 +193,6 @@ files:
 - lib/avmtrf1/issues/factory.rb
 - lib/avmtrf1/jira.rb
 - lib/avmtrf1/jira/entities.rb
-- lib/avmtrf1/jira/entities/base.rb
 - lib/avmtrf1/jira/entities/issue.rb
 - lib/avmtrf1/jira/instance.rb
 - lib/avmtrf1/oracle.rb
@@ -207,6 +208,14 @@ files:
 - lib/avmtrf1/red/profile.rb
 - lib/avmtrf1/red/profile/put_file.xml.erb
 - lib/avmtrf1/red/server.rb
+- lib/avmtrf1/redmine.rb
+- lib/avmtrf1/redmine/entities.rb
+- lib/avmtrf1/redmine/entities/issue.rb
+- lib/avmtrf1/redmine/entities/issue_status.rb
+- lib/avmtrf1/redmine/instance.rb
+- lib/avmtrf1/rest_provider.rb
+- lib/avmtrf1/rest_provider/entity.rb
+- lib/avmtrf1/rest_provider/instance.rb
 - lib/avmtrf1/result.rb
 - lib/avmtrf1/tools.rb
 - lib/avmtrf1/tools/runner.rb

data/lib/avmtrf1/jira/entities/base.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/simple_cache'
-
-module Avmtrf1
-  module Jira
-    module Entities
-      class Base
-        include ::EacRubyUtils::SimpleCache
-
-        attr_reader :instance, :data
-
-        def initialize(instance, data)
-          @instance = instance
-          @data = data
-        end
-      end
-    end
-  end
-end