avmtrf1-tools 0.38.2 → 0.38.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avmtrf1/check_point/session/login.rb +6 -2
  3. data/lib/avmtrf1/docker/image_runner.rb +2 -2
  4. data/lib/avmtrf1/esosti/session/login.rb +1 -1
  5. data/lib/avmtrf1/esosti/session/solicitacao.rb +4 -6
  6. data/lib/avmtrf1/forponto/parsers/espelho/summary_node.rb +3 -7
  7. data/lib/avmtrf1/forponto/parsers/espelho/utils.rb +1 -1
  8. data/lib/avmtrf1/forponto/user/day_registers.rb +1 -1
  9. data/lib/avmtrf1/forponto/user/month.rb +1 -1
  10. data/lib/avmtrf1/git/push_large/lfs_commit/cache.rb +1 -1
  11. data/lib/avmtrf1/git/push_large/lfs_commit/commit_changes.rb +1 -1
  12. data/lib/avmtrf1/git/push_large/lfs_commit/pick_source_revision.rb +1 -1
  13. data/lib/avmtrf1/git/push_large.rb +1 -1
  14. data/lib/avmtrf1/git/reference.rb +1 -3
  15. data/lib/avmtrf1/ini/profile.rb +3 -7
  16. data/lib/avmtrf1/inventario_sistemas/parser.rb +1 -3
  17. data/lib/avmtrf1/inventario_sistemas/site_build.rb +2 -2
  18. data/lib/avmtrf1/inventario_sistemas.rb +1 -3
  19. data/lib/avmtrf1/openvpn/config/builder.rb +2 -2
  20. data/lib/avmtrf1/oracle/objects/sql_builder.rb +1 -1
  21. data/lib/avmtrf1/red/profile.rb +1 -3
  22. data/lib/avmtrf1/redmine/entities/issue.rb +1 -3
  23. data/lib/avmtrf1/redmine/instance.rb +1 -1
  24. data/lib/avmtrf1/rest_provider/response.rb +2 -6
  25. data/lib/avmtrf1/tools/msgraph/token_retrieve.rb +1 -1
  26. data/lib/avmtrf1/tools/runner/forponto.rb +1 -1
  27. data/lib/avmtrf1/tools/runner/git/gitlab/commit_link.rb +3 -3
  28. data/lib/avmtrf1/tools/runner/oracle/source_get.rb +2 -6
  29. data/lib/avmtrf1/tools/version.rb +1 -1
  30. metadata +46 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 037a6ec540a874c12392621c8b3f464d5361d98249b1e9119e8332b061de26ab
4
- data.tar.gz: b620adfa7a3c73c3624f3333baf0964d4953c8be195d9b7e92a06c6ff0c1c0a9
3
+ metadata.gz: ab86006304513ed6d3e418dfc20763f409cadbaef183da6d236c08506784348b
4
+ data.tar.gz: 85dc28f41e85c5a769f3a948ac8a5e72693d7563fc057504f5943d0992ceb4f3
5
5
  SHA512:
6
- metadata.gz: 3aa77327c882bf6f591e7cdfed791e226bca9789207ae8bb24040a9d5a959723349f933d1759e02bee96853a900ee282cd0b7199d2ac2c57e732b21a17a4e07b
7
- data.tar.gz: e4574401f796466b176217b928b6e346f3d19119ba57c03bd98c5c78513c31e4ec58b52ef409202255c82adee9d98e7ca6dad4a2df017cbd07c0c30e3fbf7f3d
6
+ metadata.gz: 31ee3ade19ea169a9f95d8259dfba500fc3cb16b1a5805ad2eba8e7df303706bd4fba349b949ecaf1d5f597415e762a8bfdf58bbee620deeac20d2c23404d49f
7
+ data.tar.gz: 46b5ff0237d42b8f921a624121d13618246d5e9ce33445e98d4ab61e5869c0970c71d4e0e8f814f30796ac367a7d0f7b9ad16d64912aa67ce735624b26eb007f
@@ -30,17 +30,21 @@ module Avmtrf1
30
30
  end
31
31
 
32
32
  def fill_username
33
- session.wait_for_element(id: 'LoginUserPassword_auth_username').send_keys(parent.username)
33
+ element_send_keys('LoginUserPassword_auth_username', parent.username)
34
34
  end
35
35
 
36
36
  def fill_password
37
- session.wait_for_element(id: 'LoginUserPassword_auth_password').send_keys(parent.password)
37
+ element_send_keys('LoginUserPassword_auth_password', parent.password)
38
38
  end
39
39
 
40
40
  def click_login_button
41
41
  session.wait_for_element(id: 'UserCheck_Login_Button_span').click
42
42
  end
43
43
 
44
+ def element_send_keys(element_id, text)
45
+ session.wait_for_click(id: element_id).send_keys(text)
46
+ end
47
+
44
48
  def wait_for_result_page
45
49
  session.wait.until do
46
50
  element = session.find_element(id: 'usercheck_title_div')
@@ -26,7 +26,7 @@ module Avmtrf1
26
26
 
27
27
  def default_versions
28
28
  ::EacConfig::Node.context.current.entry(default_versions_config_key).value.split(',')
29
- .map(&:strip).reject(&:blank?)
29
+ .map(&:strip).reject(&:blank?)
30
30
  end
31
31
 
32
32
  def versions_to_s
@@ -53,7 +53,7 @@ module Avmtrf1
53
53
 
54
54
  def registry_name
55
55
  parsed.registry_name || ::EacConfig::Node.context.current.entry('docker.registry.name')
56
- .value
56
+ .value
57
57
  end
58
58
 
59
59
  def registry_uncached
@@ -31,7 +31,7 @@ module Avmtrf1
31
31
 
32
32
  def fill_uf
33
33
  session.wait_for_element(id: 'uf')
34
- .find_element(xpath: "//option[text()='#{parent.uf}']").click
34
+ .find_element(xpath: "//option[text()='#{parent.uf}']").click
35
35
  end
36
36
 
37
37
  def click_on_login
@@ -57,12 +57,10 @@ module Avmtrf1
57
57
 
58
58
  def click_on_first_result
59
59
  session.wait.until do
60
- begin
61
- first_result.click
62
- true
63
- rescue Selenium::WebDriver::Error::ElementClickInterceptedError
64
- false
65
- end
60
+ first_result.click
61
+ true
62
+ rescue Selenium::WebDriver::Error::ElementClickInterceptedError
63
+ false
66
64
  end
67
65
  end
68
66
 
@@ -13,20 +13,16 @@ module Avmtrf1
13
13
 
14
14
  FIELDS = %w[code description time minutes].freeze
15
15
 
16
- def code
17
- code_description_parsed.code
18
- end
16
+ delegate :code, to: :code_description_parsed
19
17
 
20
- def description
21
- code_description_parsed.description
22
- end
18
+ delegate :description, to: :code_description_parsed
23
19
 
24
20
  def time
25
21
  column_text('20%')
26
22
  end
27
23
 
28
24
  def minutes
29
- return nil unless time.present?
25
+ return nil if time.blank?
30
26
 
31
27
  m = /\A(\d+):(\d+)\z/.match(time)
32
28
  raise "\"#{time}\" does not match time pattern" unless m
@@ -10,7 +10,7 @@ module Avmtrf1
10
10
  class Utils
11
11
  class << self
12
12
  def string_recursive(node)
13
- return nil unless node.present?
13
+ return nil if node.blank?
14
14
  return sanitize_string(node.text) if node.is_a?(::Nokogiri::XML::Text)
15
15
 
16
16
  s = ''
@@ -22,7 +22,7 @@ module Avmtrf1
22
22
 
23
23
  def fresh_data_uncached
24
24
  r = ::Avmtrf1::Forponto::Session.new(user.url, user.matricula, user.codigo)
25
- .day_registers_data
25
+ .day_registers_data
26
26
  @date = ::Date.today
27
27
  r
28
28
  end
@@ -90,7 +90,7 @@ module Avmtrf1
90
90
  end
91
91
 
92
92
  def yesterday_uncached?
93
- last_cached_day < end_date && last_cached_day < (::Date.today - 1.days)
93
+ last_cached_day < end_date && last_cached_day < (::Date.today - 1.day)
94
94
  end
95
95
 
96
96
  def last_cached_day_uncached
@@ -7,7 +7,7 @@ module Avmtrf1
7
7
  module Cache
8
8
  def fs_cache
9
9
  @fs_cache ||= source_commit.fs_cache.child(
10
- lfs_file_min_size.present? ? lfs_file_min_size : 'nil'
10
+ lfs_file_min_size.presence || 'nil'
11
11
  )
12
12
  end
13
13
 
@@ -32,7 +32,7 @@ module Avmtrf1
32
32
  def commit_amend
33
33
  infom message('Commiting')
34
34
  git.command('commit', '--amend', '--allow-empty', '--allow-empty-message')
35
- .envvar('GIT_EDITOR', true).execute!
35
+ .envvar('GIT_EDITOR', true).execute!
36
36
  end
37
37
 
38
38
  def store_commit
@@ -13,7 +13,7 @@ module Avmtrf1
13
13
 
14
14
  def cherry_pick_source_revision_uncached
15
15
  checkout_base
16
- return unless previous_revision.present?
16
+ return if previous_revision.blank?
17
17
 
18
18
  infom message("Cherry pick #{source_commit.sha1}")
19
19
  result = git.execute('cherry-pick', '--allow-empty', '--allow-empty-message',
@@ -62,7 +62,7 @@ module Avmtrf1
62
62
 
63
63
  def revisions_uncached
64
64
  git.execute!('--no-pager', 'log', '--reverse', '--pretty=format:%H', source_rev)
65
- .each_line.map(&:strip)
65
+ .each_line.map(&:strip)
66
66
  end
67
67
  end
68
68
  end
@@ -19,9 +19,7 @@ module Avmtrf1
19
19
  parsed_fullname.type
20
20
  end
21
21
 
22
- def name
23
- parsed_fullname.name
24
- end
22
+ delegate :name, to: :parsed_fullname
25
23
 
26
24
  private
27
25
 
@@ -17,17 +17,13 @@ module Avmtrf1
17
17
  @self_data = self_data
18
18
  end
19
19
 
20
- def [](key)
21
- data[key]
22
- end
20
+ delegate :[], to: :data
23
21
 
24
- def fetch(key)
25
- data.fetch(key)
26
- end
22
+ delegate :fetch, to: :data
27
23
 
28
24
  def to_h(prefix = '')
29
25
  data.select { |k, _v| k.start_with?(prefix) }
30
- .map { |e| [e[0].gsub(/\A#{Regexp.quote(prefix)}/, ''), e[1]] }.to_h
26
+ .map { |e| [e[0].gsub(/\A#{Regexp.quote(prefix)}/, ''), e[1]] }.to_h
31
27
  end
32
28
 
33
29
  private
@@ -20,9 +20,7 @@ module Avmtrf1
20
20
  self.path = path.to_pathname
21
21
  end
22
22
 
23
- def to_s
24
- path.to_s
25
- end
23
+ delegate :to_s, to: :path
26
24
 
27
25
  private
28
26
 
@@ -43,8 +43,8 @@ module Avmtrf1
43
43
 
44
44
  def sistemas_uncached
45
45
  parser.body_rows
46
- .map { |body_row| new_sistema(body_row) }
47
- .sort_by { |sistema| [sistema.title.downcase] }
46
+ .map { |body_row| new_sistema(body_row) }
47
+ .sort_by { |sistema| [sistema.title.downcase] }
48
48
  end
49
49
 
50
50
  def indexed_columns_uncached
@@ -19,9 +19,7 @@ module Avmtrf1
19
19
  self.path = path.to_pathname
20
20
  end
21
21
 
22
- def to_s
23
- path.to_s
24
- end
22
+ delegate :to_s, to: :path
25
23
 
26
24
  private
27
25
 
@@ -27,8 +27,8 @@ module Avmtrf1
27
27
 
28
28
  def simple
29
29
  source_data.fetch(:simple)
30
- .map { |s| ::Shellwords.join([s.fetch(:attribute)] + s.fetch(:args)) }
31
- .map { |s| "#{s}\n" }.join
30
+ .map { |s| ::Shellwords.join([s.fetch(:attribute)] + s.fetch(:args)) }
31
+ .map { |s| "#{s}\n" }.join
32
32
  end
33
33
 
34
34
  def simple_add_or_update(name, args)
@@ -16,7 +16,7 @@ module Avmtrf1
16
16
  def sql
17
17
  "SELECT * FROM (\n" +
18
18
  [all_objects_sql, all_users_sql].map { |sub_sql| "\t(#{with_where_sql(sub_sql)})\n" }
19
- .join("\tUNION ALL\n") +
19
+ .join("\tUNION ALL\n") +
20
20
  ") order by object_type, owner, object_name\n"
21
21
  end
22
22
 
@@ -34,9 +34,7 @@ module Avmtrf1
34
34
  put_file_request(auth_url, file_path)
35
35
  end
36
36
 
37
- def server
38
- client.server
39
- end
37
+ delegate :server, to: :client
40
38
 
41
39
  private
42
40
 
@@ -6,9 +6,7 @@ module Avmtrf1
6
6
  module Redmine
7
7
  module Entities
8
8
  class Issue < ::Avmtrf1::RestProvider::Entity
9
- def closed?
10
- status.closed?
11
- end
9
+ delegate :closed?, to: :status
12
10
 
13
11
  def data
14
12
  super.fetch('issue')
@@ -32,7 +32,7 @@ module Avmtrf1
32
32
 
33
33
  def issue_statuses
34
34
  request_json('/issue_statuses').response.body_data_or_raise.fetch('issue_statuses')
35
- .map do |data|
35
+ .map do |data|
36
36
  ::Avmtrf1::Redmine::Entities::IssueStatus.new(self, data)
37
37
  end
38
38
  end
@@ -23,9 +23,7 @@ module Avmtrf1
23
23
  body_data
24
24
  end
25
25
 
26
- def body_str
27
- performed_curl.body_str
28
- end
26
+ delegate :body_str, to: :performed_curl
29
27
 
30
28
  def body_str_or_raise
31
29
  raise_unless_200
@@ -43,9 +41,7 @@ module Avmtrf1
43
41
  performed_curl.status.to_i
44
42
  end
45
43
 
46
- def url
47
- curl.url
48
- end
44
+ delegate :url, to: :curl
49
45
 
50
46
  def to_s
51
47
  "URL: #{url}\nStatus: #{status}\nBody:\n\n#{body_str}"
@@ -27,7 +27,7 @@ module Avmtrf1
27
27
  def result_string
28
28
  ::EacRubyUtils::Fs::Temp.on_file do |file|
29
29
  raise ::RuntimeError, result.pretty_inspect unless python_retrieve_command(file.to_path)
30
- .system
30
+ .system
31
31
 
32
32
  file.read
33
33
  end
@@ -46,7 +46,7 @@ module Avmtrf1
46
46
 
47
47
  def value_by_entry(name, read_options)
48
48
  ::EacConfig::Node.context.current.entry("trf1.forponto.#{name}", read_options)
49
- .send(read_options[:noecho] ? :secret_value : :value)
49
+ .send(read_options[:noecho] ? :secret_value : :value)
50
50
  end
51
51
 
52
52
  def user_uncached
@@ -37,7 +37,7 @@ module Avmtrf1
37
37
 
38
38
  def commits_uncached
39
39
  parsed.revisions.if_present(['HEAD'])
40
- .map { |source| ::Avmtrf1::Gitlab::Commit.new(repository, git_repo, source) }
40
+ .map { |source| ::Avmtrf1::Gitlab::Commit.new(repository, git_repo, source) }
41
41
  end
42
42
 
43
43
  def commit_banner(commit)
@@ -70,8 +70,8 @@ module Avmtrf1
70
70
 
71
71
  def repository_uncached
72
72
  git_repo.remotes.lazy
73
- .map { |r| ::Avmtrf1::Gitlab::Repository.by_uri(r.url) }
74
- .find(&:present?) || raise('Gitlab remote not found')
73
+ .map { |r| ::Avmtrf1::Gitlab::Repository.by_uri(r.url) }
74
+ .find(&:present?) || raise('Gitlab remote not found')
75
75
  end
76
76
  end
77
77
  end
@@ -14,13 +14,9 @@ module Avmtrf1
14
14
 
15
15
  TABLE = 'all_source'
16
16
 
17
- def name
18
- parsed.name
19
- end
17
+ delegate :name, to: :parsed
20
18
 
21
- def type
22
- parsed.type
23
- end
19
+ delegate :type, to: :parsed
24
20
 
25
21
  def run
26
22
  infov('Name', name)
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avmtrf1
4
4
  module Tools
5
- VERSION = '0.38.2'
5
+ VERSION = '0.38.3'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avmtrf1-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.38.2
4
+ version: 0.38.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eduardo H. Bogoni
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-06-21 00:00:00.000000000 Z
11
+ date: 2022-08-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aranha-selenium
@@ -30,20 +30,60 @@ dependencies:
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
32
  version: 0.2.2
33
+ - !ruby/object:Gem::Dependency
34
+ name: avm-eac_webapp_base0
35
+ requirement: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - "~>"
38
+ - !ruby/object:Gem::Version
39
+ version: '0.3'
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: 0.3.1
43
+ type: :runtime
44
+ prerelease: false
45
+ version_requirements: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - "~>"
48
+ - !ruby/object:Gem::Version
49
+ version: '0.3'
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: 0.3.1
33
53
  - !ruby/object:Gem::Dependency
34
54
  name: avm-tools
35
55
  requirement: !ruby/object:Gem::Requirement
36
56
  requirements:
37
57
  - - "~>"
38
58
  - !ruby/object:Gem::Version
39
- version: '0.114'
59
+ version: '0.131'
40
60
  type: :runtime
41
61
  prerelease: false
42
62
  version_requirements: !ruby/object:Gem::Requirement
43
63
  requirements:
44
64
  - - "~>"
45
65
  - !ruby/object:Gem::Version
46
- version: '0.114'
66
+ version: '0.131'
67
+ - !ruby/object:Gem::Dependency
68
+ name: eac_rest
69
+ requirement: !ruby/object:Gem::Requirement
70
+ requirements:
71
+ - - "~>"
72
+ - !ruby/object:Gem::Version
73
+ version: '0.6'
74
+ - - ">="
75
+ - !ruby/object:Gem::Version
76
+ version: 0.6.1
77
+ type: :runtime
78
+ prerelease: false
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: '0.6'
84
+ - - ">="
85
+ - !ruby/object:Gem::Version
86
+ version: 0.6.1
47
87
  - !ruby/object:Gem::Dependency
48
88
  name: inifile
49
89
  requirement: !ruby/object:Gem::Requirement
@@ -124,14 +164,14 @@ dependencies:
124
164
  requirements:
125
165
  - - "~>"
126
166
  - !ruby/object:Gem::Version
127
- version: '0.5'
167
+ version: 0.5.1
128
168
  type: :development
129
169
  prerelease: false
130
170
  version_requirements: !ruby/object:Gem::Requirement
131
171
  requirements:
132
172
  - - "~>"
133
173
  - !ruby/object:Gem::Version
134
- version: '0.5'
174
+ version: 0.5.1
135
175
  description:
136
176
  email:
137
177
  executables: