pebble 0.2.6.alpha1 → 0.2.6.alpha2

data/lib/pebble.rb

@@ -33,8 +33,6 @@
 # as a library via a require statement and invoked using the +pebble+ 
 # executable.
 
-require 'find'
-require 'fileutils'
 require 'pebble/site'
 require 'pebble/cli_parser'
 require 'pebble/crawler'
@@ -43,34 +41,6 @@ require 'pebble/layout_render_item'
 require 'pebble/render_seq'
 require 'pebble/version'
 
-###############################################################################
-# Some extensions to Dir
-#
-class Dir
-
-  # Recursively delete a directory tree including files (like rm -rf)
-  def Dir.rmdir_rec(dir)
-    Dir.foreach(dir) do |e|
-      next if [".", ".."].include? e
-      fullname = dir + File::Separator + e
-      if FileTest::directory?(fullname)
-        Dir.rmdir_rec(fullname)
-      else
-        File.delete(fullname)
-      end
-    end
-    Dir.delete(dir)
-  end
-
-  # Recursively create directories (like mkdir -p)
-  def Dir.mkdir_rec(dir)
-    parent = File.expand_path(File.join(dir, ".."))
-    Dir.mkdir_rec(File.expand_path(File.join(dir, ".."))) unless File.directory?(parent)
-    Dir.mkdir(dir)
-  end
-
-end
-
 ##############################################################################
 # Pebble module
 #

data/lib/pebble/crawler.rb

@@ -1,3 +1,5 @@
+require 'find'
+
 module Pebble
 
   class Crawler

data/lib/pebble/site.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Pebble
 
   class Site
@@ -41,7 +43,7 @@ module Pebble
           print "Are you sure to overwrite directory '#{@rendered_root}' [yN] ? "
           exit unless $stdin.gets.chomp.downcase == 'y'
         end
-        Dir.rmdir_rec(@rendered_root)
+        FileUtils.rm_r(@rendered_root, :secure => true)
       end
     end
 
@@ -50,7 +52,7 @@ module Pebble
     
       files.each do |file|
         target = get_and_prepare_target(file)
-        File.cp(file, target)
+        FileUtils.cp(file, target)
       end
               
     end
@@ -60,7 +62,7 @@ module Pebble
     def get_and_prepare_target(source)
       filename = source.sub(@site_root, @rendered_root)
       dirname = File.dirname(filename)
-      Dir.mkdir_rec(dirname) unless File.directory?(dirname)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
       filename
     end
 

data/lib/pebble/version.rb

@@ -1,3 +1,3 @@
 module Pebble
-  VERSION = '0.2.6.alpha1'
+  VERSION = '0.2.6.alpha2'
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 6
-  - alpha1
-  version: 0.2.6.alpha1
+  - alpha2
+  version: 0.2.6.alpha2
 platform: ruby
 authors: 
 - Christian Luginbuehl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-15 00:00:00 +02:00
+date: 2012-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency