ohloh_scm 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2741be982e5a3ff6682d155224b0fda48d96d0
-  data.tar.gz: 5c2a84c08c7e2b65c82e6c46bac0239b19457b6c
+  metadata.gz: e8d51dc67baf8863f7210a845fdcaf36f198839d
+  data.tar.gz: 88a4858964e5e0ce728fb8dab1a520d7174c2036
 SHA512:
-  metadata.gz: 9daaef7667bdb94b8a244e462dfc90152c6a36ed3301e4bf9180037a88b8685217ec6495baca24f31d3c6c6c6b2ef1cffe67d45c46338f7c02f7d66eb60ddbc3
-  data.tar.gz: 0e08308d709fa671b3ca42b345f471eaa038eac5b191d22e55f7c3798aa67f97d63a865cd9afab44ff6ec1b7a649de89d1213d20eb719f5a8c0aacefe5e4f3e6
+  metadata.gz: bb9a2b2051ba005758c45f78fb0e1dc9d2761424e88e928a8b5b45b7d879e7b6847f0f8d17d621ff315a194ff1eb7eb479e4c906136ab4f7048b710b4ef4a1b9
+  data.tar.gz: 4a430f3725a3edcf569895cc2df0a100f39692c32eba26c357c9aa5deb1dc637d5aec8acb35f01a28aab67cc46551e6a0feaeb519aef87c5f4252fef7badfe42

data/.travis.yml

@@ -10,5 +10,6 @@ install:
   - gem install posix-spawn
   - gem install nokogiri -v 1.8.1
   - gem install test-unit -v 3.2.7
+  - sudo apt-get install expect
 before_script:
   - cd $TRAVIS_BUILD_DIR

data/bin/accept_svn_ssl_certificate

@@ -0,0 +1,12 @@
+#!/usr/bin/expect -f
+
+set OPTS [lindex $argv 0]
+set URL [lindex $argv 1]
+
+set timeout 10
+
+spawn svn info "$OPTS" "$URL"
+
+expect {
+  "(R)eject, accept (t)emporarily or accept (p)ermanently? " { send "p\r"; }
+}

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

@@ -9,5 +9,8 @@ module OhlohScm::Adapters
       []
     end
 
+    def escape_single_quote(str)
+      str.to_s.gsub("'", "'\''")
+    end
   end
 end

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

@@ -11,7 +11,7 @@ module OhlohScm::Adapters
     private
 
     def cat(revision, file_path)
-      run("cd #{self.url} && git show #{ revision }:'#{ file_path }'").strip
+      run("cd #{self.url} && git show #{ revision }:'#{ escape_single_quote(file_path) }'").strip
     end
 
     def git_commit(commit)

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

@@ -15,6 +15,7 @@ module OhlohScm::Adapters
       yield(0, 1) if block_given?
 
       if FileTest.exist?(git_path)
+        accept_certificate_if_prompted
         fetch(&block)
       else
         clone(&block)
@@ -43,7 +44,13 @@ module OhlohScm::Adapters
     def accept_certificate_if_prompted
       # git svn does not support non iteractive and serv-certificate options
       # Permanently accept svn certificate when it prompts
-      run "echo p | svn info #{username_opts} #{password_opts} '#{ @source_scm.url }'"
+      opts = "#{username_opts} #{password_opts}"
+      opts = '--xml' if opts.strip.empty?
+      run "#{accept_ssl_certificate_cmd} '#{opts}' '#{@source_scm.url}'"
+    end
+
+    def accept_ssl_certificate_cmd
+      File.expand_path('../../../../../bin/accept_svn_ssl_certificate', __FILE__)
     end
 
     def password_prompt

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

@@ -22,7 +22,9 @@ module OhlohScm::Adapters
     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+/)
+        parsed_str = tag_string.split(' ')
+        rev_number_and_hash = parsed_str.pop
+        tag_name = parsed_str.join(' ')
         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)]

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.4.0'
+    STRING = '2.4.1'
   end
 end

data/test/unit/hg_misc_test.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -69,6 +69,7 @@ description: The Ohloh source control management library for interacting with Gi
 email:
 - info@openhub.net
 executables:
+- accept_svn_ssl_certificate
 - ohlog
 - string_encoder
 extensions: []
@@ -83,6 +84,7 @@ files:
 - COPYING
 - README.md
 - Rakefile
+- bin/accept_svn_ssl_certificate
 - bin/ohlog
 - bin/string_encoder
 - lib/ohloh_scm.rb