ohloh_scm 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60fae1479971d5e93adf67edcc4d4154de583112
-  data.tar.gz: e2a25ad7fdef67f35d47bc54d016742333118d6f
+  metadata.gz: 1b611998a903a8fc19bcd5c5c8ac58b88b78f97c
+  data.tar.gz: 7610da542ca2bf2859f08dff8a7e4842cb9e5af3
 SHA512:
-  metadata.gz: 573bb4c5bd6147adc78776530a0941b63ea704afa2374462d0ee1249beb35b035195d1c7c7fdfc702a2cfc190ece8cccb9374eab33c3b5ec7165eae7d3dc4017
-  data.tar.gz: b7c2f9f4a4140b2825529a5b14c341aba1efef8e9b33dde80755dfd1f67bd93f5aed752a5b1e8e37e4dde3568681acce68573bede3f600c4367cb866ac1646c5
+  metadata.gz: d49ff7154ab7cd57946340d3dc02fda710f217f6ae25ec52217d13c4afa57f3675a6b66e26530d8071c9998a7fc781b44d4f82c2569775624ad7a632a1059b1d
+  data.tar.gz: 51804d1969aeea498e40e63f770b476db01eed438127c6b44b1b6484e916c9e6ab0ee4fca39f56521be41c9de67d3782c5e1c265cbe3aad8cdba5a4ca8608131

data/.travis.yml

@@ -1,4 +1,12 @@
 language: ruby
+env:
+  - TRAVIS_CONFIG_DIR=.travis
+before_install:
+  - cd $TRAVIS_CONFIG_DIR
+  - sh .travis_ssh_setup.sh
 install:
-  - gem install posix-spawn
+  - sh .install_multiple_scms.sh
   - sh .install_dependencies.sh
+  - gem install posix-spawn
+before_script:
+  - cd $TRAVIS_BUILD_DIR

data/.travis/.install_multiple_scms.sh

@@ -0,0 +1,5 @@
+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-get update
+sudo apt-get install -y subversion cvs bzr mercurial
+sudo ln -s /usr/bin/cvs /usr/bin/cvsnt

data/.travis/.travis_ssh_setup.sh

@@ -0,0 +1,3 @@
+ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+ssh-keyscan -t rsa `hostname` >> ~/.ssh/known_hosts

data/README.md

@@ -1,4 +1,4 @@
-[![Ohloh SCM on Ohloh](https://www.ohloh.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.ohloh.net/p/ohloh_scm)
+[![Ohloh SCM on Ohloh](https://www.ohloh.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.ohloh.net/p/ohloh_scm) [![Build Status](https://travis-ci.org/blackducksoftware/ohloh_scm.svg?branch=master)](https://travis-ci.org/blackducksoftware/ohloh_scm)
 
 # Ohloh SCM
 

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

@@ -10,7 +10,7 @@ module OhlohScm::Adapters
 		end
 
 		def ls_tree(token)
-			run("cd #{path} && bzr ls -V -r #{to_rev_param(token)}").split("\n")
+      run("cd #{path} && bzr ls -V -r #{to_rev_param(token)}").split("\n")
 		end
 
 		def to_rev_param(r=nil)
@@ -38,5 +38,12 @@ module OhlohScm::Adapters
 
 			run "cd '#{url}' && bzr export --format=dir -r #{to_rev_param(token)} '#{dest_dir}'"
 		end
+
+    def tags
+      tag_strings = run("cd '#{url}' && bzr tags").split(/\n/)
+      tag_strings.map do |tag_string|
+        tag_string.split(/\s+/)
+      end
+    end
 	end
 end

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

@@ -70,6 +70,10 @@ module OhlohScm::Adapters
 			run "cvsnt -d #{self.url} rlog #{opt_branch} #{opt_time(most_recent_token)} '#{self.module_name}' | #{ string_encoder }"
 		end
 
+    def export_tag(dest_dir, tag_name = 'HEAD')
+      run "cvsnt -d #{self.url} export -d'#{dest_dir}' -r #{tag_name} '#{self.module_name}'"
+    end
+
 		def checkout(r, local_directory)
 			opt_D = r.token ? "-D'#{r.token}Z'" : ""
 
@@ -187,5 +191,13 @@ module OhlohScm::Adapters
 			  stdout, stderr = run_with_err(cmd)
       end
     end
+
+    def tags
+      tag_strings = run("cvs -Q -d #{ url } rlog -h #{ module_name } | awk -F\"[.:]\" '/^\\t/&&$(NF-1)!=0'").split(/\n/)
+      tag_strings.map do |tag_string|
+        tag_name, version = tag_string.split(':')
+        [tag_name.gsub(/\t/, ''), version.strip]
+      end
+    end
 	end
 end

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

@@ -69,5 +69,14 @@ module OhlohScm::Adapters
 		def is_merge_commit?(commit)
 			parent_tokens(commit).size > 1
 		end
+
+    def tags
+      tag_strings = run("cd #{url} && git show-ref --tags").split(/\n/)
+      tag_strings.map do |tag_string|
+        commit_hash, tag_path = tag_string.split(/\s/)
+        tag_name = tag_path.gsub('refs/tags/', '')
+        [tag_name, commit_hash]
+      end
+    end
 	end
 end

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

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module OhlohScm::Adapters
 	class HgAdapter < AbstractAdapter
 		def cat_file(commit, diff)
@@ -20,7 +22,7 @@ module OhlohScm::Adapters
 		# Example:
 		#     "Foo Bar & Baz" => "Foo\ Bar\ \&\ Baz"
 		def escape(path)
-			path.gsub(/[ `'"&()<>|#\$]/) { |c| '\\' + c }
+			path.shellescape
 		end
 	end
 end

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

@@ -8,13 +8,11 @@ module OhlohScm::Adapters
 
 		# Return the list of commit tokens following +after+.
 		def commit_tokens(opts={})
-			after = opts[:after] || 0
-			up_to = opts[:up_to] || 'tip'
-
+      hg_log_with_opts, after = hg_command_builder(opts)
 			# We reverse the final result in Ruby, rather than passing the --reverse flag to hg.
 			# That's because the -f (follow) flag doesn't behave the same in both directions.
 			# Basically, we're trying very hard to make this act just like Git. The hg_rev_list_test checks this.
-			tokens = run("cd '#{self.url}' && hg log -f #{trunk_only(opts)} -r #{up_to || 'tip'}:#{after || 0} --template='{node}\\n'").split("\n").reverse
+			tokens = run("cd '#{self.url}' && #{ hg_log_with_opts } --template='{node}\\n'").split("\n").reverse
 
 			# Hg returns everything after *and including* after.
 			# We want to exclude it.
@@ -30,9 +28,9 @@ module OhlohScm::Adapters
 		# If you need all commits including diffs, you should use the each_commit() iterator, which only holds one commit
 		# in memory at a time.
 		def commits(opts={})
-			after = opts[:after] || 0
+      hg_log_with_opts, after = hg_command_builder(opts)
 
-			log = run("cd '#{self.url}' && hg log -f #{trunk_only(opts)} -v -r tip:#{after} --style #{OhlohScm::Parsers::HgStyledParser.style_path}")
+			log = run("cd '#{self.url}' && #{ hg_log_with_opts } --style #{OhlohScm::Parsers::HgStyledParser.style_path}")
 			a = OhlohScm::Parsers::HgStyledParser.parse(log).reverse
 
 			if a.any? && a.first.token == after
@@ -55,7 +53,8 @@ module OhlohScm::Adapters
 		def each_commit(opts={})
 			after = opts[:after] || 0
 			open_log_file(opts) do |io|
-				OhlohScm::Parsers::HgStyledParser.parse(io) do |commit|
+        commits = OhlohScm::Parsers::HgStyledParser.parse(io)
+        commits.reverse.each do |commit|
 					yield commit if block_given? && commit.token != after
 				end
 			end
@@ -63,8 +62,8 @@ module OhlohScm::Adapters
 
 		# Not used by Ohloh proper, but handy for debugging and testing
 		def log(opts={})
-			after = opts[:after] || 0
-			run "cd '#{url}' && hg log -f #{trunk_only(opts)} -v -r tip:#{after} | #{ string_encoder }"
+      hg_log_with_opts = hg_command_builder(opts)
+			run "cd '#{url}' && #{ hg_log_with_opts } | #{ string_encoder }"
 		end
 
 		# Returns a file handle to the log.
@@ -72,13 +71,13 @@ module OhlohScm::Adapters
 		# it returns everything after and INCLUDING +after+. Therefore, consumers of this file should check for
 		# and reject the duplicate commit.
 		def open_log_file(opts={})
-			after = opts[:after] || 0
+      hg_log_with_opts, after = hg_command_builder(opts)
 			begin
 				if after == head_token # There are no new commits
 					# As a time optimization, just create an empty file rather than fetch a log we know will be empty.
 					File.open(log_filename, 'w') { }
 				else
-					run "cd '#{url}' && hg log --verbose #{trunk_only(opts)} -r #{after || 0}:tip --style #{OhlohScm::Parsers::HgStyledParser.verbose_style_path} | #{ string_encoder } > #{log_filename}"
+					run "cd '#{url}' && #{ hg_log_with_opts } --style #{OhlohScm::Parsers::HgStyledParser.verbose_style_path} | #{ string_encoder } > #{log_filename}"
 				end
 				File.open(log_filename, 'r') { |io| yield io }
 			ensure
@@ -90,13 +89,20 @@ module OhlohScm::Adapters
 		  File.join('/tmp', (self.url).gsub(/\W/,'') + '.log')
 		end
 
-		def trunk_only(opts={})
-			if opts[:trunk_only]
-				'--follow-first'
-			else
-				''
-			end
-		end
+    private
+
+    def hg_command_builder(opts)
+      after = opts[:after] || 0
+      up_to = opts[:up_to] || :tip
+
+      options = if opts[:trunk_only]
+        "--follow-first -r #{ up_to }:#{ after }"
+      else
+        query = "and (branch(#{ branch_name }) or ancestors(#{ branch_name }))" if branch_name && branch_name != 'default'
+        "-r '#{ up_to }:#{ after } #{ query }'"
+      end
 
+      ["hg log -f -v #{ options }", after]
+    end
 	end
 end

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

@@ -3,7 +3,8 @@ module OhlohScm::Adapters
 		def head_token
 			# This only returns first 12 characters.
 			# How can we make it return the entire hash?
-			token = run("hg id -q #{url}").strip
+      branch_opts = "--rev #{branch_name || :default}"
+			token = run("hg id -q #{url} #{branch_opts}").strip
 
 			# Recent versions of Hg now somtimes append a '+' char to the token.
 			# I believe this signifies pending changes... but we don't care.

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

@@ -18,5 +18,14 @@ module OhlohScm::Adapters
 			# Hg leaves a little cookie crumb in the export directory. Remove it.
 			File.delete(File.join(dest_dir, '.hg_archival.txt')) if File.exist?(File.join(dest_dir, '.hg_archival.txt'))
 		end
+
+    def tags
+      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]
+      end
+    end
 	end
 end

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

@@ -12,7 +12,8 @@ module OhlohScm::Adapters
 				run "rm -rf '#{self.url}'"
 				run "hg clone -U '#{from.url}' '#{self.url}'"
 			else
-				run "cd '#{self.url}' && hg revert --all && hg pull -u -y '#{from.url}'"
+        branch_opts = "-r #{ from.branch_name }" if branch_name
+				run "cd '#{self.url}' && hg revert --all && hg pull #{ branch_opts } -u -y '#{from.url}'"
 			end
 
 			yield(1,1) if block_given? # Progress bar callback

data/lib/ohloh_scm/adapters/hglib_adapter.rb

@@ -21,5 +21,5 @@ module OhlohScm::Adapters
 	end
 end
 
-require_relative 'hglib/cat_file'
 require_relative 'hglib/head'
+require_relative 'hglib/cat_file'

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

@@ -123,6 +123,11 @@ module OhlohScm::Adapters
 			run "svn export --trust-server-cert --non-interactive --ignore-externals --force -r #{commit_id} '#{SvnAdapter.uri_encode(File.join(root, branch_name.to_s))}' '#{dest_dir}'"
 		end
 
+    def export_tag(dest_dir, tag_name)
+      tag_url = "#{base_path}/tags/#{tag_name}"
+      run "svn export --trust-server-cert --non-interactive --ignore-externals --force '#{tag_url}' '#{dest_dir}'"
+    end
+
 		def ls_tree(token)
 			run("svn ls --trust-server-cert --non-interactive -R -r #{token} '#{SvnAdapter.uri_encode(File.join(root, branch_name.to_s))}@#{token}'").split("\n")
 		end
@@ -133,10 +138,29 @@ module OhlohScm::Adapters
 			" #{opt_password} --no-auth-cache "
 		end
 
+    # Svn root is not usable here since several projects are nested in subfolders.
+    # e.g. https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/ 
+    #      http://svn.apache.org/repos/asf/httpd/httpd/trunk
+    #      http://svn.apache.org/repos/asf/maven/plugin-testing/trunk
+    #      all have the same root value(https://svn.apache.org/repos/asf)
+    def tags
+      tag_strings = `svn log -v #{ base_path}/tags | grep 'tags.\\+(from.\\+:[0-9]\\+)$'`.split(/\n/)
+      tag_strings.map do |tag_string|
+        tag_string.match(/\/tags\/(.+) \(from .+:(\d+)\)\Z/)[1..2]
+      end
+    end
+
     class << self
       def has_conflicts?(working_copy_url)
         system("cd '#{ working_copy_url }' && svn status | grep 'Summary of conflicts'")
       end
     end
+
+    private
+
+    def base_path
+      url.sub(/(.*)(branches|trunk|tags)(.*)/, '\1').chomp('/')
+    end
+
 	end
 end

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.1.0'
+    STRING = '2.2.0'
   end
 end

data/test/repositories/bzr/.bzr/branch/tags

@@ -0,0 +1 @@
+d6:v1.0.047:obnox@samba.org-20090204002540-gmana8tk5f9gboq96:v2.0.048:test@example.com-20111222183733-y91if5npo3pe8ifse

data/test/test_helper.rb

@@ -47,7 +47,7 @@ class OhlohScm::Test < Test::Unit::TestCase
 		assert_equal expected_lines, actual_lines
 	end
 
-	def with_repository(type, name)
+	def with_repository(type, name, branch_name = nil)
 		OhlohScm::ScratchDir.new do |dir|
 			if Dir.entries(REPO_DIR).include?(name)
 				`cp -R #{File.join(REPO_DIR, name)} #{dir}`
@@ -56,7 +56,7 @@ class OhlohScm::Test < Test::Unit::TestCase
 			else
 				raise RuntimeError.new("Repository archive #{File.join(REPO_DIR, name)} not found.")
 			end
-			yield type.new(:url => File.join(dir, name)).normalize
+			yield type.new(:url => File.join(dir, name), branch_name: branch_name).normalize
 		end
 	end
 
@@ -101,13 +101,13 @@ class OhlohScm::Test < Test::Unit::TestCase
 		end
 	end
 
-	def with_git_repository(name)
-		with_repository(OhlohScm::Adapters::GitAdapter, name) { |git| yield git }
-	end
+  def with_git_repository(name, branch_name = nil)
+    with_repository(OhlohScm::Adapters::GitAdapter, name, branch_name) { |git| yield git }
+  end
 
-	def with_hg_repository(name)
-		with_repository(OhlohScm::Adapters::HgAdapter, name) { |hg| yield hg }
-	end
+  def with_hg_repository(name, branch_name = nil)
+    with_repository(OhlohScm::Adapters::HgAdapter, name, branch_name) { |hg| yield hg }
+  end
 
 	def with_hglib_repository(name)
 		with_repository(OhlohScm::Adapters::HglibAdapter, name) { |hg| yield hg }

data/test/unit/bzr_misc_test.rb

@@ -20,7 +20,8 @@ module OhlohScm::Adapters
 					      'file3.txt',
 					      'file4.txt',
 					      'file5.txt'],
-					     bzr.ls_tree(bzr.head_token).sort
+              bzr.ls_tree(bzr.head_token).sort.map { |filename|
+                filename.force_encoding(Encoding::UTF_8) }
 			end
 		end
 
@@ -33,5 +34,10 @@ module OhlohScm::Adapters
 			end
 		end
 
+    def test_tags
+      with_bzr_repository('bzr') do |bzr|
+        assert_equal bzr.tags, [['v1.0.0', '5'], ['v2.0.0','7']]
+      end
+    end
 	end
 end

data/test/unit/cvs_commits_test.rb

@@ -6,19 +6,19 @@ module OhlohScm::Adapters
 		def test_commits
 			with_cvs_repository('cvs', 'simple') do |cvs|
 
-				assert_equal ['2006/06/29 16:21:07',
-											'2006/06/29 18:14:47',
-											'2006/06/29 18:45:29',
-											'2006/06/29 18:48:54',
-											'2006/06/29 18:52:23'], cvs.commits.collect { |c| c.token }
-
-				assert_equal ['2006/06/29 18:48:54',
-											'2006/06/29 18:52:23'],
-					cvs.commits(:after => '2006/06/29 18:45:29').collect { |c| c.token }
+        assert_equal ['2006-06-29 16:21:07',
+											'2006-06-29 18:14:47',
+											'2006-06-29 18:45:29',
+											'2006-06-29 18:48:54',
+											'2006-06-29 18:52:23'], cvs.commits.collect { |c| c.token }
 
 				# Make sure we are date format agnostic (2008/01/01 is the same as 2008-01-01)
-				assert_equal ['2006/06/29 18:48:54',
-											'2006/06/29 18:52:23'],
+        assert_equal ['2006-06-29 18:48:54',
+                      '2006-06-29 18:52:23'],
+          cvs.commits(:after => '2006/06/29 18:45:29').collect { |c| c.token }
+
+				assert_equal ['2006-06-29 18:48:54',
+											'2006-06-29 18:52:23'],
 					cvs.commits(:after => '2006-06-29 18:45:29').collect { |c| c.token }
 
 				assert_equal [], cvs.commits(:after => '2006/06/29 18:52:23').collect { |c| c.token }

data/test/unit/cvs_misc_test.rb

@@ -62,5 +62,21 @@ module OhlohScm::Adapters
         assert_equal true, cvs.log.valid_encoding?
       end
     end
+
+    def test_tags
+      with_cvs_repository('cvs', 'simple') do |cvs|
+        assert_equal([['simple_release_tag', '1.1.1.1'], ['simple_vendor_tag', '1.1.1']], cvs.tags)
+      end
+    end
+
+    def test_export_tag
+      with_cvs_repository('cvs', 'simple') do |cvs|
+        OhlohScm::ScratchDir.new do |dir|
+          cvs.export_tag(dir, 'simple_release_tag')
+
+          assert_equal ['.','..','foo.rb'], Dir.entries(dir).sort
+        end
+      end
+    end
 	end
 end

data/test/unit/git_commits_test.rb

@@ -39,6 +39,20 @@ module OhlohScm::Adapters
 			end
 		end
 
+    def test_commits_with_branch
+      with_git_repository('git', 'develop') do |git|
+        assert_equal ['089c527c61235bd0793c49109b5bd34d439848c6',
+                      'b6e9220c3cabe53a4ed7f32952aeaeb8a822603d',
+                      '2e9366dd7a786fdb35f211fff1c8ea05c51968b1',
+                      'b4046b9a80fead62fa949232f2b87b0cb78fffcc'], git.commits.map(&:token)
+
+        assert_equal ['b4046b9a80fead62fa949232f2b87b0cb78fffcc'],
+          git.commits(:after => '2e9366dd7a786fdb35f211fff1c8ea05c51968b1').map(&:token)
+
+        assert_equal [], git.commits(:after => 'b4046b9a80fead62fa949232f2b87b0cb78fffcc')
+      end
+    end
+
     def test_trunk_only_commit_count
 			with_git_repository('git_dupe_delete') do |git|
 				assert_equal 4, git.commit_count(:trunk_only => false)

data/test/unit/git_misc_test.rb

@@ -14,7 +14,7 @@ module OhlohScm::Adapters
 
 		def test_branches
 			with_git_repository('git') do |git|
-				assert_equal ['master'], git.branches
+				assert_equal ['develop', 'master'], git.branches
 				assert git.has_branch?('master')
 			end
 		end
@@ -44,5 +44,12 @@ module OhlohScm::Adapters
         assert_equal true, git.ls_tree.all? { |filename| filename.valid_encoding? }
       end
     end
+
+    def test_tags
+      with_git_repository('git') do |git|
+        assert_equal git.tags, [['v1.0.0', 'f6e5a894ac4173f8f2a200f2c36df38a1e61121a'],
+                                ['v2.1.0', '1df547800dcd168e589bb9b26b4039bff3a7f7e4']]
+      end
+    end
 	end
 end

data/test/unit/git_push_test.rb

@@ -24,7 +24,6 @@ module OhlohScm::Adapters
 		def test_basic_push
 			with_git_repository('git') do |src|
 				OhlohScm::ScratchDir.new do |dest_dir|
-
 					dest = GitAdapter.new(:url => dest_dir).normalize
 					assert !dest.exist?
 
@@ -36,10 +35,10 @@ module OhlohScm::Adapters
 					File.open(File.join(src.url, 'foo'), 'w') { }
 					src.commit_all(OhlohScm::Commit.new)
 
+          system("cd #{ dest_dir } && git config --bool core.bare true && git config receive.denyCurrentBranch refuse")
 					src.push(dest)
 					assert dest.exist?
 					assert_equal src.log, dest.log
-
 				end
 			end
 		end

data/test/unit/hg_cat_file_test.rb

@@ -35,7 +35,7 @@ EXPECTED
 				File.open(File.join(dir, funny_name), 'w') { |f| f.write "contents" }
 
 				# Add it to an hg repository
-				`cd #{dir} && hg init && hg add * && hg commit -m test`
+				`cd #{dir} && hg init && hg add * && hg commit -u tester -m test`
 
 				# Confirm that we can read the file back
 				hg = HgAdapter.new(:url => dir).normalize

data/test/unit/hg_commits_test.rb

@@ -5,9 +5,9 @@ module OhlohScm::Adapters
 
 		def test_commit_count
 			with_hg_repository('hg') do |hg|
-				assert_equal 4, hg.commit_count
-				assert_equal 2, hg.commit_count(:after => 'b14fa4692f949940bd1e28da6fb4617de2615484')
-				assert_equal 0, hg.commit_count(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4')
+				assert_equal 5, hg.commit_count
+				assert_equal 3, hg.commit_count(:after => 'b14fa4692f949940bd1e28da6fb4617de2615484')
+				assert_equal 0, hg.commit_count(:after => '655f04cf6ad708ab58c7b941672dce09dd369a18')
 			end
 		end
 
@@ -16,12 +16,13 @@ module OhlohScm::Adapters
 				assert_equal ['01101d8ef3cea7da9ac6e9a226d645f4418f05c9',
 											'b14fa4692f949940bd1e28da6fb4617de2615484',
 											'468336c6671cbc58237a259d1b7326866afc2817',
-											'75532c1e1f1de55c2271f6fd29d98efbe35397c4'], hg.commit_tokens
+                      '75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+											'655f04cf6ad708ab58c7b941672dce09dd369a18'], hg.commit_tokens
 
-				assert_equal ['75532c1e1f1de55c2271f6fd29d98efbe35397c4'],
-					hg.commit_tokens(:after => '468336c6671cbc58237a259d1b7326866afc2817')
+				assert_equal ['655f04cf6ad708ab58c7b941672dce09dd369a18'],
+					hg.commit_tokens(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4')
 
-				assert_equal [], hg.commit_tokens(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4')
+				assert_equal [], hg.commit_tokens(:after => '655f04cf6ad708ab58c7b941672dce09dd369a18')
 			end
 		end
 
@@ -30,15 +31,34 @@ module OhlohScm::Adapters
 				assert_equal ['01101d8ef3cea7da9ac6e9a226d645f4418f05c9',
 											'b14fa4692f949940bd1e28da6fb4617de2615484',
 											'468336c6671cbc58237a259d1b7326866afc2817',
-											'75532c1e1f1de55c2271f6fd29d98efbe35397c4'], hg.commits.collect { |c| c.token }
+                      '75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+											'655f04cf6ad708ab58c7b941672dce09dd369a18'], hg.commits.collect { |c| c.token }
 
-				assert_equal ['75532c1e1f1de55c2271f6fd29d98efbe35397c4'],
-					hg.commits(:after => '468336c6671cbc58237a259d1b7326866afc2817').collect { |c| c.token }
+				assert_equal ['655f04cf6ad708ab58c7b941672dce09dd369a18'],
+					hg.commits(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4').collect { |c| c.token }
 
 				# Check that the diffs are not populated
-				assert_equal [], hg.commits(:after => '468336c6671cbc58237a259d1b7326866afc2817').first.diffs
+				assert_equal [], hg.commits(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4').first.diffs
 
-				assert_equal [], hg.commits(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4')
+				assert_equal [], hg.commits(:after => '655f04cf6ad708ab58c7b941672dce09dd369a18')
+			end
+		end
+
+		def test_commits_with_branch
+			with_hg_repository('hg', 'develop') do |hg|
+				assert_equal ['01101d8ef3cea7da9ac6e9a226d645f4418f05c9',
+											'b14fa4692f949940bd1e28da6fb4617de2615484',
+											'468336c6671cbc58237a259d1b7326866afc2817',
+                      '75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+											'4d54c3f0526a1ec89214a70615a6b1c6129c665c'], hg.commits.collect { |c| c.token }
+
+				assert_equal ['4d54c3f0526a1ec89214a70615a6b1c6129c665c'],
+					hg.commits(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4').collect { |c| c.token }
+
+				# Check that the diffs are not populated
+				assert_equal [], hg.commits(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4').first.diffs
+
+				assert_equal [], hg.commits(:after => '4d54c3f0526a1ec89214a70615a6b1c6129c665c')
 			end
 		end
 
@@ -129,18 +149,34 @@ module OhlohScm::Adapters
 				assert_equal ['01101d8ef3cea7da9ac6e9a226d645f4418f05c9',
 											'b14fa4692f949940bd1e28da6fb4617de2615484',
 											'468336c6671cbc58237a259d1b7326866afc2817',
-											'75532c1e1f1de55c2271f6fd29d98efbe35397c4'], commits.collect { |c| c.token }
+											'75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+                      '655f04cf6ad708ab58c7b941672dce09dd369a18'], commits.collect { |c| c.token }
 			end
 		end
 
+    def test_each_commit_for_branch
+      commits = []
+
+			with_hg_repository('hg', 'develop') do |hg|
+        commits = hg.each_commit
+      end
+
+      assert_equal ['01101d8ef3cea7da9ac6e9a226d645f4418f05c9',
+                    'b14fa4692f949940bd1e28da6fb4617de2615484',
+                    '468336c6671cbc58237a259d1b7326866afc2817',
+                    '75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+                    '4d54c3f0526a1ec89214a70615a6b1c6129c665c'], commits.collect { |c| c.token }
+    end
+
+
 		def test_each_commit_after
 			commits = []
 			with_hg_repository('hg') do |hg|
-				hg.each_commit(:after => 'b14fa4692f949940bd1e28da6fb4617de2615484') do |c|
+				hg.each_commit(:after => '468336c6671cbc58237a259d1b7326866afc2817') do |c|
 					commits << c
 				end
-				assert_equal ['468336c6671cbc58237a259d1b7326866afc2817',
-											'75532c1e1f1de55c2271f6fd29d98efbe35397c4'], commits.collect { |c| c.token }
+				assert_equal ['75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+											'655f04cf6ad708ab58c7b941672dce09dd369a18'], commits.collect { |c| c.token }
 			end
 		end
 

data/test/unit/hg_head_test.rb

@@ -5,14 +5,20 @@ module OhlohScm::Adapters
 
 		def test_head_and_parents
 			with_hg_repository('hg') do |hg|
-				assert_equal '75532c1e1f1d', hg.head_token
-				assert_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4', hg.head.token
+				assert_equal '655f04cf6ad7', hg.head_token
+				assert_equal '655f04cf6ad708ab58c7b941672dce09dd369a18', hg.head.token
 				assert hg.head.diffs.any? # diffs should be populated
 
-				assert_equal '468336c6671cbc58237a259d1b7326866afc2817', hg.parents(hg.head).first.token
+				assert_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4', hg.parents(hg.head).first.token
 				assert hg.parents(hg.head).first.diffs.any?
 			end
 		end
 
+    def test_head_with_branch
+      with_hg_repository('hg', 'develop') do |hg|
+        assert_equal '4d54c3f0526a1ec89214a70615a6b1c6129c665c', hg.head.token
+        assert hg.head.diffs.any?
+      end
+    end
 	end
 end

data/test/unit/hg_misc_test.rb

@@ -14,7 +14,7 @@ module OhlohScm::Adapters
 
 		def test_ls_tree
 			with_hg_repository('hg') do |hg|
-				assert_equal ['README','makefile'], hg.ls_tree(hg.head_token).sort
+				assert_equal ['README','makefile', 'two'], hg.ls_tree(hg.head_token).sort
 			end
 		end
 
@@ -22,7 +22,7 @@ module OhlohScm::Adapters
 			with_hg_repository('hg') do |hg|
 				OhlohScm::ScratchDir.new do |dir|
 					hg.export(dir)
-					assert_equal ['.', '..', 'README', 'makefile'], Dir.entries(dir).sort
+					assert_equal ['.', '..', 'README', 'makefile', 'two'], Dir.entries(dir).sort
 				end
 			end
 		end
@@ -36,5 +36,11 @@ module OhlohScm::Adapters
         end
       end
     end
+
+    def test_tags
+      with_hg_repository('hg') do |hg|
+        assert_equal hg.tags, [['tip', '5']]
+      end
+    end
 	end
 end

data/test/unit/hg_parser_test.rb

@@ -137,12 +137,12 @@ SAMPLE
 		def test_styled_parser
 			with_hg_repository('hg') do |hg|
 				assert FileTest.exist?(HgStyledParser.style_path)
-				log = hg.run("cd #{hg.url} && hg log --style #{OhlohScm::Parsers::HgStyledParser.style_path}")
+				log = hg.run("cd #{hg.url} && hg log -f --style #{OhlohScm::Parsers::HgStyledParser.style_path}")
 				commits = OhlohScm::Parsers::HgStyledParser.parse(log)
 				assert_styled_commits(commits, false)
 
 				assert FileTest.exist?(HgStyledParser.verbose_style_path)
-				log = hg.run("cd #{hg.url} && hg log --style #{OhlohScm::Parsers::HgStyledParser.verbose_style_path}")
+				log = hg.run("cd #{hg.url} && hg log -f --style #{OhlohScm::Parsers::HgStyledParser.verbose_style_path}")
 				commits = OhlohScm::Parsers::HgStyledParser.parse(log)
 				assert_styled_commits(commits, true)
 			end
@@ -151,31 +151,31 @@ SAMPLE
 		protected
 
 		def assert_styled_commits(commits, with_diffs=false)
-			assert_equal 4, commits.size
+			assert_equal 5, commits.size
 
-			assert_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4', commits[0].token
-			assert_equal 'Robin Luckey', commits[0].committer_name
-			assert_equal 'robin@ohloh.net', commits[0].committer_email
-			assert Time.utc(2009,1,20,19,34,53) - commits[0].committer_date < 1 # Don't care about milliseconds
-			assert_equal "deleted helloworld.c\n", commits[0].message
+			assert_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4', commits[1].token
+			assert_equal 'Robin Luckey', commits[1].committer_name
+			assert_equal 'robin@ohloh.net', commits[1].committer_email
+			assert Time.utc(2009,1,20,19,34,53) - commits[1].committer_date < 1 # Don't care about milliseconds
+			assert_equal "deleted helloworld.c\n", commits[1].message
 
 			if with_diffs
-				assert_equal 1, commits[0].diffs.size
-				assert_equal 'D', commits[0].diffs[0].action
-				assert_equal 'helloworld.c', commits[0].diffs[0].path
+				assert_equal 1, commits[1].diffs.size
+				assert_equal 'D', commits[1].diffs[0].action
+				assert_equal 'helloworld.c', commits[1].diffs[0].path
 			else
-				assert_equal [], commits[0].diffs
+				assert_equal [], commits[1].diffs
 			end
 
-			assert_equal '468336c6671cbc58237a259d1b7326866afc2817', commits[1].token
-			assert Time.utc(2009, 1,20,19,34,04) - commits[1].committer_date < 1
+			assert_equal '468336c6671cbc58237a259d1b7326866afc2817', commits[2].token
+			assert Time.utc(2009, 1,20,19,34,04) - commits[2].committer_date < 1
 
 			if with_diffs
-				assert_equal 2, commits[1].diffs.size
-				assert_equal 'M', commits[1].diffs[0].action
-				assert_equal 'helloworld.c', commits[1].diffs[0].path
-				assert_equal 'A', commits[1].diffs[1].action
-				assert_equal 'README', commits[1].diffs[1].path
+				assert_equal 2, commits[2].diffs.size
+				assert_equal 'M', commits[2].diffs[0].action
+				assert_equal 'helloworld.c', commits[2].diffs[0].path
+				assert_equal 'A', commits[2].diffs[1].action
+				assert_equal 'README', commits[2].diffs[1].path
 			else
 				assert_equal [], commits[0].diffs
 			end

data/test/unit/hglib_cat_file_test.rb

@@ -35,7 +35,7 @@ EXPECTED
 				File.open(File.join(dir, funny_name), 'w') { |f| f.write "contents" }
 
 				# Add it to an hg repository
-				`cd #{dir} && hg init && hg add * && hg commit -m test`
+				`cd #{dir} && hg init && hg add * && hg commit -u tester -m test`
 
 				# Confirm that we can read the file back
 				hg = HglibAdapter.new(:url => dir).normalize

data/test/unit/hglib_head_test.rb

@@ -5,11 +5,11 @@ module OhlohScm::Adapters
 
 		def test_head_and_parents
 			with_hglib_repository('hg') do |hg|
-				assert_equal '75532c1e1f1d', hg.head_token
-				assert_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4', hg.head.token
+				assert_equal '655f04cf6ad7', hg.head_token
+				assert_equal '655f04cf6ad708ab58c7b941672dce09dd369a18', hg.head.token
 				assert hg.head.diffs.any? # diffs should be populated
 
-				assert_equal '468336c6671cbc58237a259d1b7326866afc2817', hg.parents(hg.head).first.token
+				assert_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4', hg.parents(hg.head).first.token
 				assert hg.parents(hg.head).first.diffs.any?
 			end
 		end

data/test/unit/shellout_test.rb

@@ -1,4 +1,5 @@
 require_relative '../test_helper'
+require 'timeout'
 
 class ShelloutTest < OhlohScm::Test
   def test_execute_must_pipe_the_results_accurately

data/test/unit/svn_misc_test.rb

@@ -12,6 +12,23 @@ module OhlohScm::Adapters
 			end
 		end
 
+    def test_export_tag
+      with_svn_repository('svn', 'trunk') do |source_scm|
+        OhlohScm::ScratchDir.new do |svn_working_folder|
+          OhlohScm::ScratchDir.new do |dir|
+            folder_name = source_scm.root.slice(/[^\/]+\/?\Z/)
+            system "cd #{ svn_working_folder } && svn co #{ source_scm.root } && cd #{ folder_name } &&
+                    mkdir -p #{ source_scm.root.gsub(/^file:../, '') }/db/transactions
+                    svn copy trunk tags/2.0 && svn commit -m 'v2.0' && svn update"
+
+            source_scm.export_tag(dir, '2.0')
+
+            assert_equal ['.','..','COPYING','README','helloworld.c', 'makefile'], Dir.entries(dir).sort
+          end
+        end
+      end
+    end
+
 		def test_ls_tree
 			with_svn_repository('svn') do |svn|
 				assert_equal ['branches/','tags/','trunk/','trunk/helloworld.c','trunk/makefile'], svn.ls_tree(2).sort
@@ -85,5 +102,18 @@ module OhlohScm::Adapters
 				assert_equal "/trunk", svn.branch_name
 			end
 		end
+
+    def test_tags
+      with_svn_repository('svn', 'trunk') do |source_scm|
+        OhlohScm::ScratchDir.new do |svn_working_folder|
+          folder_name = source_scm.root.slice(/[^\/]+\/?\Z/)
+          system "cd #{ svn_working_folder } && svn co #{ source_scm.root } && cd #{ folder_name } &&
+                  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', source_scm.head_token.to_s]], source_scm.tags)
+        end
+      end
+    end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -35,9 +35,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .install_dependencies.sh
 - .ruby-version
 - .travis.yml
+- .travis/.install_dependencies.sh
+- .travis/.install_multiple_scms.sh
+- .travis/.travis_ssh_setup.sh
 - COPYING
 - README.md
 - Rakefile
@@ -410,36 +412,9 @@ files:
 - test/repositories/git_with_empty_merge.tgz
 - test/repositories/git_with_invalid_encoding.tgz
 - test/repositories/git_with_null_merge.tgz
-- test/repositories/hg/.hg/00changelog.i
-- test/repositories/hg/.hg/branch
-- test/repositories/hg/.hg/branch.cache
-- test/repositories/hg/.hg/dirstate
-- test/repositories/hg/.hg/requires
-- test/repositories/hg/.hg/store/00changelog.i
-- test/repositories/hg/.hg/store/00manifest.i
-- test/repositories/hg/.hg/store/data/_r_e_a_d_m_e.i
-- test/repositories/hg/.hg/store/data/helloworld.c.i
-- test/repositories/hg/.hg/store/data/makefile.i
-- test/repositories/hg/.hg/store/fncache
-- test/repositories/hg/.hg/store/undo
-- test/repositories/hg/.hg/undo.branch
-- test/repositories/hg/.hg/undo.dirstate
+- test/repositories/hg.tgz
 - test/repositories/hg_dupe_delete.tgz
-- test/repositories/hg_walk/.hg/00changelog.i
-- test/repositories/hg_walk/.hg/branch
-- test/repositories/hg_walk/.hg/branch.cache
-- test/repositories/hg_walk/.hg/dirstate
-- test/repositories/hg_walk/.hg/merge/69e27356ef629022720d868ab0c0e3394775b6c1
-- test/repositories/hg_walk/.hg/merge/state
-- test/repositories/hg_walk/.hg/requires
-- test/repositories/hg_walk/.hg/store/00changelog.i
-- test/repositories/hg_walk/.hg/store/00manifest.i
-- test/repositories/hg_walk/.hg/store/data/_r_e_a_d_m_e.i
-- test/repositories/hg_walk/.hg/store/fncache
-- test/repositories/hg_walk/.hg/store/undo
-- test/repositories/hg_walk/.hg/undo.branch
-- test/repositories/hg_walk/.hg/undo.dirstate
-- test/repositories/hg_walk/README
+- test/repositories/hg_walk.tgz
 - test/repositories/hg_with_invalid_encoding.tgz
 - test/repositories/svn/README.txt
 - test/repositories/svn/conf/authz
@@ -913,36 +888,9 @@ test_files:
 - test/repositories/git_with_empty_merge.tgz
 - test/repositories/git_with_invalid_encoding.tgz
 - test/repositories/git_with_null_merge.tgz
-- test/repositories/hg/.hg/00changelog.i
-- test/repositories/hg/.hg/branch
-- test/repositories/hg/.hg/branch.cache
-- test/repositories/hg/.hg/dirstate
-- test/repositories/hg/.hg/requires
-- test/repositories/hg/.hg/store/00changelog.i
-- test/repositories/hg/.hg/store/00manifest.i
-- test/repositories/hg/.hg/store/data/_r_e_a_d_m_e.i
-- test/repositories/hg/.hg/store/data/helloworld.c.i
-- test/repositories/hg/.hg/store/data/makefile.i
-- test/repositories/hg/.hg/store/fncache
-- test/repositories/hg/.hg/store/undo
-- test/repositories/hg/.hg/undo.branch
-- test/repositories/hg/.hg/undo.dirstate
+- test/repositories/hg.tgz
 - test/repositories/hg_dupe_delete.tgz
-- test/repositories/hg_walk/.hg/00changelog.i
-- test/repositories/hg_walk/.hg/branch
-- test/repositories/hg_walk/.hg/branch.cache
-- test/repositories/hg_walk/.hg/dirstate
-- test/repositories/hg_walk/.hg/merge/69e27356ef629022720d868ab0c0e3394775b6c1
-- test/repositories/hg_walk/.hg/merge/state
-- test/repositories/hg_walk/.hg/requires
-- test/repositories/hg_walk/.hg/store/00changelog.i
-- test/repositories/hg_walk/.hg/store/00manifest.i
-- test/repositories/hg_walk/.hg/store/data/_r_e_a_d_m_e.i
-- test/repositories/hg_walk/.hg/store/fncache
-- test/repositories/hg_walk/.hg/store/undo
-- test/repositories/hg_walk/.hg/undo.branch
-- test/repositories/hg_walk/.hg/undo.dirstate
-- test/repositories/hg_walk/README
+- test/repositories/hg_walk.tgz
 - test/repositories/hg_with_invalid_encoding.tgz
 - test/repositories/svn/README.txt
 - test/repositories/svn/conf/authz

data/test/repositories/hg/.hg/branch

@@ -1 +0,0 @@
-default

data/test/repositories/hg/.hg/requires

@@ -1,2 +0,0 @@
-revlogv1
-store

data/test/repositories/hg/.hg/store/fncache

@@ -1,3 +0,0 @@
-data/helloworld.c.i
-data/makefile.i
-data/README.i

data/test/repositories/hg/.hg/undo.branch

@@ -1 +0,0 @@
-default

data/test/repositories/hg_walk/.hg/branch

@@ -1 +0,0 @@
-default

data/test/repositories/hg_walk/.hg/merge/69e27356ef629022720d868ab0c0e3394775b6c1

@@ -1 +0,0 @@
-C

data/test/repositories/hg_walk/.hg/requires

@@ -1,2 +0,0 @@
-revlogv1
-store

data/test/repositories/hg_walk/.hg/store/fncache

@@ -1 +0,0 @@
-data/README.i

data/test/repositories/hg_walk/.hg/undo.branch

@@ -1 +0,0 @@
-default

data/test/repositories/hg_walk/README

@@ -1 +0,0 @@
-D