fs 0.0.2 → 0.1.0

data/README.mdown

@@ -49,8 +49,20 @@ commands (unsorted).
 
 ## Todo
 
-- Aliases
-- list(dir, '*.rb')
+Here is my mind … here is my mind …
+
+- maybe use underscores (remove_dir)
+- remove! to force something
+- maybe makedir! to mkdir -p
+- use Find#find in FS#find ;)
+- some kind of #tree output
+- file type
+- exist?
+- list_dirs
+- list_files
+- find_dirs
+- find_files
+- FS.link('a.txt' => 'b.txt') with a hash
 
 ## BTW
 

data/lib/fs.rb

@@ -3,8 +3,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirna
 require 'fileutils'
 require 'etc'
 require 'fs/base'
+require 'fs/alias'
 
 module FS
+  include FS::Base
+  include FS::Alias
   extend self
-  extend FS::Base
 end

data/lib/fs/alias.rb

@@ -0,0 +1,26 @@
+module FS
+  module Alias
+    ALIASES = {
+      :ls      => :list,
+      :mkdir   => :makedir,
+      :mkdir_p => :makedirs,
+      :rmdir   => :removedir,
+      :rm_r    => :removedirs,
+      :cd      => :changedir,
+      :mv      => :move,
+      :cp      => :copy,
+      :rm      => :remove,
+      :cat     => :read,
+      :ln      => :link,
+    }
+    
+    def self.included(base)
+      base.class_eval do
+        ALIASES.each do |shortcut, original|
+          alias_method shortcut, original          
+        end
+      end
+    end
+    
+  end
+end

data/lib/fs/base.rb

@@ -1,20 +1,34 @@
 module FS
   module Base
+    
     # FileUtils.touch
-    def touch(files)
+    def touch(*files)
       FileUtils.touch(files)
     end
 
     # FileUtils#mkdir
-    def makedir(dirs)
+    def makedir(*dirs)
       FileUtils.mkdir(dirs)
     end
 
     # FileUtils#mkdir_p
-    def makedirs(dirs)
+    def makedirs(*dirs)
       FileUtils.mkdir_p(dirs)
     end
 
+    # FileUtils#rmdir
+    def removedir(*dirs)
+      dirs.each do |dir|
+        raise Errno::ENOTEMPTY unless list(dir).empty?
+      end
+      FileUtils.rmdir(dirs)
+    end
+
+    # FileUtils#rm_r
+    def removedirs(*dirs)
+      FileUtils.rm_r(dirs)
+    end
+
     # Dir#glob
     def list(dir='.', pattern='*')
       glob(dir, pattern)
@@ -26,13 +40,33 @@ module FS
       glob(dir, '**', pattern)
     end
 
+    # TODO: find time to make this cool, not work only
     # FileUtils#mv
     def move(*froms, to)
       froms.each do |from|
-        FileUtils.mv(from, to)
+        FileUtils.mv(from, to)        
       end
     end
 
+    # TODO: find time to make this cool, not work only
+    # FileUtils#cp
+    def copy(*froms, to)
+      froms.each do |from|
+        FileUtils.cp(from, to)
+      end
+    end
+    
+    # Creates hard links for files and symbolic links for dirs
+    #
+    # FileUtils#ln or FileUtils#ln_s
+    def link(from, to)
+      if File.directory?(from)
+        FileUtils.ln_s(from, to)
+      else
+        FileUtils.ln(from, to)
+      end
+    end
+    
     # FileUtils#rm
     def remove(*pathes)
       FileUtils.rm(pathes)
@@ -68,6 +102,16 @@ module FS
       '/'
     end
 
+    # Dir#chdir
+    def changedir(dir)
+      Dir.chdir(dir)
+    end
+    
+    # Dir#pwd
+    def currentdir
+      Dir.pwd
+    end
+
     private
     
     def assert_dir(path)
@@ -75,9 +119,11 @@ module FS
     end
 
     def glob(dir, *patterns)
-      Dir.glob(File.join(dir, patterns)).map do |path|
-        path.gsub(/^\.?#{dir}\/?/, '')
+      fulldir = File.expand_path(dir)
+      Dir.glob(File.join(fulldir, patterns)).map do |path|
+        path.gsub(/^#{fulldir}\/?/, '')
       end
     end
+    
   end
 end

data/lib/fs/version.rb

@@ -1,3 +1,3 @@
 module FS
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/alias_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe FS::Alias do
+  
+  FS::Alias::ALIASES.each do |shortcut, original|
+    it "#{shortcut} exists for #{original}" do
+      FS.respond_to?(shortcut).should be_true
+      FS.respond_to?(original).should be_true
+      s = FS.method(shortcut)
+      o = FS.method(original)
+      s.receiver.should eql(o.receiver)
+      s.parameters.should eql(o.parameters)
+    end
+  end
+  
+end
+  

data/spec/base_spec.rb

@@ -9,7 +9,13 @@ describe FS::Base do
       File.exist?(file).should be_true 
     end
     
-    it 'touches a list of files' do
+    it 'accepts multiple files' do
+      FS.touch('foo.txt', 'bar.txt')
+      File.exist?('foo.txt').should be_true
+      File.exist?('bar.txt').should be_true
+    end
+    
+    it 'accepts a list of files' do
       files = ['foo.txt', 'bar.txt']
       FS.touch(files)
       files.each do |file|
@@ -24,6 +30,12 @@ describe FS::Base do
       File.directory?('foo').should be_true
     end
     
+    it 'accepts multiple dirs' do
+      FS.makedir('foo', 'bar')
+      File.directory?('foo').should be_true
+      File.directory?('bar').should be_true
+    end
+    
     it 'fails if a parent dir is missing' do
       lambda {FS.makedir('foo/bar')}.should raise_error
     end
@@ -36,6 +48,43 @@ describe FS::Base do
       File.directory?('foo/bar').should be_true
       File.directory?('foo/bar/baz').should be_true
     end
+    
+    it 'accepts multiple dirs' do
+      FS.makedirs('foo/bar', 'baz/yep')
+      File.directory?('foo').should be_true
+      File.directory?('foo/bar').should be_true
+      File.directory?('baz').should be_true
+      File.directory?('baz/yep').should be_true
+    end
+  end
+  
+  describe 'removedir' do
+    it 'removes a dir' do
+      FS.makedir('foo')
+      FS.removedir('foo')
+      File.exist?('foo').should be_false
+    end
+    
+    it 'fails if dir not empty' do
+      FS.makedirs('foo/dir')
+      FS.touch('foo/file')
+      lambda {FS.removedir('foo')}.should raise_error
+    end
+  end
+  
+  describe 'removedirs' do
+    it 'removes a dir' do
+      FS.makedir('foo')
+      FS.removedirs('foo')
+      File.exist?('foo').should be_false
+    end
+    
+    it 'removes a dir even if something is inside' do
+      FS.makedirs('foo/dir')
+      FS.touch('foo/file')
+      FS.removedirs('foo')
+      File.exist?('foo').should be_false
+    end
   end
   
   describe 'list' do
@@ -120,7 +169,7 @@ describe FS::Base do
   end
   
   describe 'move' do
-    it 'rename a file' do
+    it 'renames a file' do
       FS.touch('foo.txt')
       FS.move('foo.txt', 'bar.txt')
       FS.list.should eql(['bar.txt'])
@@ -144,6 +193,46 @@ describe FS::Base do
     end
   end
   
+  describe 'copy' do
+    it 'copies a file' do
+      FS.write('foo.txt', 'lala')
+      FS.copy('foo.txt', 'bar.txt')
+      File.exist?('foo.txt').should be_true
+      File.exist?('bar.txt').should be_true
+    end
+
+    it 'copies the content' do
+      FS.write('foo.txt', 'lala')
+      FS.copy('foo.txt', 'bar.txt')
+      FS.read('foo.txt').should eql('lala')
+      FS.read('bar.txt').should eql('lala')
+    end
+    
+    it 'copies a file to a dir' do
+      FS.write('foo.txt', 'lala')
+      FS.makedir('dir')
+      FS.copy('foo.txt', 'dir/bar.txt')
+      File.exist?('foo.txt').should be_true
+      File.exist?('dir/bar.txt').should be_true
+    end
+  end
+  
+  describe 'link' do
+    it 'links to files' do
+      FS.touch('foo.txt')
+      FS.link('foo.txt', 'bar.txt')
+      FS.write('foo.txt', 'lala')
+      FS.read('bar.txt').should eql('lala')
+    end
+    
+    it 'links to dirs' do
+      FS.makedir('foo')
+      FS.link('foo', 'bar')
+      FS.touch('foo/file')
+      FS.list('bar').should eql(['file'])
+    end
+  end
+  
   describe 'remove' do
     it 'removes files' do
       FS.touch('file')
@@ -210,12 +299,27 @@ describe FS::Base do
       FS.home('root').should match(/\/root$/)
     end
   end
-  
-  # describe 'removedir'
-  # describe 'removedirs'
-  # describe 'currentdir'
-  # describe 'changedir'
-  # describe 'copy'
-  # describe 'link'
 
+  describe 'currentdir' do
+    it 'returns the current dir' do
+      FS.currentdir.should eql(@test_dir)
+    end
+    
+    it 'works after dir was changed' do
+      here = FS.currentdir
+      FS.makedir('foo')
+      Dir.chdir('foo')
+      FS.currentdir.should eql(File.join(here, 'foo'))
+    end
+  end
+  
+  describe 'changedir' do
+    it 'change the current dir' do
+      here = Dir.pwd
+      FS.makedir('foo')
+      FS.changedir('foo')
+      Dir.pwd.should eql(File.join(here, 'foo'))
+    end
+  end
+  
 end

data/spec/support/test_dir_support.rb

@@ -25,6 +25,7 @@ module FS
         end
       end
     end
+    
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: fs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Bernd J\xC3\xBCnger"
@@ -62,8 +62,10 @@ files:
 - Rakefile
 - fs.gemspec
 - lib/fs.rb
+- lib/fs/alias.rb
 - lib/fs/base.rb
 - lib/fs/version.rb
+- spec/alias_spec.rb
 - spec/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_dir_support.rb
@@ -97,6 +99,7 @@ signing_key:
 specification_version: 3
 summary: Work with your filesystem!
 test_files: 
+- spec/alias_spec.rb
 - spec/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_dir_support.rb