nearline 0.0.5 → 0.0.6

data/lib/nearline/archived_file.rb

@@ -16,13 +16,21 @@ module Nearline
         # The path doesn't actually exist and fails a File.lstat
         return nil if file_information.path_hash.nil?
         
-        # We need to create a record for either a directory or file
+        # We need to create a record for a link, directory or file
         archived_file = ArchivedFile.new(
           file_information.archived_file_parameters
         )
+        
+        # Find a new link
+        if(file_information.ftype == "link")
+          archived_file.ftype_data = file_information.link_target
+          archived_file.save!
+          file_information.manifest.archived_files << archived_file
+          return archived_file          
+        end
 
         # Find a new directory
-        if (file_information.is_directory)
+        if (file_information.ftype=="directory")
           archived_file.save!
           file_information.manifest.archived_files << archived_file
           return archived_file
@@ -38,20 +46,28 @@ module Nearline
         end
         archived_file
         
-        # TODO: Symbolic links, block devices, ...?
+        # TODO: block devices, ...?
       end
             
       def restore(*args)
         @options = args.extract_options!
-        if (self.is_directory)
+
+        if (self.ftype == "link")
+          guarantee_path
+          File.symlink(self.ftype_data,
+            option_override(:path))
+          #restore_metadata
+          return
+        end
+
+        if (self.ftype == "directory")
           FileUtils.mkdir_p option_override(:path)
           restore_metadata
           return
         end
-        target_path = File.dirname(option_override(:path))
-        if (!File.exist? target_path)
-          FileUtils.mkdir_p target_path
-        end
+        
+        # ftype == "file"
+        guarantee_path
         f = File.open(option_override(:path), "wb")
         self.file_content.restore_to(f)
         f.close
@@ -59,6 +75,13 @@ module Nearline
         return
       end
       
+      def guarantee_path
+        target_path = File.dirname(option_override(:path))
+        if (!File.exist? target_path)
+          FileUtils.mkdir_p target_path
+        end        
+      end
+      
       def option_override(key)
         if (@options.has_key?(key))
           return @options[key]

data/lib/nearline/file_information.rb

@@ -0,0 +1,88 @@
+module Nearline
+  module Models
+    
+    # Handles file paths and metadata for a file in a manifest
+    # Acts as a builder for archived_file by providing the construction parameters
+    class FileInformation
+      attr_reader :path_hash,
+        :stat,  # lstat result
+        :ftype, # file type, either "link", "directory", or "file"
+        :archived_file_parameters, # construction parameters for archived_file
+        :manifest, # reference to the associated manifest, so logging can happen
+        :file_path, # the full, expanded file path of the file
+        :archived_path, # the path as stored to the repository (less drive letter in Windows)
+        :link_target
+      
+      def initialize(file_path, manifest)
+        @manifest = manifest
+        @file_path = File.expand_path(file_path)
+        @archived_path = cleaned_file_path
+        @stat = read_stat
+        @ftype = ftype_lookup(file_path)
+        @path_hash = generate_path_hash
+        @archived_file_parameters = build_parameters
+      end
+      
+      def cleaned_file_path
+        if RUBY_PLATFORM =~/win/
+          return @file_path[2..-1]
+        end
+        @file_path
+      end
+      
+      def read_stat
+        stat = nil
+        begin
+          stat = File.lstat(@file_path)
+        rescue
+          @manifest.add_log("File not found on lstat: #{@file_path}")
+        end
+        stat
+      end
+
+      def generate_path_hash
+        return nil if @stat.nil?          
+        target = [@manifest.system.name, 
+          @archived_path,
+          @stat.uid,
+          @stat.gid,
+          @stat.mtime.to_i,
+          @stat.mode].join(':')
+        Digest::SHA1.hexdigest(target)
+      end
+        
+      def file_content_value
+        return FileContent.new unless @ftype == "directory"
+        return nil
+      end
+
+      def ftype_lookup(file_path)
+        if File.symlink?(file_path)
+          @link_target = File.readlink file_path
+          return "link"
+        end
+        if File.directory?(file_path)
+          return "directory"
+        end
+        return "file"
+      end
+
+      def build_parameters
+        return nil if @stat.nil?
+        {
+          :system => @manifest.system,
+          :path => @archived_path,
+          :path_hash => @path_hash,
+          :file_content => file_content_value,
+          :uid => @stat.uid,
+          :gid => @stat.gid,
+          :mtime => @stat.mtime.to_i,
+          :mode => @stat.mode,
+          :ftype => @ftype    
+        }
+      end
+
+    end
+
+  end
+end

data/lib/nearline/manifest.rb

@@ -25,64 +25,6 @@ module Nearline
       end
     end
     
-    # Handles file paths and metadata for a file in a manifest
-    class FileInformation
-      attr_reader :path_hash, :stat, :is_directory,
-        :archived_file_parameters, :manifest, :file_path
-      
-      def initialize(file_path, manifest)
-        @manifest = manifest
-        @file_path = file_path
-        @stat = read_stat
-        @is_directory = File.directory?(file_path)
-        @path_hash = generate_path_hash
-        @archived_file_parameters = build_parameters
-      end
-
-      def read_stat
-        stat = nil
-        begin
-          # TODO: change to lstat when we handle links
-          stat = File.stat(@file_path)
-        rescue
-          @manifest.add_log("File not found on stat: #{@file_path}")
-        end
-        stat
-      end
-
-      def generate_path_hash
-        return nil if @stat.nil?          
-        target = [@manifest.system.name, 
-          @file_path,
-          @stat.uid,
-          @stat.gid,
-          @stat.mtime.to_i,
-          @stat.mode].join(':')
-        Digest::SHA1.hexdigest(target)
-      end
-        
-      def file_content_entry_for_files_only
-        return FileContent.new unless @is_directory
-        return nil
-      end
-
-      def build_parameters
-        return nil if @stat.nil?
-        {
-          :system => @manifest.system,
-          :path => @file_path,
-          :path_hash => @path_hash,
-          :file_content => file_content_entry_for_files_only,
-          :uid => @stat.uid,
-          :gid => @stat.gid,
-          :mtime => @stat.mtime.to_i,
-          :mode => @stat.mode,
-          :is_directory => @is_directory    
-        }
-      end
-
-    end
-    
     # A Manifest represents the corpus of ArchivedFiles and
     # set of Log messages resulting from a backup attempt
     class Manifest < ActiveRecord::Base
@@ -192,16 +134,16 @@ module Nearline
       
       # Iterate all missing files from this manifest, yielding each
       def iterate_all_missing
-        files_restored = []
+        files_iterated = []
         self.archived_files.each do |af|
           begin
-            File.stat(af.path)
+            File.lstat(af.path)
           rescue
             yield af
-            files_restored << af.path
+            files_iterated << af.path
           end
         end
-        return files_restored
+        return files_iterated
       end
       
       def add_log(message)
@@ -223,12 +165,12 @@ module Nearline
       def  archived_file_content_query(op)
         <<-END_SQL
 select distinct fc.id
- from archived_files af,
- archived_files_manifests afm, file_contents fc
- where
- afm.manifest_id #{op} #{self.id} and
- afm.archived_file_id = af.id and
- af.file_content_id = fc.id      
+from archived_files af,
+archived_files_manifests afm, file_contents fc
+where
+afm.manifest_id #{op} #{self.id} and
+afm.archived_file_id = af.id and
+af.file_content_id = fc.id      
         END_SQL
       end
       
@@ -301,8 +243,8 @@ select distinct af.id
       # A simple string reporting the performance of the manifest
       def summary
         completed = (completed_at.nil?) ? "DNF" : completed_at
-        "#{system.name} started: #{created_at}; finished: #{completed}; " +
-          "#{archived_files.size} files; #{logs.size} Errors reported"
+        "#{system.name} started: #{created_at}\nfinished: #{completed}\n" +
+          "#{archived_files.size} files\n#{logs.size} Error#{(logs.size != 1) ? 's' : ''} reported"
       end
       
     end

data/lib/nearline/module_methods.rb

@@ -2,9 +2,9 @@ module Nearline
   module_function
 
   # Version of the software
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   # Last version that changed the database structure
-  DB_VERSION = "0.0.4"
+  DB_VERSION = "0.0.6"
   
   # Array of every Nearline Model using an ActiveRecord connection
   AR_MODELS = Nearline::Models.constants.map do |m|

data/lib/nearline/schema.rb

@@ -44,11 +44,6 @@ module Nearline
           t.column :file_content_id, :integer, :null => false
         end
         
-        add_index :sequences, [:sequence, :file_content_id], :unique => true,
-          :name => "sequence_jn_index"
-
-        add_index :sequences, [:block_id]
-        
         create_table :systems do |t|
           t.column :name, :string, :null => false
         end
@@ -64,7 +59,8 @@ module Nearline
           t.column :gid, :integer, :default => -1
           t.column :mtime, :integer, :default => 0
           t.column :mode, :integer, :default => 33206  # "chmod 100666"
-          t.column :is_directory, :boolean
+          t.column :ftype, :string, :null => false
+          t.column :ftype_data, :text
         end
         
         add_index :archived_files, [:path_hash], :unique => true
@@ -81,12 +77,6 @@ module Nearline
           t.column :archived_file_id, :integer
           t.column :manifest_id, :integer
         end
-
-        add_index :archived_files_manifests,
-          [:archived_file_id, :manifest_id], {
-          :unique => true,
-          :name => "manifest_jn_index"
-        }
         
         # Keeps a record of problems during backup related to a manifest
         create_table :logs do |t|

data/lib/nearline.rb

@@ -16,6 +16,7 @@ require 'nearline/log'
 require 'nearline/manifest'
 
 # Non-AR model
+require 'nearline/file_information'
 require 'nearline/file_sequencer'
 
 # Static methods on Nearline

data/test/nearline_test.rb

@@ -9,7 +9,6 @@ unless File.exist?($data_path)
   FileUtils.mkdir $data_path 
 end
 
-require 'schema_test'
 require 'block_test'
 require 'nearline_module_test'
 require 'file_content_test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nearline
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Robert J. Osborne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-22 00:00:00 -04:00
+date: 2008-07-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - lib/nearline/log.rb
 - lib/nearline/archived_file.rb
 - lib/nearline/file_content.rb
+- lib/nearline/file_information.rb
 - lib/nearline/manifest.rb
 - lib/nearline.rb
 - tasks/gemspec.rake