fssm 0.2.1 → 0.2.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:patch: 2
+:build: 
 :major: 0
 :minor: 2
-:patch: 1
-:build: 

data/fssm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fssm}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Tilley"]
-  s.date = %q{2010-12-10}
+  s.date = %q{2010-12-11}
   s.description = %q{file system state monitor}
   s.email = %q{ttilley@gmail.com}
   s.extra_rdoc_files = [

data/lib/fssm/path.rb

@@ -78,7 +78,7 @@ class FSSM::Path
 
   def split_path(path)
     path = FSSM::Pathname.for(path)
-    [@path, (path.relative? ? path : path.relative_path_from(@path))]
+    [@path.to_s, (path.relative? ? path : path.relative_path_from(@path)).to_s]
   end
 
   def set_path(path)

data/lib/fssm/pathname.rb

@@ -1,503 +1,31 @@
 require 'fileutils'
 require 'find'
+require 'pathname'
 
 module FSSM
-  class Pathname < String
-    SYMLOOP_MAX = 8
-
-    ROOT    = '/'.freeze
-    DOT     = '.'.freeze
-    DOT_DOT = '..'.freeze
+  class Pathname < ::Pathname
+    ROOT = '/'.freeze
 
     class << self
       def for(path)
-        path.is_a?(::FSSM::Pathname) ? path : new(path.to_s)
+        path.is_a?(Pathname) ? path : new(path)
       end
-    end
-
-    def initialize(path)
-      raise ArgumentError, "path cannot contain ASCII NULLs" if path.to_s =~ %r{\0}
-      super(path.to_s)
-    end
-
-    def <=>(other)
-      self.tr('/', "\0").to_s <=> other.to_str.tr('/', "\0")
-    rescue NoMethodError
-      nil
-    end
-
-    def ==(other)
-      left  =                  self.cleanpath.tr('/', "\0").to_s
-      right = self.class.for(other).cleanpath.tr('/', "\0").to_s
-
-      left == right
-    rescue NoMethodError
-      false
-    end
-
-    def +(path)
-      dup << path
-    end
-
-    def <<(path)
-      replace( join(path).cleanpath! )
-    end
-
-    def absolute?
-      self[0, 1].to_s == ROOT
-    end
-
-    def ascend
-      parts = to_a
-      parts.length.downto(1) do |i|
-        yield self.class.join(parts[0, i])
-      end
-    end
-
-    def children
-      entries[2..-1]
-    end
-
-    def cleanpath!
-      parts = to_a
-      final = []
-
-      parts.each do |part|
-        case part
-          when DOT     then
-            next
-          when DOT_DOT then
-            case final.last
-              when ROOT    then
-                next
-              when DOT_DOT then
-                final.push(DOT_DOT)
-              when nil     then
-                final.push(DOT_DOT)
-              else
-                final.pop
-            end
-          else
-            final.push(part)
-        end
-      end
-
-      replace(final.empty? ? DOT : self.class.join(*final))
-    end
-
-    def cleanpath
-      dup.cleanpath!
-    end
 
-    def descend
-      parts = to_a
-      1.upto(parts.length) { |i| yield self.class.join(parts[0, i]) }
+      alias :[] :glob
     end
 
-    def dot?
-      self == DOT
-    end
-
-    def dot_dot?
-      self == DOT_DOT
-    end
-
-    def each_filename(&blk)
-      to_a.each(&blk)
-    end
-
-    def mountpoint?
-      stat1 = self.lstat
-      stat2 = self.parent.lstat
-
-      stat1.dev != stat2.dev || stat1.ino == stat2.ino
-    rescue Errno::ENOENT
-      false
-    end
-
-    def parent
-      self + '..'
-    end
-
-    def realpath
-      path = self
-
-      SYMLOOP_MAX.times do
-        link = path.readlink
-        link = path.dirname + link if link.relative?
-        path = link
-      end
-
-      raise Errno::ELOOP, self
-    rescue Errno::EINVAL
-      path.expand_path
-    end
-
-    def relative?
-      !absolute?
-    end
-
-    def relative_path_from(base)
-      base = self.class.for(base)
-
-      raise ArgumentError, 'no relative path between a relative and absolute' if self.absolute? != base.absolute?
-
-      return self if base.dot?
-      return self.class.new(DOT) if self == base
-
-      base = base.cleanpath.to_a
-      dest = self.cleanpath.to_a
-
-      while !dest.empty? && !base.empty? && dest[0] == base[0]
-        base.shift
-        dest.shift
-      end
-
-      base.shift if base[0] == DOT
-      dest.shift if dest[0] == DOT
-
-      raise ArgumentError, "base directory may not contain '#{DOT_DOT}'" if base.include?(DOT_DOT)
-
-      path = base.fill(DOT_DOT) + dest
-      path = self.class.join(*path)
-      path = self.class.new(DOT) if path.empty?
-
-      path
-    end
-
-    def root?
-      !!(self =~ %r{^#{ROOT}+$})
-    end
-
-    def to_a
-      array = to_s.split(File::SEPARATOR)
+    def segments
+      path = to_s
+      array = path.split(File::SEPARATOR)
       array.delete('')
-      array.insert(0, ROOT) if absolute?
+      array.insert(0, ROOT) if path[0,1] == ROOT
       array
     end
 
-    alias segments to_a
-
-    def to_path
-      self
-    end
-
-    def to_s
-      # this is required to work in rubinius
-      String.allocate.replace(self)
-    end
-
-    alias to_str to_s
-
-    def unlink
-      Dir.unlink(self.to_s)
-      true
-    rescue Errno::ENOTDIR
-      File.unlink(self.to_s)
-      true
-    end
-  end
-
-  class Pathname
-    def self.[](pattern)
-      Dir[pattern].map! {|d| FSSM::Pathname.new(d) }
-    end
-
-    def self.pwd
-      FSSM::Pathname.new(Dir.pwd)
-    end
-
-    def entries
-      Dir.entries(self.to_s).map! {|e| FSSM::Pathname.new(e) }
-    end
-
-    def mkdir(mode = 0777)
-      Dir.mkdir(self.to_s, mode)
-    end
-
-    def opendir(&blk)
-      Dir.open(self.to_s, &blk)
-    end
-
-    def rmdir
-      Dir.rmdir(self.to_s)
-    end
-
-    def self.glob(pattern, flags = 0)
-      dirs = Dir.glob(pattern, flags)
-      dirs.map! {|path| FSSM::Pathname.new(path) }
-
-      if block_given?
-        dirs.each {|dir| yield dir }
-        nil
-      else
-        dirs
-      end
-    end
-
     def glob(pattern, flags = 0, &block)
       patterns = [pattern].flatten
-      patterns.map! {|p| self.class.glob(self.to_s + p, flags, &block) }
+      patterns.map! {|p| self.class.glob(to_s + p, flags, &block) }
       patterns.flatten
     end
-
-    def chdir
-      blk = lambda { yield self } if block_given?
-      Dir.chdir(self.to_s, &blk)
-    end
-  end
-
-  class Pathname
-    def blockdev?
-      FileTest.blockdev?(self.to_s)
-    end
-
-    def chardev?
-      FileTest.chardev?(self.to_s)
-    end
-
-    def directory?
-      FileTest.directory?(self.to_s)
-    end
-
-    def executable?
-      FileTest.executable?(self.to_s)
-    end
-
-    def executable_real?
-      FileTest.executable_real?(self.to_s)
-    end
-
-    def exists?
-      FileTest.exists?(self.to_s)
-    end
-
-    def file?
-      FileTest.file?(self.to_s)
-    end
-
-    def grpowned?
-      FileTest.grpowned?(self.to_s)
-    end
-
-    def owned?
-      FileTest.owned?(self.to_s)
-    end
-
-    def pipe?
-      FileTest.pipe?(self.to_s)
-    end
-
-    def readable?
-      FileTest.readable?(self.to_s)
-    end
-
-    def readable_real?
-      FileTest.readable_real?(self.to_s)
-    end
-
-    def setgid?
-      FileTest.setgit?(self.to_s)
-    end
-
-    def setuid?
-      FileTest.setuid?(self.to_s)
-    end
-
-    def socket?
-      FileTest.socket?(self.to_s)
-    end
-
-    def sticky?
-      FileTest.sticky?(self.to_s)
-    end
-
-    def symlink?
-      FileTest.symlink?(self.to_s)
-    end
-
-    def world_readable?
-      FileTest.world_readable?(self.to_s)
-    end
-
-    def world_writable?
-      FileTest.world_writable?(self.to_s)
-    end
-
-    def writable?
-      FileTest.writable?(self.to_s)
-    end
-
-    def writable_real?
-      FileTest.writable_real?(self.to_s)
-    end
-
-    def zero?
-      FileTest.zero?(self.to_s)
-    end
-  end
-
-  class Pathname
-    def atime
-      File.atime(self.to_s)
-    end
-
-    def ctime
-      File.ctime(self.to_s)
-    end
-
-    def ftype
-      File.ftype(self.to_s)
-    end
-
-    def lstat
-      File.lstat(self.to_s)
-    end
-
-    def mtime
-      File.mtime(self.to_s)
-    end
-
-    def stat
-      File.stat(self.to_s)
-    end
-
-    def utime(atime, mtime)
-      File.utime(self.to_s, atime, mtime)
-    end
-  end
-
-  class Pathname
-    def self.join(*parts)
-      last_part = FSSM::Pathname.new(parts.last)
-      return last_part if last_part.absolute?
-      FSSM::Pathname.new(File.join(*parts.reject {|p| p.empty? }))
-    end
-
-    def basename
-      self.class.new(File.basename(self.to_s))
-    end
-
-    def chmod(mode)
-      File.chmod(mode, self.to_s)
-    end
-
-    def chown(owner, group)
-      File.chown(owner, group, self.to_s)
-    end
-
-    def dirname
-      self.class.new(File.dirname(self.to_s))
-    end
-
-    def expand_path(from = nil)
-      self.class.new(File.expand_path(self.to_s, from))
-    end
-
-    def extname
-      File.extname(self.to_s)
-    end
-
-    def fnmatch?(pat, flags = 0)
-      File.fnmatch(pat, self.to_s, flags)
-    end
-
-    def join(*parts)
-      self.class.join(self.to_s, *parts)
-    end
-
-    def lchmod(mode)
-      File.lchmod(mode, self.to_s)
-    end
-
-    def lchown(owner, group)
-      File.lchown(owner, group, self.to_s)
-    end
-
-    def link(to)
-      File.link(self.to_s, to)
-    end
-
-    def open(mode = 'r', perm = nil, &blk)
-      File.open(self.to_s, mode, perm, &blk)
-    end
-
-    def readlink
-      self.class.new(File.readlink(self.to_s))
-    end
-
-    def rename(to)
-      File.rename(self.to_s, to)
-      replace(to)
-    end
-
-    def size
-      File.size(self.to_s)
-    end
-
-    def size?
-      File.size?(self.to_s)
-    end
-
-    def split
-      File.split(self.to_s).map {|part| FSSM::Pathname.new(part) }
-    end
-
-    def symlink(to)
-      File.symlink(self.to_s, to)
-    end
-
-    def truncate(size)
-      File.truncate(self.to_s, size)
-    end
-  end
-
-  class Pathname
-    def mkpath
-      self.class.new(FileUtils.mkpath(self.to_s))
-    end
-
-    def rmtree
-      self.class.new(FileUtils.rmtree(self.to_s).first)
-    end
-
-    def touch
-      self.class.new(FileUtils.touch(self.to_s).first)
-    end
-  end
-
-  class Pathname
-    def each_line(sep = $/, &blk)
-      IO.foreach(self.to_s, sep, &blk)
-    end
-
-    def read(len = nil, off = 0)
-      IO.read(self.to_s, len, off)
-    end
-
-    def readlines(sep = $/)
-      IO.readlines(self.to_s, sep)
-    end
-
-    def sysopen(mode = 'r', perm = nil)
-      IO.sysopen(self.to_s, mode, perm)
-    end
-  end
-
-  class Pathname
-    def find
-      Find.find(self.to_s) {|path| yield FSSM::Pathname.new(path) }
-    end
-  end
-
-  class Pathname
-    class << self
-      alias getwd pwd
-    end
-
-    alias absolute expand_path
-    alias delete   unlink
-    alias exist?   exists?
-    alias fnmatch  fnmatch?
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fssm
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Travis Tilley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -05:00
+date: 2010-12-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency