avmtrf1-tools 0.35.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3596640cb42d9331fc9a64994e5c9e0bc2804b17ea6683985317c6b8bd18a025
-  data.tar.gz: ffdc002e2061a896be7e43396fc4e16526cafda04a32383297d6fd95f8c34ff0
+  metadata.gz: 48fb6d183fcf0b449c91abd20944f74ebd440d719ead3b6a02668d9b4def2554
+  data.tar.gz: b30b7c8baccbbd700be03c2823c7dbdfc7adc828dfb036409f3ab70d9b083800
 SHA512:
-  metadata.gz: ce9c393bbaaae052c799ba9b67e5767b97d247e5672d9fbe3073cfd22084583a0e59db48faa1bc63709c0e683474c54d27cd7a5dee3d47d921d3e1e7c202fd0a
-  data.tar.gz: 72c41df2ae775716cb562fa13905edb0ae6704462d3e7993293b005edb1ef885f479f3b67f5063f88779c8e010f24f8948f43f82ac4abc66369d4f62a9399091
+  metadata.gz: 2d57fbca329752db6d22248da2205cef1bc52518af47e90ba8e44d6629a8bbd14bc0617b18bc12a16e543a5e6ca0ff144dfacf851c1bc5749041431df96e128a
+  data.tar.gz: 5995b88d6360f46ac73c95e6631cb3f70d4540cb99e44f7ca7ec3809043369a56f8d788f2b2c0b1af37ee0aa9c4c2828b431a574b844e48ee67fa9d53e6047db

data/lib/avmtrf1/forponto/user/month.rb

@@ -86,7 +86,7 @@ module Avmtrf1
         end
 
         def recache?
-          !data_cache.cached? || yesterday_uncached?
+          !data_cache.stored? || yesterday_uncached?
         end
 
         def yesterday_uncached?
@@ -114,7 +114,7 @@ module Avmtrf1
         end
 
         def cached_data
-          raise 'There is no data cached' unless data_cache.cached?
+          raise 'There is no data cached' unless data_cache.stored?
 
           ::EacRubyUtils::Yaml.load(data_cache.read)
         end

data/lib/avmtrf1/git/gitlab.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Git

data/lib/avmtrf1/git/push_large/lfs_commit.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Git

data/lib/avmtrf1/git/push_large/source_commit.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/git/commit'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Git

data/lib/avmtrf1/gitlab/commit.rb

@@ -7,22 +7,30 @@ module Avmtrf1
       enable_simple_cache
       common_constructor :repository, :git, :source
 
+      delegate :id, to: :git_commit
+
       def to_s
         source
       end
 
-      def web_url(object_type = 'commit')
-        "#{repository.web_url}/#{object_type}/#{full_id}"
+      # @return [String]
+      def markdown_link(object_type = 'commit')
+        "[#{git_commit.abbreviated_commit_hash}|#{web_url(object_type)}]"
       end
 
-      private
+      # @return [String]
+      def textile_link(object_type = 'commit')
+        "\"#{git_commit.abbreviated_commit_hash}\":#{web_url(object_type)}"
+      end
 
-      def full_id_uncached
-        git.rev_parse(source)
+      def web_url(object_type = 'commit')
+        "#{repository.web_url}/#{object_type}/#{git_commit.commit_hash}"
       end
 
-      def short_id_uncached
-        git.execute!('rev-parse', '--short', full_id).strip
+      private
+
+      def git_commit_uncached
+        git.commit(git.rev_parse(source))
       end
     end
   end

data/lib/avmtrf1/gitlab/repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Gitlab

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_rest/api'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
+require 'avmtrf1/template'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class TokenRetrieve
+        enable_simple_cache
+        common_constructor :client_id
+
+        private
+
+        def python_retrieve_command(file)
+          ::EacRubyUtils::Envs.local.command(python_retrieve_program_path, client_id, file)
+        end
+
+        # @return [Hash]
+        def result_uncached
+          ::EacRubyUtils::Yaml.load(result_string)
+        end
+
+        # @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
+
+            file.read
+          end
+        end
+
+        def python_retrieve_program_path
+          template.child('python_retriever.py').path
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/msgraph.rb

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

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/runner/app_src'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/check_point/session'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'yaml'
 
 module Avmtrf1

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/default_esosti'
 
 module Avmtrf1

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/forponto/user/day_registers'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/forponto/user/balance'
 
 module Avmtrf1

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_config/node'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/forponto/user'
 
 module Avmtrf1

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/runner/git'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/gitlab/commit'
 require 'avmtrf1/gitlab/repository'
 
@@ -13,7 +13,9 @@ module Avmtrf1
           class CommitLink
             runner_with :help, :output do
               desc 'Mostra o link de uma revisão no Gitlab do TRF1.'
+              bool_opt '-m', '--markdown', 'Formata URL como link Markdown.'
               bool_opt '-t', '--tree', 'URL com "tree" no lugar de "commit".'
+              bool_opt '-T', '--textile', 'Formata URL como link Textile.'
               pos_arg 'revisions', optional: true, repeat: true
             end
 
@@ -35,22 +37,30 @@ module Avmtrf1
 
             def commits_uncached
               parsed.revisions.if_present(['HEAD'])
-                    .map { |source| ::Avmtrf1::Gitlab::Commit.new(repository, git, source) }
+                    .map { |source| ::Avmtrf1::Gitlab::Commit.new(repository, git_repo, source) }
             end
 
             def commit_banner(commit)
               separator
               infov 'Source', commit.source
-              infov 'Commit ID', commit.full_id
+              infov 'Commit ID', commit.id
               infov 'Web URL', commit.web_url
             end
 
-            def git
-              runner_context.call(:git)
+            # @return [String]
+            def commit_output(commit)
+              return commit.textile_link(object_type) if parsed.textile?
+              return commit.markdown_link(object_type) if parsed.markdown?
+
+              commit.web_url(object_type)
+            end
+
+            def git_repo
+              runner_context.call(:git_repo)
             end
 
             def output_content
-              commits.map { |c| c.web_url(object_type) + "\n" }.join
+              commits.map { |c| commit_output(c) + "\n" }.join
             end
 
             def repository_banner
@@ -59,9 +69,9 @@ module Avmtrf1
             end
 
             def repository_uncached
-              git.git.remotes.lazy
-                 .map { |r| ::Avmtrf1::Gitlab::Repository.by_uri(r.url) }
-                 .find(&:present?) || raise('Gitlab remote not found')
+              git_repo.remotes.lazy
+                      .map { |r| ::Avmtrf1::Gitlab::Repository.by_uri(r.url) }
+                      .find(&:present?) || raise('Gitlab remote not found')
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/runner/git'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/git/cached_repository'
 
 module Avmtrf1

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/git/push_large'
 
 module Avmtrf1

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/runner/git'
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+require 'avmtrf1/tools/msgraph/token_retrieve'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Token
+          runner_with :help, :output
+
+          def run
+            infov 'Client ID', token_retrieve.client_id
+            run_output
+          end
+
+          private
+
+          def output_content
+            ::EacRubyUtils::Yaml.dump(token_retrieve.result)
+          end
+
+          def token_retrieve_uncached
+            ::Avmtrf1::Tools::Msgraph::TokenRetrieve.new(runner_context.call(:client_id))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          arg_opt '-i', '--client-id', 'ID de aplicação cliente alternativo.'
+          subcommands
+        end
+
+        def client_id
+          client_id_by_argument || client_id_by_config
+        end
+
+        def client_id_by_argument
+          parsed.client_id.presence
+        end
+
+        def client_id_by_config
+          ::EacConfig::Node.context.current.entry('msgraph.client_id').value
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/oracle/query.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

data/lib/avmtrf1/tools/runner/oracle/source_get.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

data/lib/avmtrf1/tools/runner/oracle/user_clear.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 
 module Avmtrf1
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/oracle/connection/base.rb'
 require 'avmtrf1/oracle/connection/string_builder.rb'
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/ini'
 require 'avmtrf1/red/profile'
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/core_ext'
+require 'avmtrf1/tools/core_ext'
 require 'avmtrf1/trf1_dspace_base0/instance'
 
 module Avmtrf1

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.35.0'
+    VERSION = '0.38.0'
   end
 end

data/template/avmtrf1/tools/msgraph/token_retrieve/python_retriever.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+
+# Requirements
+# pyperclip>=1.6.0
+# requests>=2.18.4
+# adal>=1.0.0
+# pyyaml
+
+from adal import AuthenticationContext
+import argparse
+import pyperclip
+import sys
+import webbrowser
+import yaml
+
+
+class Config:
+    AUTHORITY_URL = 'https://login.microsoftonline.com/common'
+    RESOURCE = 'https://graph.microsoft.com'
+    API_VERSION = 'beta'
+
+
+class TokenInfo:
+    def __init__(self, args):
+        self.__device = None
+        self.__token = None
+        self.__context = None
+        self.__args = args
+
+    def context(self):
+        if not self.__context:
+            self.__context = AuthenticationContext(Config.AUTHORITY_URL,
+                                                   api_version=None)
+        return self.__context
+
+    def device(self):
+        if not self.__device:
+            self.__device = self.context().acquire_user_code(
+                Config.RESOURCE, self.__args.client_id)
+        return self.__device
+
+    def token(self, auto=True):
+        if not self.__token:
+            device_code = self.device()
+            if auto:
+                pyperclip.copy(
+                    device_code['user_code'])  # copy user code to clipboard
+                webbrowser.open(
+                    device_code['verification_url'])  # open browser
+                self.info(
+                    f'The code {device_code["user_code"]} has been copied to your clipboard, '
+                    f'and your web browser is opening {device_code["verification_url"]}. '
+                    'Paste the code to sign in.\n')
+            else:
+                self.info(device_code['message'])
+
+            self.__token = self.context().acquire_token_with_device_code(
+                Config.RESOURCE, device_code, self.__args.client_id)
+        return self.__token
+
+    def info(self, message):
+        sys.stderr.write(message + "\n")
+
+    def result(self):
+        if self.token():
+            return {'device': self.device(), 'token': self.token()}
+        else:
+            return None
+
+    def run(self):
+        if self.result():
+            with open(self.__args.output_path, 'w') as outfile:
+                yaml.dump(self.result(), outfile, default_flow_style=False)
+            self.info('Result writed in "%s"' % (self.__args.output_path))
+        else:
+            sys.exit("Result empty!")
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Recupera token de acesso ao MSGraph')
+    parser.add_argument('client_id')
+    parser.add_argument('output_path')
+    args = parser.parse_args()
+    TokenInfo(args).run()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.113.6
+        version: '0.114'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.113.6
+        version: '0.114'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +148,6 @@ files:
 - lib/avmtrf1/check_point.rb
 - lib/avmtrf1/check_point/session.rb
 - lib/avmtrf1/check_point/session/login.rb
-- lib/avmtrf1/core_ext.rb
 - lib/avmtrf1/default_esosti.rb
 - lib/avmtrf1/default_jira.rb
 - lib/avmtrf1/default_redmine.rb
@@ -290,6 +283,9 @@ files:
 - lib/avmtrf1/template.rb
 - lib/avmtrf1/tools.rb
 - lib/avmtrf1/tools/application.rb
+- lib/avmtrf1/tools/core_ext.rb
+- lib/avmtrf1/tools/msgraph.rb
+- lib/avmtrf1/tools/msgraph/token_retrieve.rb
 - lib/avmtrf1/tools/runner.rb
 - lib/avmtrf1/tools/runner/app_src.rb
 - lib/avmtrf1/tools/runner/check_point.rb
@@ -309,6 +305,8 @@ files:
 - lib/avmtrf1/tools/runner/git/issues_check.rb
 - lib/avmtrf1/tools/runner/git/push_large.rb
 - lib/avmtrf1/tools/runner/inventario_sistemas.rb
+- lib/avmtrf1/tools/runner/msgraph.rb
+- lib/avmtrf1/tools/runner/msgraph/token.rb
 - lib/avmtrf1/tools/runner/node_js.rb
 - lib/avmtrf1/tools/runner/node_js/docker.rb
 - lib/avmtrf1/tools/runner/openvpn.rb
@@ -344,6 +342,7 @@ files:
 - template/avmtrf1/php/docker_image/aux/setup_apache_site.sh
 - template/avmtrf1/php/docker_image/aux/start.sh
 - template/avmtrf1/php/docker_image/aux/templates/apache_site.conf
+- template/avmtrf1/tools/msgraph/token_retrieve/python_retriever.py
 - template/avmtrf1/trf1_dspace_base0/deploy/build.properties.template
 homepage: http://redmine.trf1.gov.br/projects/avm-trf1
 licenses: []