rake 0.8.0 → 0.8.1

data/CHANGES

@@ -1,6 +1,11 @@
 = Rake Changelog
 
-== Pre-Version 0.7.4
+== Version 0.8.1
+
+* Removed requires on parsedate.rb (in Ftptools)
+* Removed ftools from rake.rb.  Made it options in sys.rb
+
+== Version 0.8.0
 
 * Added task parameters (e.g. "rake build[version7]")
 * Made task parameters passable to prerequisites.

data/lib/rake.rb

@@ -29,10 +29,9 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.0'
+RAKEVERSION = '0.8.1'
 
 require 'rbconfig'
-require 'ftools'
 require 'getoptlong'
 require 'fileutils'
 require 'singleton'

data/lib/rake/contrib/ftptools.rb

@@ -6,7 +6,6 @@
 # use.
 
 require 'date'
-require 'parsedate'
 require 'net/ftp'
 
 module Rake # :nodoc:
@@ -20,6 +19,10 @@ module Rake # :nodoc:
       @date_class ||= Date
     end
 
+    def self.time
+      @time_class ||= Time
+    end
+
     def initialize(path, entry)
       @path = path
       @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
@@ -54,17 +57,28 @@ module Rake # :nodoc:
     end
 
     def determine_time(d1, d2, d3)
-      elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
-      if elements[0].nil?
-        today = self.class.date.today
-        if elements[1] > today.month
-          elements[0] = today.year - 1
-        else
-          elements[0] = today.year
+      now = self.class.time.now
+      if /:/ =~ d3
+        h, m = d3.split(':')
+        result = Time.parse("#{d1} #{d2} #{now.year} #{d3}")
+        if result > now
+          result = Time.parse("#{d1} #{d2} #{now.year-1} #{d3}")
         end
+      else
+        result = Time.parse("#{d1} #{d2} #{d3}")
       end
-      elements = elements.collect { |el| el.nil? ? 0 : el }
-      Time.mktime(*elements[0,7])
+      result
+#       elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
+#       if elements[0].nil?
+#         today = self.class.date.today
+#         if elements[1] > today.month
+#           elements[0] = today.year - 1
+#         else
+#           elements[0] = today.year
+#         end
+#       end
+#       elements = elements.collect { |el| el.nil? ? 0 : el }
+#       Time.mktime(*elements[0,7])
     end
   end
 

data/lib/rake/contrib/sys.rb

@@ -23,7 +23,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 #
-require 'ftools'
+begin
+  require 'ftools'
+rescue LoadError
+end
 require 'rbconfig'
 
 ######################################################################

data/test/filecreation.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'ftools'
-
 module FileCreation
   OLDFILE = "testdata/old"
   NEWFILE = "testdata/new"

data/test/test_ftp.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'date'
+require 'time'
 require 'test/unit'
 require 'rake/contrib/ftptools'
 
@@ -8,13 +9,16 @@ class FakeDate
   def self.today
     Date.new(2003,10,3)
   end
+  def self.now
+    Time.local(2003,10,3,12,00,00)
+  end
 end
 
 
 class TestFtpFile < Test::Unit::TestCase
 
   def setup
-    Rake::FtpFile.class_eval { @date_class = FakeDate }
+    Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }
   end
 
   def test_general

data/test/test_rules.rb

@@ -261,7 +261,7 @@ class TestRules < Test::Unit::TestCase
 
   def test_rule_with_proc_dependent_will_trigger
     ran = false
-    File.makedirs("testdata/src/jw")
+    mkdir_p("testdata/src/jw")
     create_file("testdata/src/jw/X.java")
     rule %r(classes/.*\.class) => [
       proc { |fn| fn.pathmap("%{classes,testdata/src}d/%n.java") }
@@ -278,7 +278,7 @@ class TestRules < Test::Unit::TestCase
 
   def test_proc_returning_lists_are_flattened_into_prereqs
     ran = false
-    File.makedirs("testdata/flatten")
+    mkdir_p("testdata/flatten")
     create_file("testdata/flatten/a.txt")
     task 'testdata/flatten/b.data' do |t|
       ran = true

metadata

@@ -1,40 +1,43 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.7
-specification_version: 2
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-12-20 00:00:00 -05:00
-summary: Ruby based make-like utility.
-require_paths: 
-- lib
-email: jim@weirichhouse.org
-homepage: http://rake.rubyforge.org
-rubyforge_project: rake
-description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
+  version: 0.8.1
+platform: ruby
+authors: 
+- Jim Weirich
 autorequire: 
-default_executable: rake
 bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-platform: ruby
-signing_key: 
 cert_chain: []
 
-post_install_message: 
-authors: 
-- Jim Weirich
+date: 2007-12-26 00:00:00 -05:00
+default_executable: rake
+dependencies: []
+
+description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
+email: jim@weirichhouse.org
+executables: 
+- rake
+extensions: []
+
+extra_rdoc_files: 
+- README
+- MIT-LICENSE
+- TODO
+- CHANGES
+- doc/glossary.rdoc
+- doc/proto_rake.rdoc
+- doc/rakefile.rdoc
+- doc/rational.rdoc
+- doc/release_notes/rake-0.4.14.rdoc
+- doc/release_notes/rake-0.4.15.rdoc
+- doc/release_notes/rake-0.5.0.rdoc
+- doc/release_notes/rake-0.5.3.rdoc
+- doc/release_notes/rake-0.5.4.rdoc
+- doc/release_notes/rake-0.6.0.rdoc
+- doc/release_notes/rake-0.7.0.rdoc
+- doc/release_notes/rake-0.7.1.rdoc
+- doc/release_notes/rake-0.7.2.rdoc
+- doc/release_notes/rake-0.7.3.rdoc
 files: 
 - install.rb
 - CHANGES
@@ -131,8 +134,9 @@ files:
 - doc/release_notes/rake-0.7.1.rdoc
 - doc/release_notes/rake-0.7.2.rdoc
 - doc/release_notes/rake-0.7.3.rdoc
-test_files: []
-
+has_rdoc: true
+homepage: http://rake.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -140,30 +144,26 @@ rdoc_options:
 - README
 - --title
 - Rake -- Ruby Make
-extra_rdoc_files: 
-- README
-- MIT-LICENSE
-- TODO
-- CHANGES
-- doc/glossary.rdoc
-- doc/proto_rake.rdoc
-- doc/rakefile.rdoc
-- doc/rational.rdoc
-- doc/release_notes/rake-0.4.14.rdoc
-- doc/release_notes/rake-0.4.15.rdoc
-- doc/release_notes/rake-0.5.0.rdoc
-- doc/release_notes/rake-0.5.3.rdoc
-- doc/release_notes/rake-0.5.4.rdoc
-- doc/release_notes/rake-0.6.0.rdoc
-- doc/release_notes/rake-0.7.0.rdoc
-- doc/release_notes/rake-0.7.1.rdoc
-- doc/release_notes/rake-0.7.2.rdoc
-- doc/release_notes/rake-0.7.3.rdoc
-executables: 
-- rake
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: rake
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby based make-like utility.
+test_files: []