avmtrf1-tools 0.39.6 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f26b0210df64425354daf7e5d9ac10dcb0aecbb51b00f9079ac5dc1ff5e8e2
-  data.tar.gz: 7a1ee3b449c30d1ad515d28359aaf8b8a15442bb995a6797a12bce30eba61a25
+  metadata.gz: 409b614dd9df105476d7d7ce456efbaf3166b6c7eacf0d51bf507e84b0814423
+  data.tar.gz: ce1872a84c657132015e826bb8bbc59fc939b031f5cb7c9d90ea706877618eda
 SHA512:
-  metadata.gz: 11a4f7ec4a34de508424eceb46f9d3358d3b9e11e1b5f0fcf9375169dc6df8a50193fdbe9891069b0b5e0adb7fa88181a0f04246774afa88e47dd19b5d96645c
-  data.tar.gz: 3607982ce6d014d551c92a323b308143b6b02e473fbb03dddf8c8a8768aeafade90a5a6dbae49cecef16c5037e6555651383c2b9c3a8893e1d505d7a6e3d57af
+  metadata.gz: 786b256eb94d24cad76a280e6621c5b37b8042b38bf0a95d0c7df81592e917b3698abb774d27569087146a78c782bc62c0fae488235bdc888464db610699ced0
+  data.tar.gz: c53d815127b4e1da902e3ac1e239c55aa40b2c4817e6c4d911b50507c94c6052c3e05b2d9bc1778dfed303bb0052ab019be9e72af0ec7c060d671b439b62d156

data/lib/avmtrf1/docker/image.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/docker/image'
+require 'avmtrf1/tools/version'
 require 'eac_templates/sources/from_all_gems'
 
 module Avmtrf1
@@ -11,6 +12,27 @@ module Avmtrf1
 
       common_constructor :registry, :platform_version
 
+      APT_SETUP = <<CODE
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+CODE
+      DEBIAN_STRETCH_FIX_SOURCES = <<CODE
+RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
+RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
+CODE
+      DEBIAN_STRETCH_APT_SETUP = DEBIAN_STRETCH_FIX_SOURCES + APT_SETUP
+
+      # @return [String]
+      def apt_setup
+        APT_SETUP
+      end
+
+      # @return [String]
+      def debian_stretch_apt_setup
+        DEBIAN_STRETCH_APT_SETUP
+      end
+
       def platform_stereotype_tag
         self.class.name.split('::')[-2].underscore.dasherize
       end

data/lib/avmtrf1/node_js/docker_image.rb

@@ -5,6 +5,10 @@ require 'avmtrf1/docker/image'
 module Avmtrf1
   module NodeJs
     class DockerImage < ::Avmtrf1::Docker::Image
+      # @return [String]
+      def apt_setup
+        debian_stretch_apt_setup.gsub('-y dist-upgrade', '-y --allow-unauthenticated dist-upgrade')
+      end
     end
   end
 end

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

@@ -11,7 +11,6 @@ module Avmtrf1
         enable_abstract_methods
         abstract_methods :mcrypt_install, :xdebug_pecl_package
 
-        DEFAULT_BEFORE_CODE = ''
         GD_OPTIONS = %w[--with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir
                         --with-xpm-dir --with-freetype-dir].freeze
         PLATFORM_STEREOTYPE_TAG = 'php'
@@ -23,11 +22,6 @@ module Avmtrf1
           end
         end
 
-        # @return [String]
-        def before_code
-          DEFAULT_BEFORE_CODE
-        end
-
         # @return [String]
         def php_dist_curl_args
           '-sS "https://www.php.net/distributions/php-$PHP_VERSION.tar.gz"'

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

@@ -7,10 +7,6 @@ module Avmtrf1
   module Php
     module DockerImages
       class V5 < ::Avmtrf1::Php::DockerImages::Base
-        BEFORE_CODE = <<CODE
-RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
-RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
-CODE
         MCRYPT_INSTALL = <<~CODE
         RUN docker-php-ext-install mcrypt
         CODE
@@ -28,8 +24,8 @@ RUN cd /tmp && \
 CODE
 
         # @return [String]
-        def before_code
-          BEFORE_CODE
+        def apt_setup
+          debian_stretch_apt_setup
         end
 
         # @return [String]

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/msgraph/api/team'
+require 'eac_rest/entity'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Api < ::EacRest::Api
+        class Root < ::EacRest::Entity
+          # @return [Array<Avmtrf1::Tools::Msgraph::Api::Group>]
+          def joined_teams
+            api.request('/me/joinedTeams').response.body_data.fetch('value').map do |team_data|
+              child_entity(::Avmtrf1::Tools::Msgraph::Api::Team, team_data)
+            end
+          end
+
+          # @return [Avmtrf1::Tools::Msgraph::Api::Group]
+          def group(group_id)
+            child_entity(::Avmtrf1::Tools::Msgraph::Api::Group, group_id)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_rest/entity'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Api < ::EacRest::Api
+        class Team < ::EacRest::Entity
+          %w[classification createdDateTime description discoverySettings displayName funSettings
+             guestSettings internalId isArchived isMembershipLimitedToOwners memberSettings
+             messagingSettings specialization summary tenantId visibility webUrl].each do |key|
+            define_method key.underscore do
+              data.fetch(key)
+            end
+
+            # @return [String]
+            def id_from_data
+              data.fetch('id')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_rest/api'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Api < ::EacRest::Api
+        API_ROOT_URL = 'https://graph.microsoft.com/v1.0'
+
+        enable_simple_cache
+        common_constructor :client_id, super_args: -> { [API_ROOT_URL] }
+
+        # @return [String]
+        def access_token
+          token_info.fetch(:token).fetch(:accessToken)
+        end
+
+        # @return [EacRest::Request]
+        def request(service_url_suffix, headers = {}, &body_data_proc)
+          super(service_url_suffix, headers, &body_data_proc)
+            .header('Authorization', "Bearer #{access_token}")
+        end
+
+        def fs_object_id
+          client_id.to_s.variableize
+        end
+
+        private
+
+        # @return [EacFs::StorageTree]
+        def token_info_cache
+          fs_cache.child('token')
+        end
+
+        def token_info_uncached
+          token_info_cache.read_or_store_yaml { new_token_info }
+        end
+
+        def new_token_info
+          ::Avmtrf1::Tools::Msgraph::TokenRetrieve.new(client_id).result
+        end
+
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+require 'avmtrf1/tools/msgraph/token_retrieve'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class JoinedTeams
+          runner_with :help, :output do
+            desc 'Lista as próprias equipes no MS Teams.'
+          end
+
+          def run
+            infov 'Found', teams.count
+            run_output
+          end
+
+          private
+
+          def output_content
+            teams.map { |t| "#{t.id}|#{t.display_name}\n" }.join
+          end
+
+          def teams_uncached
+            api.root_entity.joined_teams.sort_by { |t| [t.display_name, t.id] }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/tools/core_ext'
+require 'avmtrf1/tools/msgraph/api'
 
 module Avmtrf1
   module Tools
@@ -11,6 +12,7 @@ module Avmtrf1
           arg_opt '-i', '--client-id', 'ID de aplicação cliente alternativo.'
           subcommands
         end
+        for_context :api
 
         def client_id
           client_id_by_argument || client_id_by_config
@@ -23,6 +25,13 @@ module Avmtrf1
         def client_id_by_config
           ::EacConfig::Node.context.current.entry('msgraph.client_id').value
         end
+
+        private
+
+        # @return [Avmtrf1::Tools::Msgraph::Api]
+        def api_uncached
+          ::Avmtrf1::Tools::Msgraph::Api.new(client_id)
+        end
       end
     end
   end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.39.6'
+    VERSION = '0.40.0'
   end
 end

data/template/avmtrf1/node_js/docker_image/Dockerfile.template

@@ -1,6 +1,20 @@
 # base image
 FROM node:%%PLATFORM_VERSION%%
 
+%%APT_SETUP%%
+
+# ASDF - 0.12.0
+ENV ASDF_DIR='/opt/asdf'
+ENV ASDF_PACKAGE='https://github.com/asdf-vm/asdf/archive/816195d615427b033a7426a4fb4d7fac4cf2d791.tar.gz'
+RUN mkdir -p "${ASDF_DIR}"
+RUN wget -qO- "${ASDF_PACKAGE}" | tar -xzf - --strip-components 1 -C "${ASDF_DIR}"
+
+# Python
+ENV PYTHON_VERSION='3.6.15'
+RUN "${ASDF_DIR}/bin/asdf" plugin add python
+RUN "${ASDF_DIR}/bin/asdf" install python "${PYTHON_VERSION}"
+RUN "${ASDF_DIR}/bin/asdf" global python "${PYTHON_VERSION}"
+
 # Inicializador
 RUN mkdir '/auxiliary'
 RUN mkdir '/auxiliary/eac-bash-lib'

data/template/avmtrf1/node_js/docker_image/auxiliary/init.sh

@@ -10,6 +10,7 @@ done
 export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 source "$AUX_ROOT/lib.sh"
+source "${ASDF_DIR}/asdf.sh"
 
 # Caminho raiz da aplicação
 path_set 'APP_ROOT' '/' '/app'

data/template/avmtrf1/php/docker_images/base/Dockerfile.template

@@ -1,11 +1,6 @@
 FROM php:%%PLATFORM_VERSION%%-apache
 
-%%BEFORE_CODE%%
-
-# Base ubuntu
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update
-RUN apt-get -y dist-upgrade
+%%APT_SETUP%%
 
 # Apache HTTP
 RUN a2enmod rewrite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.6
+  version: 0.40.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
@@ -50,20 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.151'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.151.1
+        version: '0.153'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.151'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.151.1
+        version: '0.153'
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -323,6 +317,9 @@ files:
 - lib/avmtrf1/tools/application.rb
 - lib/avmtrf1/tools/core_ext.rb
 - lib/avmtrf1/tools/msgraph.rb
+- lib/avmtrf1/tools/msgraph/api.rb
+- lib/avmtrf1/tools/msgraph/api/root.rb
+- lib/avmtrf1/tools/msgraph/api/team.rb
 - lib/avmtrf1/tools/msgraph/token_retrieve.rb
 - lib/avmtrf1/tools/runner.rb
 - lib/avmtrf1/tools/runner/check_point.rb
@@ -343,6 +340,7 @@ files:
 - 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/joined_teams.rb
 - lib/avmtrf1/tools/runner/msgraph/token.rb
 - lib/avmtrf1/tools/runner/node_js.rb
 - lib/avmtrf1/tools/runner/node_js/docker.rb