+ 4.2.4

floere · Feb 2, 2012 · 274fc46 · 274fc46
1 parent 05ca726
commit 274fc46
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/history.textile b/history.textile
@@ -1,5 +1,9 @@
 h2. Upcoming Version
 
+h2. Version 4.2.4 "fileutils"
+
+* hanke: (server) Require fileutils regardless of the Ruby version Picky is run in. 
+
 h2. Version 4.2.3 "overbird"
 
 * hanke: (server) Require fileutils in case we run Picky on MacRuby (thanks overbryd).

diff --git a/server/lib/picky.rb b/server/lib/picky.rb
@@ -10,6 +10,7 @@ module Picky
   require 'yajl'
   require 'procrastinate'
   require 'rack_fast_escape' if defined? Rack
+  require 'fileutils'
 
   # Check if platform specific modifiers need to be installed.
   #

diff --git a/server/lib/picky/platforms/macruby.rb b/server/lib/picky/platforms/macruby.rb
@@ -7,12 +7,6 @@
 
   puts "Installing Picky specific MacRuby extensions."
 
-  # Note by @overbryd in https://gist.github.com/1710233:
-  # require fileutils to use FileUtils. Otherwise an error gets raised.
-  # uninitialized constant Picky::Backends::Helpers::File::FileUtils (NameError)
-  #
-  require 'fileutils'
-
   module Kernel
 
     def require_relative relative_feature

diff --git a/version.rb b/version.rb
@@ -1,3 +1,3 @@
 module Picky
-  VERSION = '4.2.3'
+  VERSION = '4.2.4'
 end