svn-fixture 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/svn-fixture.rb

@@ -8,7 +8,7 @@ require "svn/fs"
 require "svn/repos"
 
 module SvnFixture
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
   
   CONFIG_DEFAULTS = {
     :base_path => File.join(Dir.tmpdir, 'svn-fixture')
@@ -31,7 +31,9 @@ module SvnFixture
     def svn_time(val)
       return nil if val.nil?
       val = Time.parse(val) unless val.respond_to?(:strftime)
-      val.strftime("%Y-%m-%dT%H:%M:%S.000000Z")
+      val = val.utc if val.respond_to?(:utc)
+      usec = val.respond_to?(:usec) ? val.usec : 0
+      val.strftime("%Y-%m-%dT%H:%M:%S.") + sprintf('%06dZ', usec)
     end
     
     # Return a Date or Time formatted as expected by 

data/lib/svn-fixture/directory.rb

@@ -90,10 +90,13 @@ module SvnFixture
     
     # Set a property for the Directory
     # (see http://svnbook.red-bean.com/en/1.1/ch07s02.html):
-    # - +name+: The property name (must be "human-readable text")
-    # - +value+: The value of the property.
-    def prop(name, value)
-      @ctx.propset(name, SvnFixture.svn_prop(value), @path[0..-2])
+    #
+    # ==== Parameters
+    # name<String>:: The property name (must be "human-readable text")
+    # 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)
     end
   end
 end

data/lib/svn-fixture/repository.rb

@@ -2,7 +2,7 @@ module SvnFixture
   # Repository sets up the repository and is reponsible for checkouts and 
   # the actual commit(s). No actual work is done until +commit+ is called.
   class Repository   
-    attr_reader :repos, :ctx, :wc_path, :revisions
+    attr_reader :repos, :ctx, :revisions
     
     class << self      
       # Get an SvnFixture::Repository by name. If not found, it creates a new
@@ -153,9 +153,19 @@ module SvnFixture
       self.class.repositories.delete(@name)
     end
     
+    # Absolute path to working copy
+    def wc_path
+      ::File.expand_path(@wc_path)
+    end
+    
+    # Absolute path to repository
+    def repos_path
+      ::File.expand_path(@repos_path)
+    end
+    
     # URI (file://...) for accessing the Repository
     def uri
-      "file://" + ::File.expand_path(@repos_path)
+      "file://" + self.repos_path
     end
     
     private

data/lib/svn-fixture/revision.rb

@@ -50,6 +50,7 @@ module SvnFixture
     # Only argument is an instance of SvnFixture::Repository that is the
     # Repository to which this revision is committed.
     def commit(repo)
+      repo.ctx.update(repo.wc_path) # Ensure everything up-to-date
       root = Directory.new(repo.ctx, repo.wc_path)
       root.instance_eval(&@block) if @block
       ci = repo.ctx.ci(repo.wc_path)
@@ -59,6 +60,7 @@ module SvnFixture
         repo.repos.fs.set_prop('svn:author', @author, rev) if @author
         repo.repos.fs.set_prop('svn:date', @date, rev) if @date
         @revprops.each do | key, val |
+          val = SvnFixture.svn_time(val) if val.respond_to?(:strftime)
           repo.repos.fs.set_prop(key.to_s, val.to_s, rev)
         end
       else

data/spec/svn-fixture/directory_spec.rb

@@ -184,8 +184,28 @@ describe SvnFixture::Directory do
           '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
+      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
+          'Prop Value'
+      @ctx.propget('prop:name', @path + "/subdir", rev)[@full_repos_path + "/subdir"].should be_nil
+      @ctx.propget('prop:name', @path + "/file.txt", rev)[@full_repos_path + "/file.txt"].should be_nil
+    end
+    
+    it 'should set a property recursively if told to' do
+      @dir.prop('prop:name', 'Prop Value', true)
+      rev = @ctx.ci(@wc_path).revision
+      @ctx.propget('prop:name', @path, rev)[@full_repos_path].should ==
+          'Prop Value'
+      @ctx.propget('prop:name', @path + "/subdir", rev)[@full_repos_path + "/subdir"].should ==
+          'Prop Value'
+      @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'))
+      @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'

data/spec/svn-fixture/file_spec.rb

@@ -49,7 +49,7 @@ describe SvnFixture::File do
     end
     
     it 'should format a Time correctly' do
-      @file.prop('prop:timeval', Time.parse('2009-06-18 14:00'))
+      @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'

data/spec/svn-fixture/repository_spec.rb

@@ -321,6 +321,20 @@ describe SvnFixture::Repository do
     end
   end
   
+  describe '#wc_path' do
+    it 'should be the absolute path to the working copy' do
+      r = @klass.new('test1', '/test/repos', '/test/wc')
+      r.wc_path.should == '/test/wc'
+    end
+  end
+  
+  describe '#repos_path' do
+    it 'should be the absolute path to the repository' do
+      r = @klass.new('test1', '/test/repos', '/test/wc')
+      r.repos_path.should == '/test/repos'
+    end
+  end
+  
   describe '#uri' do
     it 'should return the uri for accessing the Repository' do
       r = @klass.new('test1', '/test/path')

data/spec/svn-fixture/revision_spec.rb

@@ -29,7 +29,14 @@ describe SvnFixture::Revision do
       @repos = SvnFixture::repo('file_test').checkout
       # @repos_path = @repos.instance_variable_get(:@repos_path)
       @wc_path = @repos.instance_variable_get(:@wc_path)
-      @rev = @klass.new(1, 'msg', :author => 'author', :date => Time.parse('2009-01-01 12:00:00Z'), 'other:revprop' => 20) do
+      options = {
+        :author => 'author',
+        :date => Time.parse('2009-01-01 12:00:00Z'),
+        'other:revprop' => 20,
+        'other:timeprop' => Time.parse('2009-01-01 12:00:01.0912Z')
+      }
+      
+      @rev = @klass.new(1, 'msg', options) do
         dir('test-dir')
       end
       @rev.commit(@repos)
@@ -63,6 +70,7 @@ describe SvnFixture::Revision do
     
     it 'should set additional revprops if given' do
       @fs.prop('other:revprop', 1).should == '20'
+      @fs.prop('other:timeprop', 1).should == '2009-01-01T12:00:01.091200Z'
     end
     
     it 'should print warning if no changes' do

data/spec/svn-fixture_spec.rb

@@ -4,7 +4,7 @@ describe SvnFixture do
   
   describe '.svn_time' do
     it 'should format as expected by ::Svn::Client::Context#propset' do
-      t = Time.parse('2009-06-18 13:00')
+      t = Time.parse('2009-06-18 13:00 UTC')
       SvnFixture.svn_time(t).should == '2009-06-18T13:00:00.000000Z'
       
       d = Date.parse('2009-06-19')
@@ -12,8 +12,8 @@ describe SvnFixture do
     end
     
     it 'should parse the #to_s value if not a Date or Time or nil' do
-      t = '2009-06-18 13:00'
-      SvnFixture.svn_time(t).should == '2009-06-18T13:00:00.000000Z'
+      t = '2009-06-18 13:00:01.002 UTC'
+      SvnFixture.svn_time(t).should == '2009-06-18T13:00:01.002000Z'
     end
     
     it 'should return nil if value is nil' do
@@ -23,8 +23,8 @@ describe SvnFixture do
   
   describe '.svn_prop' do
     it 'should format Time/Date as expected by ::Svn::Client::Context#propset' do
-      t = Time.parse('2009-06-18 13:00')
-      SvnFixture.svn_prop(t).should == '2009-06-18T13:00:00.000000Z'
+      t = Time.parse('2009-06-18 13:00:01.002111 UTC')
+      SvnFixture.svn_prop(t).should == '2009-06-18T13:00:01.002111Z'
       
       d = Date.parse('2009-06-19')
       SvnFixture.svn_prop(d).should == '2009-06-19T00:00:00.000000Z'

data/svn-fixture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{svn-fixture}
-  s.version = "0.1.3"
+  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-10-17}
+  s.date = %q{2009-10-18}
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: svn-fixture
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 -05:00
+date: 2009-10-18 00:00:00 -05:00
 default_executable: 
 dependencies: []