svn_wc 0.0.5 → 0.0.6

data/README.rdoc

@@ -5,7 +5,7 @@ Operate on the working copy of a (remote) Subversion (svn) repository.
 
 == VERSION:
 
-Version 0.0.5
+Version 0.0.6
 
 
 == SYNOPSIS:
@@ -280,13 +280,17 @@ Author:: {David Wright}[http://www.dwright.us/] <david_v_wright@yahoo.com>
 
 == ACKNOWLEDGEMENTS:
 
-*  Much of this code was guided from reading the {SVN Ruby Bindings unit tests}[https://svn.collab.net/repos/svn/trunk/subversion/bindings/swig/ruby/test/]
+*  Much of this code was guided from reading the {SVN Ruby Bindings unit tests}[http://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/ruby/]
 
 * {Doxygen Docs}[http://svn.collab.net/svn-doxygen/search.php?query=svn_wc_entry]
   Ruby          -> Svn::Wc::Entry 
   Doxygen Docs  -> svn_wc_entry
 
-* The Doxyogen Modules {docs}[http://svn.collab.net/svn-doxygen/modules.html]
+  The collab.net Docs/code seem to have moved to being hosted by Apache:
+  or can view here: (I cant seem to find the Doxyogen docs anymore)
+  {Ruby SWIG Code}[https://trac.mathweb.org/tntbase/browser/trunk/SVN/src-trunk/subversion/bindings/swig/ruby/test?rev=4&order=name]
+  or can view here:
+  {Ruby SWIG Code}[http://www.opensource.apple.com/source/subversion/subversion-16/subversion/subversion/bindings/swig/ruby/test/]
 
 * Tim Coulter did some work with the {Ruby bindings as well}[http://www.oneofthewolves.com/svn_repos/svn_repos.rb]
 

data/lib/svn_wc.rb

@@ -132,7 +132,7 @@ module SvnWc
   #
   class RepoAccess
 
-    VERSION = '0.0.3'
+    VERSION = '0.0.6'
 
     # initialization
     # three optional parameters
@@ -371,7 +371,12 @@ module SvnWc
     # alias up
     def update(paths=[])
 
-      if paths.empty? then paths = self.svn_repo_working_copy end
+      if paths.empty? 
+        paths = self.svn_repo_working_copy
+      else
+        @limit_to_dir_path = paths
+      end
+
       #XXX update is a bummer, just returns the rev num, not affected files
       #(svn command line up, also returns altered/new files - mimic that)
       # hence our inplace hack (_pre/_post update_entries)
@@ -390,7 +395,6 @@ module SvnWc
         #       #Svn::Error::FS_NO_SUCH_REVISION,
         #       #Svn::Error::WcNotDirectory,
         #       #Svn::Error::EntryNotFound => e
-        #       Exception => e
         rescue Exception => err
           raise RepoAccessError, "Update Failed: #{err.message}"
         end
@@ -413,11 +417,18 @@ module SvnWc
         ##puts "#{ent[:status]} | #{ent[:repo_rev]} | #{ent[:entry_name]}"
         e_name = ent[:entry_name]
         stat = ent[:status]
+
+        if @limit_to_dir_path # limit files returned to this (and subdir's of) dir
+          fle = File.join(self.svn_repo_working_copy, e_name)
+          next unless fle.include? @limit_to_dir_path
+        end
+
         @pre_up_entries.push e_name
         ## how does it handle deletes?
         #if info()[:rev] != ent[:repo_rev]
         #  puts "changed file: #{File.join(paths, ent[:entry_name])} | #{ent[:status]} "
         #end
+
         if stat == 'M' then @modified_entries.push "#{stat}\t#{e_name}" end
       end
     end
@@ -428,11 +439,20 @@ module SvnWc
     #
     def _post_update_entries #:nodoc:
       post_up_entries = Array.new
-      list_entries.each { |ent| post_up_entries.push ent[:entry_name] }
+      list_entries.each { |ent| 
+        if @limit_to_dir_path # limit files returned to this (and subdir's of) dir
+          fle = File.join(self.svn_repo_working_copy, ent[:entry_name])
+          next unless fle.include? @limit_to_dir_path
+        end
+        post_up_entries.push ent[:entry_name]
+      }
 
       added   = post_up_entries - @pre_up_entries
       removed = @pre_up_entries - post_up_entries
 
+      #raise "#{post_up_entries}\n#{@pre_up_entries}"
+      #raise "#{added} - #{removed}"
+
       if added.length > 0
           added.each {|e_add| @modified_entries.push "A\t#{e_add}" }
       end
@@ -623,14 +643,15 @@ module SvnWc
     def list_entries(dir=self.svn_repo_working_copy, file=nil, verbose=false)
 
       @entry_list, @show, @verbose = [], true, verbose
-
+       
       Svn::Wc::AdmAccess.open(nil, dir, false, 5) do |adm|
         @adm = adm
         if file.nil?
           #also see walk_entries (in svn bindings) has callback
           adm.read_entries.keys.sort.each { |ef|
-            next unless ef.length >= 1 # why this check and not file.exists?
-            _collect_get_entry_info(File.join(dir, ef))
+            next unless ef.length >= 1
+            svn_entry = File.join(dir, ef)
+            _collect_get_entry_info svn_entry
           }
         else
           _collect_get_entry_info(file)
@@ -641,6 +662,7 @@ module SvnWc
       @entry_list
     end
 
+
     #
     # private
     #
@@ -654,6 +676,7 @@ module SvnWc
       if File.directory?(abs_path_file)
         Dir.entries(abs_path_file).each do |de|
           next if de == '..' or de == '.' or de == '.svn'
+
           status_info = _get_entry_info(File.join(abs_path_file, de))
           @entry_list.push status_info if status_info and not status_info.empty?
         end

data/test/svn_wc_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright (c) 2009 David Wright
 #
 # You are free to modify and use this file under the terms of the GNU LGPL.
@@ -298,7 +299,7 @@ class TestSvnWc < Test::Unit::TestCase
     begin
       info = svn.info(file)
       orig_rev = info[:rev]
-      fail 'is not under version control'
+      fail 'cant get info on non checked in file'
     rescue SvnWc::RepoAccessError => e
       assert e.message.match(/is not under version control/)
     ensure
@@ -324,6 +325,82 @@ class TestSvnWc < Test::Unit::TestCase
     assert_equal rev+1, n_rev
   end
 
+  def test_add_new_file_with_utf8_symbol_and_commit_and_delete
+    # fail on svn 1.6.6 (Centos 5.8) with utf8 issue
+    # attributing to utf8 issues, which may be incorrect
+    v = `svn --version`.match(/svn, version (\d+\.\d+\.\d+)\s/)[1] rescue '1.6.7'
+    if '1.6.6' <= v
+      puts "skipping utf8 test for svn version: #{v}"
+      return
+    end
+
+    svn = SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
+    file = new_unique_file_at_path2('£20')
+    begin
+      svn.info(file)
+      fail 'file not in svn'
+    rescue SvnWc::RepoAccessError => e
+      #cant get info: bad URI(is not URI?): 
+      assert e.message.match(/cant get info/)
+    end
+
+    assert_nothing_raised{svn.add file}
+    assert_equal 'A', svn.status[0][:status]
+    assert svn.status[0][:path].match(File.basename(file))
+    rev = svn.commit file
+    assert rev >= 1
+    svn.delete file
+    assert_equal 'D', svn.status[0][:status]
+    assert svn.status[0][:path].match(File.basename(file))
+    # commit our delete
+    n_rev = svn.commit file
+    assert_equal [], svn.status
+    assert_equal rev+1, n_rev
+  end
+
+  def test_add_new_file_with_utf8_symbols_and_commit_and_delete
+    # fail on svn 1.6.6 (Centos 5.8) with utf8 issue
+    # attributing to utf8 issues, which may be incorrect
+    v = `svn --version`.match(/svn, version (\d+\.\d+\.\d+)\s/)[1] rescue '1.6.7'
+    if '1.6.6' <= v
+      puts "skipping utf8 test for svn version: #{v}"
+      return
+    end
+
+    svn = SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
+    file = new_unique_file_at_path2('£20_ߣáçkqùë_Jâçqùë')
+    begin
+      svn.info(file)
+      fail 'file not in svn'
+    rescue SvnWc::RepoAccessError => e
+      #cant get info: bad URI(is not URI?): 
+      assert e.message.match(/cant get info/)
+    end
+
+    assert_nothing_raised{svn.add file}
+
+    begin
+      svn.add file
+    rescue SvnWc::RepoAccessError => e
+      assert e.message.match(/is already under version control/)
+    end
+
+    #assert_equal 'A', svn.status[0][:status]
+    # why '?' and not 'A'!?
+    assert_equal '?', svn.status[0][:status]
+    #assert svn.status[0][:path].match(File.basename(file))
+    #assert_equal File.basename(svn.status[0][:path]), File.basename(file)
+    rev = svn.commit file
+    assert rev >= 1
+    svn.delete file
+    assert_equal 'D', svn.status[0][:status]
+    assert svn.status[0][:path].match(File.basename(file))
+    # commit our delete
+    n_rev = svn.commit file
+    assert_equal [], svn.status
+    assert_equal rev+1, n_rev
+  end
+
   def test_add_new_dir_and_file_and_commit_and_delete_with_pre_open_instance
     @@svn_wc.set_conf @conf_file
     @@svn_wc.do_checkout true
@@ -381,7 +458,55 @@ class TestSvnWc < Test::Unit::TestCase
     assert File.file?(f[3])
     assert FileUtils.rm_rf(File.dirname(f[3]))
   end
+  
+  def test_operations_on_specific_dir_not_process_others
+    svn = SvnWc::RepoAccess.new(@conf_file, true, true)
 
+    f = []
+    (1..4).each { |d|
+      wc_new_dir = File.join @conf['svn_repo_working_copy'], "dir#{d}"
+      FileUtils.mkdir wc_new_dir
+      wc_new_file = "test_#{d}.txt"
+      f[d] = File.join wc_new_dir, wc_new_file
+      FileUtils.touch f[d]
+    }
+
+    begin
+      svn.info(f[1])
+      fail 'is not under version control'
+    rescue SvnWc::RepoAccessError => e
+      assert e.message.match(/is not a working copy/)
+    end
+    #svn.add [File.dirname(f[1]), File.dirname(f[2]), File.dirname(f[4])]
+    #rev = svn.commit [File.dirname(f[1]), File.dirname(f[2]), File.dirname(f[4]), f[1], f[2], f[4]]
+    #assert rev >= 1
+    
+    assert !svn.status(File.dirname(f[2])).to_s.match(/dir1/)
+    assert svn.status(File.dirname(f[2])).to_s.match(/dir2/)
+    assert !svn.status(File.dirname(f[2])).to_s.match(/dir3/)
+    assert !svn.status(File.dirname(f[2])).to_s.match(/dir4/)
+
+    assert !svn.status(File.dirname(f[3])).to_s.match(/dir1/)
+    assert svn.status(File.dirname(f[3])).to_s.match(/dir3/)
+    assert !svn.status(File.dirname(f[3])).to_s.match(/dir2/)
+    assert !svn.status(File.dirname(f[3])).to_s.match(/dir4/)
+
+    # not it repo yet
+    assert_raise(SvnWc::RepoAccessError) { svn.list(File.dirname(f[3])) }
+    svn.add [File.dirname(f[2]), File.dirname(f[3])]
+    rev = svn.commit [File.dirname(f[2]), File.dirname(f[3]), f[2], f[3]]
+
+    # list by dir matches specific only
+    assert svn.list(File.dirname(f[3]))[1].to_s.match(/test_3.txt/)
+    assert !svn.list(File.dirname(f[3]))[1].to_s.match(/test_2.txt/)
+
+    # list matches all
+    assert svn.list.to_s.match(/test_2.txt/)
+    assert svn.list.to_s.match(/test_3.txt/)
+
+
+  end
+  
   def test_add_commit_update_file_status_revision_modify_diff_revert
     svn = SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
     f = new_unique_file_at_path
@@ -459,7 +584,7 @@ class TestSvnWc < Test::Unit::TestCase
       svn.update, 'added 3 files into another working copy of the repo, update
                    on current repo finds them, good!'
 
-    # Confirm can do add/delete/modified simultaniously
+    # Confirm can do add/delete/modified simultaneously
     # modify, 1 committed file, current repo
     lf = File.join @conf['svn_repo_working_copy'], fe[0]
     File.open(lf, 'a') {|fl| fl.write('local repo file is modified')}
@@ -479,6 +604,54 @@ class TestSvnWc < Test::Unit::TestCase
 
   end
 
+  def test_update_can_act_on_specific_dir
+    svn = SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
+
+    rev = svn.info()[:rev]
+    assert_equal [rev, []], svn.update
+
+    # add 3 files to a nested subdir under repo root
+    dir = 't/t/t'
+   (rev1, file) = check_out_new_working_copy_add_commit_new_entry_into_subdir(dir)
+    assert_equal rev+1, rev1
+
+    # add 3 files to a different nested subdir under repo root
+    dir2 = 'f/f/f'
+   (rev2, file2) = check_out_new_working_copy_add_commit_new_entry_into_subdir(dir2)
+    assert_equal rev+2, rev2
+
+    # find first nested subdir file
+    assert_equal \
+    [(rev + 2), ["A\t#{dir}/#{File.basename file}", "A\tt/t/t", "A\tt/t"]],
+      svn.update(File.join(@conf['svn_repo_working_copy'], 't')),
+      'found file under first subdir path of the repo, but not the second subdir, good!'
+
+    # find second nested subdir file
+    assert_equal \
+    [(rev + 2), ["A\t#{dir2}/#{File.basename file2}", "A\tf/f/f", "A\tf/f"]], #svn.update(File.join(@conf['svn_repo_working_copy'], dir2)),
+      svn.update(File.join(@conf['svn_repo_working_copy'], 'f')),
+      'update can accept a path to update and only act on that path, great!'
+
+    dir3 = 't'
+    (rev3, nf, nf2) = check_out_new_working_copy_add_commit_new_entries(dir, dir3)
+
+    # second nested subdir file - should not see added file
+    assert_equal \
+    [rev3, []], svn.update(File.join(@conf['svn_repo_working_copy'], 'f')),
+      'update can act on passed path (or not act :)'
+
+    # first nested subdir file - should find 1 new file
+    assert_equal [rev3, ["A\t#{dir}/#{File.basename nf}"]],
+      svn.update(File.join(@conf['svn_repo_working_copy'], dir)),
+      'svn update can update based specified on non-top level path, great!'
+
+    # first nested subdir file - should find second new file
+    assert_equal [rev3, ["A\t#{dir3}/#{File.basename nf2}"]],
+      svn.update(File.join(@conf['svn_repo_working_copy'], dir3)),
+      'svn update can update based specified on non-top level path, great!'
+
+  end
+
   def test_add_exception_on_already_added_file
     svn = SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
     this_wc_rev = 0
@@ -617,7 +790,7 @@ class TestSvnWc < Test::Unit::TestCase
     svn.add dir_ent, recurse=true, force=true
     rev = svn.commit repo_wc
 
-    entries =  svn.list_entries
+    entries =  svn.list_entries.sort_by{|h| h[:entry_name]}
 
     assert_equal File.basename(entries[0][:entry_name]), 
                  File.basename(file)
@@ -782,10 +955,19 @@ class TestSvnWc < Test::Unit::TestCase
  
   def new_unique_file_at_path(wc_repo=@conf['svn_repo_working_copy'])
     #Tempfile.new('test_', wc_repo).path
+    FileUtils.mkdir_p wc_repo unless File.directory? wc_repo
     new_file_name = File.join(wc_repo, "test_#{Time.now.usec.to_s}.txt")
     FileUtils.touch new_file_name
     new_file_name
   end
+ 
+  def new_unique_file_at_path2(f_name=nil, wc_repo=nil)
+    wc_repo =@conf['svn_repo_working_copy'] if wc_repo.nil?
+    #Tempfile.new('test_', wc_repo).path
+    new_file_name = File.join(wc_repo, "test_#{f_name}_#{Time.now.usec.to_s}.txt")
+    FileUtils.touch new_file_name
+    new_file_name
+  end
 
   def _working_copy_repo_at_path(wc_repo=@wc_repo2)
     conf = @conf
@@ -821,6 +1003,64 @@ class TestSvnWc < Test::Unit::TestCase
     return rev, ff
   end
 
+  def check_out_new_working_copy_add_commit_new_entry_into_subdir(dir)
+    svn = _working_copy_repo_at_path
+
+    ff = Array.new
+    f = new_unique_file_at_path(File.join(svn.svn_repo_working_copy, dir))
+    #p svn
+
+    #svn.add f
+    #rev = svn.commit f
+    #puts File.exists? f
+    dirs = dir.split('/')
+    d_to_add = []
+    dp = ''
+    dirs.each do |d|
+      dp << "/#{d}"
+      d =  File.join(svn.svn_repo_working_copy, dp)
+      #puts "adding #{d}"
+      d_to_add.push d
+      # just  have to add the top level subdir path
+      # then all under it is found
+      break
+    end
+    #d_to_add.push f
+
+    #puts d_to_add.inspect
+
+    svn.add d_to_add
+    rev = svn.commit d_to_add
+    raise 'cant get rev' unless rev
+    return rev, f
+  end
+
+  def check_out_new_working_copy_add_commit_new_entries(dir, dir2)
+    svn = _working_copy_repo_at_path
+
+    f = new_unique_file_at_path(File.join(svn.svn_repo_working_copy, dir))
+    f2 = new_unique_file_at_path(File.join(svn.svn_repo_working_copy, dir2))
+    #p svn
+
+    svn.add f
+    svn.add f2
+    rev = svn.commit f
+    rev = svn.commit f2
+    raise 'file not created' unless File.exists?(f) and File.exists?(f2)
+    raise 'cant get rev' unless rev
+    return rev, f, f2
+  end
+
+  def touch_file_add_to_svn(svn, dir)
+    f = new_unique_file_at_path dir
+
+    svn.add f
+    rev = svn.commit f
+    raise 'file not created' unless File.exists?(f)
+    raise 'cant get rev' unless rev
+    return rev, f
+  end
+
   def modify_file_and_commit_into_another_working_repo
     svn = _working_copy_repo_at_path
     f = new_unique_file_at_path(svn.svn_repo_working_copy)
@@ -831,6 +1071,7 @@ class TestSvnWc < Test::Unit::TestCase
     return rev, f
   end
 
+
 end
 
 if VERSION < '1.8.7'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn_wc
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - David Wright
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2012-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: []