smallcage 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.7 2009-09-18
+
+* bugfix issue #2: The files under the common prefix directory should not be removed. http://github.com/bluemark/smallcage/issues/#issue/2
+
 == 0.1.6 2009-09-07
 
 * use _local.smc for local machine settings. This file overwrite _dir.smc.

data/lib/smallcage/commands/update.rb

@@ -51,8 +51,9 @@ module SmallCage::Commands
     def delete_expired_files(urilist)
       old_urilist = load_list
       root = @loader.root
-      target_uri = SmallCage::DocumentPath.new(root, @loader.target).uri
-
+      target     = SmallCage::DocumentPath.new(root, @loader.target)
+      target_uri = target.uri
+      target_uri += "/" if target.path.directory? and target_uri[-1] != ?/
       if @loader.target.file?
         old_urilist << target_uri unless old_urilist.include?(target_uri)
         return old_urilist
@@ -67,7 +68,7 @@ module SmallCage::Commands
           not_target_uris << uri
         end
       end
-      
+
       deletelist = target_uris - urilist
 
       deletelist.each do |uri|

data/lib/smallcage/version.rb

@@ -2,7 +2,7 @@ module SmallCage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/data/htdocs3/a/index.html.smc

@@ -0,0 +1,2 @@
+--- |
+common prefix directory test. 'a' and 'ab' and 'abc'.

data/spec/data/htdocs3/ab/index.html.smc

@@ -0,0 +1,4 @@
+--- |
+common prefix directory test. 'a' and 'ab' and 'abc'.
+
+

data/spec/data/htdocs3/abc/index.html.smc

@@ -0,0 +1,2 @@
+--- |
+common prefix directory test. 'a' and 'ab'.

data/spec/smallcage_spec.rb

@@ -54,5 +54,32 @@ describe "smallcage" do
     end
     
   end
+  
+  # http://github.com/bluemark/smallcage/issues/#issue/2
+  it "should not delete files under the common prefix directory" do
+    root = Pathname.new(File.dirname(__FILE__) + "/data/htdocs3")
+    begin
+      SmallCage::Runner.run({ :command => "update", :path => root.to_s, :quiet => true })
+      
+      (root + "a/index.html").file?.should be_true
+      (root + "ab/index.html").file?.should be_true
+      (root + "abc/index.html").file?.should be_true
+
+      SmallCage::Runner.run({ :command => "update", :path => (root + "a").to_s, :quiet => true })
+      
+      (root + "a/index.html").file?.should be_true
+      (root + "ab/index.html").file?.should be_true
+      (root + "abc/index.html").file?.should be_true
+
+      SmallCage::Runner.run({ :command => "update", :path => (root + "ab").to_s, :quiet => true })
+
+      (root + "a/index.html").file?.should be_true
+      (root + "ab/index.html").file?.should be_true
+      (root + "abc/index.html").file?.should be_true
+    ensure
+      SmallCage::Runner.run({:command => "clean", :path => root.to_s, :quiet => true })
+    end
+    
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smallcage
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - SAITO Toshihiro
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 +09:00
+date: 2009-09-18 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -121,6 +121,9 @@ files:
 - spec/data/htdocs3/a/b/_local.smc
 - spec/data/htdocs3/a/b/c/_local.smc
 - spec/data/htdocs3/a/b/c/index.html.smc
+- spec/data/htdocs3/a/index.html.smc
+- spec/data/htdocs3/ab/index.html.smc
+- spec/data/htdocs3/abc/index.html.smc
 - spec/document_path_spec.rb
 - spec/export_spec.rb
 - spec/import_spec.rb