dflat 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     anvl (0.1.0)
-    checkm (0.0.1)
+    checkm (0.0.3)
     git (1.2.5)
     i18n (0.4.1)
     jeweler (1.5.1)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/dflat.gemspec

@@ -0,0 +1,81 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dflat}
+  s.version = "0.0.2"
+
+  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.email = %q{chris@cbeer.info}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dflat.gemspec",
+    "lib/dflat.rb",
+    "lib/dflat/home.rb",
+    "lib/dflat/version.rb",
+    "lib/dnatural.rb",
+    "test/helper.rb",
+    "test/test_dflat.rb"
+  ]
+  s.homepage = %q{http://github.com/cbeer/dflat}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Ruby Dflat implementation}
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_dflat.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<namaste>, [">= 0"])
+      s.add_runtime_dependency(%q<anvl>, [">= 0"])
+      s.add_runtime_dependency(%q<lockit>, [">= 0"])
+      s.add_runtime_dependency(%q<checkm>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<namaste>, [">= 0"])
+      s.add_dependency(%q<anvl>, [">= 0"])
+      s.add_dependency(%q<lockit>, [">= 0"])
+      s.add_dependency(%q<checkm>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<namaste>, [">= 0"])
+    s.add_dependency(%q<anvl>, [">= 0"])
+    s.add_dependency(%q<lockit>, [">= 0"])
+    s.add_dependency(%q<checkm>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/dflat.rb

@@ -1,5 +1,5 @@
 require 'dflat/home'
-require 'dflat/dir'
+require 'dflat/version'
 require 'dnatural'
 module Dflat
   VERSION = 'Dflat/0.19'

data/lib/dflat/home.rb

@@ -16,7 +16,7 @@ module Dflat
 			   :classScheme => 'CLOP/0.3' }
 
     def self.mkdir path, integer=0777, args = {}
-      Dir.mkdir path, integer
+      ::Dir.mkdir path, integer
       d = Home.new path
       d.type = Dflat::VERSION
       v = d.version! 'v001', nil
@@ -55,7 +55,7 @@ module Dflat
 
     def version version
       # xxx use namaste 'type' to load the right dir..
-      Dnatural::Dir.new File.join(path, version)
+      Dflat::Version::Dir.load File.join(path, version)
     end
 
     def version! dest = nil, src = nil
@@ -88,12 +88,12 @@ module Dflat
     end
 
     def select &block
-      d = Dir.new path
+      d = Dflat::Version::Dir.new path
       d.select &block
     end
     private
     def new_version version
-      d = Dnatural::Dir.mkdir File.join(path, version)
+      d = Dflat::Version::Full.mkdir File.join(path, version)
     end
 
     def current_version

data/lib/dflat/version.rb

@@ -0,0 +1,100 @@
+require 'namaste'
+require 'lockit'
+require 'fileutils'
+module Dflat
+  module Version
+    class Dir < ::Dir
+      include Namaste::Mixin
+      include LockIt::Mixin
+     
+      def self.load path
+        Full.new path
+      end
+
+      def version
+        File.basename(path)
+      end
+      def manifest
+        data = ''
+        data = open(manifest_path).read if File.exists? manifest_path
+        @manifest ||= Checkm::Manifest.new data, :path => data_path
+      end
+
+      def manifest!
+        @manifest = nil
+        manifest
+      end
+    end
+
+    class Empty < Dir
+
+      def self.mkdir path, integer = 0777, args = {}
+        super path, integer
+	File.open(File.join(path, 'empty.txt')) do |f|
+          f << "empty"
+	end
+      end
+
+      def list
+        []
+      end
+    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')
+        d
+      end
+
+      def list
+        manifest.entries.map { |e| e.sourcefileorurl }
+      end
+
+      def add src, dest, options = {}
+        file = FileUtils.cp src, File.join(data_path, dest), options
+
+        manifest!
+        lock
+        m = manifest.add dest, :base => data_path
+        File.open(File.join(path, 'manifest.txt'), 'w') do |f|
+          f.write(m.to_s)
+        end
+        
+        unlock
+        File.new File.join(data_path, dest)
+      end
+
+      def remove list, options = {}
+        list = [list] if list.instance_of? String
+        FileUtils.rm list.map { |x| File.join(data_path, x) }, options
+
+        m = manifest!
+        lock
+        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
+        unlock
+      end
+
+      private
+      def data_path
+        File.join(self.path, DATA_DIR)
+      end
+      def manifest_path
+        File.join(path, 'manifest.txt')
+      end
+
+    end
+  end
+end

data/lib/dnatural.rb

@@ -1,13 +1,11 @@
 require 'checkm'
 require 'namaste'
 require 'fileutils'
-require 'lockit'
 
 module Dnatural
   VERSION = 'Dnatural/0.17'
   class Dir < ::Dir
     include Namaste::Mixin
-    include LockIt::Mixin
     
     def self.mkdir path, integer=0777, args = {}
       super path, integer
@@ -24,58 +22,18 @@ module Dnatural
       d
     end
 
-    def version
-      File.basename(path)
-    end
-
-    def manifest
-      data = ''
-      data = open(File.join(path, 'manifest.txt')).read if File.exists? File.join(path, 'manifest.txt')
-      @manifest ||= Checkm::Manifest.new data
-    end
-
-    def manifest!
-      @manifest = nil
-      manifest
-    end
-
     def list
       glob('**/*')
     end
 
     def add src, dest, options = {}
       file = FileUtils.cp src, File.join(path, dest), options
-
-      manifest!
-
-      lock
-      m = manifest.add dest, :base => path
-      File.open(File.join(path, 'manifest.txt'), 'w') do |f|
-        f.write(m.to_s)
-      end
-
-      unlock
-
       File.new File.join(path, dest)
     end
 
     def remove list, options = {}
       list = [list] if list.instance_of? String 
       FileUtils.rm list.map { |x| File.join(path, x) }, options
-
-      m = manifest!
-      lock
-
-      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
-
-      unlock
     end
-
   end
 end

data/test/test_dflat.rb

@@ -20,7 +20,7 @@ class TestDflat < Test::Unit::TestCase
       assert_contains(files, 'current.txt')
       assert_contains(files, 'dflat-info.txt')
       assert_contains(files, 'v001')
-      assert_contains(files, 'v001/0=dnatural_0.17')
+      assert_contains(files, 'v001/full/0=dnatural_0.17')
     end
 
     should "point to versioned content" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dflat
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Beer
@@ -165,9 +165,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- dflat.gemspec
 - lib/dflat.rb
-- lib/dflat/dir.rb
 - lib/dflat/home.rb
+- lib/dflat/version.rb
 - lib/dnatural.rb
 - test/helper.rb
 - test/test_dflat.rb

data/lib/dflat/dir.rb

@@ -1,6 +0,0 @@
-module Dflat
-  class Dir < ::Dir
-    include Namaste::Mixin
-    include LockIt::Mixin
-  end
-end