ohloh_scm 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6615b37772fbe90a21d53ccdcfdd68debdad63
-  data.tar.gz: ff680d9b0ad8120d1d2d2e7d526e064df1642f4a
+  metadata.gz: c873b524463be1c3642bf50aca333e6d6529d1ae
+  data.tar.gz: 3cad06de5d7429b3e79b92dec0e22a95f395bd89
 SHA512:
-  metadata.gz: 16418bbdd67f1c816b0ff7cbc0a8b173e499fc0152fd786023f56832b2907aaa5d4d84185989fd5a45a9b3256f19176f43959d997d88b0bc9542b511084b1fff
-  data.tar.gz: 0742285eb15e65fc6f747cbf126495344e1827866561ae9c26049b9a7da233d0e012817d4081c91af2e069966d1cd407c3f510e7d568ed50dc136e15db367ef4
+  metadata.gz: a0eb711b227afe777b36fcc039c5e21123cff9b900c0777d8e135e2d5e441db1aa03bd9c6d6ec32527a046e54c8650a899d50f3e33c2a494b4a53b24765c3290
+  data.tar.gz: 78f2a00f77ca3c297351b5af2a918c79b548c93b66bb893f6e3790fb5a2e804a77565d9c6480cc2990882696d243e36e01037faa91fe41848a6fd6ecc1284318

data/.travis.yml

@@ -11,3 +11,4 @@ install:
   - gem install nokogiri -v 1.6.8
 before_script:
   - cd $TRAVIS_BUILD_DIR
+dist: precise

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

@@ -79,7 +79,7 @@ module OhlohScm::Adapters
 		# Returns the first commit with a revision number greater than the provided revision number
 		def next_revision_xml(after=0)
 			return "<?xml?>" if after.to_i >= head_token
-			run "svn log --trust-server-cert --non-interactive --verbose --xml --stop-on-copy -r #{after.to_i+1}:#{final_token || 'HEAD'} --limit 1 #{opt_auth} '#{SvnAdapter.uri_encode(File.join(self.root, self.branch_name))}@#{final_token || 'HEAD'}' | #{ string_encoder }"
+			run "svn log --trust-server-cert --non-interactive --verbose --xml --stop-on-copy -r #{after.to_i+1}:#{final_token || 'HEAD'} --limit 1 #{opt_auth} '#{SvnAdapter.uri_encode(File.join(self.root, self.branch_name.to_s))}@#{final_token || 'HEAD'}' | #{ string_encoder }"
 		end
 
 		# If the passed diff represents the wholesale movement of the entire

data/lib/ohloh_scm/parsers/git_styled_parser.rb

@@ -71,6 +71,12 @@ module OhlohScm::Parsers
 						# Submodules have a file mode of '160000', which indicates a "gitlink"
 						# We ignore submodules completely.
 						e.diffs << OhlohScm::Diff.new( :action => $5, :path => $6, :sha1 => $4, :parent_sha1 => $3 ) unless $1=='160000' || $2=='160000'
+					elsif line =~ /:([0-9]+) ([0-9]+) ([a-z0-9]+) ([a-z0-9]+) (R[0-9]+)\t"?(.+[^"])"?$/
+                                                old_path, new_path = $6.split("\t")
+						unless $1=='160000' || $2=='160000'
+						  e.diffs << OhlohScm::Diff.new( :action => 'D', :path => old_path, :sha1 => NULL_SHA1, :parent_sha1 => $3 )
+						  e.diffs << OhlohScm::Diff.new( :action => 'A', :path => new_path, :sha1 => $4, :parent_sha1 => NULL_SHA1 )
+                                                end
 					end
 
 				else

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.3.1'
+    STRING = '2.3.2'
   end
 end

data/ohloh_scm.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'posix-spawn', '~> 0.3'
   gem.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
+  gem.add_runtime_dependency 'test-unit', '~> 3.2', '>= 3.2.7'
 end

data/test/data/helloworld.log

@@ -30,3 +30,12 @@ __END_COMMENT__
 :000000 100644 0000000000000000000000000000000000000000 f0547ce063095e66be74618bc410989df226d2d2 A	README
 :100644 100644 4c734ad53b272c9b3d719f214372ac497ff6c068 f6adcae4447809b651c787c078d255b2b4e963c5 M	helloworld.c
 :100644 100644 d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 e440e5c842586965a7fb77deda2eca68612b1f53 M	ohloh_token
+__BEGIN_COMMIT__
+Commit: a66c35d4224a9f425d1163651b9e0fb1b4b64b9f
+Author: robin
+Date: Sun, 11 Jun 2006 11:50:17 +0200
+__BEGIN_COMMENT__
+rename ohloh_token to ohloh_tokens
+<unknown>
+__END_COMMENT__
+:100644 100644 82dde552eb88ca764d728319284b92b7639e8057 82dde552eb88ca764d728319284b92b7639e8057 R100	ohloh_token	ohloh_tokens

data/test/unit/git_log_parser_test.rb

@@ -14,7 +14,7 @@ module OhlohScm::Parsers
 			end
 
 			assert commits
-			assert_equal 3, commits.size
+			assert_equal 4, commits.size
 
 			commits.each do |commit|
 				# puts commit.inspect
@@ -28,9 +28,6 @@ module OhlohScm::Parsers
 				commit.diffs.each do |d|
 					assert_equal 40, d.sha1.length
 					assert_equal 40, d.parent_sha1.length
-					# 00000000.... is ok for our parent's sha1 (if we have no parent), but not for us!
-					assert_not_equal "0000000000000000000000000000000000000000", d.sha1
-
 					assert d.path.length > 0
 					assert d.action =~ /[ACDMRTUXB]/
 				end

metadata

@@ -1,49 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
 description: The Ohloh source control management library for interacting with Git,
   SVN, CVS, Hg and Bzr repositories.
 email:
@@ -54,12 +74,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
-- .travis/.install_dependencies.sh
-- .travis/.install_multiple_scms.sh
-- .travis/.travis_ssh_setup.sh
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- ".travis/.install_dependencies.sh"
+- ".travis/.install_multiple_scms.sh"
+- ".travis/.travis_ssh_setup.sh"
 - COPYING
 - README.md
 - Rakefile
@@ -600,12 +620,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []