fs 0.2.0 → 0.2.1

data/.gitignore

@@ -3,5 +3,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
-.yardoc/
-doc/
+.rbenv-version

data/.travis.yml

@@ -1,2 +1,3 @@
 rvm:
-  - 1.9.2
+  - 1.9.2
+  - 1.9.3

data/README.mdown

@@ -1,4 +1,5 @@
-# FS (FileSystem)
+# FS (FileSystem) [![Build Status](http://travis-ci.org/blindgaenger/fs.png)](http://travis-ci.org/blindgaenger/fs)
+
 
 Work with your filesystem!
 

data/Rakefile

@@ -3,10 +3,4 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
-task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
-  t.options = ["--title", "FS #{FS::VERSION}"]
-end
+task :default => :spec

data/fs.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rake', '0.9.2.2'
-  s.add_development_dependency 'rspec', '2.7.0'
-  s.add_development_dependency 'yard', '0.7.2'
-  s.add_development_dependency 'bluecloth', '2.2.0'
-end
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+end

data/lib/fs/base.rb

@@ -19,7 +19,7 @@ module FS
     # FileUtils#rmdir
     def removedir(*dirs)
       dirs.each do |dir|
-        raise Errno::ENOTEMPTY unless list(dir).empty?
+        raise Errno::ENOTEMPTY unless empty?(dir)
       end
       FileUtils.rmdir(dirs)
     end
@@ -31,15 +31,15 @@ module FS
 
     # Dir#glob
     def list(dir='.', pattern='*')
-      glob(dir, pattern, nil)
+      glob(dir, pattern)
     end
 
     def list_dirs(dir='.', pattern='*')
-      glob(dir, pattern, ->(path){FS.directory?(path)})
+      glob(dir, pattern) {|path| FS.directory?(path) }
     end
 
     def list_files(dir='.', pattern='*')
-      glob(dir, pattern, ->(path){FS.file?(path)})
+      glob(dir, pattern) {|path| FS.file?(path) }
     end
 
     # TODO: find time to make this cool, not work only
@@ -83,10 +83,10 @@ module FS
       end
     end
 
-    # File#open(file, 'r')
+    # File#open(file, 'r').read
     def read(file, &block)
       if block_given?
-        File.open(file, 'r', &block)
+        File.open(file, 'r') {|f| block[f.read] }
       else
         content = nil
         File.open(file, 'r') {|f| content = f.read }
@@ -94,6 +94,28 @@ module FS
       end
     end
 
+    # File#open(file, 'r').each
+    def read_lines(file, &block)
+      if block_given?
+        File.open(file, 'r').each {|line| line.chomp!; block[line] }
+      else
+        lines = []
+        File.open(file, 'r').each {|line| line.chomp!; lines << line }
+        lines
+      end
+    end
+
+    # File#open(file, 'r') =~ /REGEX/
+    def grep(file, regexp, &block)
+      if block_given?
+        File.open(file, 'r').each {|line| line.chomp!; block[line] if line =~ regexp }
+      else
+        lines = []
+        File.open(file, 'r').each {|line| line.chomp!; lines << line if line =~ regexp }
+        lines
+      end
+    end
+
     # Dir#home
     # the path is always expanded
     def home(user=nil)
@@ -156,10 +178,10 @@ module FS
     # uses File.size and Dir.entries
     # for files it returns `nil` if file does not exist, `true` if it's empty
     def empty?(path)
-      if !File.exist?(path)
-        nil
-      elsif File.directory?(path)
-        Dir.entries(path) == ['.', '..']
+      raise Errno::ENOENT unless File.exist?(path)
+      if File.directory?(path)
+        files = Dir.entries(path)
+        files.size == 2 && files.sort == ['.', '..']
       else
         File.size(path) == 0
       end
@@ -217,7 +239,8 @@ module FS
       return '' if path == '/' || path == '.'
       base = File.basename(path)
       ext = File.extname(path)
-      ext.empty? ? base :base[0...-ext.size]
+      return base if ext.empty?
+      base[0...-ext.size]
     end
 
     # "tmp/foo/bar.todo" => ["tmp/foo", "bar", ".todo"]
@@ -239,16 +262,12 @@ module FS
 
     private
 
-    def assert_dir(path)
-      raise "not a directory: #{path}" unless File.directory?(path)
-    end
-
-    def glob(dir, *patterns, condition)
+    def glob(dir, *patterns, &block)
       fulldir = File.expand_path(dir)
       regexp = /^#{Regexp.escape(fulldir)}\/?/
       Dir.
         glob(File.join(fulldir, patterns)).
-        select {|path| condition.nil? || condition[path] }.
+        select {|path| block.nil? || block[path] }.
         map {|path| path.gsub(regexp, '') }.
         sort
     end

data/lib/fs/find.rb

@@ -29,12 +29,12 @@ module FS
     end
 
     def find_dirs(dir, options={}, &block)
-      condition = ->(path){FileTest.directory?(path)}
+      condition = ->(path){ FileTest.directory?(path) }
       find(dir, options.merge(:condition => condition), &block)
     end
 
     def find_files(dir, options={}, &block)
-      condition = ->(path){!FileTest.directory?(path)}
+      condition = ->(path){ !FileTest.directory?(path) }
       find(dir, options.merge(:condition => condition), &block)
     end
 

data/lib/fs/version.rb

@@ -1,3 +1,3 @@
 module FS
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/base_spec.rb

@@ -37,7 +37,7 @@ describe FS::Base do
     end
 
     it 'fails if a parent dir is missing' do
-      lambda {FS.makedir('foo/bar')}.should raise_error
+      ->{ FS.makedir('foo/bar') }.should raise_error
     end
   end
 
@@ -68,7 +68,7 @@ describe FS::Base do
     it 'fails if dir not empty' do
       FS.makedirs('foo/dir')
       FS.touch('foo/file')
-      lambda {FS.removedir('foo')}.should raise_error
+      ->{ FS.removedir('foo') }.should raise_error(Errno::ENOTEMPTY)
     end
   end
 
@@ -269,14 +269,14 @@ describe FS::Base do
 
     it 'fails on dirs' do
       FS.makedir('dir')
-      lambda {FS.remove('dir')}.should raise_error
+      ->{ FS.remove('dir') }.should raise_error
     end
 
     # FIXME: fakefs
     # it 'fails if the dir is not empty' do
     #   FS.makedir('/foo')
     #   FS.touch('/foo/bar')
-    #   lambda {FS.remove('/foo')}.should raise_error
+    #   ->{ FS.remove('/foo') }.should raise_error
     # end
   end
 
@@ -293,14 +293,48 @@ describe FS::Base do
   end
 
   describe '::read' do
-    it 'reads the content to a string' do
+    before do
       File.open('foo.txt', 'w') {|f| f.write 'bar' }
+    end
+
+    it 'reads the content to a string' do
       FS.read('foo.txt').should eql('bar')
     end
 
-    it 'reads the content to a block' do
-      File.open('foo.txt', 'w') {|f| f.write 'bar' }
-      FS.read('foo.txt') {|f| f.read.should eql('bar')}
+    it 'yields the content to a block' do
+      FS.read('foo.txt') {|content| content.should eql('bar')}
+    end
+  end
+
+  describe '::read_lines' do
+    before do
+      File.open('foo.txt', 'w') {|f| f.write "bar\nbaz\nqux" }
+    end
+
+    it 'reads all lines to an array' do
+      FS.read_lines('foo.txt').should eql(['bar', 'baz', 'qux'])
+    end
+
+    it 'yields all lines to a block' do
+      lines = []
+      FS.read_lines('foo.txt') {|line| lines << line}
+      lines.should eql(['bar', 'baz', 'qux'])
+    end
+  end
+
+  describe '::grep' do
+    before do
+      File.open('foo.txt', 'w') {|f| f.write "this\nis\nthe\ntest" }
+    end
+
+    it 'greps matching lines to an array' do
+      FS.grep('foo.txt', /is/).should eql(['this', 'is'])
+    end
+
+    it 'yields matching lines to a block' do
+      lines = []
+      FS.grep('foo.txt', /is/) {|line| lines << line}
+      lines.should eql(['this', 'is'])
     end
   end
 
@@ -415,7 +449,7 @@ TXT
   describe '::empty?' do
     it 'returns nil if the path does not exist' do
       FS.exist?('foobar').should be_false
-      FS.empty?('foobar').should be_nil
+      ->{ FS.empty?('foobar') }.should raise_error(Errno::ENOENT)
     end
 
     it 'returns if a file is empty' do

data/spec/support/test_dir_support.rb

@@ -1,6 +1,6 @@
 module FS
   module SpecHelpers
-    
+
     def self.extended(example_group)
       example_group.use_helper(example_group)
     end
@@ -24,7 +24,7 @@ module FS
         end
       end
     end
-    
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,52 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158694320 !ruby/object:Gem::Requirement
+  requirement: &70120123039860 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158694320
+  version_requirements: *70120123039860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158693840 !ruby/object:Gem::Requirement
+  requirement: &70120123039440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158693840
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2158693380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-  type: :development
-  prerelease: false
-  version_requirements: *2158693380
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: &2158692920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: *2158692920
+  version_requirements: *70120123039440
 description: FS gathers the cluttered methods for working with files and dirs. Internally
   using the good old standard library, but providing simple methods in a single place.
 email:
@@ -95,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2428767844622882813
+      hash: -2961947820199174561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,10 +82,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2428767844622882813
+      hash: -2961947820199174561
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Work with your filesystem!