svn_wc 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,3 +1,6 @@
+version 0.0.4
+* added :svn_repo_config_file accessor (rw)
+
 version 0.0.3
 * add all possible arg options to 'add' (from client.rb)
 * enable propset (ignore) only

data/README.rdoc

@@ -5,7 +5,7 @@ Operate on the working copy of a (remote) Subversion (svn) repository.
 
 == VERSION:
 
-Version 0.0.3
+Version 0.0.4
 
 
 == SYNOPSIS:
@@ -265,7 +265,7 @@ See the ChangeLog file for details.
 Copyright 2009 David Wright (david_v_wright@yahoo.com), all rights reserved.
 
 
-SvnWc::RepoAccess 0.0.3 is released under the LGPL license.
+SvnWc::RepoAccess 0.0.4 is released under the LGPL license.
 
 
 == AUTHOR:

data/lib/svn_wc.rb

@@ -164,7 +164,8 @@ module SvnWc
     # TODO revist these
     #++
     attr_accessor :svn_user, :svn_pass, :svn_repo_master, \
-                  :svn_repo_working_copy, :cur_file
+                  :svn_repo_working_copy, :cur_file,
+                  :svn_repo_config_path, :svn_repo_config_file
     attr_reader :ctx, :repos
 
     #
@@ -172,13 +173,13 @@ module SvnWc
     #
     def set_conf(conf)
       begin
-      conf = load_conf(conf)
-      @svn_user              = conf['svn_user']
-      @svn_pass              = conf['svn_pass']
-      @svn_repo_master       = conf['svn_repo_master']
-      @svn_repo_working_copy = conf['svn_repo_working_copy']
-      @config_path           = conf['svn_repo_config_path']
-      Svn::Core::Config.ensure(@config_path)
+        conf = load_conf(conf)
+        @svn_user              = conf['svn_user']
+        @svn_pass              = conf['svn_pass']
+        @svn_repo_master       = conf['svn_repo_master']
+        @svn_repo_working_copy = conf['svn_repo_working_copy']
+        @svn_repo_config_path  = conf['svn_repo_config_path']
+        Svn::Core::Config.ensure(@svn_repo_config_path)
       rescue Exception => e
         raise RepoAccessError, 'errors loading conf file'
       end
@@ -248,6 +249,7 @@ module SvnWc
       if cnf.nil? or cnf.empty? 
         raise RepoAccessError, 'No config file provided!'
       elsif cnf and cnf.class == String and File.exists? cnf
+        @svn_repo_config_file = cnf
         cnf = IO.read(cnf)
       end
 
@@ -713,12 +715,12 @@ module SvnWc
       @status_info[:conflict_new]   = s.conflict_new
       @status_info[:lock_comment]   = s.lock_comment
       @status_info[:copyfrom_rev]   = s.copyfrom_rev
-      @status_info[:working_size]   = s.working_size
+      #@status_info[:working_size]   = s.working_size
       @status_info[:conflict_wrk]   = s.conflict_wrk
       @status_info[:cmt_author]     = s.cmt_author
-      @status_info[:changelist]     = s.changelist
+      #@status_info[:changelist]     = s.changelist
       @status_info[:lock_token]     = s.lock_token
-      @status_info[:keep_local]     = s.keep_local
+      #@status_info[:keep_local]     = s.keep_local
       @status_info[:lock_owner]     = s.lock_owner
       @status_info[:prop_time]      = s.prop_time
       @status_info[:has_props]      = s.has_props
@@ -736,7 +738,7 @@ module SvnWc
       @status_info[:is_add]         = s.add?
       @status_info[:is_dir]         = s.dir?
       @status_info[:repos]          = s.repos
-      @status_info[:depth]          = s.depth
+      #@status_info[:depth]          = s.depth
       @status_info[:uuid]           = s.uuid
       @status_info[:url]            = s.url
     end
@@ -866,15 +868,17 @@ module SvnWc
     #--
     # TODO support other propset's ; also propget
     #++
-    def propset(type, file, dir_path)
+    def propset(type, files, dir_path=self.svn_repo_working_copy)
       raise RepoAccessError, '"ignore" is only supported propset' \
              unless type == 'ignore'
 
       svn_session() do |svn|
-        begin
-          svn.propset(Svn::Core::PROP_IGNORE, file, dir_path)
-        rescue Exception => e #Svn::Error::EntryNotFound => e
-          raise RepoAccessError, "Propset (Ignore) Failed: #{e.message}"
+        files.each do |ef|
+          begin
+            svn.propset(Svn::Core::PROP_IGNORE, ef, dir_path)
+          rescue Exception => e #Svn::Error::EntryNotFound => e
+            raise RepoAccessError, "Propset (Ignore) Failed: #{e.message}"
+          end
         end
       end
     end
@@ -916,7 +920,7 @@ module SvnWc
     end
 
     def setup_auth_baton(auth_baton) # :nodoc:
-      auth_baton[Svn::Core::AUTH_PARAM_CONFIG_DIR] = @config_path
+      auth_baton[Svn::Core::AUTH_PARAM_CONFIG_DIR] = @svn_repo_config_path
       auth_baton[Svn::Core::AUTH_PARAM_DEFAULT_USERNAME] = @svn_user
     end
 

data/test/svn_wc_test.rb

@@ -619,9 +619,9 @@ class TestSvnWc < Test::Unit::TestCase
 
     entries =  svn.list_entries
 
-    assert_equal File.basename(entries[0][:entry_name]), 
-                 File.basename(file)
     assert_equal File.basename(entries[1][:entry_name]), 
+                 File.basename(file)
+    assert_equal File.basename(entries[0][:entry_name]), 
                  File.basename(file2)
     assert_equal entries.size, 2
     assert_nil entries[2]
@@ -636,7 +636,7 @@ class TestSvnWc < Test::Unit::TestCase
       assert ! info[:is_dir]
       assert ! info[:has_props]
       assert ! info[:deleted]
-      assert ! info[:keep_local]
+      #assert ! info[:keep_local]
       assert ! info[:has_prop_mods]
       assert   info[:normal?]
       assert   info[:is_file]
@@ -649,7 +649,7 @@ class TestSvnWc < Test::Unit::TestCase
       assert_nil info[:lock_owner]
       assert_nil info[:present_props]
       assert_nil info[:lock_token]
-      assert_nil info[:changelist]
+      #assert_nil info[:changelist]
       assert_nil info[:prejfile]
 
       #assert_equal info[:cmt_author], `id`
@@ -658,13 +658,13 @@ class TestSvnWc < Test::Unit::TestCase
       assert_equal info[:cmt_rev] , rev
       #assert_equal info[:cmt_date] , rev
       #:checksum=>"bb9c00f6fc03c2213ac1f0278853dc32", :working_size=>9,
-      assert_equal info[:working_size] , 9
+      #assert_equal info[:working_size] , 9
       assert_equal info[:schedule], 0
       assert_equal info[:lock_creation_date], 0
       assert_equal info[:copyfrom_rev], -1
       assert_equal info[:prop_time], 0
       assert_equal info[:kind], 1  # i.e. is file
-      assert_equal info[:depth], 3
+      #assert_equal info[:depth], 3
       assert_equal info[:status]   , ' '
       assert_equal info[:entry_name], f_entry
       assert_equal info[:url], "#{File.join(@conf['svn_repo_master'],f_entry)}"
@@ -702,6 +702,45 @@ class TestSvnWc < Test::Unit::TestCase
 
   end
 
+ # XXX wtf!? why is svn_list ignoring the file, its not set to ignore
+ # TODO investiate
+  def test_propset_ignore_file_unrevisioned
+    svn = SvnWc::RepoAccess.new(YAML::dump(@conf), true, true)
+
+    repo_wc = @conf['svn_repo_working_copy']
+
+    file = File.join repo_wc, 'another_file_to_ignore.txt'
+ 
+    #svn.propset('ignore', file)
+    #svn.prop_set(Svn::Core::PROP_IGNORE, file, repo_wc)
+
+    #file = File.join repo_wc, file
+    # create file we have already ignored, above
+    File.open(file, "w") {|f| f.print('testing propset ignore file.')}
+    
+
+    #dir_ent = Dir.mktmpdir('P', repo_wc)
+    #file2 = new_unique_file_at_path dir_ent
+    file2 = new_unique_file_at_path
+    #p svn.list_entries
+    #p `ls -l "#{repo_wc}"`
+
+    #svn.add dir_ent, recurse=true, force=true
+    #svn.add dir_ent, recurse=true, force=true
+    svn.add file2
+    #p svn.list_entries
+    #svn.commit repo_wc
+    svn.commit
+
+    assert_raise(SvnWc::RepoAccessError) { svn.info file }
+    assert_equal File.basename(svn.list_entries[0][:entry_name]), 
+                 File.basename(file2)
+    assert_equal svn.list_entries.size, 1
+    assert_nil svn.list_entries[1]
+    #p svn.list_entries
+
+  end
+
   # TODO
   # from client.rb
   #def log(paths, start_rev, end_rev, limit,

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: svn_wc
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - David Wright
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -08:00
+date: 2010-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -42,18 +47,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: svn_wc operates on a working copy (on the local filesystem) of a remote Subversion repository.