svn-transform 0.1.0 → 0.2.0

data/Rakefile

@@ -16,7 +16,7 @@ EOF
     gem.email = "jmorgan@morgancreative.net"
     gem.homepage = "http://github.com/jm81/svn-props-to-yaml"
     gem.authors = ["Jared Morgan"]
-    gem.add_dependency('svn-fixture', '= 0.2.0')
+    gem.add_dependency('svn-fixture', '= 0.3.0')
     gem.add_development_dependency "spicycode-micronaut"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/examples/fixtures/original.rb

@@ -47,6 +47,7 @@ SvnFixture.repo('original') do
       end
       
       file 'computers.txt' do
+        prop 'todelete', 'delete this'
         body "---\r\neol: CRLF\r\n\---\r\n\r\ncomputers do not \r\nlike salsa so much."
       end
     end
@@ -62,6 +63,7 @@ SvnFixture.repo('original') do
     dir 'articles' do
       file 'computers.txt' do
         prop 'alt:title', 'Computers'
+        propdel 'todelete'
       end
     end
   end

data/examples/fixtures/result.rb

@@ -63,6 +63,7 @@ SvnFixture.repo('result') do
       end
       
       file 'computers.md' do
+        prop 'todelete', 'delete this'
         body "--- \ntitle: Computers\neol: CRLF\npublished_at: 2009-07-01 12:00:00\n---\n\ncomputers do not \nlike salsa so much."
       end
     end
@@ -80,6 +81,7 @@ SvnFixture.repo('result') do
     dir 'articles' do
       file 'computers.md' do
         prop 'alt:title', 'Computers'
+        propdel 'todelete'
         body "--- \ntitle: Computers\neol: CRLF\npublished_at: 2009-07-01 12:00:00\n---\n\ncomputers do not \nlike salsa so much."
       end
     end

data/examples/svn-transform/transform/newline_example.rb

@@ -41,6 +41,14 @@ describe SvnTransform::Transform::Newline do
       @file.body.should == "\nabc\n"
     end
     
+    it 'should skip binary files' do
+      input = "\r\nabc\r\n"
+      @file.body = input
+      @file.properties['svn:mime-type'] = 'application/octet-stream'
+      @klass.new(@file).run.should be_false
+      @file.body.should == "\r\nabc\r\n"
+    end
+    
     it 'should replace all newlines with @newline' do
       input = "\r\nabc\r\n\n\n\r"
       @file.body = input

data/lib/svn-transform.rb

@@ -1,8 +1,12 @@
 require 'pathname'
 require 'svn-fixture'
+require 'fileutils'
+
+STDOUT.sync = true
 
 class SvnTransform
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
+  PRINT_INFO = false
   
   class << self
     # Use diff to compare two repositories (on local file system)
@@ -37,6 +41,62 @@ class SvnTransform
         return false
       end
     end
+    
+    COMPARE_DIR = '/tmp/svn-transform/compare'
+    COMPARE_OLD_DIR = File.join(COMPARE_DIR, 'old')
+    COMPARE_NEW_DIR = File.join(COMPARE_DIR, 'new')
+    
+    # Compare checkouts. This takes much longer than .compare but can give a
+    # more accurate picture, because it is not affected by the changes in
+    # svn:entry properties (well, it actually just ignores the related files),
+    # the chance that entries are just in different order within the db file, or
+    # differences between the directory structure of the repo's db folders.
+    #
+    # It also has the advantage that the repositories can be remote.
+    #
+    # Note that this method will destroy existing files in the COMPARE_DIR
+    #
+    # ==== Parameters
+    # old_repo<String>:: URI of original (in) repository.
+    # new_repo<String>:: URI of generated (out) repository.
+    # min_rev<Integer>:: Starting revision for comparison
+    # max_rev<Integer>:: Ending revision for comparison
+    def co_compare(old_repo, new_repo, min_rev, max_rev)
+      FileUtils.rm_rf(COMPARE_OLD_DIR)
+      FileUtils.rm_rf(COMPARE_NEW_DIR)
+
+      rev = min_rev
+      `svn co -r#{rev} "#{old_repo}" "#{COMPARE_OLD_DIR}"`
+      `svn co -r#{rev} "#{new_repo}" "#{COMPARE_NEW_DIR}"`
+      
+      while rev <= max_rev
+        co_compare_rev(rev)
+        rev += 1
+      end
+    end
+    
+    # Called by .co_compare, this checks out and compares the repositories at
+    # a signle revision. It prints out any differences.
+    #
+    # ==== Parameters
+    # rev<Integer>:: The revision to compare.
+    #
+    # ==== Returns
+    # True, False:: Whether the revisions are identical
+    def co_compare_rev(rev)
+      print "#{rev} " if PRINT_INFO
+      `svn update -r#{rev} "#{COMPARE_OLD_DIR}"`
+      `svn update -r#{rev} "#{COMPARE_NEW_DIR}"`
+      ret = `diff --brief --exclude=entries -r "#{COMPARE_OLD_DIR}" "#{COMPARE_NEW_DIR}"`
+      if ret.empty?
+        return true
+      else
+        puts "\nREVISION #{rev}"
+        puts ret
+        puts ("-" * 70)
+        return false
+      end
+    end
   end
   
   # Setup and SvnTransform with in (existing) repository URI, a name for the
@@ -116,13 +176,15 @@ class SvnTransform
   # calls +changesets+ to do the actual work. Finally, commit the SvnFixture
   # (out repo) and update its rev 0 date to match the in repo
   def convert
-    in_repo_session = Session.new(@in_repo_uri, @in_username, @out_username)
+    in_repo_session = Session.new(@in_repo_uri, @in_username, @in_password)
     @in_repo = in_repo_session.session
     @ctx = in_repo_session.context
     @out_repo = SvnFixture.repo(@out_repo_name, @out_repos_path, @out_wc_path)
     
     # Process changesets and commit
+    puts "\nReading existing log..." if PRINT_INFO
     changesets
+    puts "\nCommitting to new..." if PRINT_INFO
     @out_repo.commit
     
     # Update rev 0 date
@@ -142,6 +204,7 @@ class SvnTransform
     path_renames = {}
     
     @in_repo.log(*args) do |changes, rev_num, author, date, msg|
+      print "#{rev_num} " if PRINT_INFO
       # Sort so that files are processed first (for benefit of PropsToYaml),
       # and deletes are last
       changes = changes.sort { |a,b| sort_for(a, rev_num) <=> sort_for(b, rev_num) }
@@ -155,6 +218,7 @@ class SvnTransform
       out_wc_path = @out_repo.wc_path
       svn_transform = self
       @out_repo.revision(rev_num, msg, rev_props) do
+        print "#{rev_num} " if SvnTransform::PRINT_INFO
         # Now go through all the changes. Setup directorie structure for each
         # node. This is easier to understand, in my opinion.
         
@@ -170,6 +234,12 @@ class SvnTransform
           
           # TODO Replaces
           
+          copy_from_path = nil
+          if change.copyfrom_path
+            short_from_path = path_renames[change.copyfrom_path] || change.copyfrom_path
+            copy_from_path = ::File.join(out_wc_path, short_from_path)
+          end
+          
           if change.action == 'D'
             del_path = path_renames['/' + full_path.to_s] || full_path.to_s
             @ctx.delete(::File.join(out_wc_path, del_path))
@@ -178,21 +248,11 @@ class SvnTransform
             transform_file = ::SvnTransform::File.new(full_path, data, rev_num, rev_props)
             original_path = transform_file.path
             svn_transform.__send__(:process_file_transforms, transform_file)
-            
-            if change.copyfrom_path
-              from_path = path_renames[change.copyfrom_path] || change.copyfrom_path
-              @ctx.cp( 
-                ::File.join(out_wc_path, from_path),
-                ::File.join(out_wc_path, transform_file.path.to_s)
-              )
-            end
-            
+            @ctx.cp(copy_from_path, ::File.join(out_wc_path, transform_file.path.to_s)) if copy_from_path
             unless transform_file.skip?
               parent_dir.file(transform_file.basename) do
                 body(transform_file.body)
-                transform_file.properties.each_pair do |prop_k, prop_v|
-                  prop(prop_k, prop_v) unless prop_k =~ /\Asvn:entry/
-                end
+                props(transform_file.properties)
               end
               # For benefit of copies
               if original_path != transform_file.path
@@ -200,13 +260,13 @@ class SvnTransform
               end
             end
           else # directory
+            # Paths don't change for directories, but use this for consistency
+            @ctx.cp(copy_from_path, ::File.join(out_wc_path, full_path.to_s)) if copy_from_path
             parent_dir.dir(full_path.basename.to_s) do
               data = in_repo.dir(full_path.to_s, rev_num)
               transform_dir = ::SvnTransform::Dir.new(full_path, data, rev_num, rev_props, in_repo, self)
               svn_transform.__send__(:process_dir_transforms, transform_dir)
-              transform_dir.properties.each_pair do |prop_k, prop_v|
-                prop(prop_k, prop_v) unless prop_k =~ /\Asvn:entry/
-              end
+              props(transform_dir.properties)
             end
           end
         end
@@ -246,8 +306,10 @@ class SvnTransform
   
   # Return an Integer such that file changes are first, directories second
   # and deleted nodes last (to minimize the chance of a Transformation being
-  # overridden.
+  # overridden. Copies are done first (so that files within a copied dir don't
+  # try to create the dir before the copy.
   def sort_for(change, rev_num)
+    return -1 if change[1].copyfrom_path
     return 2 if change[1].action == 'D'
     return 0 if @in_repo.stat(change[0].sub(/\A\//, ''), rev_num).file?
     return 1

data/lib/svn-transform/transform/newline.rb

@@ -24,6 +24,8 @@ class SvnTransform
       # ==== Returns
       # True, False:: indicating whether a change was made.
       def run
+        # Skip binary files; this is probably not the best way to determine.
+        return false if 'application/octet-stream' == @file.properties['svn:mime-type']
         body = @file.body.dup
         # Replace CR and CRLF
         body = all_to_lf(body)

data/svn-transform.gemspec

@@ -0,0 +1,86 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{svn-transform}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jared Morgan"]
+  s.date = %q{2009-11-02}
+  s.description = %q{Given a Subversion repository, svn-transform creates a new repo that is by 
+default identical, but allows changes to files, for example all or some of the 
+properties on each file can be moved from the properties to YAML prepended to 
+the body of the file. Primarily useful prior to conversions to other repository 
+types such as git.
+}
+  s.email = %q{jmorgan@morgancreative.net}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "examples/example_helper.rb",
+     "examples/fixtures/dir_props.rb",
+     "examples/fixtures/original.rb",
+     "examples/fixtures/result.rb",
+     "examples/svn-transform/dir_example.rb",
+     "examples/svn-transform/file_example.rb",
+     "examples/svn-transform/transform/extension_example.rb",
+     "examples/svn-transform/transform/newline_example.rb",
+     "examples/svn-transform/transform/noop_example.rb",
+     "examples/svn-transform/transform/props_to_yaml_example.rb",
+     "examples/svn-transform_example.rb",
+     "lib/svn-transform.rb",
+     "lib/svn-transform/dir.rb",
+     "lib/svn-transform/file.rb",
+     "lib/svn-transform/session.rb",
+     "lib/svn-transform/transform/extension.rb",
+     "lib/svn-transform/transform/newline.rb",
+     "lib/svn-transform/transform/noop.rb",
+     "lib/svn-transform/transform/props_to_yaml.rb",
+     "svn-transform.gemspec"
+  ]
+  s.homepage = %q{http://github.com/jm81/svn-props-to-yaml}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Copy Subversion repository, with the ability to alter files}
+  s.test_files = [
+    "examples/example_helper.rb",
+     "examples/fixtures/dir_props.rb",
+     "examples/fixtures/original.rb",
+     "examples/fixtures/result.rb",
+     "examples/svn-transform/dir_example.rb",
+     "examples/svn-transform/file_example.rb",
+     "examples/svn-transform/transform/extension_example.rb",
+     "examples/svn-transform/transform/newline_example.rb",
+     "examples/svn-transform/transform/noop_example.rb",
+     "examples/svn-transform/transform/props_to_yaml_example.rb",
+     "examples/svn-transform_example.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<svn-fixture>, ["= 0.3.0"])
+      s.add_development_dependency(%q<spicycode-micronaut>, [">= 0"])
+    else
+      s.add_dependency(%q<svn-fixture>, ["= 0.3.0"])
+      s.add_dependency(%q<spicycode-micronaut>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<svn-fixture>, ["= 0.3.0"])
+    s.add_dependency(%q<spicycode-micronaut>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: svn-transform
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -05:00
+date: 2009-11-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: spicycode-micronaut
@@ -73,6 +73,7 @@ files:
 - lib/svn-transform/transform/newline.rb
 - lib/svn-transform/transform/noop.rb
 - lib/svn-transform/transform/props_to_yaml.rb
+- svn-transform.gemspec
 has_rdoc: true
 homepage: http://github.com/jm81/svn-props-to-yaml
 licenses: []