dflat 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/dflat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dflat}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-11-27}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/dflat/home.rb",
     "lib/dflat/version.rb",
     "lib/dnatural.rb",
+    "lib/redd.rb",
     "test/helper.rb",
     "test/test_dflat.rb"
   ]

data/lib/dflat.rb

@@ -1,6 +1,7 @@
 require 'dflat/home'
 require 'dflat/version'
 require 'dnatural'
+require 'redd'
 module Dflat
   VERSION = 'Dflat/0.19'
 end

data/lib/dflat/home.rb

@@ -19,8 +19,8 @@ module Dflat
       ::Dir.mkdir path, integer
       d = Home.new path
       d.type = Dflat::VERSION
-      v = d.version! 'v001', nil
       d.info = args[:info] || DEFAULT_PROPERTIES
+      d.init
       d
     end
 
@@ -53,33 +53,63 @@ module Dflat
       version(v)
     end
 
+    def next
+      v = next_version
+      version(v) if File.exists? File.join(path, v)
+    end
+
     def version version
       # xxx use namaste 'type' to load the right dir..
       Dflat::Version::Dir.load File.join(path, version)
     end
 
-    def version! dest = nil, src = nil
+    def init
+      new_version('v001')
+      self.current = 'v001'
+    end
+
+    def checkout
       lock
-      dest ||= next_version
-      if src
-        FileUtils.cp_r File.join(path, src), File.join(path, dest)
-      else
-	if current_version
-          FileUtils.cp_r current.path, File.join(path, dest)
-	else
-          new_version(dest)
-	  self.current = dest
-	end
+      if current_version and not File.exists?  File.join(path, next_version)
+	FileUtils.cp_r current.path, File.join(path, next_version)
       end
+      unlock
+      return version(next_version)
+    end
 
+    def commit args = {}
+      lock
+      v = self.current = version(next_version)
       unlock
-      return version(dest)
+      v
+    end
+
+    def commit!
+      lock
+      # xxx full -> redd?
+      previous = current
+      v = self.current = version(next_version)
+
+      previous.to_delta(current)
+
+      unlock
+      v
+    end
+
+    def export version
+      v = version(version)
+      return v if v.instance_of? Dflat::Version::Full
+    end
+
+    def [] version
+      export(version)
     end
 
     def current= version
       version = version.version if version.respond_to? :version
       return false unless File.directory? File.join(path, version)
       File.open(File.join(path, 'current.txt'), 'w') { |f| f.write(version) }
+
       @current = version
     end
 
@@ -91,6 +121,7 @@ module Dflat
       d = Dflat::Version::Dir.new path
       d.select &block
     end
+
     private
     def new_version version
       d = Dflat::Version::Full.mkdir File.join(path, version)
@@ -101,7 +132,11 @@ module Dflat
     end
 
     def next_version
-      "v%03d" % (self.versions.map { |x| File.basename(x).sub(/^v/, '').to_i }.max + 1)
+      "v%03d" % (current_version.sub(/^v/, '').to_i + 1)
+    end
+
+    def update_directory_delta from, to = current
+     
     end
   end
 end

data/lib/dflat/version.rb

@@ -8,7 +8,10 @@ module Dflat
       include LockIt::Mixin
      
       def self.load path
-        Full.new path
+        d = Dir.new path
+        return Full.new path if d.entries.any? { |f| f =~ /full/ }
+        return Delta.new path if types.any? { |t| t[:name] =~ /redd/i }
+	return Empty.new path
       end
 
       def version
@@ -41,15 +44,12 @@ module Dflat
     end
 
     class Full < Dir
-      include Namaste::Mixin
-      include LockIt::Mixin
-
       DATA_DIR = 'full'
 
       def self.mkdir path, integer = 0777, args = {}
         super path, integer
 	d = Full.new path
-	Dnatural::Dir.mkdir File.join(d.path, 'full')
+	Dnatural::Dir.mkdir File.join(d.path, DATA_DIR)
         d
       end
 
@@ -87,6 +87,35 @@ module Dflat
         unlock
       end
 
+      def to_delta version
+	redd = ReDD::Dir.mkdir File.join(self.path, Delta::DATA_DIR)
+        delta = Delta.new self.path
+
+	old = self.manifest.to_hash
+	new = version.manifest.to_hash
+
+	changeset = {:delete => [], :add => []}
+
+	new.select do |filename, entry|
+          changeset[:delete] << filename unless old[filename] and old[filename] == entry[filename]
+	end
+
+	old.select do |filename, entry|
+          changeset[:add] << filename unless new[filename] and old[filename] == entry[filename]
+	end
+	
+        changeset[:delete].each do |filename|
+	  delta.remove filename
+	end
+
+        changeset[:add].each do |filename|
+	  delta.add File.join(data_path, filename), filename
+	end
+
+	FileUtils.rm_rf data_path
+	return delta
+      end
+
       private
       def data_path
         File.join(self.path, DATA_DIR)
@@ -94,7 +123,56 @@ module Dflat
       def manifest_path
         File.join(path, 'manifest.txt')
       end
+    end
+    class Delta < Dir
+      DATA_DIR = 'delta'
+
+      def self.mkdir path, integer = 0777, args = {}
+        super path, integer
+	d = Delta.new path
+	@redd = ReDD::Dir.mkdir File.join(d.path, DATA_DIR)
+        d
+      end
+
+      def initialize path
+        super path
+        @redd = ReDD::Dir.new File.join(path, DATA_DIR)
+      end
+
+      def add source, dest, options = {}
+        manifest!
+        f = @redd.add source, dest, options
+        m = manifest.add dest, :base => File.join(data_path, 'add')
+        File.open(File.join(path, 'manifest.txt'), 'w') do |f|
+          f.write(m.to_s)
+        end
+        
+	f
+      end
 
+      def remove list, options = {}
+        list = [list] if list.instance_of? String
+        @redd.remove list.map { |x| x }, options
+        m = manifest!
+        list.each do |l|
+          m = m.remove l
+        end
+
+        File.open(File.join(path, 'manifest.txt'), 'w') do |f|
+          f.write(m.to_s)
+        end
+      end
+
+      private
+      def data_path
+        File.join(self.path, DATA_DIR)
+      end
+      def dmanifest_path
+        File.join(path, 'd-manifest.txt')
+      end
+      def manifest_path
+        File.join(path, 'manifest.txt')
+      end
     end
   end
 end

data/lib/redd.rb

@@ -0,0 +1,39 @@
+require 'checkm'
+require 'namaste'
+require 'fileutils'
+
+module ReDD
+  VERSION = 'ReDD/0.1'
+  class Dir < ::Dir
+    include Namaste::Mixin
+    
+    def self.mkdir path, integer=0777, args = {}
+      super path, integer
+      d = Dir.new path
+      d.type = Dnatural::VERSION
+
+      ::Dir.chdir(d.path)  do
+        ::Dir.mkdir 'add'
+	FileUtils.touch 'delete.txt'
+      end
+      d
+    end
+
+    def list
+      NoMethodError
+    end
+
+    def add src, dest, options = {}
+      FileUtils.mkdir_p File.dirname(File.join(path, 'add', dest))
+      file = FileUtils.cp src, File.join(path, 'add', dest), options
+      File.new File.join(path, 'add', dest)
+    end
+
+    def remove list, options = {}
+      list = [list] if list.instance_of? String
+      File.open(File.join(path, 'delete.txt'), 'w') do |f|
+        f.write list.join("\n")
+      end
+    end
+  end
+end

data/test/test_dflat.rb

@@ -59,15 +59,57 @@ class TestDflat < Test::Unit::TestCase
     end
 
     should "do basic dnatural versioning" do
-      version = @dflat.version!
+      version = @dflat.checkout
 
       assert_equal(@dflat.current.version, 'v001')
       assert_equal(open(File.join(@dflat.path, 'current.txt')).read, 'v001')
+                  
+      @dflat.commit
 
-      @dflat.current = version
-
-      assert_equal(File.basename(version.path), 'v002')
+      assert_equal(version.version, 'v002')
       assert_equal(open(File.join(@dflat.path, 'current.txt')).read, 'v002')
     end
+
+    should "handle ReDD versioning" do
+
+      previous = @dflat.current
+      version = @dflat.checkout
+      @dflat.commit!
+      
+      assert(File.exists? File.join(previous.path, 'delta'))
+    end
+
+    should "handle ReDD adds" do
+
+      previous = @dflat.current
+      version = @dflat.checkout
+      version.add 'LICENSE.txt', 'producer/abcdef'
+      @dflat.commit!
+      
+      assert(File.exists? File.join(previous.path, 'delta'))
+      assert_equal(open(File.join(previous.path, 'delta', 'delete.txt')).read, 'producer/abcdef')
+    end
+
+    should "handle ReDD removes" do
+      previous = @dflat.current
+      previous.add 'LICENSE.txt', 'producer/abcdef'
+      version = @dflat.checkout
+      version.remove 'producer/abcdef'
+      @dflat.commit!
+      
+      assert(File.exists? File.join(previous.path, 'delta', 'add', 'producer', 'abcdef'))
+    end
+
+    should "handle ReDD modifies" do
+      previous = @dflat.current
+      previous.add 'LICENSE.txt', 'producer/abcdef'
+      version = @dflat.checkout
+      version.add 'README.rdoc', 'producer/abcdef'
+      @dflat.commit!
+      
+      assert(File.exists? File.join(previous.path, 'delta', 'add', 'producer', 'abcdef'))
+      assert_equal(open(File.join(previous.path, 'delta', 'delete.txt')).read, 'producer/abcdef')
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dflat
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -05:00
+date: 2010-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,7 @@ files:
 - lib/dflat/home.rb
 - lib/dflat/version.rb
 - lib/dnatural.rb
+- lib/redd.rb
 - test/helper.rb
 - test/test_dflat.rb
 has_rdoc: true