ohloh_scm 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01aee4685daafad8c1d67aaf29980d436e8a9f90
-  data.tar.gz: 5b4e1b06ab670dec334adcda280ec20964f2bbe8
+  metadata.gz: fe066288b332c9dd10ec78dd83a5939c6e7d33ae
+  data.tar.gz: 943728f5598a66f587ec1f1d62da2ac5880170df
 SHA512:
-  metadata.gz: 641c9907527a60ddcbbcc34451a3f8088a242d9c67a2766cad1f6deae4a6db40ad25e9382aae50f70879e26be14feb7c0c34b7ce9192323115fc7f9c0cdbe592
-  data.tar.gz: 2e018d289cced44e09b5ffc5773d0a689968087cee77414a6f375f8a9ae104ea332c53c0d9ac7f809e97ab98c71f4c3a103eac2a6043eb1672efe27e5f907402
+  metadata.gz: bbfd34de0a9ba9a7d4b2d2d3500bbc1d92fc2f17e895c081ffa717287d0ad3f947990956233210f5b88ef477e62eb76e9aaf5833b7d345a149644083f4992aca
+  data.tar.gz: 01cc2c61d974a275a0a0f819cd2dd0cc0372bac4d7da063274a57048c596524b5080a4693e22a70ceb38ab41d88b0823bdb1ef5d8dfea7fd771bd55863719c9f

data/.ruby-version

@@ -1,2 +1,2 @@
-2.0.0-p648
+2.0.0-p645
 

data/.travis/.install_multiple_scms.sh

@@ -1,5 +1,6 @@
 sudo sh -c 'echo "deb http://opensource.wandisco.com/ubuntu precise svn18" >> /etc/apt/sources.list.d/subversion18.list'
 sudo wget -q http://opensource.wandisco.com/wandisco-debian.gpg -O- | sudo apt-key add -
+sudo apt-add-repository -y ppa:git-core/ppa
 sudo apt-get update
-sudo apt-get install -y subversion cvs bzr mercurial
+sudo apt-get install -y git subversion cvs bzr mercurial
 sudo ln -s /usr/bin/cvs /usr/bin/cvsnt

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

@@ -42,8 +42,11 @@ module OhlohScm::Adapters
     def tags
       tag_strings = run("cd '#{url}' && bzr tags").split(/\n/)
       tag_strings.map do |tag_string|
-        tag_string.split(/\s+/)
-      end
+        tag_name, rev = tag_string.split(/\s+/)
+        next if rev == '?' || tag_name == '....'
+        time_string = run("cd '#{ url }' && bzr log -r #{ rev } | grep 'timestamp:' | sed 's/timestamp://'")
+        [tag_name, rev, Time.parse(time_string)]
+      end.compact
     end
 	end
 end

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

@@ -76,11 +76,12 @@ module OhlohScm::Adapters
 
     def tags
       return [] if no_tags?
-      tag_strings = run("cd #{url} && git show-ref --tags").split(/\n/)
+      tag_strings = run("cd #{url} && git tag --format='%(creatordate:iso-strict) %(objectname) %(refname)'").split(/\n/)
       tag_strings.map do |tag_string|
-        commit_hash, tag_path = tag_string.split(/\s/)
+        timestamp_string, commit_hash, tag_path = tag_string.split(/\s/)
+        timestamp = Time.parse(timestamp_string)
         tag_name = tag_path.gsub('refs/tags/', '')
-        [tag_name, commit_hash]
+        [tag_name, commit_hash, timestamp]
       end
     end
 	end

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

@@ -23,8 +23,9 @@ module OhlohScm::Adapters
       tag_strings = run("cd '#{path}' && hg tags").split(/\n/)
       tag_strings.map do |tag_string|
         tag_name, rev_number_and_hash = tag_string.split(/\s+/)
-        rev_number = rev_number_and_hash.slice(/\A\d+/)
-        [tag_name, rev_number]
+        rev = rev_number_and_hash.slice(/\A\d+/)
+        time_string = run("cd '#{ path }' && hg log -r #{ rev } | grep 'date:' | sed 's/date://'")
+        [tag_name, rev, Time.parse(time_string)]
       end
     end
 	end

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

@@ -146,7 +146,9 @@ module OhlohScm::Adapters
     def tags
       tag_strings = `svn ls -v #{ base_path}/tags`.split(/\n/)
       tag_strings.map do |tag_string|
-        tag_string.split(' ').values_at(-1, 0).map { |v| v.chomp('/') }
+        date_string = tag_string.split(' ').values_at(-4, -3, -2).join(' ')
+        folder_and_rev = tag_string.split(' ').values_at(-1, 0).map { |v| v.chomp('/') }
+        folder_and_rev << Time.parse(date_string)
       end[1..-1]
     end
 

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.2.3'
+    STRING = '2.2.4'
   end
 end

data/test/unit/bzr_misc_test.rb

@@ -36,7 +36,24 @@ module OhlohScm::Adapters
 
     def test_tags
       with_bzr_repository('bzr') do |bzr|
-        assert_equal bzr.tags, [['v1.0.0', '5'], ['v2.0.0','7']]
+        time_1 = Time.parse('2009-02-04 00:25:40 +0000')
+        time_2 = Time.parse('2011-12-22 18:37:33 +0000')
+        monkey_patch_run_method_to_match_tag_patterns
+        assert_equal [['v1.0.0', '5', time_1], ['v2.0.0','7', time_2]], bzr.tags
+      end
+    end
+
+    private
+
+    def monkey_patch_run_method_to_match_tag_patterns
+      original_method = AbstractAdapter.method(:run)
+      AbstractAdapter.send :define_method, :run do |command|
+        if command =~ /bzr tags/
+          # The output of `bzr tags` sometimes has tags referring to ? while sometimes has dotted separators.
+          "0.11-1.1             ?\n0.14-1               ?\n....\n#{ original_method.call(command) }"
+        else
+          original_method.call(command)
+        end
       end
     end
 	end

data/test/unit/git_misc_test.rb

@@ -47,8 +47,8 @@ module OhlohScm::Adapters
 
     def test_tags
       with_git_repository('git') do |git|
-        assert_equal git.tags, [['v1.0.0', 'f6e5a894ac4173f8f2a200f2c36df38a1e61121a'],
-                                ['v2.1.0', '1df547800dcd168e589bb9b26b4039bff3a7f7e4']]
+        assert_equal git.tags, [['v1.0.0', 'f6e5a894ac4173f8f2a200f2c36df38a1e61121a', Time.parse('2016-07-31T07:58:30+05:30')],
+                                ['v2.1.0', '1df547800dcd168e589bb9b26b4039bff3a7f7e4', Time.parse('2006-07-14T16:07:15-07:00')]]
       end
     end
 

data/test/unit/hg_misc_test.rb

@@ -39,7 +39,8 @@ module OhlohScm::Adapters
 
     def test_tags
       with_hg_repository('hg') do |hg|
-        assert_equal hg.tags, [['tip', '5']]
+        time = Time.parse('Fri Jul 22 18:00:18 2016 +0530')
+        assert_equal  [['tip', '5', time]], hg.tags
       end
     end
 	end

data/test/unit/svn_misc_test.rb

@@ -111,7 +111,9 @@ module OhlohScm::Adapters
                   mkdir -p #{ source_scm.root.gsub(/^file:../, '') }/db/transactions
                   svn copy trunk tags/2.0 && svn commit -m 'v2.0' && svn update"
 
-          assert_equal([['2.0', '6']], source_scm.tags)
+          assert_equal(['2.0', '6'], source_scm.tags.first[0..1])
+          # Avoid millisecond comparision.
+          assert_equal(Time.now.strftime('%F %R'), source_scm.tags.first[-1].strftime('%F %R'))
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -602,7 +602,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Source Control Management