avmtrf1-tools 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3596640cb42d9331fc9a64994e5c9e0bc2804b17ea6683985317c6b8bd18a025
-  data.tar.gz: ffdc002e2061a896be7e43396fc4e16526cafda04a32383297d6fd95f8c34ff0
+  metadata.gz: 493f91da0b605f4a9a83c65ad7147af44d9cae1d2776647fc0daeeaa911351ff
+  data.tar.gz: 4ab6779365c2601f3a913aeeb658ad39f42273f8f6bbc05a93a89817006d89ca
 SHA512:
-  metadata.gz: ce9c393bbaaae052c799ba9b67e5767b97d247e5672d9fbe3073cfd22084583a0e59db48faa1bc63709c0e683474c54d27cd7a5dee3d47d921d3e1e7c202fd0a
-  data.tar.gz: 72c41df2ae775716cb562fa13905edb0ae6704462d3e7993293b005edb1ef885f479f3b67f5063f88779c8e010f24f8948f43f82ac4abc66369d4f62a9399091
+  metadata.gz: 1b945f2e35f0d2b79be9fb7ec67d9b6cfd2c3c2e0381918626ed966136a2136b50c161844dc78c3b7337abe269ca93aa3eb2d73a9aafc77d7b72a4d7b32ecc36
+  data.tar.gz: cc0e2ebe992386740b907725086b9e29184bf8f18aded506db9a7f5c3eb774eba38cd86eed6738f89b05a042ad7c06cbf17c15d5e16a0fac146839198acd4f2e

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/gitlab/commit.rb

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

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

@@ -14,6 +14,7 @@ module Avmtrf1
             runner_with :help, :output do
               desc 'Mostra o link de uma revisão no Gitlab do TRF1.'
               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 +36,29 @@ 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 if parsed.textile?
+
+              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 +67,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-01-24 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