rake 0.9.0.beta.0 → 0.9.0.beta.1

data/CHANGES

@@ -37,9 +37,6 @@
   call 'task :xzy' in your code, include Rake::DSL into your class, or
   put the code in a Rake::DSL.environment do ... end block.
 
-* Allow single line comments immediately prior to a task to be used in
-  place of +desc+.
-
 * Split rake.rb into individual files.
 
 * Support for the --where (-W) flag for showing where a task is defined.

data/doc/rakefile.rdoc

@@ -383,32 +383,18 @@ loading.
 
 Standard Ruby comments (beginning with "#") can be used anywhere it is
 legal in Ruby source code, including comments for tasks and rules.
-A single-line comment immediately before a task (with no blank line
-between it and the task) will be used as that task's description, and
-the task and description will appear in the list displayed
-using the "-T" switch.
+However, if you wish a task to be described using the "-T" switch,
+then you need to use the +desc+ command to describe the task.
 
 === Example:
 
-  # Create a distribution package
+  desc "Create a distribution package"
   task :package => [ ... ] do ... end
 
-You can also use the +desc+ command before a task to set the
-description for the task. In this case, intervening blank lines
-are allowed
-
-=== Example:
-
-  desc 'Create a distribution package'
-
-  task :package => [ ... ] do ... end
-
-The +desc+ comment takes priority over the comment for of description.
-
 The "-T" switch (or "--tasks" if you like to spell things out) will
-display a list of tasks that have a description.  If you use
-comments or +desc+ to describe your major tasks, you have a
-semi-automatic way of generating a summary of your Rake file.
+display a list of tasks that have a description.  If you use +desc+ to
+describe your major tasks, you have a semi-automatic way of generating
+a summary of your Rake file.
 
   traken$ rake -T
   (in /home/.../rake)

data/lib/rake/task_manager.rb

@@ -287,39 +287,13 @@ module Rake
 
     private
 
-    # Return the current description. If there isn't one, try to find it
-    # by reading in the source file and looking for a comment immediately
-    # prior to the task definition
+    # Return the current description, clearing it in the process.
     def get_description(task)
-      desc = @last_description || find_preceding_comment_for_task(task)
+      desc = @last_description
       @last_description = nil
       desc
     end
 
-    def find_preceding_comment_for_task(task)
-      loc = task.locations.last
-      file_name, line = parse_location(loc)
-      return nil unless file_name
-      comment_from_file(file_name, line)
-    end
-
-    def parse_location(loc)
-      if loc =~ /^(.*):(\d+)/
-        [ $1, Integer($2) ]
-      else
-        nil
-      end
-    end
-
-    def comment_from_file(file_name, line)
-      return if file_name == '(eval)'
-      @file_cache ||= {}
-      content = (@file_cache[file_name] ||= File.readlines(file_name))
-      line -= 2
-      return nil unless content[line] =~ /^\s*#\s*(.*)/
-      $1
-    end
-
     class << self
       attr_accessor :record_task_metadata
       TaskManager.record_task_metadata = false

data/lib/rake/version.rb

@@ -5,7 +5,7 @@ module Rake
       MINOR = 9,
       BUILD = 0,
       BETA  = 'beta',
-      BETANUM = 0,
+      BETANUM = 1,
     ]
   end
   VERSION = Version::NUMBERS.join('.')

data/test/functional/session_based_tests.rb

@@ -369,7 +369,7 @@ class SessionBasedTests < Test::Unit::TestCase
     in_environment("PWD" => "test/data/comments") do
       rake "-T"
     end
-    assert_match("comment for t1", @out)
+    assert_no_match(/comment for t1/, @out)
   end
 
   def test_comment_separated_from_task_by_blank_line_is_not_picked_up
@@ -389,7 +389,7 @@ class SessionBasedTests < Test::Unit::TestCase
 
   def test_correct_number_of_tasks_reported
     Dir.chdir("test/data/comments") { rake("-T")}
-    assert_equal(3, @out.split(/\n/).grep(/t\d/).size)
+    assert_equal(2, @out.split(/\n/).grep(/t\d/).size)
   end
 
   def test_file_list_is_requirable_separately

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.beta.0
+  prerelease: 6
+  version: 0.9.0.beta.1
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,29 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-02-28 00:00:00 -05:00
 default_executable: rake
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: session
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.4"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: flexmock
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.8.11
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "      Rake is a Make-like program implemented in Ruby. Tasks\n      and dependencies are specified in standard Ruby syntax.\n"
 email: jim@weirichhouse.org
 executables: 
@@ -227,21 +230,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: 1.3.2
-  version: 
 requirements: []
 
 rubyforge_project: rake
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby based make-like utility.