ohloh_scm 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a322fad83c4037af1c158059932dab5353d403cd
-  data.tar.gz: f9db5553957c95828874b830e369c1c988f78f4f
+  metadata.gz: 221f78cfedf3586d06bfea3132d509bb349ff4e1
+  data.tar.gz: 4487e8e5f0fc705b19299129fbc9435c25a92eb4
 SHA512:
-  metadata.gz: 9a049a46558b3508c172bd03bf1d162710d971f2cf6fd506361d5bab3fa43ac67ac3587be93d5e1c173ec566aabab2fc4cdef4dc2034e3acba02a981b1b0b886
-  data.tar.gz: 7ab4d177283d85be65275676a0bc007c1de27daa21cddb9c89abc274202cead609165775b215bc8a617aea9758838022663ce048393b1530193dee80f5afc035
+  metadata.gz: 5672b4f5bbe90b94a2aad221b71d016f3a81d791bac1c1c67f7a451152243560f6be11fb108fef64de0b9e341d0c823d662de15fd73d85b4d8bf656ac8053724
+  data.tar.gz: e8a18f49bd52af373cb1150c4c9790d6c8641d9d0a0171756c882927945a9855ec247387e799f2ea4f8d2032e5c50ae38962a2b1c72c4bc5c3ac4b788b23d083

data/lib/ohloh_scm/adapters/git/misc.rb

@@ -76,14 +76,32 @@ module OhlohScm::Adapters
 
     def tags
       return [] if no_tags?
-      tag_strings = run("cd #{url} && git tag --format='%(creatordate:iso-strict) %(objectname) %(refname)'").split(/\n/)
+      tag_strings = run("cd #{url} && git tag --format='%(creatordate:iso-strict) %(objectname) %(refname)' | sed 's/refs\\/tags\\///'").split(/\n/)
       tag_strings.map do |tag_string|
-        timestamp_string, commit_hash, tag_path = tag_string.split(/\s/)
-        timestamp_string = '1970-01-01' if timestamp_string.strip.empty?
-        timestamp = Time.parse(timestamp_string)
-        tag_name = tag_path.gsub('refs/tags/', '')
-        [tag_name, commit_hash, timestamp]
+        timestamp_string, commit_hash, tag_name = tag_string.split(/\s/)
+        [tag_name, dereferenced_sha(tag_name) || commit_hash, time_object(timestamp_string)]
       end
     end
-	end
+
+    private
+
+    def dereferenced_sha(tag_name)
+      dtag_sha_and_name = dtag_sha_and_names.find { |sha_and_name| sha_and_name.last == tag_name }
+      dtag_sha_and_name.first if dtag_sha_and_name
+    end
+
+    def dtag_sha_and_names
+      @dtag_sha_and_names ||= dereferenced_tag_strings.map(&:split)
+    end
+
+    def dereferenced_tag_strings
+      # Pattern: b6e9220c3cabe53a4ed7f32952aeaeb8a822603d refs/tags/v1.0.0^{}
+      run("cd #{url} && git show-ref --tags -d | grep '\\^{}' | sed 's/\\^{}//' | sed 's/refs\\/tags\\///'").split(/\n/)
+    end
+
+    def time_object(timestamp_string)
+      timestamp_string = '1970-01-01' if timestamp_string.strip.empty?
+      timestamp = Time.parse(timestamp_string)
+    end
+  end
 end

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.3.4'
+    STRING = '2.3.5'
   end
 end

data/test/unit/git_misc_test.rb

@@ -45,13 +45,28 @@ module OhlohScm::Adapters
       end
     end
 
+    def test_fixture_repo_has_dereferenced_tags
+      with_git_repository('git') do |git|
+        tag_shas = git.run("cd #{git.url} && git tag --format='%(objectname)' | sed 's/refs\\/tags\\///'").split(/\n/)
+        assert_equal true, tag_shas.any? { |sha| not git.commit_tokens.include?(sha) }
+      end
+    end
+
     def test_tags
       with_git_repository('git') do |git|
-        assert_equal git.tags, [['v1.0.0', 'f6e5a894ac4173f8f2a200f2c36df38a1e61121a', Time.parse('2016-07-31T07:58:30+05:30')],
+        assert_equal git.tags, [['v1.0.0', 'b6e9220c3cabe53a4ed7f32952aeaeb8a822603d', Time.parse('2016-07-31T07:58:30+05:30')],
+                                ['v1.1.0-lw', '2e9366dd7a786fdb35f211fff1c8ea05c51968b1', Time.parse('2006-06-11T11:34:17-07:00')],
                                 ['v2.1.0', '1df547800dcd168e589bb9b26b4039bff3a7f7e4', Time.parse('2006-07-14T16:07:15-07:00')]]
       end
     end
 
+    def test_tags_reference_valid_commits
+      with_git_repository('git') do |git|
+        tag_shas = git.tags.map { |list| list[1] }
+        assert_equal true, tag_shas.all? { |sha| git.commit_tokens.include?(sha) }
+      end
+    end
+
     def test_tags_with_non_tagged_repository
       with_git_repository('git_walk') do |git|
         assert_equal git.tags, []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn