avmtrf1-tools 0.41.1 → 0.42.1

data/lib/avmtrf1/oracle.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
+Dir["#{File.dirname(__FILE__)}/#{File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
   require path
 end
 

data/lib/avmtrf1/patches/avm/git/issue/complete.rb

@@ -44,7 +44,7 @@ module Avmtrf1
   end
 end
 
-::EacRubyUtils.patch(
-  ::Avm::Git::Issue::Complete,
-  ::Avmtrf1::Patches::Avm::Git::Issue::Complete
+EacRubyUtils.patch(
+  Avm::Git::Issue::Complete,
+  Avmtrf1::Patches::Avm::Git::Issue::Complete
 )

data/lib/avmtrf1/patches/avm/git/issue.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/lib/avmtrf1/patches/avm/git/launcher/base.rb

@@ -28,7 +28,7 @@ module Avmtrf1
 
               def parse_status_file(line)
                 m = /\A(.)(.)\s*(\S.*)\z/.match(line.strip)
-                return ::OpenStruct.new(stage: m[1], dirty: m[2], path: m[3]) if m
+                return ::OpenStruct.new(stage: m[1], dirty: m[2], path: m[3]) if m # rubocop:disable Style/OpenStructUse
 
                 raise "\"#{line.strip}\" did not match pattern"
               end
@@ -40,7 +40,7 @@ module Avmtrf1
   end
 end
 
-::EacRubyUtils.patch(
-  ::Avm::Git::Launcher::Base,
-  ::Avmtrf1::Patches::Avm::Git::Launcher::Base
+EacRubyUtils.patch(
+  Avm::Git::Launcher::Base,
+  Avmtrf1::Patches::Avm::Git::Launcher::Base
 )

data/lib/avmtrf1/patches/avm/git/launcher.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/lib/avmtrf1/patches/avm/git.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/lib/avmtrf1/patches/avm.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/lib/avmtrf1/patches.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/lib/avmtrf1/php/docker_images/v5.rb

@@ -8,20 +8,20 @@ module Avmtrf1
     module DockerImages
       class V5 < ::Avmtrf1::Php::DockerImages::Base
         MCRYPT_INSTALL = <<~CODE
-        RUN docker-php-ext-install mcrypt
+          RUN docker-php-ext-install mcrypt
+        CODE
+        XDEBUG_INSTALL = <<~CODE
+          RUN apt-get install -y git
+          RUN cd /tmp && \
+            git clone https://github.com/xdebug/xdebug.git && \
+            cd xdebug && \
+            git checkout XDEBUG_2_5_5 && \
+            phpize && \
+            ./configure --enable-xdebug && \
+            make && \
+            make install && \
+            rm -rf /tmp/xdebug
         CODE
-        XDEBUG_INSTALL = <<CODE
-RUN apt-get install -y git
-RUN cd /tmp && \
-  git clone https://github.com/xdebug/xdebug.git && \
-  cd xdebug && \
-  git checkout XDEBUG_2_5_5 && \
-  phpize && \
-  ./configure --enable-xdebug && \
-  make && \
-  make install && \
-  rm -rf /tmp/xdebug
-CODE
 
         # @return [String]
         def apt_setup

data/lib/avmtrf1/red/client.rb

@@ -2,7 +2,7 @@
 
 require 'avmtrf1/red/server'
 require 'avmtrf1/red/helper'
-require 'pp'
+require 'pp' # rubocop:disable Lint/RedundantRequireStatement
 require 'tempfile'
 
 module Avmtrf1

data/lib/avmtrf1/redmine/instance.rb

@@ -12,7 +12,7 @@ module Avmtrf1
       class << self
         def parse_issue_id(issue_id)
           m = ISSUE_ID_PATTERN.match(issue_id)
-          m ? ::OpenStruct.new(provider_issue_id: m[1]) : nil
+          m ? ::OpenStruct.new(provider_issue_id: m[1]) : nil # rubocop:disable Style/OpenStructUse
         end
       end
 

data/lib/avmtrf1/rest_provider/request.rb

@@ -10,7 +10,7 @@ module Avmtrf1
       common_constructor :url, :body_data_proc, default: [nil]
 
       def autenticate(username, password)
-        self.auth = ::OpenStruct.new(username: username, password: password)
+        self.auth = ::OpenStruct.new(username: username, password: password) # rubocop:disable Style/OpenStructUse
       end
 
       def header(name, value)

data/lib/avmtrf1/rest_provider/response.rb

@@ -31,7 +31,7 @@ module Avmtrf1
         body_str
       end
 
-      def raise_unless_200
+      def raise_unless_200 # rubocop:disable Naming/VariableNumber
         return nil if status == 200
 
         raise self

data/lib/avmtrf1/result.rb

@@ -10,7 +10,7 @@ module Avmtrf1
     lists.add_string :type, :success, :error, :neutral
 
     lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
-      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
         def self.#{type}(output)
           new(TYPE_#{type.upcase}, output)
         end

data/lib/avmtrf1/tools/msgraph/api/entity.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/tools/msgraph/request_mixin'
 require 'eac_rest/entity'
 require 'eac_ruby_utils/core_ext'
 
@@ -8,13 +9,25 @@ module Avmtrf1
     module Msgraph
       class Api < ::EacRest::Api
         class Entity < ::EacRest::Entity
-          def request_data(url_suffix)
-            req = api.request(url_suffix)
+          def request_data(url_suffix, &block)
+            req = request_data_request(url_suffix, &block)
             req.response.body_data_or_raise
-          rescue ::Avmtrf1::Tools::Msgraph::InvalidTokenError
+          rescue ::Avmtrf1::Tools::Msgraph::Error => e
+            raise e unless e.invalid_token?
+
             api.clear_token_info
             req.response.body_data_or_raise
           end
+
+          private
+
+          # @return [EacRest::Request]
+          def request_data_request(url_suffix, &block)
+            req = api.request(url_suffix)
+            req = block.call(req) if block
+            req.singleton_class.prepend(::Avmtrf1::Tools::Msgraph::RequestMixin)
+            req
+          end
         end
       end
     end

data/lib/avmtrf1/tools/msgraph/api/team/member_add.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/msgraph/api/entity'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Api < ::EacRest::Api
+        class Team < ::Avmtrf1::Tools::Msgraph::Api::Entity
+          class MemberAdd
+            acts_as_instance_method
+
+            common_constructor :team, :user_id
+
+            # @return [Hash]
+            def result
+              team.members_request do |req|
+                req.verb(:post).header('Content-type', 'application/json')
+                  .body_data(body_hash.to_json)
+              end
+            end
+
+            # @return [Hash]
+            def body_hash
+              {
+                '@odata.type' => '#microsoft.graph.aadUserConversationMember',
+                'user@odata.bind' => "https://graph.microsoft.com/v1.0/users('#{user_id}')"
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/msgraph/api/team.rb

@@ -21,10 +21,17 @@ module Avmtrf1
             end
 
             def members
-              request_data("/teams/#{id}/members").map do |member_data|
+              members_request.map do |member_data|
                 child_entity(::Avmtrf1::Tools::Msgraph::Api::Member, member_data)
               end
             end
+
+            # @return [EacRest::Request]
+            def members_request(&block)
+              request_data("/teams/#{id}/members", &block)
+            end
+
+            require_sub __FILE__, require_mode: :kernel
           end
         end
       end

data/lib/avmtrf1/tools/msgraph/api.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/tools/msgraph/request_mixin'
 require 'eac_rest/api'
 require 'eac_ruby_utils/core_ext'
 
@@ -26,10 +25,8 @@ module Avmtrf1
 
         # @return [EacRest::Request]
         def request(service_url_suffix, headers = {}, &body_data_proc)
-          r = super(service_url_suffix, headers, &body_data_proc)
-                .header('Authorization', "Bearer #{access_token}")
-          r.singleton_class.prepend(::Avmtrf1::Tools::Msgraph::RequestMixin)
-          r
+          super(service_url_suffix, headers, &body_data_proc)
+            .header('Authorization', "Bearer #{access_token}")
         end
 
         def fs_object_id

data/lib/avmtrf1/tools/msgraph/error.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_rest/error'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Error < ::EacRest::Error
+        INVALID_TOKEN_CODE = 'InvalidAuthenticationToken'
+
+        attr_reader :data
+
+        def initialize(data)
+          @data = data
+          super(data.pretty_inspect)
+        end
+
+        # @return [String]
+        def code
+          data.fetch('code')
+        end
+
+        # @return [Boolean]
+        def invalid_token?
+          code == INVALID_TOKEN_CODE
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/msgraph/response_mixin.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/tools/msgraph/invalid_token_error'
+require 'eac_rest/response'
+require 'avmtrf1/tools/msgraph/error'
 require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
@@ -8,42 +9,13 @@ module Avmtrf1
     module Msgraph
       module ResponseMixin
         ERROR_KEY = 'error'
-        INVALID_TOKEN_CODE = 'InvalidAuthenticationToken'
         VALUE_KEY = 'value'
 
         def body_data_or_raise
-          check_invalid_token
           r = super
-          return r unless r.is_a?(::Hash)
-
-          body_hash_or_raise(r)
-        end
-
-        # @return [String, nil]
-        def error_code
-          return false unless body_data.is_a?(::Hash)
-          return false unless body_data.key?(ERROR_KEY)
-
-          body_data.fetch(ERROR_KEY).fetch('code')
-        end
-
-        protected
-
-        def body_hash_or_raise(result_data)
-          return result_data.fetch(VALUE_KEY) if result_data.key?(VALUE_KEY)
-          return raise_error_from_hash(result_data.fetch(ERROR_KEY)) if result_data.key?(ERROR_KEY)
-
-          nbr
-        end
-
-        def check_invalid_token
-          return unless error_code == INVALID_TOKEN_CODE
-
-          raise ::Avmtrf1::Tools::Msgraph::InvalidTokenError
-        end
-
-        def raise_error_from_hash(error_hash)
-          raise ::EacRest::Error, error_hash.pretty_inspect
+          r.is_a?(::Hash) && r.key?(VALUE_KEY) ? r.fetch(VALUE_KEY) : r
+        rescue ::EacRest::Response => e
+          raise ::Avmtrf1::Tools::Msgraph::Error, e.body_data.fetch(ERROR_KEY)
         end
       end
     end

data/lib/avmtrf1/tools/msgraph/token_retrieve.rb

@@ -26,8 +26,8 @@ module Avmtrf1
         # @return [String]
         def result_string
           ::EacRubyUtils::Fs::Temp.on_file do |file|
-            raise ::RuntimeError, result.pretty_inspect unless python_retrieve_command(file.to_path)
-                                                                 .system
+            raise result.pretty_inspect.to_s unless python_retrieve_command(file.to_path)
+                                                      .system
 
             file.read
           end

data/lib/avmtrf1/{ruby/gems → tools/rubygems}/dependency.rb

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

data/lib/avmtrf1/{ruby/gems → tools/rubygems}/not_found_error.rb

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

data/lib/avmtrf1/{ruby/gems.rb → tools/rubygems.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
-  module Ruby
-    module Gems
+  module Tools
+    module Rubygems
       require_sub __FILE__
     end
   end

data/lib/avmtrf1/tools/runner/forponto/resumos.rb

@@ -18,7 +18,7 @@ module Avmtrf1
           end
 
           def head_month
-            today = ::Date.today
+            today = ::Date.today # rubocop:disable Rails/Date
             date = ::Date.civil(today.year, today.month, 1)
             runner_context.call(:user).month(date.year, date.month)
           end
@@ -37,7 +37,7 @@ module Avmtrf1
 
           def show_month_summaries(month)
             month.os_data.summaries.each do |s|
-              infov '    * ' + summary_to_label(s), summary_to_value(s)
+              infov '    * ' + summary_to_label(s), summary_to_value(s) # rubocop:disable Style/StringConcatenation
             end
           end
 

data/lib/avmtrf1/tools/runner/forponto/saldo.rb

@@ -58,7 +58,7 @@ module Avmtrf1
           end
 
           def show_month_end_resume(mba)
-            infov '     * Left', minutes_to_s(mba.left) + ' ' + left_status(mba)
+            infov '     * Left', minutes_to_s(mba.left) + ' ' + left_status(mba) # rubocop:disable Style/StringConcatenation
             infov '     * After trigger', minutes_to_s(mba.after_trigger)
             infov '     * After trigger acum.', minutes_to_s(mba.after_trigger_acum)
           end

data/lib/avmtrf1/tools/runner/git/gitlab/commit_link.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/tools/runner/git'
+require 'avm/git/runners/base'
 require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/gitlab/commit'
 require 'avmtrf1/gitlab/repository'
@@ -8,7 +8,7 @@ require 'avmtrf1/gitlab/repository'
 module Avmtrf1
   module Tools
     class Runner
-      class Git < ::Avm::Tools::Runner::Git
+      class Git < ::Avm::Git::Runners::Base
         class Gitlab
           class CommitLink
             runner_with :help, :output do
@@ -60,7 +60,7 @@ module Avmtrf1
             end
 
             def output_content
-              commits.map { |c| commit_output(c) + "\n" }.join
+              commits.map { |c| commit_output(c) + "\n" }.join # rubocop:disable Style/StringConcatenation
             end
 
             def repository_banner

data/lib/avmtrf1/tools/runner/git/gitlab.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/runner/git'
+require 'avm/git/runners/base'
 require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools
     class Runner
-      class Git < ::Avm::Tools::Runner::Git
+      class Git < ::Avm::Git::Runners::Base
         class Gitlab
           require_sub __FILE__
           runner_with :help, :subcommands do

data/lib/avmtrf1/tools/runner/git/issues_check.rb

@@ -6,7 +6,7 @@ require 'avmtrf1/git/cached_repository'
 module Avmtrf1
   module Tools
     class Runner
-      class Git < ::Avm::Tools::Runner::Git
+      class Git < ::Avm::Git::Runners::Base
         class IssuesCheck
           runner_with :help do
             desc 'Confronta situação das demandas no Git com a situação nos trackers.'

data/lib/avmtrf1/tools/runner/git/push_large.rb

@@ -6,16 +6,16 @@ require 'avmtrf1/git/push_large'
 module Avmtrf1
   module Tools
     class Runner
-      class Git < ::Avm::Tools::Runner::Git
+      class Git < ::Avm::Git::Runners::Base
         class PushLarge
           DEFAULT_REPO_PATH = '.'
           DEFAULT_REMOTE = 'origin'
 
           runner_with :help do
-            desc 'Realiza push de repositórios grandes (Que falham com "pack exceeds maximum' \
-              ' allowed size")'
-            arg_opt '-C', '--repo-path', 'Caminho do repositório local' \
-              " [default: #{DEFAULT_REPO_PATH}]."
+            desc 'Realiza push de repositórios grandes (Que falham com "pack exceeds maximum ' \
+                 'allowed size")'
+            arg_opt '-C', '--repo-path', 'Caminho do repositório local ' \
+                                         "[default: #{DEFAULT_REPO_PATH}]."
             arg_opt '-r', '--remote', "Nome do remoto [default: #{DEFAULT_REMOTE}]."
             pos_arg :source_ref
             pos_arg :target_ref

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/runner/git'
+require 'avm/git/runners/base'
 require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools
     class Runner
-      class Git < ::Avm::Tools::Runner::Git
+      class Git < ::Avm::Git::Runners::Base
         require_sub __FILE__
       end
     end

data/lib/avmtrf1/tools/runner/msgraph/joined_teams.rb

@@ -8,7 +8,9 @@ module Avmtrf1
     class Runner
       class Msgraph
         class JoinedTeams
-          runner_with :help, :output do
+          LIST_COLUMNS = %w[id display_name].freeze
+
+          runner_with :help, :output_list do
             desc 'Lista as próprias equipes no MS Teams.'
           end
 
@@ -17,12 +19,16 @@ module Avmtrf1
             run_output
           end
 
-          private
+          def list_columns
+            LIST_COLUMNS
+          end
 
-          def output_content
-            teams.map { |t| "#{t.id}|#{t.display_name}\n" }.join
+          def list_rows
+            teams
           end
 
+          private
+
           def teams_uncached
             api.root_entity.joined_teams.sort_by { |t| [t.display_name, t.id] }
           end

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

@@ -28,7 +28,7 @@ module Avmtrf1
             infov 'Response status', response.status
             infov 'Response body class', response.body_data.class
             infov 'Response body', '*'
-            out response.body_data.to_yaml + "\n"
+            out response.body_data.to_yaml + "\n" # rubocop:disable Style/StringConcatenation
           end
 
           def request_uncached

data/lib/avmtrf1/tools/runner/msgraph/team/member/add.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+require 'avmtrf1/tools/msgraph/error'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Team
+          class Member
+            class Add
+              runner_with :help, :output_item
+
+              def run
+                start_banner
+                add_member
+                run_output
+                fatal_error error.code if error.present?
+              end
+
+              private
+
+              attr_accessor :error, :result_data
+
+              def add_member
+                self.error = nil
+                self.result_data = team.member_add(member_id)
+              rescue ::Avmtrf1::Tools::Msgraph::Error => e
+                self.error = e
+                self.result_data = error.data
+              end
+
+              def start_banner
+                infov 'Team', team.id
+                infov 'Member ID', member_id
+              end
+
+              def item_hash
+                result_data
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end