svn-fixture 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/svn-fixture.rb

@@ -8,7 +8,7 @@ require "svn/fs"
 require "svn/repos"
 
 module SvnFixture
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
   
   CONFIG_DEFAULTS = {
     :base_path => File.join(Dir.tmpdir, 'svn-fixture')
@@ -71,5 +71,5 @@ end
 
 require 'svn-fixture/repository'
 require 'svn-fixture/revision'
-require 'svn-fixture/directory'
 require 'svn-fixture/file'
+require 'svn-fixture/directory'

data/lib/svn-fixture/directory.rb

@@ -30,7 +30,7 @@ module SvnFixture
   #     ctx.checkout('file:///repository/uri', '/fs/path/of/wc')
   #     d = SvnFixture::Directory.new(ctx, '/fs/path/of/wc/to/dir')
   #     d.prop('propname', 'Value')
-  class Directory
+  class Directory < File
     
     # +new+ is normally called through Directory#dir (a block to a Revision is
     # applied to the root Directory).
@@ -43,6 +43,7 @@ module SvnFixture
       @ctx  = ctx
       @path = path
       @path += "/" unless path[-1] == 47
+      @clean_path = @path[0..-2] # Path without a trailing slash.
     end
     
     # Create or access a subdirectory. Takes the name of the subdirectory (not a
@@ -96,7 +97,7 @@ module SvnFixture
     # value<String>:: The value of the property.
     # recurse<True, False>:: Apply this property to descendants?
     def prop(name, value, recurse = false)
-      @ctx.propset(name, SvnFixture.svn_prop(value), @path[0..-2], recurse)
+      @ctx.propset(name, SvnFixture.svn_prop(value), @clean_path, recurse)
     end
   end
 end

data/lib/svn-fixture/file.rb

@@ -40,6 +40,7 @@ module SvnFixture
     # - +path+: The path (on the file system) of the File in the working copy
     def initialize(ctx, path)
       @ctx, @path = ctx, path
+      @clean_path = path # Path without a trailing slash. Used by methods shared with Directory
     end
     
     # Set a property for the file
@@ -50,6 +51,47 @@ module SvnFixture
       @ctx.propset(name, SvnFixture.svn_prop(value), @path)
     end
     
+    # Remove a property from the directory
+    #
+    # ==== Parameters
+    # name<String>:: The property name
+    def propdel(name)
+      @ctx.propdel(name, @clean_path)
+    end
+    
+    # Set all properties from a hash, deleting any existing that are not
+    # included in the hash. "svn:entry" properties are ignored, as these are
+    # handled internally by Subversion.
+    # 
+    # ==== Parameters
+    # hsh<Hash>:: Properties to set (name => value)
+    def props(hsh)
+      # Getting the proplist for a node that hasn't been committed doesn't
+      # seem to work. This isn't a problem (there's no existing props to delete)
+      # so just skip those.
+      skip_deletes = false
+      @ctx.status(@clean_path) do |path, status|
+        skip_deletes = true if @clean_path == path && status.entry.add?
+      end
+      
+      # Delete any that aren't in hash
+      unless skip_deletes
+        url = @ctx.url_from_path(@clean_path)
+        existing = @ctx.proplist(@clean_path).find { |pl| pl.name == url }
+        
+        if existing
+          existing.props.each_pair do |k, v|
+            propdel(k) unless (hsh[k] || k =~ /\Asvn:entry/)
+          end
+        end
+      end
+      
+      # Set props (except svn:entry)
+      hsh.each do |k, v|
+        prop(k, v) unless k =~ /\Asvn:entry/
+      end
+    end
+    
     # Set the content of a file
     def body(val)
       ::File.open(@path, 'w') { |f| f.write(val) }

data/spec/spec_helper.rb

@@ -4,3 +4,5 @@ require 'svn-fixture'
 Spec::Runner.configure do |config|
   
 end
+
+require 'svn-fixture/props_shared.rb'

data/spec/svn-fixture/directory_spec.rb

@@ -9,8 +9,11 @@ describe SvnFixture::Directory do
     @repos = SvnFixture::repo('dir_test') do
       revision(1, 'create directory and file') do
         dir('test-dir') do
+          prop 'three', 'dir'
           dir('subdir')
-          file('file.txt')
+          file('file.txt') do
+            prop 'one', 'two'
+          end
         end
       end
     end
@@ -23,13 +26,15 @@ describe SvnFixture::Directory do
   before(:each) do
     @path = File.join(@wc_path, 'test-dir')
     @full_repos_path = "file://#{File.join(@repos_path, 'test-dir')}"
-    @dir = @klass.new(@ctx, @path)
+    @dir = @node = @klass.new(@ctx, @path)
   end
   
   after(:all) do
     SvnFixture::Repository.destroy_all
   end
   
+  it_should_behave_like "nodes with properties"
+  
   describe '#initialize' do
     it 'should set ctx and path' do
       dir = @klass.new(@ctx, '/tmp/path/')
@@ -172,18 +177,6 @@ describe SvnFixture::Directory do
   end
   
   describe '#prop' do    
-    it 'should set a property' do
-      @dir.prop('prop:name', 'Prop Value')
-      rev = @ctx.ci(@wc_path).revision
-      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
-          'Prop Value'
-      
-      @dir.prop('prop:name', 'New Value')
-      rev = @ctx.ci(@wc_path).revision
-      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
-          'New Value'
-    end
-    
     it 'should not set a property recursively by default' do
       @dir.prop('prop:name', 'Prop Value')
       rev = @ctx.ci(@wc_path).revision
@@ -203,12 +196,5 @@ describe SvnFixture::Directory do
       @ctx.propget('prop:name', @path + "/file.txt", rev)[@full_repos_path + "/file.txt"].should ==
           'Prop Value'
     end
-    
-    it 'should format a Time correctly' do
-      @dir.prop('prop:timeval', Time.parse('2009-06-18 14:00 UTC'))
-      rev = @ctx.ci(@wc_path).revision
-      @ctx.propget('prop:timeval', @path, rev)[@full_repos_path].should ==
-          '2009-06-18T14:00:00.000000Z'
-    end
   end
 end

data/spec/svn-fixture/file_spec.rb

@@ -20,13 +20,15 @@ describe SvnFixture::File do
   before(:each) do
     @path = File.join(@wc_path, 'test.txt')
     @full_repos_path = "file://#{File.join(@repos_path, 'test.txt')}"
-    @file = @klass.new(@ctx, @path)
+    @file = @node = @klass.new(@ctx, @path)
   end
   
   after(:all) do
     SvnFixture::Repository.destroy_all
   end
   
+  it_should_behave_like "nodes with properties"
+  
   describe '#initialize' do
     it 'should set ctx and path' do
       file = @klass.new(@ctx, '/tmp/path')
@@ -35,27 +37,6 @@ describe SvnFixture::File do
     end
   end
   
-  describe '#prop' do    
-    it 'should set a property' do
-      @file.prop('prop:name', 'Prop Value')
-      rev = @ctx.ci(@wc_path).revision
-      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
-          'Prop Value'
-      
-      @file.prop('prop:name', 'New Value')
-      rev = @ctx.ci(@wc_path).revision
-      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
-          'New Value'
-    end
-    
-    it 'should format a Time correctly' do
-      @file.prop('prop:timeval', Time.parse('2009-06-18 14:00 UTC'))
-      rev = @ctx.ci(@wc_path).revision
-      @ctx.propget('prop:timeval', @path, rev)[@full_repos_path].should ==
-          '2009-06-18T14:00:00.000000Z'
-    end
-  end
-  
   describe '#body' do
     it "should update the File's contents" do
       @file.body('Test Content')

data/spec/svn-fixture/props_shared.rb

@@ -0,0 +1,57 @@
+shared_examples_for "nodes with properties" do
+  describe '#prop' do
+    it 'should set a property' do
+      @node.prop('prop:name', 'Prop Value')
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
+          'Prop Value'
+      
+      @node.prop('prop:name', 'New Value')
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
+          'New Value'
+    end
+    
+    it 'should format a Time correctly' do
+      @node.prop('prop:timeval', Time.parse('2009-06-18 14:00 UTC'))
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:timeval', @path, rev)[@full_repos_path].should ==
+          '2009-06-18T14:00:00.000000Z'
+    end
+  end
+  
+  describe '#props' do
+    it 'should set properties (deleting those not included)' do
+      @node.props('prop:name' => 'One', 'prop:two' => 'Two')
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should == 'One'
+      @ctx.propget('prop:two', @path, rev)[@full_repos_path].should == 'Two'
+      
+      @node.props('prop:two' => 'Two', 'prop:three' => 'Three')
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:two', @path, rev)[@full_repos_path].should == 'Two'
+      @ctx.propget('prop:three', @path, rev)[@full_repos_path].should == 'Three'
+      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should be_nil
+    end
+    
+    it 'should ignore svn:entry properties' do
+      @node.should_receive(:prop).with('prop:name', 'One')
+      @node.props('prop:name' => 'One')
+      @node.should_not_receive(:prop).with('svn:entry:time', 'One')
+      @node.props('svn:entry:time' => 'One')
+    end
+  end
+  
+  describe '#propdel' do    
+    it 'should delete a property' do
+      @node.prop('prop:del', 'Prop Value')
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:del', @path, rev)[@full_repos_path].should ==
+          'Prop Value'
+      
+      @node.propdel('prop:del')
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:del', @path, rev)[@full_repos_path].should be_nil
+    end
+  end
+end

data/svn-fixture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{svn-fixture}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2009-10-18}
+  s.date = %q{2009-10-31}
   s.description = %q{svn-fixture simplifies creating (or updating) a Subversion repository. It is
 designed to be used in tests that require a Subversion repo, but can also be
 used to initialize a repository according to some template. svn-fixture depends
@@ -38,6 +38,7 @@ on the Subversion Ruby bindings.
      "spec/svn-fixture/file_spec.rb",
      "spec/svn-fixture/fixtures/hello_world.rb",
      "spec/svn-fixture/integration_spec.rb",
+     "spec/svn-fixture/props_shared.rb",
      "spec/svn-fixture/repository_spec.rb",
      "spec/svn-fixture/revision_spec.rb",
      "spec/svn-fixture_spec.rb",
@@ -55,6 +56,7 @@ on the Subversion Ruby bindings.
      "spec/svn-fixture/file_spec.rb",
      "spec/svn-fixture/fixtures/hello_world.rb",
      "spec/svn-fixture/integration_spec.rb",
+     "spec/svn-fixture/props_shared.rb",
      "spec/svn-fixture/repository_spec.rb",
      "spec/svn-fixture/revision_spec.rb",
      "spec/svn-fixture_spec.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: svn-fixture
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 -05:00
+date: 2009-10-31 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,7 @@ files:
 - spec/svn-fixture/file_spec.rb
 - spec/svn-fixture/fixtures/hello_world.rb
 - spec/svn-fixture/integration_spec.rb
+- spec/svn-fixture/props_shared.rb
 - spec/svn-fixture/repository_spec.rb
 - spec/svn-fixture/revision_spec.rb
 - spec/svn-fixture_spec.rb
@@ -84,6 +85,7 @@ test_files:
 - spec/svn-fixture/file_spec.rb
 - spec/svn-fixture/fixtures/hello_world.rb
 - spec/svn-fixture/integration_spec.rb
+- spec/svn-fixture/props_shared.rb
 - spec/svn-fixture/repository_spec.rb
 - spec/svn-fixture/revision_spec.rb
 - spec/svn-fixture_spec.rb