svn2git 2.3.1 → 2.3.2

data/ChangeLog.markdown

@@ -1,3 +1,11 @@
+# 2.3.2 - 2014-06-08
+
+  This is a bugfix release. It fixes issues running with Windows using MRI ruby and fixes a problem with Ruby 1.8.7.
+  
+  * Removed open4 dependency. svn2git no longer has any runtime dependencies and things work well on Windows again.
+  * Fixed an issue with Ruby 1.8.7, which doesn't implicitly require the 'thread' library meaning classes that library weren't in scope.
+
+
 # 2.3.1 - 2014-05-14
 
   This is a critical bugfix release if you're running git >= 1.8.3.2.  In the days of svn2git 1.x we supported syncing

data/Rakefile

@@ -12,7 +12,6 @@ begin
     spec.email = "nirvdrum@gmail.com"
     spec.license = 'MIT'
     spec.add_development_dependency 'minitest'
-    spec.add_dependency 'open4'
   end
   Jeweler::GemcutterTasks.new
   

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 require 'pp'
-require 'open4'
 require 'timeout'
+require 'thread'
 
 module Svn2Git
   DEFAULT_AUTHORS_FILE = "~/.svn2git/authors"
@@ -374,7 +374,6 @@ module Svn2Git
       log "Running command: #{cmd}\n"
 
       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
@@ -386,44 +385,28 @@ module Svn2Git
 
       # 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|
+      IO.popen("2>&1 #{cmd}") do |output|
         threads = []
 
-        threads << Thread.new(stdout) do |stdout|
-          stdout.each do |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|
+        threads << Thread.new(output) do |output|
           # 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
+          output.each(' ') do |word|
+            ret << word
+
+            if printout_output
+              $stdout.print word
+            else
+              log word
             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|
+        Thread.new do
           loop do
             user_reply = @stdin_queue.pop
 
@@ -441,12 +424,7 @@ module Svn2Git
         @stdin_queue << nil
       end
 
-      # 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)
+      if exit_on_error && $?.exitstatus != 0
         $stderr.puts "command failed:\n#{cmd}"
         exit -1
       end

data/svn2git.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{svn2git}
-  s.version = "2.3.1"
+  s.version = "2.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = %q{2014-05-15}
+  s.date = %q{2014-06-08}
   s.default_executable = %q{svn2git}
   s.email = %q{nirvdrum@gmail.com}
   s.executables = ["svn2git"]
@@ -42,14 +42,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
     else
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<open4>, [">= 0"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<open4>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn2git
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - James Coglan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-15 00:00:00 -04:00
+date: 2014-06-08 00:00:00 -04:00
 default_executable: svn2git
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,20 +33,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 description: 
 email: nirvdrum@gmail.com
 executables: