rtask 006 → 007

data/History.txt

@@ -1,3 +1,7 @@
+== 006: 2008-04-12
+* Keita Yamaguchi:
+  * Added version checker
+
 == 005: 2008-04-11
 * Keita Yamaguchi:
   * Renamed bin/rtask.rb to bin/rtask

data/README.txt

@@ -1,7 +1,7 @@
 = RTask
 
 Author::    Keita Yamaguchi(山口 慶太) <keita.yamaguchi@gmail.com>
-Copyright:: © Keita Yamaguchi, 2007ー2008. All rights reserved.
+Copyright:: © Keita Yamaguchi, 2007-2008. All rights reserved.
 License::   Ruby License
 
 RTask provides easy way to release Ruby’s gem packages. This also provides useful Rake tasks for releasing packages and uploading documents.

data/Rakefile

@@ -2,4 +2,4 @@ require "rubygems"
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 require "rtask"
 
-RTask.new
+RTask.new(:use => :all, :version => RTask::VERSION)

data/bin/rtask

@@ -4,24 +4,62 @@ require "rubygems"
 require "rtask"
 require "optparse"
 
-$task = RTask.new
+$task = RTask.new(:use => :all)
 
-OptionParser.new(nil, 18) do |opt|
-  opt.on("-r", "--release", "Release the packages") do
-    puts "Release"
-    $task.real_release
-    exit
+def call_task(name)
+  ARGV.clear
+  ARGV[0] = name
+  Rake.application.init
+  # This is ugly, but needed for unknown reason
+  # (filetask contains unused empty string).
+  # Please teach me if you know about it.
+  filetask = Rake.application.instance_eval{@tasks["html/index.html"]}
+  filetask.instance_eval do
+    @prerequisites.exclude("")
+  end
+  Rake.application.top_level
+  exit
+end
+
+OptionParser.new(nil, 24) do |opt|
+  opt.on("-r", "--release", RTask::MESSAGE[:release]) do
+    call_task "release"
+  end
+
+  opt.on("-p", "--packages", RTask::MESSAGE[:packages]) do
+    call_task "packages"
+  end
+
+  opt.on("--gem", RTask::MESSAGE[:gem]) do
+    call_task "gem"
+  end
+
+  opt.on("--tgz", RTask::MESSAGE[:tgz]) do
+    call_task "tgz"
   end
 
-  opt.on("-p", "--package", "Create gem and tgz packages") do
-    puts "Create gem and tgz packages"
-    $task.real_gem
-    $task.real_tgz
+  opt.on("--zip", RTask::MESSAGE[:zip]) do
+    call_task "zip"
+  end
+
+  opt.on("--rdoc", "Build the rdoc HTML Files") do
+    call_task "rdoc"
+  end
+
+  opt.on("--publish", RTask::MESSAGE[:publish]) do
+    call_task "publish"
+  end
+
+  opt.on("-c", "--clean", "Remove packages and temporary products") do
+    call_task "clean"
   end
 
   opt.on("-h", "--help", "Show this message") do
-    puts opt.help
-    exit
+    puts opt.help; exit
+  end
+
+  opt.on("-v", "--version", "Show RTask version") do
+    puts RTask::VERSION; exit
   end
 
   opt.parse!(ARGV)

data/lib/rtask.rb

@@ -24,7 +24,8 @@ require 'gemify'
 #   rake tgz           # Create the tgz package
 #
 class RTask
-  VERSION = "005"
+  VERSION = "007"
+  MESSAGE = Hash.new
 
   attr_reader :project, :package, :version
 
@@ -44,20 +45,46 @@ class RTask
     yield self if block_given?
   end
 
-  # Specifies to use tasks.
+  # define task
+  def self.define_task(description, rule)
+    name = rule
+    if rule.kind_of?(Hash)
+      name = rule.keys.first
+    end
+
+    MESSAGE[name] = description
+
+    define_method("register_task_#{name}") do |rtask|
+      desc description if description
+      task(rule){ rtask.send name if rtask.respond_to?(name) }
+    end
+  end
+
+  # Specifies to use tasks
   def use(*names)
     if names[0] == :all
-      names = [:clean, :rdoc, :publish, :release, :gem, :tgz]
+      names = [:clean, :rdoc, :publish, :release, :packages]
     end
     names.each do |name|
-      send(name.to_sym)
+      register = "register_task_#{name}"
+      case name
+      when :clean, :rdoc
+        send(name)
+      when :packages
+        send(register, self)
+        send("register_task_gem", self)
+        send("register_task_tgz", self)
+        send("register_task_zip", self)
+      else
+        send(register, self)
+      end
     end
   end
 
   # Task for cleaning.
   def clean
     require 'rake/clean'
-    CLEAN.include ['**/.*.sw?', '*.gem', '*.tgz', '.config', '**/.DS_Store']
+    CLEAN.include ['html', '*.gem', '*.tgz', '*.zip', '.config', '**/.DS_Store']
   end
 
   # Task for generating documents using rdoc.
@@ -66,7 +93,7 @@ class RTask
     Rake::RDocTask.new do |doc|
       doc.title = "#{@package}-#{@version} documentation"
       doc.main = "README.txt"
-      doc.rdoc_files.include("{README,History,License}.txt", "lib/**/*.rb")
+      doc.rdoc_files.include("{README,History,License}.txt", "lib/*.rb")
       doc.options << "--line-numbers" << "--inline-source" << "-c UTF-8"
       yield doc if block_given?
     end
@@ -75,20 +102,14 @@ class RTask
   # Task for uploading API documentation.
   def publish
     require 'rake/contrib/rubyforgepublisher'
-    desc "Upload API documentation"
-    task :publish => [:rdoc] do
-      pub = Rake::RubyForgePublisher.new(@project, @user["username"])
-      pub.upload
-    end
+    pub = Rake::RubyForgePublisher.new(@project, @user["username"])
+    pub.upload
   end
 
+  define_task "Upload API documentation", :publish => [:rdoc]
+
   # Task for release the package.
   def release
-    desc 'Release new gem version'
-    task :release do real_release end
-  end
-
-  def real_release #:nodoc:
     if @lib_version and @version.to_s != @lib_version.to_s
       puts "Version confilict between the library and in .gemified"
       puts "library: " + @lib_version.to_s
@@ -98,8 +119,9 @@ class RTask
     filename = "#{@package}-#{@version}"
     gem = filename + ".gem"
     tgz = filename + ".tgz"
+    zip = filename + ".zip"
     if File.exist?(gem) and File.exist?(tgz)
-      @rubyforge.add_release @project, @package, @version, gem, tgz
+      @rubyforge.add_release @project, @package, @version, gem, tgz, zip
       puts "Released #{gem} and #{tgz}"
     else
       puts "Please make gem and tgz files first: rake gem tgz"
@@ -107,24 +129,50 @@ class RTask
     end
   end
 
-  # Task for creating gem.
-  def gem
-    desc "Create the gem package"
-    task :gem do real_gem end
-  end
+  define_task 'Release new gem', :release => [:packages]
+
+  # Task for creating packages
+  define_task "Create packages", :packages => [:gem, :tgz, :zip]
 
-  def real_gem #:nodoc:
+  # Task for creating gem
+  def gem
     sh "gemify -I"
   end
 
-  # Task for creating tgz.
-  def tgz
-    desc "Create the tgz package"
-    task :tgz do real_tgz end
-  end
+  define_task "Create the gem package", :gem
 
-  def real_tgz #:nodoc:
+  # Task for creating tgz
+  def tgz
     tgz = "#{@package}-#{@version}.tgz"
     sh "tar -T Manifest.txt -c -z -f #{tgz}"
   end
+
+  define_task "Create the tgz package", :tgz
+
+  # Task for creating zip
+  def zip
+    require "zip/zipfilesystem"
+    filename = "#{@package}-#{@version}.zip"
+    rm filename if File.exist?(filename)
+    Zip::ZipFile.open(filename, Zip::ZipFile::CREATE) do |zip|
+      manifest.each do |file|
+        zip.file.open(File.join("#{package}-#{@version}", file), "w") do |out|
+          out.write(File.open(file).read)
+        end
+      end
+    end
+  end
+
+  define_task "Create the zip package", :zip
+
+  private
+
+  def manifest
+    manifest = Dir.glob("*Manifest*", File::FNM_CASEFOLD).first
+    unless manifest
+      puts "Please make manifest"
+      exit
+    end
+    File.read(manifest).split("\n")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtask
 version: !ruby/object:Gem::Version 
-  version: "006"
+  version: "007"
 platform: ruby
 authors: 
 - Keita Yamaguchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-12 00:00:00 +09:00
+date: 2008-04-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: keita.yamaguchi@gmail.com
 executables: