Merge branch 'byebye_fileutils'

deps/templates/app.rb

@@ -56,13 +56,13 @@ def discover_latest_version
         }.map {|entry|
           pre = prefix_to_use
           target_path = pre / entry
-          if !target_path.exists? || confirm("Overwrite #{target_path}?") { FileUtils.rm_r target_path }
+          if !target_path.exists? || confirm("Overwrite #{target_path}?") { target_path.rm }
             if archive.is_a? Babushka::DmgResource
               log_block("Found #{entry} in the DMG, copying to #{pre}") {
-                shell "cp -pPR '#{entry}' '#{pre.end_with('/')}'"
+                entry.copy pre.end_with('/')
               }
             else
-              log_block("Found #{entry}, moving to #{pre}") { FileUtils.mv entry, pre.end_with('/') }
+              log_block("Found #{entry}, moving to #{pre}") { entry.move pre.end_with('/') }
             end
           end
         }

lib/babushka/helpers/path_helpers.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Babushka
   module PathHelpers
     def in_dir dir, opts = {}, &block

lib/fancypath/fancypath.rb

@@ -52,7 +52,7 @@ def join(path)
 
   # make file
   def touch
-    FileUtils.touch self.to_s
+    `touch '#{self}'`
     self
   end
 
@@ -64,7 +64,7 @@ def create_dir
   alias_method :create, :create_dir
 
   def copy(dest)
-    FileUtils.cp(self, dest)
+    `cp -pPR '#{self}' '#{dest}'`
     self
   end
 
@@ -91,8 +91,7 @@ def readlink
   end
 
   def mkdir
-    require 'fileutils'
-    FileUtils.mkdir_p self
+    `mkdir -p '#{self}'`
     self
   end
 

spec/babushka/path_helpers_spec.rb

@@ -2,13 +2,12 @@
 
 class PathTester; extend PathHelpers end
 
-require 'fileutils'
 describe "in_dir" do
   before do
     @tmp_dir = tmp_prefix
-    FileUtils.mkdir_p @tmp_dir
+    `mkdir -p '#{@tmp_dir}'`
     @tmp_dir_2 = File.join(tmp_prefix, '2')
-    FileUtils.mkdir_p @tmp_dir_2
+    `mkdir -p '#{@tmp_dir_2}'`
 
     @original_pwd = Dir.pwd
 

spec/fancypath/fancypath_spec.rb

@@ -119,6 +119,21 @@
     it('copies the contents') { @file.copy(TMP_DIR/'foo').read.should == @file.read }
   end
 
+  describe '#copy on a directory' do
+    before {
+      @dir.mkdir
+      (@dir / 'testfile').touch
+    }
+    it('returns a Fancypath') { @dir.copy(TMP_DIR/'foo').should be_instance_of(Fancypath) }
+    it('creates a new dir with a file in it') {
+      @dir.copy(TMP_DIR/'foo')
+      (TMP_DIR/'foo').should exist
+      (TMP_DIR/'foo/testfile').should exist
+    }
+    it('keeps the original') { @dir.copy(TMP_DIR/'foo'); @dir.should exist }
+    it('copies the contents') { @dir.copy(TMP_DIR/'foo'); (TMP_DIR/'foo/testfile').read.should == (@dir/'testfile').read }
+  end
+
   describe '#set_extension' do
     example "file without extension" do
       Fancypath('/tmp/foo').set_extension('rb').should == Fancypath('/tmp/foo.rb')

spec/spec_helper.rb

@@ -15,8 +15,8 @@ def tmp_prefix
   "#{'/private' if Base.host.osx?}/tmp/rspec/its_ok_if_a_test_deletes_this/babushka"
 end
 
-FileUtils.rm_r tmp_prefix if File.exists? tmp_prefix
-FileUtils.mkdir_p tmp_prefix unless File.exists? tmp_prefix
+`rm -rf '#{tmp_prefix}'` if File.exists? tmp_prefix
+`mkdir -p '#{tmp_prefix}'` unless File.exists? tmp_prefix
 
 module Babushka
   class Resource
@@ -27,7 +27,7 @@ def archive_prefix
 
   class Source
     def remove!
-      !cloneable? || !File.exists?(path) || FileUtils.rm_r(path)
+      !cloneable? || !File.exists?(path) || `rm -rf '#{path}'`
     end
     private
     def self.sources_yml