svn_wc 0.0.1 → 0.0.2

data/README.rdoc

@@ -5,37 +5,35 @@ Operate on the working copy of a (remote) Subversion (svn) repository.
 
 == VERSION:
 
-Version 0.0.1
+Version 0.0.2
 
 
 == SYNOPSIS:
-ruby code
 
     require 'svn_wc'
     
-    # assumes a previous initial checkout
     svn_wc = SvnWc::RepoAccess.new
     
     svn_wc.set_conf 'svn_wc_conf.yaml'
     
     # checkout, needed first time only, 
     # 'true',  force overwrite of working copy directory path
-    #svn_wc.do_checkout true
+    svn_wc.do_checkout true
     
     file = Tempfile.new('test_', svn_wc.svn_repo_working_copy).path
+
     begin
+
       svn_wc.add file
-      puts "svn Added file: #{file}"
+
       rev = svn_wc.commit file
-      raise 'commit failed' unless rev >= 1
+
       puts "svn committed file: #{file}, revision #{rev}"
-      svn_wc.delete file
-      # commit our delete
-      rev = svn_wc.commit file
-      puts "svn deleted file: #{file}, revision #{rev}"
-      raise 'commit failed' unless rev >= 1
+
     rescue SvnWc::RepoAccessError, Exception => e
+
       raise e.message
+
     end
 
 
@@ -267,7 +265,7 @@ See the ChangeLog file for details.
 Copyright 2009 David Wright (david_v_wright@yahoo.com), all rights reserved.
 
 
-SvnWc::RepoAccess 0.1.0 is released under the LGPL license.
+SvnWc::RepoAccess 0.0.2 is released under the LGPL license.
 
 
 == AUTHOR:

data/lib/svn_wc.rb

@@ -110,6 +110,18 @@ require 'svn/error'
 #     #assert(wc_status.entry.normal?)
 #     #ctx.prop_set(Svn::Core::PROP_IGNORE, file2, dir_path)
 #++
+#module Svn
+#  class Error
+#    #WC_NOT_DIRECTORY  # 1.4.2
+#    class WcNotDirectory # 1.6.6
+#      raise StandardError.new(
+#    #WC_NOT_DIRECTORY  # 1.4.2
+#    end
+#    class AuthnNoProvider
+#      raise StandardError
+#    end
+#  end
+#end
 
 module SvnWc
 
@@ -118,7 +130,7 @@ module SvnWc
 
   class RepoAccess
 
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
 
     DEFAULT_CONF_FILE  = File.join(File.dirname(File.dirname(\
                                File.expand_path(__FILE__))), 'svn_wc_conf.yaml')
@@ -146,6 +158,9 @@ module SvnWc
     attr_reader :ctx, :repos
 
     def do_checkout(force=false)
+      if @svn_repo_working_copy.nil? 
+        raise RepoAccessError, 'conf file not loaded! - Fatal Error' 
+      end
       ## do checkout if not exists at specified local path
       if File.directory? @svn_repo_working_copy and not force
         raise RepoAccessError, 'target local directory  ' << \
@@ -189,9 +204,10 @@ module SvnWc
         svn_session() { |ctx| 
            ctx.checkout(@svn_repo_master, @svn_repo_working_copy) 
         }
-      rescue Svn::Error::RaLocalReposOpenFailed,
-             Svn::Error::FsAlreadyExists,
-             Exception => e
+      #rescue Svn::Error::RaLocalReposOpenFailed,
+      #       Svn::Error::FsAlreadyExists,
+      #       Exception => e
+      rescue Exception => e
         raise RepoAccessError, e.message
       end
     end
@@ -242,10 +258,11 @@ module SvnWc
           files.each { |ef|
              svn.add(ef, true)
           }
-        rescue Svn::Error::ENTRY_EXISTS, 
-               Svn::Error::AuthnNoProvider,
-               Svn::Error::WcNotDirectory,
-               Svn::Error::SvnError => e
+        #rescue Svn::Error::ENTRY_EXISTS, 
+        #       Svn::Error::AuthnNoProvider,
+        #       #Svn::Error::WcNotDirectory,
+        #       Svn::Error::SvnError => e
+        rescue Exception => e
           raise RepoAccessError, "Add Failed: #{e.message}"
         end
       end
@@ -264,10 +281,11 @@ module SvnWc
       svn_session() do |svn|
         begin
           svn.delete(files)
-        rescue Svn::Error::AuthnNoProvider,
-               Svn::Error::WcNotDirectory,
-               Svn::Error::ClientModified,
-               Svn::Error::SvnError => e
+        #rescue Svn::Error::AuthnNoProvider,
+        #       #Svn::Error::WcNotDirectory,
+        #       Svn::Error::ClientModified,
+        #       Svn::Error::SvnError => e
+        rescue Exception => e
           raise RepoAccessError, "Delete Failed: #{e.message}"
         end
       end
@@ -293,10 +311,12 @@ module SvnWc
       svn_session(msg) do |svn|
         begin
           rev = svn.commit(files).revision
-        rescue Svn::Error::WcNotDirectory,
-               Svn::Error::AuthnNoProvider,
-               Svn::Error::IllegalTarget,
-               Svn::Error::EntryNotFound => e
+        #rescue Svn::Error::AuthnNoProvider,
+        #       #Svn::Error::WcNotDirectory,
+        #       Svn::Error::IllegalTarget,
+        #       #Svn::Error::EntryNotFound => e
+        #       Exception => e
+        rescue Exception => e
           raise RepoAccessError, "Commit Failed: #{e.message}"
         end
       end
@@ -349,9 +369,12 @@ module SvnWc
         begin
           #p svn.status paths
           rev = svn.update(paths, nil, 'infinity')
-        rescue Svn::Error::WcNotDirectory,
-               Svn::Error::AuthnNoProvider, #Svn::Error::FS_NO_SUCH_REVISION,
-               Svn::Error::EntryNotFound => e
+        #rescue Svn::Error::AuthnNoProvider, 
+        #       #Svn::Error::FS_NO_SUCH_REVISION,
+        #       #Svn::Error::WcNotDirectory,
+        #       #Svn::Error::EntryNotFound => e
+        #       Exception => e
+        rescue Exception => e
           raise RepoAccessError, "Update Failed: #{e.message}"
         end
       end
@@ -439,8 +462,9 @@ module SvnWc
           ) do |path, status|
             infos << [path, status]
           end
-        rescue Svn::Error::WcNotDirectory,
-                RuntimeError => svn_err
+        rescue RuntimeError,
+                #Svn::Error::WcNotDirectory,
+                Exception => svn_err
           raise RepoAccessError, "status check Failed: #{svn_err}"
         end
       end
@@ -498,10 +522,12 @@ module SvnWc
             f_rec[:last_changed_rev] = dirent.created_rev
             paths.push f_rec
           end
-        rescue Svn::Error::WcNotDirectory,
-               Svn::Error::AuthnNoProvider,
-               Svn::Error::FS_NO_SUCH_REVISION,
-               Svn::Error::EntryNotFound => e
+        #rescue Svn::Error::AuthnNoProvider,
+        #       #Svn::Error::WcNotDirectory,
+        #       Svn::Error::FS_NO_SUCH_REVISION,
+        #       #Svn::Error::EntryNotFound => e
+        #       Exception => e
+        rescue Exception => e
           raise RepoAccessError, "List Failed: #{e.message}"
         end
       end
@@ -682,34 +708,38 @@ module SvnWc
           r_info[:last_changed_rev]  = type.last_changed_rev
           r_info[:last_changed_date] = type.last_changed_date
           r_info[:conflict_old]    = type.conflict_old
-          r_info[:tree_conflict]   = type.tree_conflict
+          #r_info[:tree_conflict]   = type.tree_conflict
           r_info[:repos_root_url]  = type.repos_root_url
           r_info[:repos_root_URL]  = type.repos_root_URL
           r_info[:copyfrom_rev]    = type.copyfrom_rev
           r_info[:copyfrom_url]    = type.copyfrom_url
-          r_info[:working_size]    = type.working_size
+          #r_info[:working_size]    = type.working_size
           r_info[:conflict_wrk]    = type.conflict_wrk
           r_info[:conflict_new]    = type.conflict_new
           r_info[:has_wc_info]     = type.has_wc_info
           r_info[:repos_UUID]      = type.repos_UUID
-          r_info[:changelist]      = type.changelist
+          #r_info[:changelist]      = type.changelist
           r_info[:prop_time]       = type.prop_time
           r_info[:text_time]       = type.text_time
           r_info[:checksum]        = type.checksum
           r_info[:prejfile]        = type.prejfile
           r_info[:schedule]        = type.schedule
           r_info[:taguri]          = type.taguri
-          r_info[:depth]           = type.depth
+          #r_info[:depth]           = type.depth
           r_info[:lock]            = type.lock
-          r_info[:size]            = type.size
+          #r_info[:size]            = type.size
           r_info[:url]             = type.url
           r_info[:dup]             = type.dup
           r_info[:URL]             = type.URL
           r_info[:rev]             = type.rev
         end
-      rescue Svn::Error::EntryNotFound,
-             Svn::Error::RaIllegalUrl,
-             Svn::Error::WcNotDirectory => e
+      #rescue Svn::Error::WcNotDirectory => e
+      #       #Svn::Error::RaIllegalUrl,
+      #       #Svn::Error::EntryNotFound,
+      #       #Svn::Error::RaIllegalUrl,
+      #       #Svn::Error::WC_NOT_DIRECTORY
+      #       #Svn::Error::WcNotDirectory => e
+      rescue Exception => e
         raise RepoAccessError, "cant get info: #{e.message}"
       end
       r_info
@@ -776,7 +806,8 @@ module SvnWc
       svn_session() do |svn|
         begin
           svn.diff([], file, rev, file, "WORKING", out_file.path, err_file.path)
-        rescue Svn::Error::EntryNotFound => e
+        rescue Exception => e
+               #Svn::Error::EntryNotFound => e
           raise RepoAccessError, "Diff Failed: #{e.message}"
         end
       end

data/test/svn_wc_test.rb

@@ -164,7 +164,8 @@ class TestSvnWc < Test::Unit::TestCase
     end
 
     # the 'dot' dirs
-    assert_equal 2, Dir.entries(@conf['svn_repo_working_copy']).count
+    #assert_equal 2, Dir.entries(@conf['svn_repo_working_copy']).count # 1.8.7 >
+    assert_equal 2, Dir.entries(@conf['svn_repo_working_copy']).size # 1.8.6 <
 
     assert_raise SvnWc::RepoAccessError do
       # already exists, wont overwrite dir
@@ -172,12 +173,14 @@ class TestSvnWc < Test::Unit::TestCase
     end
 
     # the 'dot' dirs
-    assert_equal 2, Dir.entries(@conf['svn_repo_working_copy']).count
+    #assert_equal 2, Dir.entries(@conf['svn_repo_working_copy']).count # 1.8.7 >
+    assert_equal 2, Dir.entries(@conf['svn_repo_working_copy']).size # 1.8.6 <
 
     SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
 
     # did a checkout, now more than 2 files
-    assert Dir.entries(@conf['svn_repo_working_copy']).count > 2
+    #assert Dir.entries(@conf['svn_repo_working_copy']).count > 2 # 1.8.7 >
+    assert Dir.entries(@conf['svn_repo_working_copy']).size > 2 # 1.8.6 <
   end
 
   ## NOTE too much 'system' setup work
@@ -233,7 +236,7 @@ class TestSvnWc < Test::Unit::TestCase
     assert_equal @conf['svn_repo_master'], svn.info[:repos_root_url]
 
     # now have a working copy
-    assert File.directory? @conf['svn_repo_working_copy']
+    assert File.directory?(@conf['svn_repo_working_copy'])
 
   end
 
@@ -376,7 +379,7 @@ class TestSvnWc < Test::Unit::TestCase
     assert_equal rev+1, n_rev
 
     assert ! File.file?(f[4])
-    assert File.file? f[3]
+    assert File.file?(f[3])
     assert FileUtils.rm_rf(File.dirname(f[3]))
   end
 
@@ -445,7 +448,7 @@ class TestSvnWc < Test::Unit::TestCase
     assert_equal rev+1, rev1
 
     fe = Array.new
-    files.each { |e| fe.push File.basename e}
+    files.each { |e| fe.push File.basename(e)}
     assert_equal \
       [(rev + 1), ["A\t#{fe[0]}", "A\t#{fe[1]}", "A\t#{fe[2]}"]],
       svn.update, 'added 3 files into another working copy of the repo, update
@@ -462,7 +465,7 @@ class TestSvnWc < Test::Unit::TestCase
                                                                   )
     # add 1 file, in another repo
     (rev3, file)  = check_out_new_working_copy_add_and_commit_new_entries
-    fe.push File.basename file[0]
+    fe.push File.basename(file[0])
 
     assert_equal \
       [(rev + 3), ["M\t#{fe[0]}", "A\t#{fe[3]}", "D\t#{fe[1]}", "D\t#{fe[2]}"]],
@@ -516,7 +519,7 @@ class TestSvnWc < Test::Unit::TestCase
 
     the_diff = r_list - d_list
     # not cross platform
-    assert_equal the_diff, [File.join @conf['svn_repo_working_copy'], '/']
+    assert_equal the_diff, [File.join(@conf['svn_repo_working_copy'], '/')]
     #puts the_diff
     #p d_list.length
     #p r_list.length
@@ -671,3 +674,45 @@ class TestSvnWc < Test::Unit::TestCase
 
 end
 
+if VERSION < '1.8.7'
+  # File lib/tmpdir.rb, line 99
+  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+    case prefix_suffix
+    when nil
+      prefix = "d"
+      suffix = ""
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+    end
+    tmpdir ||= Dir.tmpdir
+    t = Time.now.strftime("%Y%m%d")
+    n = nil
+    begin
+      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+      path << "-#{n}" if n
+      path << suffix
+      Dir.mkdir(path, 0700)
+    rescue Errno::EEXIST
+      n ||= 0
+      n += 1
+      retry
+    end
+
+    if block_given?
+      begin
+        yield path
+      ensure
+        FileUtils.remove_entry_secure path
+      end
+    else
+      path
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: svn_wc
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Wright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: []