svn2git 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4a9fc54bbab7715f45e042b64a8d43c7c45ba8
-  data.tar.gz: 62f4f6a037614764a92279b050bf17bc924535c5
+  metadata.gz: 2b945b1a4df0af0d51a1c7d5662528c79975bf8c
+  data.tar.gz: 0ce18a7123508f6368250867884714cfa0589865
 SHA512:
-  metadata.gz: 2148e941a74b9b9d1b7e57f9c0932f05f29f4b37b368ec80581b4174ebe835440443e53ec29ac74b303c4121317297a71c8c5485d5993a1537fdac575c3e1459
-  data.tar.gz: 943712834f6d29603c17eb266f2327b6e892874e9a2ad4cfd65fb6d04e463c2213ba5b02543f796b15236605932376e4eefc530be6bacf063371c694544ed947
+  metadata.gz: 7262ee9fedddbdc47119bfba8e4aee8373bac52c6dec3ffccb50346697936ed6e2cc65a9a0d9b4aef16b0975dc1c545412d77b40dec750e85838bc2ce7980299
+  data.tar.gz: aa518ed21531bc16d70ab39f48af4d78b4e2e651e1c2271c7f3d0b2f395b94d33c9393ea2e0cdd26af35cf46f0be61b077c2b708b61d887730f3926e696f8c82

data/ChangeLog.markdown

@@ -1,4 +1,13 @@
+# 2.3.0 - 2014-05-14
+  This release passes STDIN through to the underlying git-svn process, allowing users to interact with the
+  git-svn prompt.  Principally, it will allow users to choose what to do when prompted about unverified
+  SSL certificates.
+
+  * Pass STDIN through to the underlying git-svn process so users can respond to prompts.
+
 # 2.2.5 - 2014-03-09
+  This is a bugfix release. It improves handling of quotes in SVN commit messages.
+
 
   * Fixed an with single quote escaping (thanks aucl).
   * Escape double quotes (e.g., if they appear in a commit message) before passing to the shell (thanks aucl).

data/Rakefile

@@ -11,6 +11,7 @@ begin
     spec.homepage = "https://github.com/nirvdrum/svn2git"
     spec.email = "nirvdrum@gmail.com"
     spec.add_development_dependency 'test-unit'
+    spec.add_dependency 'open4'
   end
   Jeweler::GemcutterTasks.new
   

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
-:minor: 2
-:patch: 5
+:minor: 3
+:patch: 0
 :build: 

data/lib/svn2git/migration.rb

@@ -1,5 +1,7 @@
 require 'optparse'
 require 'pp'
+require 'open4'
+require 'timeout'
 
 module Svn2Git
   DEFAULT_AUTHORS_FILE = "~/.svn2git/authors"
@@ -340,23 +342,79 @@ module Svn2Git
       log "Running command: #{cmd}"
 
       ret = ''
+      @mutex ||= Mutex.new
+      @stdin_queue ||= Queue.new
+
+      # We need to fetch input from the user to pass through to the underlying sub-process.  We'll constantly listen
+      # for input and place any received values on a queue for consumption by a pass-through thread that will forward
+      # the contents to the underlying sub-process's stdin pipe.
+      @stdin_thread ||= Thread.new do
+        loop { @stdin_queue << $stdin.gets.chomp }
+      end
 
-      cmd = "2>&1 #{cmd}"
-      IO.popen(cmd) do |stdout|
-        if printout_output
-          stdout.each_char do |character|
-            $stdout.print character
-            ret << character
-          end
-        else
+      # Open4 forks, which JRuby doesn't support.  But JRuby added a popen4-compatible method on the IO class,
+      # so we can use that instead.
+      status = (defined?(JRUBY_VERSION) ? IO : Open4).popen4(cmd) do |pid, stdin, stdout, stderr|
+        threads = []
+
+        threads << Thread.new(stdout) do |stdout|
           stdout.each do |line|
-            log line
-            ret << line
+            @mutex.synchronize do
+              ret << line
+
+              if printout_output
+                $stdout.print line
+              else
+                log line
+              end
+            end
+          end
+        end
+
+        threads << Thread.new(stderr) do |stderr|
+          # git-svn seems to do all of its prompting for user input via STDERR.  When it prompts for input, it will
+          # not terminate the line with a newline character, so we can't split the input up by newline.  It will,
+          # however, use a space to separate the user input from the prompt.  So we split on word boundaries here
+          # while draining STDERR.
+          stderr.each(' ') do |word|
+            @mutex.synchronize do
+              ret << word
+
+              if printout_output
+                $stdout.print word
+              else
+                log word
+              end
+            end
+          end
+        end
+
+        # Simple pass-through thread to take anything the user types via STDIN and passes it through to the
+        # sub-process's stdin pipe.
+        Thread.new(stdin) do |stdin|
+          loop do
+            user_reply = @stdin_queue.pop
+
+            # nil is our cue to stop looping (pun intended).
+            break if user_reply.nil?
+
+            stdin.puts user_reply
+            stdin.close
           end
         end
+
+        threads.each(&:join)
+
+        # Push nil to the stdin_queue to gracefully exit the STDIN pass-through thread.
+        @stdin_queue << nil
       end
 
-      if exit_on_error && ($?.exitstatus != 0)
+      # JRuby's open4 doesn't return a Process::Status object when invoked with a block, but rather returns the
+      # block expression's value.  The Process::Status is stored as $?, so we need to normalize the status
+      # object if on JRuby.
+      status = $? if defined?(JRUBY_VERSION)
+
+      if exit_on_error && (status.exitstatus != 0)
         $stderr.puts "command failed:\n#{cmd}"
         exit -1
       end

data/svn2git.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: svn2git 2.2.5 ruby lib
+# stub: svn2git 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "svn2git"
-  s.version = "2.2.5"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = "2014-03-10"
+  s.date = "2014-05-14"
   s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
@@ -40,11 +40,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
     else
       s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<open4>, [">= 0"])
     end
   else
     s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<open4>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn2git
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - James Coglan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nirvdrum@gmail.com
 executables: