ohloh_scm 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca7f42fcd9f22befb6a03ef35aeea2fae669bac
-  data.tar.gz: d8f226bf6718b5cbb3787692e1669d1c6d149e1c
+  metadata.gz: 3ae124d155c81e72f0675772b1402466d93754c3
+  data.tar.gz: dcfe1fe5c6e6d0d4650682455ab3806c1470a26c
 SHA512:
-  metadata.gz: 7911b3775c0bd4898d9bbf1bfcd92772fc38f090858974b6b1b980680ce4d51728832cfde6f71d4188155e489566a3b85ca488b504dca1faea42e53e1a12baa9
-  data.tar.gz: 10474e25bc367e512ab7eeb51c7f474d46e88cb846a2ca1b2c44ee7db21793d032b85bda4c649fc8ca85d01435d68b0339e3a1f47ef21ecaeb2e3e29be86c4c0
+  metadata.gz: 877ab8696d6ee27c2faf3e6ab88e0e60a526bbabd96d6e27dcf3f31b01a799c68cecad611bc891785afaae39403b42b6fbbed9e66e5fbec29b6046f83862d3a8
+  data.tar.gz: 4427d117872450bc3f4af78a0414de457119f7731ee13fbbc24d31e68fa3c6e60f107cd0f869b1b831f5d2a558b494234a7ef36d33bafcd3b4e4c2208700ae5c

data/bin/accept_svn_ssl_certificate

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

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

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

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

@@ -5,6 +5,13 @@ module OhlohScm::Adapters
       git_svn_log(cmd: cmd, oneline: true).to_i
     end
 
+    def source_scm_commit_count(opts={})
+      options = username_and_password_opts(opts[:source_scm])
+      svn_log = run("#{accept_ssl_certificate_cmd} svn info #{options} '#{opts[:source_scm].url}'")
+      svn_log.match(/Revision: ([\d]*)/)
+      $1.to_i - opts[:after].to_i
+    end
+
     def commits(opts={})
       parsed_commits = []
       open_log_file(opts) do |io|

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

@@ -5,6 +5,16 @@ module OhlohScm::Adapters
       run("#{git_svn_log_cmd} #{oneline_flag} #{cmd}").strip
     end
 
+    def accept_ssl_certificate_cmd
+      File.expand_path('../../../../../bin/accept_svn_ssl_certificate', __FILE__)
+    end
+
+    def username_and_password_opts(source_scm)
+      username = source_scm.username.to_s.empty? ? '' : "--username #{ @source_scm.username }"
+      password = source_scm.password.to_s.empty? ? '' : "--password='#{@source_scm.password}'"
+      "#{username} #{password}"
+    end
+
     private
 
     def git_svn_log_cmd

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

@@ -28,7 +28,7 @@ module OhlohScm::Adapters
       prepare_dest_dir
       accept_certificate_if_prompted
 
-      max_step = @source_scm.commit_count(after: 0)
+      max_step = source_scm_commit_count(source_scm: @source_scm, after: 0)
       cmd = "#{password_prompt} git svn clone --quiet #{username_opts} '#{@source_scm.url}' '#{self.url}'"
       track_conversion(cmd, max_step, &block)
     end
@@ -44,23 +44,14 @@ 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
-      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__)
+      opts = username_and_password_opts(@source_scm)
+      run "#{accept_ssl_certificate_cmd} svn info #{opts} '#{@source_scm.url}'"
     end
 
     def password_prompt
       @source_scm.password.to_s.empty? ? '' : "echo #{ @source_scm.password } |"
     end
 
-    def password_opts
-      @source_scm.password.to_s.empty? ? '' : "--password='#{@source_scm.password}'"
-    end
-
     def username_opts
       @source_scm.username.to_s.empty? ? '' : "--username #{ @source_scm.username }"
     end
@@ -71,7 +62,7 @@ module OhlohScm::Adapters
     end
 
     def fetch(&block)
-      max_step = @source_scm.commit_count(after: head_token)
+      max_step = source_scm_commit_count(source_scm: @source_scm, after: head_token)
       cmd = "cd #{self.url} && git svn fetch"
       track_conversion(cmd, max_step, &block)
     end

data/lib/ohloh_scm/version.rb

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

data/test/unit/git_svn_commits_test.rb

@@ -24,5 +24,14 @@ module OhlohScm::Adapters
         assert_equal [1,2,3,5], git_svn.commits.map(&:token)
       end
     end
+
+    def test_source_scm_commit_count
+      with_svn_repository('svn', 'trunk') do |src|
+        OhlohScm::ScratchDir.new do |dest_dir|
+          git_svn = GitSvnAdapter.new(:url => dest_dir).normalize
+          assert_equal(git_svn.source_scm_commit_count(source_scm: src), 5)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn