sake 1.0.14 → 1.0.15

data/lib/sake.rb

@@ -77,7 +77,7 @@ class Sake
   module Version #:nodoc:
     Major  = '1'
     Minor  = '0'
-    Tweak  = '14'
+    Tweak  = '15'
     String = [ Major, Minor, Tweak ].join('.')
   end
 
@@ -114,11 +114,22 @@ class Sake
       begin
         tasks   = TasksFile.parse(@args[index + 1]).tasks
         pattern = @args[index + 2]
-      rescue
+      rescue => parse_error
         tasks   = Store.tasks.sort
         pattern = index ? @args[index + 1] : nil
       end
-      return show_tasks(tasks, pattern, display_hidden)
+      output = show_tasks(tasks, pattern, display_hidden)
+      if output.empty? and @args.size > 1  # show_tasks didn't show any tasks
+        case parse_error
+        when Errno::ENOENT, OpenURI::HTTPError
+          die "# Can't find file (or task) `#{@args[index + 1]}'"
+        when SecurityError
+          die "# SecurityError parsing `#{@args[index + 1]}'"
+        else
+          die "# No matching tasks for `#{pattern}'" if pattern
+        end
+      end
+      return output
 
     ##
     # Install a Rakefile or a single Rake task
@@ -308,6 +319,7 @@ class Sake
   #   Sake::TasksFile.parse('Rakefile')
   #   Sake::TasksFile.parse('http://errtheblog.com/code/errake')
   class TasksFile
+    include Rake::TaskManager
     attr_reader :tasks
 
     ##
@@ -322,13 +334,6 @@ class Sake
       instance = new
       Thread.new { instance.instance_eval "$SAFE = 3\n#{body}" }.join
       instance
-      
-    rescue Errno::ENOENT
-      STDERR.puts "Error: The file '#{file}' doesn't exist!"
-      exit 1
-    rescue OpenURI::HTTPError
-      STDERR.puts "Error: '#{file}' not found! (OpenURI::HTTPError)"
-      exit 1
     end
 
     def initialize
@@ -359,20 +364,16 @@ class Sake
 
     ## 
     # Define a task and any dependencies it may have.
-    def task(name, &block)
-      # If we're passed a hash, we know it has one key (the name of
-      # the task) pointing to a single or multiple dependencies. 
-      if name.is_a? Hash
-        deps = name.values.first 
-        name = name.keys.first
-      end
+    def task(*args, &block)
+      # Use Rake::TaskManager method to get task details
+      task_name, arg_names, deps = resolve_args(args)
 
       # Our namespace is really just a convenience method.  Essentially,
       # a namespace is just part of the task name.
-      name = [ @namespace, name ].flatten * ':'
+      task_name = [ @namespace, task_name ].flatten * ':'
 
       # Sake's version of a rake task
-      task = Task.new(name, deps, @comment, &block)
+      task = Task.new(task_name, arg_names, deps, @comment, &block)
 
       @tasks << task
 
@@ -422,9 +423,10 @@ class Sake
   class Task
     attr_reader :name, :comment
 
-    def initialize(name, deps = nil, comment = nil, &block)
+    def initialize(name, args = nil, deps = nil, comment = nil, &block)
       @name    = name
       @comment = comment
+      @args    = Array(args)
       @deps    = Array(deps)
       @body    = block
     end
@@ -436,12 +438,21 @@ class Sake
       out << "desc '#{@comment.gsub("'", "\\\\'")}'\n" if @comment
       out << "task '#{@name}'"
 
+      if @args.any?
+        args = @args.map { |arg| ":#{arg}" }.join(', ')
+        out << ", #{args} "
+      end
+
       if @deps.any?
         deps = @deps.map { |dep| "'#{dep}'" }.join(', ')
-        out << " => [ #{deps} ]" 
+        out << ", :needs => [ #{deps} ]"
       end
 
-      out << " do\n"
+      if @args.any?
+        out << " do |t, args|\n"
+      else
+        out << " do\n"
+      end
       
       # get rid of the proc { / } lines
       out << @body.to_ruby.split("\n")[1...-1].join("\n") rescue nil
@@ -508,6 +519,7 @@ class Sake
     ##
     # Wrote our current tasks_file to disk, overwriting the current Store.
     def save!
+      tasks_file # ensure the tasks_file is loaded before overwriting
       File.open(path, 'w') do |file|
         file.puts tasks_file.to_ruby
       end

data/sake.gemspec

@@ -1,21 +1,30 @@
 
-# Gem::Specification for Sake-1.0.14
+# Gem::Specification for Sake-1.0.15
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sake}
-  s.version = "1.0.14"
-  s.date = %q{2008-03-16}
-  s.summary = %q{Sake tastes great and helps maintain system-level Rake files.}
+  s.version = "1.0.15"
+
+  s.specification_version = 2 if s.respond_to? :specification_version=
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Chris Wanstrath"]
+  s.date = %q{2008-06-15}
+  s.default_executable = %q{sake}
+  s.description = %q{Sake tastes great and helps maintain system-level Rake files.}
   s.email = %q{chris@ozmm.org}
+  s.executables = ["sake"]
+  s.extra_rdoc_files = ["bin/sake", "lib/help.rb", "lib/pastie.rb", "lib/sake.rb", "lib/server.rb", "README", "LICENSE"]
+  s.files = ["bin/sake", "lib/help.rb", "lib/pastie.rb", "lib/sake.rb", "lib/server.rb", "Manifest", "Rakefile", "README", "LICENSE", "sake.gemspec"]
+  s.has_rdoc = true
   s.homepage = %q{http://errtheblog.com/}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sake", "--main", "README"]
+  s.require_paths = ["lib"]
   s.rubyforge_project = %q{err}
-  s.description = %q{Sake tastes great and helps maintain system-level Rake files.}
-  s.default_executable = %q{sake}
-  s.has_rdoc = true
-  s.authors = ["Chris Wanstrath"]
-  s.files = ["bin/sake", "lib/help.rb", "lib/pastie.rb", "lib/sake.rb", "lib/server.rb", "Manifest", "Rakefile", "README", "LICENSE", "sake.gemspec"]
-  s.executables = ["sake"]
+  s.rubygems_version = %q{1.1.1}
+  s.summary = %q{Sake tastes great and helps maintain system-level Rake files.}
+
   s.add_dependency(%q<ParseTree>, ["= 2.1.1"])
   s.add_dependency(%q<ruby2ruby>, ["= 1.1.8"])
 end

metadata

@@ -1,61 +1,21 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: sake
 version: !ruby/object:Gem::Version 
-  version: 1.0.14
-date: 2008-03-16 00:00:00 -07:00
-summary: Sake tastes great and helps maintain system-level Rake files.
-require_paths: 
-- lib
-email: chris@ozmm.org
-homepage: http://errtheblog.com/
-rubyforge_project: err
-description: Sake tastes great and helps maintain system-level Rake files.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.15
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Chris Wanstrath
-files: 
-- bin/sake
-- lib/help.rb
-- lib/pastie.rb
-- lib/sake.rb
-- lib/server.rb
-- Manifest
-- Rakefile
-- README
-- LICENSE
-- sake.gemspec
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: 
-- sake
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-06-15 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ParseTree
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -64,9 +24,67 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.8
     version: 
+description: Sake tastes great and helps maintain system-level Rake files.
+email: chris@ozmm.org
+executables: 
+- sake
+extensions: []
+
+extra_rdoc_files: 
+- bin/sake
+- lib/help.rb
+- lib/pastie.rb
+- lib/sake.rb
+- lib/server.rb
+- README
+- LICENSE
+files: 
+- bin/sake
+- lib/help.rb
+- lib/pastie.rb
+- lib/sake.rb
+- lib/server.rb
+- Manifest
+- Rakefile
+- README
+- LICENSE
+- sake.gemspec
+has_rdoc: true
+homepage: http://errtheblog.com/
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Sake
+- --main
+- README
+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: []
+
+rubyforge_project: err
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Sake tastes great and helps maintain system-level Rake files.
+test_files: []
+