smallcage 0.0.8 → 0.0.9

data/History.txt

@@ -1,3 +1,13 @@
+== 0.0.9 2008-04-21
+
+* fix smc auto command bug.
+* add RedCloth project template (redcloth).
+* add multi language project template (lang).
+
+* add auto navigation servlet to the HTTP server.
+* add export command.
+* delete output file when smc source file does not exist.
+
 == 0.0.6 2007-11-04
 
 * smcオブジェクトのpathがStringだったのをPathnameを保持するように修正。ファイルアクセスで使う値なのでPathnameの方が良いと判断しました。

data/Manifest.txt

@@ -7,27 +7,37 @@ bin/smc
 config/hoe.rb
 config/requirements.rb
 lib/smallcage.rb
-lib/smallcage/commands/Manifest.erb
+lib/smallcage/application.rb
 lib/smallcage/commands/auto.rb
+lib/smallcage/commands/base.rb
 lib/smallcage/commands/clean.rb
+lib/smallcage/commands/export.rb
 lib/smallcage/commands/import.rb
 lib/smallcage/commands/manifest.rb
 lib/smallcage/commands/server.rb
 lib/smallcage/commands/update.rb
+lib/smallcage/document_path.rb
 lib/smallcage/erb_base.rb
+lib/smallcage/http_server.rb
 lib/smallcage/loader.rb
 lib/smallcage/misc.rb
 lib/smallcage/renderer.rb
+lib/smallcage/resources/Manifest.erb
+lib/smallcage/resources/auto.html
 lib/smallcage/runner.rb
 lib/smallcage/version.rb
-log/debug.log
-project/default/_smc/helpers/base_helper.rb
-project/default/_smc/helpers/site_helper.rb
-project/default/_smc/templates/default.rhtml
-project/default/_smc/templates/footer.rhtml
-project/default/_smc/templates/header.rhtml
+project/base/_smc/helpers/base_helper.rb
+project/base/_smc/helpers/site_helper.rb
+project/base/_smc/templates/default.rhtml
+project/base/_smc/templates/footer.rhtml
+project/base/_smc/templates/header.rhtml
+project/lang/_smc/helpers/lang_helper.rb
+project/lang/_smc/templates/other_lang.rhtml
 project/nkf/_smc/filters/filters.yml
 project/nkf/_smc/filters/nkf_filter.rb
+project/redcloth/_smc/helpers/red_cloth_helper.rb
+project/redcloth/_smc/templates/markdown.rhtml
+project/redcloth/_smc/templates/textile.rhtml
 project/relpath/_smc/filters/filters.yml
 project/relpath/_smc/filters/relpath_filter.rb
 project/standard/_dir.smc
@@ -55,6 +65,12 @@ script/generate.cmd
 setup.rb
 spec/data/htdocs1/_dir.smc
 spec/data/htdocs1/a/b/c/index.html.smc
+spec/data/htdocs2/_smc/templates/dummy.rhtml
+spec/data/htdocs2/a/b/c/test.html
+spec/data/htdocs2/a/b/test.html
+spec/data/htdocs2/a/test.html.smc
+spec/document_path_spec.rb
+spec/export_spec.rb
 spec/import_spec.rb
 spec/loader_spec.rb
 spec/manifest_spec.rb

data/bin/smc

@@ -3,134 +3,14 @@
 #  Created on 2007-8-22.
 #  Copyright (c) 2007. All rights reserved.
 
+unless defined? Gem
+  $:.unshift File.dirname(__FILE__) + "/../lib"
+end
+
 begin
   require 'rubygems'
+  require 'smallcage'
+  SmallCage::Application.execute
 rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-
-require 'smallcage'
-require 'optparse'
-
-STDOUT.sync = true
-
-VERSION_NOTE = "SmallCage #{SmallCage::VERSION::STRING} - Lightweight CMS Package."
-OPTIONS = {}
-OPTIONS[:original_argv] = ARGV.clone
-
-OptionParser.new do |opts|
-
-  opts.banner =<<BANNER
-Usage: #{File.basename($0)} <subcommand> [options]
-#{VERSION_NOTE}
-Subcommands are:
-    update [path]                    Build smc contents.
-    clean  [path]                    Remove files generated from *.smc source.
-    server [path] [port]             Start HTTP server.
-    auto   [path]                    Start auto update daemon.
-    import [name|uri]                Import project.
-    manifest [path]                  Generate Manifest.html file.
-
-Options are:
-BANNER
-
-  opts.separator ""
-  opts.on("-h", "--help", "Show this help message.") do
-    puts opts
-    exit
-  end
-  opts.on("-v", "--version", "Show version info.") do
-    puts VERSION_NOTE
-    exit
-  end
-
-  subparsers = Hash.new do |h,k|
-    $stderr.puts "no such subcommand: #{k}"
-    exit 1
-  end
-  
-  subparsers[:update] = OptionParser.new do |subp|
-    subp.banner =<<EOT
-Usage: update [PATH]
-EOT
-  end
-  
-  subparsers[:server] = OptionParser.new do |subp|
-    subp.banner =<<EOT
-Usage: server [PATH] [PORT]
-EOT
-  end
-
-  subparsers[:auto] = OptionParser.new do |subp|
-    subp.banner =<<EOT
-Usage: auto [PATH]
-EOT
-  end
-
-  subparsers[:generate] = OptionParser.new do |subp|
-  end
-  subparsers[:release] = OptionParser.new do |subp|
-  end
-  subparsers[:help] = OptionParser.new do |subp|
-  end
-  subparsers[:import] = OptionParser.new do |subp|
-  end
-  subparsers[:manifest] = OptionParser.new do |subp|
-  end
-  subparsers[:clean] = OptionParser.new do |subp|
-  end
-
-  commands = Hash.new {|h,k| k}
-  commands.merge!({
-  	:up => :update,
-  	:sv => :server,
-  	:au => :auto,
-  	:gen => :generate,
-  	:rel => :release,
-  	:st => :status,
-  })
-
-  opts.order!(ARGV)
-  unless ARGV.empty?
-    OPTIONS[:command] = commands[ARGV.shift.to_sym]
-    subparsers[OPTIONS[:command]].parse!(ARGV)
-  end
-  
-  if OPTIONS[:command].nil?
-    puts opts
-    exit
-  elsif OPTIONS[:command] == :help
-    subcmd = ARGV.shift
-    if subcmd.nil?
-      puts opts
-    else
-      puts subparsers[subcmd.to_sym]
-    end
-    exit
-  elsif OPTIONS[:command] == :update
-    OPTIONS[:path] = ARGV.shift
-    OPTIONS[:path] ||= "."
-  elsif OPTIONS[:command] == :server
-    OPTIONS[:path] = ARGV.shift
-    OPTIONS[:port] = ARGV.shift
-    OPTIONS[:path] ||= "."
-    OPTIONS[:port] ||= 80
-  elsif OPTIONS[:command] == :auto
-    OPTIONS[:path] = ARGV.shift
-    OPTIONS[:path] ||= "."
-  elsif OPTIONS[:command] == :import
-  	OPTIONS[:from] = ARGV.shift
-  	OPTIONS[:from] ||= "default"
-  	
-  	OPTIONS[:to] = ARGV.shift
-  	OPTIONS[:to] ||= "."
-  elsif OPTIONS[:command] == :manifest
-    OPTIONS[:path] = ARGV.shift
-    OPTIONS[:path] ||= "."
-  elsif OPTIONS[:command] == :clean
-    OPTIONS[:path] = ARGV.shift
-    OPTIONS[:path] ||= "."
-  end
 end
 
-SmallCage::Runner.run(OPTIONS)

data/lib/smallcage.rb

@@ -5,6 +5,7 @@ require 'erb'
 require 'pathname'
 require 'open-uri'
 require 'fileutils'
+require 'delegate'
 
 require 'smallcage/version'
 require 'smallcage/misc'
@@ -12,11 +13,6 @@ require 'smallcage/loader'
 require 'smallcage/erb_base'
 require 'smallcage/renderer'
 require 'smallcage/runner'
-
-require 'smallcage/commands/update'
-require 'smallcage/commands/clean'
-require 'smallcage/commands/server'
-require 'smallcage/commands/auto'
-require 'smallcage/commands/import'
-require 'smallcage/commands/manifest'
-
+require 'smallcage/document_path'
+require 'smallcage/http_server'
+require 'smallcage/application'

data/lib/smallcage/application.rb

@@ -0,0 +1,159 @@
+
+VERSION_NOTE = "SmallCage #{SmallCage::VERSION::STRING} - Lightweight CMS Package."
+OPTIONS = {}
+OPTIONS[:original_argv] = ARGV.clone
+
+class SmallCage::Application
+  require 'optparse'
+
+  @@signal_handlers = {
+    "INT" => [],
+    "TERM" => []
+  }
+  
+  @@signal_handlers.keys.each do |signal|
+    Signal.trap(signal) do
+      @@signal_handlers[signal].each do |proc|
+        proc.call(signal)
+      end
+    end
+  end
+  
+  def self.add_signal_handler(signal, handler)
+    signal.to_a.each do |s|
+      @@signal_handlers[s] << handler
+    end
+  end
+
+  def self.execute
+
+STDOUT.sync = true
+
+OptionParser.new do |opts|
+
+  opts.banner =<<BANNER
+Usage: #{File.basename($0)} <subcommand> [options]
+#{VERSION_NOTE}
+Subcommands are:
+    update [path]                    Build smc contents.
+    clean  [path]                    Remove files generated from *.smc source.
+    server [path] [port]             Start HTTP server.
+    auto   [path] [port]             Start auto update daemon.
+    import [name|uri]                Import project.
+    export [path] [outputpath]       Export project.
+    manifest [path]                  Generate Manifest.html file.
+
+Options are:
+BANNER
+
+  opts.separator ""
+  opts.on("-h", "--help", "Show this help message.") do
+    puts opts
+    exit
+  end
+  opts.on("-v", "--version", "Show version info.") do
+    puts VERSION_NOTE
+    exit
+  end
+
+  subparsers = Hash.new do |h,k|
+    $stderr.puts "no such subcommand: #{k}"
+    exit 1
+  end
+  
+  subparsers[:update] = OptionParser.new do |subp|
+    subp.banner =<<EOT
+Usage: update [PATH]
+EOT
+  end
+  
+  subparsers[:server] = OptionParser.new do |subp|
+    subp.banner =<<EOT
+Usage: server [PATH] [PORT]
+EOT
+  end
+
+  subparsers[:auto] = OptionParser.new do |subp|
+    subp.banner =<<EOT
+Usage: auto [PATH]
+EOT
+  end
+
+  subparsers[:generate] = OptionParser.new do |subp|
+  end
+  subparsers[:release] = OptionParser.new do |subp|
+  end
+  subparsers[:help] = OptionParser.new do |subp|
+  end
+  subparsers[:import] = OptionParser.new do |subp|
+  end
+  subparsers[:export] = OptionParser.new do |subp|
+  end
+  subparsers[:manifest] = OptionParser.new do |subp|
+  end
+  subparsers[:clean] = OptionParser.new do |subp|
+  end
+
+  commands = Hash.new {|h,k| k}
+  commands.merge!({
+  	:up => :update,
+  	:sv => :server,
+  	:au => :auto,
+  	:gen => :generate,
+  	:rel => :release,
+  	:st => :status,
+  })
+
+  opts.order!(ARGV)
+  unless ARGV.empty?
+    OPTIONS[:command] = commands[ARGV.shift.to_sym]
+    subparsers[OPTIONS[:command]].parse!(ARGV)
+  end
+  
+  if OPTIONS[:command].nil?
+    puts opts
+    exit
+  elsif OPTIONS[:command] == :help
+    subcmd = ARGV.shift
+    if subcmd.nil?
+      puts opts
+    else
+      puts subparsers[subcmd.to_sym]
+    end
+    exit
+  elsif OPTIONS[:command] == :update
+    OPTIONS[:path] = ARGV.shift
+    OPTIONS[:path] ||= "."
+  elsif OPTIONS[:command] == :server
+    OPTIONS[:path] = ARGV.shift
+    OPTIONS[:port] = ARGV.shift
+    OPTIONS[:path] ||= "."
+    OPTIONS[:port] ||= 80
+  elsif OPTIONS[:command] == :auto
+    OPTIONS[:path] = ARGV.shift
+    OPTIONS[:path] ||= "."
+    OPTIONS[:port] = ARGV.shift
+  elsif OPTIONS[:command] == :import
+  	OPTIONS[:from] = ARGV.shift
+  	OPTIONS[:from] ||= "default"
+  	
+  	OPTIONS[:to] = ARGV.shift
+  	OPTIONS[:to] ||= "."
+  elsif OPTIONS[:command] == :export
+  	OPTIONS[:path] = ARGV.shift
+  	OPTIONS[:path] ||= "."
+  	
+  	OPTIONS[:out] = ARGV.shift
+  elsif OPTIONS[:command] == :manifest
+    OPTIONS[:path] = ARGV.shift
+    OPTIONS[:path] ||= "."
+  elsif OPTIONS[:command] == :clean
+    OPTIONS[:path] = ARGV.shift
+    OPTIONS[:path] ||= "."
+  end
+end
+
+SmallCage::Runner.run(OPTIONS)
+
+end
+end

data/lib/smallcage/commands/auto.rb

@@ -1,52 +1,158 @@
 module SmallCage::Commands
-  class Auto
-    def self.execute(opts)
-      self.new(opts).execute
-    end
+  class Auto < SmallCage::Commands::Base
     
     def initialize(opts)
-      @opts = opts
+      super(opts)
       @target = Pathname.new(opts[:path])
+      @port = opts[:port]
       @sleep = 1
       @mtimes = {}
     end
-    
+
     def execute
-      puts "SmallCage Auto Update"
-      puts "-" * 60
+      puts_banner
 
-      ['INT', 'TERM'].each do |signal|
-        Signal.trap(signal) do
-          puts
-          puts "exit."
-          exit
+      start_http_server unless @port.nil?
+      init_sig_handler
+
+      @loader = SmallCage::Loader.new(@target)
+
+      first_loop = true
+      @update_loop = true
+      while @update_loop
+        if first_loop
+          first_loop = false
+          update_target
+        else
+          update_modified_files
         end
+        sleep @sleep
       end
+    end
     
-      loop do
-        sleep @sleep
-                
-        loader = SmallCage::Loader.new(@target)
-
-        do_update = false
-        loader.each_smc_file do |f|
+    def modified_special_files
+      root = @loader.root
+      
+      result = []
+      Dir.chdir(root) do
+        Dir.glob("_smc/{templates,filters,helpers}/*") do |f|
+          f = root + f
           mtime = File.stat(f).mtime
           if @mtimes[f] != mtime
             @mtimes[f] = mtime
-            do_update = true
+            result << f
           end
         end
-        
-        if do_update
-          runner = SmallCage::Runner.new({ :path => @target })
-          runner.update
-          print "\a"
-          puts "-" * 60
+      end
+      
+      return result
+    end
+    private :modified_special_files
+
+    def modified_files
+      result = []
+      @loader.each_smc_file do |f|
+        mtime = File.stat(f).mtime
+        if @mtimes[f] != mtime
+          @mtimes[f] = mtime
+          result << f
         end
+      end
+      return result
+    end
+    private :modified_files
+    
+    def update_target
+      # load @mtimes
+      modified_special_files
+      target_files = modified_files 
+
+      runner = SmallCage::Runner.new({ :path => @target })
+      runner.update
+      
+      update_http_server(target_files)
+      puts_line
+    end
+    private :update_target
 
+    def update_modified_files
+      reload = false
+      if modified_special_files.empty?
+        target_files = modified_files
+      else
+        # update root directory.
+        target_files = [@loader.root + "./_dir.smc"]
+        reload = true
+      end
+      
+      return if target_files.empty?
+      target_files.each do |tf|
+        if tf.basename.to_s == "_dir.smc"
+          runner = SmallCage::Runner.new({ :path => tf.parent })
+        else
+          runner = SmallCage::Runner.new({ :path => tf })
+        end
+        runner.update
       end
+      
+      if reload
+        @http_server.reload
+      else
+        update_http_server(target_files)
+      end
+      puts_line
+    end
+    private :update_modified_files
     
+    def puts_banner
+      return if quiet?
+      puts "SmallCage Auto Update"
+      puts "http://localhost:#{@port}/_smc/auto" unless @port.nil?
+      puts
+    end
+    private :puts_banner
+    
+    def puts_line
+      return if quiet?
+      puts "-" * 60
+      print "\a" # Bell
+    end
+    private :puts_line
+    
+    def update_http_server(target_files)
+      return unless @http_server
+      path = target_files.find {|p| p.basename.to_s != "_dir.smc" }
+      if path.nil?
+        dir = target_files.shift
+        dpath = SmallCage::DocumentPath.new(@loader.root, dir.parent)
+        @http_server.updated_uri = dpath.uri
+      else
+        dpath = SmallCage::DocumentPath.new(@loader.root, path)
+        @http_server.updated_uri = dpath.outuri
+      end
+    end
+    private :update_http_server
+
+    def init_sig_handler
+      shutdown_handler = Proc.new do |signal|
+        @http_server.shutdown unless @http_server.nil?
+        @update_loop = false
+      end
+      SmallCage::Application.add_signal_handler(["INT", "TERM"], shutdown_handler)
+    end
+    private :init_sig_handler
+
+    def start_http_server 
+      document_root = @opts[:path]
+      port = @opts[:port]
+        
+      @http_server = SmallCage::HTTPServer.new(document_root, port)
+       
+      Thread.new do
+        @http_server.start    
+      end
     end
+    private :start_http_server
     
   end
 end