ohloh_scm 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378882678ff49161d322fc368a1944e09686a566
-  data.tar.gz: 3ea30efcf663eb4990f73d668bce248644d7e560
+  metadata.gz: 11c59e009a1f9f5c39943115bed6752677b2543b
+  data.tar.gz: cb701ae9abbdf33b4e8a3f683e45dcd0c308b25f
 SHA512:
-  metadata.gz: a3e1af35b147289e08537f1bdb503c7d77cdae338475d3c96a15edf07d63e0ca7342b9996b370b347ba5686feb8a9cd7693c72fe5bb93561b7cfd341de95a76d
-  data.tar.gz: de87be2d7d73615867accb6dc567cd5b42978751f32530fbe2127dc6539ea434b3e7548b7b81d502071186756008259ef4f23a2eaba30075de05f99dc5ebd4a2
+  metadata.gz: ad5adb5f274f12c66d518e02e4d6bf58d5d66c36391200acc33277be14bd9c071cd79d7be6bed4f584a5e894862c0beb6c482d1555a2a3542d5a705c72432b76
+  data.tar.gz: 0bf9d24af492feeaad0ff90f7606e483f6c3bc587f4ad52ff6e51a4bf31d9415afe0dd26c9a6abc4bf6c80cdd8e8f68963415cab748266f693f781dd83afe7a4

data/lib/ohloh_scm/adapters/svn_chain/chain.rb

@@ -86,7 +86,7 @@ module OhlohScm::Adapters
 		# code tree from one directory to another, this method returns the name
 		# of the previous directory.
 		def parent_branch_name(d)
-			if d.action == 'A' && branch_name[0, d.path.size] == d.path && d.from_path && d.from_revision
+			if %w(A R).include?(d.action) && branch_name[0, d.path.size] == d.path && d.from_path && d.from_revision
 				d.from_path + branch_name[d.path.size..-1]
 			end
 		end

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

@@ -23,7 +23,7 @@ module OhlohScm::Adapters
 		# If the diff points to a file, simply returns the diff.
 		# If the diff points to a directory, returns an array of diffs for every file in the directory.
 		def deepen_diff(diff, rev)
-			if diff.action == 'A' && diff.path == '' && parent_svn && rev == first_token
+      if %w(A R).include?(diff.action) && diff.path == '' && parent_svn && rev == first_token
 				# A very special case that is important for chaining.
 				# This is the first commit, and the entire tree is being created by copying from parent_svn.
 				# In this case, there isn't actually any change, just

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.2.11'
+    STRING = '2.2.12'
   end
 end

data/test/unit/svn_chain_commits_test.rb

@@ -5,47 +5,49 @@ module OhlohScm::Parsers
 
 		def test_chained_commit_tokens
 			with_svn_chain_repository('svn_with_branching', '/trunk') do |svn|
-				assert_equal [1,2,4,5,8,9], svn.commit_tokens
-				assert_equal [2,4,5,8,9], svn.commit_tokens(:after => 1)
-				assert_equal [4,5,8,9], svn.commit_tokens(:after => 2)
-				assert_equal [4,5,8,9], svn.commit_tokens(:after => 3)
-				assert_equal [5,8,9], svn.commit_tokens(:after => 4)
-				assert_equal [8,9], svn.commit_tokens(:after => 5)
-				assert_equal [8,9], svn.commit_tokens(:after => 6)
-				assert_equal [8,9], svn.commit_tokens(:after => 7)
-				assert_equal [9], svn.commit_tokens(:after => 8)
-				assert_equal [], svn.commit_tokens(:after => 9)
-				assert_equal [], svn.commit_tokens(:after => 10)
+				assert_equal [1,2,4,5,8,9,11], svn.commit_tokens
+				assert_equal [2,4,5,8,9,11], svn.commit_tokens(:after => 1)
+				assert_equal [4,5,8,9,11], svn.commit_tokens(:after => 2)
+				assert_equal [4,5,8,9,11], svn.commit_tokens(:after => 3)
+				assert_equal [5,8,9,11], svn.commit_tokens(:after => 4)
+				assert_equal [8,9,11], svn.commit_tokens(:after => 5)
+				assert_equal [8,9,11], svn.commit_tokens(:after => 6)
+				assert_equal [8,9,11], svn.commit_tokens(:after => 7)
+				assert_equal [9,11], svn.commit_tokens(:after => 8)
+				assert_equal [11], svn.commit_tokens(:after => 9)
+				assert_equal [], svn.commit_tokens(:after => 11)
 			end
 		end
 
 		def test_chained_commit_count
 			with_svn_chain_repository('svn_with_branching', '/trunk') do |svn|
-				assert_equal 6, svn.commit_count
-				assert_equal 5, svn.commit_count(:after => 1)
-				assert_equal 4, svn.commit_count(:after => 2)
-				assert_equal 4, svn.commit_count(:after => 3)
-				assert_equal 3, svn.commit_count(:after => 4)
-				assert_equal 2, svn.commit_count(:after => 5)
-				assert_equal 2, svn.commit_count(:after => 6)
-				assert_equal 2, svn.commit_count(:after => 7)
-				assert_equal 1, svn.commit_count(:after => 8)
-				assert_equal 0, svn.commit_count(:after => 9)
+				assert_equal 7, svn.commit_count
+				assert_equal 6, svn.commit_count(:after => 1)
+				assert_equal 5, svn.commit_count(:after => 2)
+				assert_equal 5, svn.commit_count(:after => 3)
+				assert_equal 4, svn.commit_count(:after => 4)
+				assert_equal 3, svn.commit_count(:after => 5)
+				assert_equal 3, svn.commit_count(:after => 6)
+				assert_equal 3, svn.commit_count(:after => 7)
+				assert_equal 2, svn.commit_count(:after => 8)
+				assert_equal 1, svn.commit_count(:after => 9)
+				assert_equal 0, svn.commit_count(:after => 11)
 			end
 		end
 
 		def test_chained_commits
 			with_svn_chain_repository('svn_with_branching', '/trunk') do |svn|
-				assert_equal [1,2,4,5,8,9], svn.commits.collect { |c| c.token }
-				assert_equal [2,4,5,8,9], svn.commits(:after => 1).collect { |c| c.token }
-				assert_equal [4,5,8,9], svn.commits(:after => 2).collect { |c| c.token }
-				assert_equal [4,5,8,9], svn.commits(:after => 3).collect { |c| c.token }
-				assert_equal [5,8,9], svn.commits(:after => 4).collect { |c| c.token }
-				assert_equal [8,9], svn.commits(:after => 5).collect { |c| c.token }
-				assert_equal [8,9], svn.commits(:after => 6).collect { |c| c.token }
-				assert_equal [8,9], svn.commits(:after => 7).collect { |c| c.token }
-				assert_equal [9], svn.commits(:after => 8).collect { |c| c.token }
-				assert_equal [], svn.commits(:after => 9).collect { |c| c.token }
+				assert_equal [1,2,4,5,8,9,11], svn.commits.collect { |c| c.token }
+				assert_equal [2,4,5,8,9,11], svn.commits(:after => 1).collect { |c| c.token }
+				assert_equal [4,5,8,9,11], svn.commits(:after => 2).collect { |c| c.token }
+				assert_equal [4,5,8,9,11], svn.commits(:after => 3).collect { |c| c.token }
+				assert_equal [5,8,9,11], svn.commits(:after => 4).collect { |c| c.token }
+				assert_equal [8,9,11], svn.commits(:after => 5).collect { |c| c.token }
+				assert_equal [8,9,11], svn.commits(:after => 6).collect { |c| c.token }
+				assert_equal [8,9,11], svn.commits(:after => 7).collect { |c| c.token }
+				assert_equal [9,11], svn.commits(:after => 8).collect { |c| c.token }
+				assert_equal [11], svn.commits(:after => 9).collect { |c| c.token }
+				assert_equal [], svn.commits(:after => 11).collect { |c| c.token }
 			end
 		end
 
@@ -64,7 +66,7 @@ module OhlohScm::Parsers
 				end
 			end
 
-			assert_equal [1,2,4,5,8,9], commits.collect { |c| c.token }
+			assert_equal [1,2,4,5,8,9,11], commits.collect { |c| c.token }
 
 			# This repository spends a lot of energy moving directories around.
 			# File edits actually occur in just 3 commits.
@@ -105,6 +107,12 @@ module OhlohScm::Parsers
 			assert_equal 1, commits[5].diffs.size
 			assert_equal 'M', commits[5].diffs.first.action
 			assert_equal '/helloworld.c', commits[5].diffs.first.path
+
+      # Revision 10: /trunk/goodbyeworld.c & /trunk/helloworld.c are modified
+      # on branches/development, hence no commit reported.
+
+      # Revision 11: The trunk is reverted back to revision 9.
+			assert_equal 0, commits[6].diffs.size
 		end
 
 		# Specifically tests this case:

data/test/unit/svn_chain_test.rb

@@ -6,7 +6,7 @@ module OhlohScm::Parsers
 		def test_chain
 			with_svn_chain_repository('svn_with_branching', '/trunk') do |svn|
 				chain = svn.chain
-				assert_equal 4, chain.size
+				assert_equal 5, chain.size
 
 				# In revision 1, the trunk is created.
 				assert_equal '/trunk', chain[0].branch_name
@@ -25,19 +25,29 @@ module OhlohScm::Parsers
 				assert_equal 7, chain[2].final_token
 
 				# In revision 8, a new trunk is created by copying the branch.
-				# This trunk still lives on, so its final_token is nil.
+				# The next final_token will be 9.
 				assert_equal '/trunk', chain[3].branch_name
 				assert_equal 8, chain[3].first_token
-				assert_equal nil, chain[3].final_token
+				assert_equal 9, chain[3].final_token
+
+				# In revision 11, trunk is reverted back to rev 9
+				# This trunk still lives on, so its final_token is nil.
+				assert_equal '/trunk', chain[4].branch_name
+				assert_equal 11, chain[4].first_token
+				assert_nil chain[4].final_token
 			end
 		end
 
 		def test_parent_svn
 			with_svn_chain_repository('svn_with_branching', '/trunk') do |svn|
-				# In this repository, /branches/development becomes
+        # The first chain is the copy commit from trunk:9 into rev 11.
+				p0 = svn.parent_svn
+        assert_equal 9, p0.final_token
+
+        # In this repository, /branches/development becomes
 				# the /trunk in revision 8. So there should be a parent
 				# will final_token 7.
-				p1 = svn.parent_svn
+				p1 = p0.parent_svn
 				assert_equal p1.url, svn.root + '/branches/development'
 				assert_equal p1.branch_name, '/branches/development'
 				assert_equal p1.final_token, 7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -469,47 +469,7 @@ files:
 - test/repositories/svn/hooks/start-commit.tmpl
 - test/repositories/svn/locks/db-logs.lock
 - test/repositories/svn/locks/db.lock
-- test/repositories/svn_with_branching/README.txt
-- test/repositories/svn_with_branching/conf/authz
-- test/repositories/svn_with_branching/conf/passwd
-- test/repositories/svn_with_branching/conf/svnserve.conf
-- test/repositories/svn_with_branching/db/current
-- test/repositories/svn_with_branching/db/format
-- test/repositories/svn_with_branching/db/fs-type
-- test/repositories/svn_with_branching/db/revprops/0
-- test/repositories/svn_with_branching/db/revprops/1
-- test/repositories/svn_with_branching/db/revprops/2
-- test/repositories/svn_with_branching/db/revprops/3
-- test/repositories/svn_with_branching/db/revprops/4
-- test/repositories/svn_with_branching/db/revprops/5
-- test/repositories/svn_with_branching/db/revprops/6
-- test/repositories/svn_with_branching/db/revprops/7
-- test/repositories/svn_with_branching/db/revprops/8
-- test/repositories/svn_with_branching/db/revprops/9
-- test/repositories/svn_with_branching/db/revs/0
-- test/repositories/svn_with_branching/db/revs/1
-- test/repositories/svn_with_branching/db/revs/2
-- test/repositories/svn_with_branching/db/revs/3
-- test/repositories/svn_with_branching/db/revs/4
-- test/repositories/svn_with_branching/db/revs/5
-- test/repositories/svn_with_branching/db/revs/6
-- test/repositories/svn_with_branching/db/revs/7
-- test/repositories/svn_with_branching/db/revs/8
-- test/repositories/svn_with_branching/db/revs/9
-- test/repositories/svn_with_branching/db/uuid
-- test/repositories/svn_with_branching/db/write-lock
-- test/repositories/svn_with_branching/format
-- test/repositories/svn_with_branching/hooks/post-commit.tmpl
-- test/repositories/svn_with_branching/hooks/post-lock.tmpl
-- test/repositories/svn_with_branching/hooks/post-revprop-change.tmpl
-- test/repositories/svn_with_branching/hooks/post-unlock.tmpl
-- test/repositories/svn_with_branching/hooks/pre-commit.tmpl
-- test/repositories/svn_with_branching/hooks/pre-lock.tmpl
-- test/repositories/svn_with_branching/hooks/pre-revprop-change.tmpl
-- test/repositories/svn_with_branching/hooks/pre-unlock.tmpl
-- test/repositories/svn_with_branching/hooks/start-commit.tmpl
-- test/repositories/svn_with_branching/locks/db-logs.lock
-- test/repositories/svn_with_branching/locks/db.lock
+- test/repositories/svn_with_branching.tgz
 - test/repositories/svn_with_invalid_encoding.tgz
 - test/repositories/svn_with_tree_move/README.txt
 - test/repositories/svn_with_tree_move/conf/authz
@@ -945,47 +905,7 @@ test_files:
 - test/repositories/svn/hooks/start-commit.tmpl
 - test/repositories/svn/locks/db-logs.lock
 - test/repositories/svn/locks/db.lock
-- test/repositories/svn_with_branching/README.txt
-- test/repositories/svn_with_branching/conf/authz
-- test/repositories/svn_with_branching/conf/passwd
-- test/repositories/svn_with_branching/conf/svnserve.conf
-- test/repositories/svn_with_branching/db/current
-- test/repositories/svn_with_branching/db/format
-- test/repositories/svn_with_branching/db/fs-type
-- test/repositories/svn_with_branching/db/revprops/0
-- test/repositories/svn_with_branching/db/revprops/1
-- test/repositories/svn_with_branching/db/revprops/2
-- test/repositories/svn_with_branching/db/revprops/3
-- test/repositories/svn_with_branching/db/revprops/4
-- test/repositories/svn_with_branching/db/revprops/5
-- test/repositories/svn_with_branching/db/revprops/6
-- test/repositories/svn_with_branching/db/revprops/7
-- test/repositories/svn_with_branching/db/revprops/8
-- test/repositories/svn_with_branching/db/revprops/9
-- test/repositories/svn_with_branching/db/revs/0
-- test/repositories/svn_with_branching/db/revs/1
-- test/repositories/svn_with_branching/db/revs/2
-- test/repositories/svn_with_branching/db/revs/3
-- test/repositories/svn_with_branching/db/revs/4
-- test/repositories/svn_with_branching/db/revs/5
-- test/repositories/svn_with_branching/db/revs/6
-- test/repositories/svn_with_branching/db/revs/7
-- test/repositories/svn_with_branching/db/revs/8
-- test/repositories/svn_with_branching/db/revs/9
-- test/repositories/svn_with_branching/db/uuid
-- test/repositories/svn_with_branching/db/write-lock
-- test/repositories/svn_with_branching/format
-- test/repositories/svn_with_branching/hooks/post-commit.tmpl
-- test/repositories/svn_with_branching/hooks/post-lock.tmpl
-- test/repositories/svn_with_branching/hooks/post-revprop-change.tmpl
-- test/repositories/svn_with_branching/hooks/post-unlock.tmpl
-- test/repositories/svn_with_branching/hooks/pre-commit.tmpl
-- test/repositories/svn_with_branching/hooks/pre-lock.tmpl
-- test/repositories/svn_with_branching/hooks/pre-revprop-change.tmpl
-- test/repositories/svn_with_branching/hooks/pre-unlock.tmpl
-- test/repositories/svn_with_branching/hooks/start-commit.tmpl
-- test/repositories/svn_with_branching/locks/db-logs.lock
-- test/repositories/svn_with_branching/locks/db.lock
+- test/repositories/svn_with_branching.tgz
 - test/repositories/svn_with_invalid_encoding.tgz
 - test/repositories/svn_with_tree_move/README.txt
 - test/repositories/svn_with_tree_move/conf/authz

data/test/repositories/svn_with_branching/README.txt

@@ -1,5 +0,0 @@
-This is a Subversion repository; use the 'svnadmin' tool to examine
-it.  Do not add, delete, or modify files here unless you know how
-to avoid corrupting the repository.
-
-Visit http://subversion.tigris.org/ for more information.

data/test/repositories/svn_with_branching/conf/authz

@@ -1,21 +0,0 @@
-### This file is an example authorization file for svnserve.
-### Its format is identical to that of mod_authz_svn authorization
-### files.
-### As shown below each section defines authorizations for the path and
-### (optional) repository specified by the section name.
-### The authorizations follow. An authorization line can refer to a
-### single user, to a group of users defined in a special [groups]
-### section, or to anyone using the '*' wildcard.  Each definition can
-### grant read ('r') access, read-write ('rw') access, or no access
-### ('').
-
-[groups]
-# harry_and_sally = harry,sally
-
-# [/foo/bar]
-# harry = rw
-# * =
-
-# [repository:/baz/fuz]
-# @harry_and_sally = rw
-# * = r

data/test/repositories/svn_with_branching/conf/passwd

@@ -1,8 +0,0 @@
-### This file is an example password file for svnserve.
-### Its format is similar to that of svnserve.conf. As shown in the
-### example below it contains one section labelled [users].
-### The name and password for each user follow, one account per line.
-
-[users]
-# harry = harryssecret
-# sally = sallyssecret

data/test/repositories/svn_with_branching/conf/svnserve.conf

@@ -1,30 +0,0 @@
-### This file controls the configuration of the svnserve daemon, if you
-### use it to allow access to this repository.  (If you only allow
-### access through http: and/or file: URLs, then this file is
-### irrelevant.)
-
-### Visit http://subversion.tigris.org/ for more information.
-
-[general]
-### These options control access to the repository for unauthenticated
-### and authenticated users.  Valid values are "write", "read",
-### and "none".  The sample settings below are the defaults.
-# anon-access = read
-# auth-access = write
-### The password-db option controls the location of the password
-### database file.  Unless you specify a path starting with a /,
-### the file's location is relative to the conf directory.
-### Uncomment the line below to use the default password file.
-# password-db = passwd
-### The authz-db option controls the location of the authorization
-### rules for path-based access control.  Unless you specify a path
-### starting with a /, the file's location is relative to the conf
-### directory.  If you don't specify an authz-db, no path-based access
-### control is done.
-### Uncomment the line below to use the default authorization file.
-# authz-db = authz
-### This option specifies the authentication realm of the repository.
-### If two repositories have the same authentication realm, they should
-### have the same password database, and vice versa.  The default realm
-### is repository's uuid.
-# realm = My First Repository

data/test/repositories/svn_with_branching/db/current

@@ -1 +0,0 @@
-9 6 5

data/test/repositories/svn_with_branching/db/format

@@ -1 +0,0 @@
-2

data/test/repositories/svn_with_branching/db/fs-type

@@ -1 +0,0 @@
-fsfs

data/test/repositories/svn_with_branching/db/revprops/0

@@ -1,5 +0,0 @@
-K 8
-svn:date
-V 27
-2009-02-05T13:31:04.304965Z
-END

data/test/repositories/svn_with_branching/db/revprops/1

@@ -1,13 +0,0 @@
-K 10
-svn:author
-V 5
-robin
-K 8
-svn:date
-V 27
-2009-02-05T13:32:07.992496Z
-K 7
-svn:log
-V 16
-Initial Revision
-END

data/test/repositories/svn_with_branching/db/revprops/2

@@ -1,13 +0,0 @@
-K 10
-svn:author
-V 5
-robin
-K 8
-svn:date
-V 27
-2009-02-05T13:33:19.430758Z
-K 7
-svn:log
-V 27
-Added helloworld.c to trunk
-END

data/test/repositories/svn_with_branching/db/revprops/3

@@ -1,13 +0,0 @@
-K 10
-svn:author
-V 5
-robin
-K 8
-svn:date
-V 27
-2009-02-05T13:33:46.533428Z
-K 7
-svn:log
-V 30
-Accidentally deleted the trunk
-END

data/test/repositories/svn_with_branching/db/revprops/4

@@ -1,13 +0,0 @@
-K 10
-svn:author
-V 5
-robin
-K 8
-svn:date
-V 27
-2009-02-05T13:35:52.897202Z
-K 7
-svn:log
-V 35
-Resurrect the trunk from revision 2
-END