ohloh_scm 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ae124d155c81e72f0675772b1402466d93754c3
-  data.tar.gz: dcfe1fe5c6e6d0d4650682455ab3806c1470a26c
+SHA256:
+  metadata.gz: 7ce58eb162cb90bd87f81492e7b81ee43bc6a3d1ed5469a2e772d316d6aa084f
+  data.tar.gz: ec0bc5a78784e98d1d381bbbfcd92d7e7d17c58a14660cdbe133f75bdd541c35
 SHA512:
-  metadata.gz: 877ab8696d6ee27c2faf3e6ab88e0e60a526bbabd96d6e27dcf3f31b01a799c68cecad611bc891785afaae39403b42b6fbbed9e66e5fbec29b6046f83862d3a8
-  data.tar.gz: 4427d117872450bc3f4af78a0414de457119f7731ee13fbbc24d31e68fa3c6e60f107cd0f869b1b831f5d2a558b494234a7ef36d33bafcd3b4e4c2208700ae5c
+  metadata.gz: c6cf921619af3159e0bcd35627dc90c0d8e855da6a4191d7d02373d1fb7345723c15b8219783914faf5487cf4b94e2f2090f4cb1237dae025d2a9a6810e1ead1
+  data.tar.gz: 925a9357f8960cfb4fc144a83ecb78c17983e33ef015217b91a551961206a6b95e2ca03236b21bd0dea31628dcb8f8819e35726fdfb5470a029191298b5c5746

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

@@ -63,6 +63,7 @@ module OhlohScm::Adapters
 			after = opts[:after]
 			begin
         ensure_host_key
+        return if has_lock?
 				run "cvsnt -d #{self.url} rlog #{opt_branch} #{opt_time(after)} '#{self.module_name}' | #{ string_encoder } > #{rlog_filename}"
 				File.open(rlog_filename, 'r') do |file|
 					yield file

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

@@ -192,6 +192,15 @@ module OhlohScm::Adapters
       end
     end
 
+    def has_lock?
+      begin
+        run "timeout 30 cvsnt -q -d #{self.url} rlog '#{self.module_name}'"
+        false
+      rescue => e
+        e.message.match(/waiting for.*lock in/) ? true : false
+      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|

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

@@ -1,8 +1,8 @@
 module OhlohScm::Adapters
   class GitSvnAdapter < AbstractAdapter
     def commit_count(opts={})
-      cmd = "#{after_revision(opts)} | wc -l"
-      git_svn_log(cmd: cmd, oneline: true).to_i
+      cmd = "#{after_revision(opts)} | grep -E -e '^r[0-9]+.*lines$' | wc -l"
+      git_svn_log(cmd: cmd, oneline: false).to_i
     end
 
     def source_scm_commit_count(opts={})

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.4.4'
+    STRING = '2.4.5'
   end
 end

data/ohloh_scm.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require 'ohloh_scm/version'
 
@@ -12,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = %[https://github.com/blackducksw/ohloh_scm/]
   gem.license       = %[GPL v2.0]
 
-  gem.files         = `git ls-files -z`.split("\x0")
+  gem.files         = `git ls-files -z`.force_encoding('utf-8').split("\x0")
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w(lib)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -645,7 +645,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Source Control Management