svn2git 2.3.2 → 2.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6288171a5042a47ab1f9355f5beeb9671436c5b5
+  data.tar.gz: 94c00b0071c912bc66e4cc5a10f7d99fe9973710
+SHA512:
+  metadata.gz: cc234ce7131b7c60952c29c4f63e37c933e1ba6719ad699c946aa5f7d9f5b10cc18322b155689f12db76809bfbd2b8672b7da8762efe5a80b8f2f9e9d9f1a98c
+  data.tar.gz: 9a653aac4a7fbfb31751413244675f4f57ebd8258dd925b9c4f9302995a45f85fcfbebbdc4e33be41dde79ca1b01820c61bbd465143887899fcb7ef94a0ce06b

data/ChangeLog.markdown

@@ -1,3 +1,13 @@
+# 2.4.0 - 2016-10-30
+
+  This release introduces the ability to supply a password for SVN repositories that can't authenticate by other means.
+  It also adds the ability to specify the '--branches' and '--tags' arguments multiple times to better support those with
+  more complicated SVN repository layouts.
+
+  * Added support for the '--password' option for authentication (thanks edpbx).
+  * Added the ability to specify the '--branches' and '--tags' arguments multiple times (thanks pdf).
+  * Fixed a problem with processing of the '--exclude' argument (improper quoting internally) (thanks pdf).
+
 # 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.

data/README.markdown

@@ -66,7 +66,7 @@ Installation
 
 Make sure you have git, git-svn, and ruby installed.  svn2git is a ruby wrapper around git's native SVN support through git-svn.  It is possible to have git installed without git-svn installed, so please do verify that you can run `$ git svn` successfully.  For a Debian-based system, the installation of the prerequisites would look like:
 
-    $ sudo apt-get install git-core git-svn ruby rubygems
+    $ sudo apt-get install git-core git-svn ruby
 
 Once you have the necessary software on your system, you can install svn2git through rubygems, which will add the `svn2git` command to your PATH.    
 
@@ -118,6 +118,10 @@ one of them.
 
         $ svn2git http://svn.example.com/path/to/repo --username <<user_with_perms>>
 
+If this doesn't cooperate and you need to specify a password on the command-line:
+
+        $ svn2git http://svn.example.com/path/to/repo --username <<user_with_perms>> --password <<password>>
+
 8. You need to migrate starting at a specific svn revision number.
 
         $ svn2git http://svn.example.com/path/to/repo --revision <<starting_revision_number>>
@@ -176,11 +180,11 @@ repository which name on its own line. This would allow you to easily
 redirect the output of this command sequence to `~/.svn2git/authors` and have
 a very good starting point for your mapping.
 
-    $ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/^ //' | sort | uniq
+    $ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/ //g' | sort | uniq
 
 Or, for a remote URL:
 
-    $ svn log --quiet http://path/to/root/of/project | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/^ //' | sort | uniq
+    $ svn log --quiet http://path/to/root/of/project | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/ //g' | sort | uniq
 
 Debugging
 ---------
@@ -202,9 +206,10 @@ Options Reference
     Specific options:
             --rebase                     Instead of cloning a new project, rebase an existing one against SVN
             --username NAME              Username for transports that needs it (http(s), svn)
+            --password PASS              Password for transports that needs it (http(s), svn)
             --trunk TRUNK_PATH           Subpath to trunk from repository URL (default: trunk)
-            --branches BRANCHES_PATH     Subpath to branches from repository URL (default: branches)
-            --tags TAGS_PATH             Subpath to tags from repository URL (default: tags)
+            --branches BRANCHES_PATH     Subpath to branches from repository URL (default: branches); can be used multiple times
+            --tags TAGS_PATH             Subpath to tags from repository URL (default: tags); can be used multiple times
             --rootistrunk                Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches
             --notrunk                    Do not import anything from trunk
             --nobranches                 Do not try to import any branches

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -47,11 +47,12 @@ module Svn2Git
       options[:nominimizeurl] = false
       options[:rootistrunk] = false
       options[:trunk] = 'trunk'
-      options[:branches] = 'branches'
-      options[:tags] = 'tags'
+      options[:branches] = []
+      options[:tags] = []
       options[:exclude] = []
       options[:revision] = nil
       options[:username] = nil
+      options[:password] = nil
       options[:rebasebranch] = false
 
       if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
@@ -74,16 +75,20 @@ module Svn2Git
           options[:username] = username
         end
 
+        opts.on('--password PASSWORD', 'Password for transports that need it (http(s), svn)') do |password|
+          options[:password] = password
+        end
+
         opts.on('--trunk TRUNK_PATH', 'Subpath to trunk from repository URL (default: trunk)') do |trunk|
           options[:trunk] = trunk
         end
 
-        opts.on('--branches BRANCHES_PATH', 'Subpath to branches from repository URL (default: branches)') do |branches|
-          options[:branches] = branches
+        opts.on('--branches BRANCHES_PATH', 'Subpath to branches from repository URL (default: branches); can be used multiple times') do |branches|
+          options[:branches] << branches
         end
 
-        opts.on('--tags TAGS_PATH', 'Subpath to tags from repository URL (default: tags)') do |tags|
-          options[:tags] = tags
+        opts.on('--tags TAGS_PATH', 'Subpath to tags from repository URL (default: tags); can be used multiple times') do |tags|
+          options[:tags] << tags
         end
 
         opts.on('--rootistrunk', 'Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches') do
@@ -172,30 +177,47 @@ module Svn2Git
       exclude = @options[:exclude]
       revision = @options[:revision]
       username = @options[:username]
+      password = @options[:password]
 
       if rootistrunk
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
         cmd = "git svn init --prefix=svn/ "
-        cmd += "--username=#{username} " unless username.nil?
+        cmd += "--username='#{username}' " unless username.nil?
+        cmd += "--password='#{password}' " unless password.nil?
         cmd += "--no-metadata " unless metadata
         if nominimizeurl
           cmd += "--no-minimize-url "
         end
-        cmd += "--trunk=#{@url}"
+        cmd += "--trunk='#{@url}'"
         run_command(cmd, true, true)
 
       else
         cmd = "git svn init --prefix=svn/ "
 
         # Add each component to the command that was passed as an argument.
-        cmd += "--username=#{username} " unless username.nil?
+        cmd += "--username='#{username}' " unless username.nil?
+        cmd += "--password='#{password}' " unless password.nil?
         cmd += "--no-metadata " unless metadata
         if nominimizeurl
           cmd += "--no-minimize-url "
         end
-        cmd += "--trunk=#{trunk} " unless trunk.nil?
-        cmd += "--tags=#{tags} " unless tags.nil?
-        cmd += "--branches=#{branches} " unless branches.nil?
+        cmd += "--trunk='#{trunk}' " unless trunk.nil?
+        unless tags.nil?
+          # Fill default tags here so that they can be filtered later
+          tags = ['tags'] if tags.empty?
+          # Process default or user-supplied tags
+          tags.each do |tag|
+            cmd += "--tags='#{tag}' "
+          end
+        end
+        unless branches.nil?
+          # Fill default branches here so that they can be filtered later
+          branches = ['branches'] if branches.empty?
+          # Process default or user-supplied branches
+          branches.each do |branch|
+            cmd += "--branches='#{branch}' "
+          end
+        end
 
         cmd += @url
 
@@ -216,11 +238,11 @@ module Svn2Git
         regex = []
         unless rootistrunk
           regex << "#{trunk}[/]" unless trunk.nil?
-          regex << "#{tags}[/][^/]+[/]" unless tags.nil?
-          regex << "#{branches}[/][^/]+[/]" unless branches.nil?
+          tags.each{|tag| regex << "#{tag}[/][^/]+[/]"} unless tags.nil? or tags.empty?
+          branches.each{|branch| regex << "#{branch}[/][^/]+[/]"} unless branches.nil? or branches.empty?
         end
         regex = '^(?:' + regex.join('|') + ')(?:' + exclude.join('|') + ')'
-        cmd += "'--ignore-paths=#{regex}'"
+        cmd += "--ignore-paths='#{regex}' "
       end
       run_command(cmd, true, true)
 

data/svn2git.gemspec

@@ -2,16 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: svn2git 2.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{svn2git}
-  s.version = "2.3.2"
+  s.name = "svn2git"
+  s.version = "2.4.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 = %q{2014-06-08}
-  s.default_executable = %q{svn2git}
-  s.email = %q{nirvdrum@gmail.com}
+  s.date = "2016-10-30"
+  s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
@@ -31,14 +32,13 @@ Gem::Specification.new do |s|
     "test/escape_quotes_test.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = %q{https://github.com/nirvdrum/svn2git}
+  s.homepage = "https://github.com/nirvdrum/svn2git"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A tool for migrating svn projects to git}
+  s.rubygems_version = "2.5.1"
+  s.summary = "A tool for migrating svn projects to git"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 0"])

metadata

@@ -1,48 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: svn2git
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 2
-  version: 2.3.2
+version: !ruby/object:Gem::Version
+  version: 2.4.0
 platform: ruby
-authors: 
+authors:
 - James Coglan
 - Kevin Menard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-06-08 00:00:00 -04:00
-default_executable: svn2git
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nirvdrum@gmail.com
-executables: 
+executables:
 - svn2git
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - ChangeLog.markdown
 - README.markdown
-files: 
+files:
 - ChangeLog.markdown
 - MIT-LICENSE
 - README.markdown
@@ -55,39 +46,28 @@ files:
 - test/commands_test.rb
 - test/escape_quotes_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/nirvdrum/svn2git
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for migrating svn projects to git
 test_files: []
-