svn2git 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14294b9fe3b9c678bde246f6312efa2e32721bdb
-  data.tar.gz: 72b0efbcca461dc3e9f73bb2c60d87e627b1cff8
+  metadata.gz: 5c4a9fc54bbab7715f45e042b64a8d43c7c45ba8
+  data.tar.gz: 62f4f6a037614764a92279b050bf17bc924535c5
 SHA512:
-  metadata.gz: 55d42fb0ac0c9d0da5d98dfac0554ac30151eb418e2a1303a014c3b6278c7bfc1f81444d4116247204233fe0e2751260d30aa83cee995b31070bdd868f4a9ead
-  data.tar.gz: 5dae5756b74582e831bd9eed0e8dc85348b99afc16ced0a4dcd776a11afbe537e2c2a766d89a73cb8815ea7af2c0f984133831407ecb9fc95eaf4dbda04d1800
+  metadata.gz: 2148e941a74b9b9d1b7e57f9c0932f05f29f4b37b368ec80581b4174ebe835440443e53ec29ac74b303c4121317297a71c8c5485d5993a1537fdac575c3e1459
+  data.tar.gz: 943712834f6d29603c17eb266f2327b6e892874e9a2ad4cfd65fb6d04e463c2213ba5b02543f796b15236605932376e4eefc530be6bacf063371c694544ed947

data/ChangeLog.markdown

@@ -1,10 +1,15 @@
-# 2.2.4 - 2014-04-08
+# 2.2.5 - 2014-03-09
+
+  * 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).
+
+# 2.2.4 - 2014-03-08
 
   There was a permissions problem with some of the files packed in 2.2.3.  This was caught immediately after the gem
   was pushed, so it was yanked as it simply wouldn't work for anyone.  2.2.4 contains everything 2.2.3 did, but with
   proper packaging.
 
-# 2.2.3 - 2014-04-08
+# 2.2.3 - 2014-03-08
 
   This is a bugfix release. First change done by FeeJai
 

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake'
+require 'rake/testtask'
 require 'rubygems/package_task'
 
 begin
@@ -7,39 +8,23 @@ begin
     spec.name = "svn2git"
     spec.summary = "A tool for migrating svn projects to git"
     spec.authors = ["James Coglan", "Kevin Menard"]
-    spec.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
+    spec.homepage = "https://github.com/nirvdrum/svn2git"
     spec.email = "nirvdrum@gmail.com"
+    spec.add_development_dependency 'test-unit'
   end
   Jeweler::GemcutterTasks.new
   
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
-    
-# 
-# spec = Gem::Specification.new do |spec| 
-#   
-#   spec.version = "1.1.0"
-#   spec.platform = Gem::Platform::RUBY
-#   
-#   
-#   spec.require_path = "lib"
-#   spec.files = FileList["lib/**/*"].to_a
-#   spec.autorequire = "lib/svn2git.rb"
-#   spec.bindir = "bin"
-#   spec.executables = ["svn2git"]
-#   spec.default_executable = "svn2git"
-#   
-#   
-#   
-#   
-#   spec.test_files = FileList["test/**/*"].to_a
-#   spec.has_rdoc = true
-#   spec.extra_rdoc_files = ["README"]
-#   spec.rdoc_options << "--main" << "README" << '--line-numbers' << '--inline-source'
-# end
-#  
-# Rake::GemPackageTask.new(spec) do |pkg| 
-#   pkg.need_tar = true 
-# end
-# 
+
+desc 'Test the rubber plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Default: run unit tests.'
+task :default => :test

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -145,6 +145,14 @@ module Svn2Git
       options
     end
 
+    def self.escape_quotes(str)
+      str.gsub(/'|"/) { |c| "\\#{c}" }
+    end
+
+    def escape_quotes(str)
+      Svn2Git::Migration.escape_quotes(str)
+    end
+
   private
 
     def clone!
@@ -374,10 +382,6 @@ module Svn2Git
       end
     end
 
-    def escape_quotes(str)
-      str.gsub("'", "'\\\\''")
-    end
-
     def git_config_command
       if @git_config_command.nil?
         status = run_command('git config --local --get user.name', false)

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.4 ruby lib
+# stub: svn2git 2.2.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "svn2git"
-  s.version = "2.2.4"
+  s.version = "2.2.5"
 
   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-09"
+  s.date = "2014-03-10"
   s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
@@ -26,12 +26,25 @@ Gem::Specification.new do |s|
     "VERSION.yml",
     "bin/svn2git",
     "lib/svn2git.rb",
-    "lib/svn2git/blah.rb",
     "lib/svn2git/migration.rb",
-    "svn2git.gemspec"
+    "svn2git.gemspec",
+    "test/escape_quotes_test.rb",
+    "test/test_helper.rb"
   ]
-  s.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
-  s.rubygems_version = "2.2.0"
+  s.homepage = "https://github.com/nirvdrum/svn2git"
+  s.rubygems_version = "2.2.2"
   s.summary = "A tool for migrating svn projects to git"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+    else
+      s.add_dependency(%q<test-unit>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<test-unit>, [">= 0"])
+  end
 end
 

data/test/escape_quotes_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
+
+class EscapeQuotesTest < Test::Unit::TestCase
+  def test_identity
+    expected = 'A string without any need to escape.'
+    actual = Svn2Git::Migration.escape_quotes(expected)
+
+    assert_equal expected, actual
+  end
+
+  def test_escape_single_quotes
+    actual = Svn2Git::Migration.escape_quotes("Here's a message with 'single quotes.'")
+
+    assert_equal "Here\\'s a message with \\'single quotes.\\'", actual
+  end
+
+  def test_escape_double_quotes
+    actual = Svn2Git::Migration.escape_quotes('Here is a message with "double quotes."')
+
+    assert_equal 'Here is a message with \\"double quotes.\\"', actual
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+
+require 'svn2git'
+require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn2git
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - James Coglan
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
-dependencies: []
+date: 2014-03-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nirvdrum@gmail.com
 executables:
@@ -27,10 +41,11 @@ files:
 - VERSION.yml
 - bin/svn2git
 - lib/svn2git.rb
-- lib/svn2git/blah.rb
 - lib/svn2git/migration.rb
 - svn2git.gemspec
-homepage: https://www.negativetwenty.net/redmine/projects/svn2git
+- test/escape_quotes_test.rb
+- test/test_helper.rb
+homepage: https://github.com/nirvdrum/svn2git
 licenses: []
 metadata: {}
 post_install_message: 
@@ -49,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool for migrating svn projects to git

data/lib/svn2git/blah.rb

@@ -1,4 +0,0 @@
-require 'migration'
-
-migration = Svn2Git::Migration.new(ARGV)
-migration.run!