dtask 001 → 002

data/.gemified

@@ -1,11 +1,11 @@
 --- 
 :summary: DTask provides easy way to deploy web application.
 :email: keita.yamaguchi@gmail.com
-:has_rdoc: true
 :name: dtask
+:has_rdoc: true
 :homepage: http://rubyforge.org/projects/dtask/
-:version: "001"
+:version: "002"
+:rubyforge_project: dtask
 :dependencies: 
 - net-ssh
-:rubyforge_project: dtask
 :author: Keita Yamaguchi

data/lib/dtask.rb

@@ -2,58 +2,52 @@ require "net/ssh"
 require "singleton"
 
 class DTask
-  VERSION = "001"
+  VERSION = "002"
 
+  # Command error.
   class Error < StandardError; end
 
+  # DTask configuration.
   class Config
     include Singleton
 
     def initialize; @table = Hash.new; end
-    def o(table); table.each {|key, val| @table[key] = val }; end
 
-    class << self
-      def method_missing(name, *args)
-        if md = /(.+)=$/.match(name.to_s)
-          instance.instance_eval { @table[name] = args.first }
-        else
-          instance.instance_eval { @table[name] }
-        end
+    def self.method_missing(name, *args)
+      if md = /(.+)=$/.match(name.to_s)
+        instance.instance_eval { @table[name] = args.first }
+      else
+        instance.instance_eval { @table[name] }
       end
     end
+
+    private
+
+    def o(table); table.each {|key, val| @table[key] = val }; end
   end
 
-  class Remote
-    attr_reader :out
-    attr_reader :err
+  # Remote box.
+  class RemoteBox
+    attr_reader :out, :err
 
     def initialize
-      options = {
-        :username => Config.user,
-        :auth_methods => "publickey"
-      }
-      @session = Net::SSH.start(Config.server, options)
+      @session = Net::SSH.start(Config.server, Config.user)
       @shell = @session.shell.sync
       @out = []
       @err = []
     end
 
-    def pout(msg)
-      puts "OUT> #{msg}"
-    end
-
-    def perr(msg)
-      puts "ERR> #{msg}"
-    end
-
+    # Run the command or call the task.
     def l(cmd)
       cmd.kind_of?(Symbol) ? DTask.run(cmd) : sh(cmd)
     end
 
+    # Ignore errors.
     def l!(cmd)
       begin l(cmd) rescue Error end
     end
 
+    # Run the command.
     def sh(cmd)
       puts "% #{cmd}"
       res = @shell.send_command(cmd)
@@ -61,21 +55,37 @@ class DTask
       perr res.stderr if res.stderr and res.stderr.size > 0
       @out << res.stdout
       @err << res.stderr
-      res.status == 0 ? res.stdout : raise Error
+      res.status == 0 ? res.stdout : (raise Error)
     end
 
+    # Change the current to application directory.
     def cd_appdir
       l "cd #{Config.appdir} && pwd"
     end
+
+    private
+
+    # Print stdout.
+    def pout(msg)
+      puts "OUT> #{msg}"
+    end
+
+    # Print stderr.
+    def perr(msg)
+      puts "ERR> #{msg}"
+    end
   end
 
+  # task table
   TASK = Hash.new
 
+  # Load the dtask file.
   def initialize(name)
     load File.expand_path("~/.dtask/#{name}.dtask")
-    @remote = Remote.new
+    @remote = RemoteBox.new
   end
 
+  # Run the task.
   def run(task)
     if TASK.key?(task)
       puts "#{Config.server} >>> #{task}"
@@ -88,10 +98,12 @@ class DTask
 end
 
 module Kernel
+  # Defines a task.
   def task(name, &block)
     DTask::TASK[name] = block
   end
 
+  # Setup the DTask configuration.
   def setup(&block)
     DTask::Config.instance.instance_eval(&block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dtask
 version: !ruby/object:Gem::Version 
-  version: "001"
+  version: "002"
 platform: ruby
 authors: 
 - Keita Yamaguchi