smallcage 0.1.7 → 0.1.8

data/.gitignore

@@ -0,0 +1,5 @@
+*~
+.DS_Store
+.project
+pkg
+doc

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.8 2009-11-05
+
+* add URI template feature.
+
 == 0.1.7 2009-09-18
 
 * bugfix issue #2: The files under the common prefix directory should not be removed. http://github.com/bluemark/smallcage/issues/#issue/2

data/Rakefile

@@ -1,144 +1,18 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/sshpublisher'
-require 'fileutils'
-require 'lib/smallcage'
-require 'spec'
-require 'spec/rake/spectask'
-
-include FileUtils
-
-NAME              = "smallcage"
-AUTHORS           = ["SAITO Toshihiro", "gom", "KOSEKI Kengo"]
-EMAIL             = "smallcage@googlegroups.com"
-DESCRIPTION       = "Lightweight CMS package."
-RUBYFORGE_PROJECT = "smallcage"
-HOMEPATH          = "http://www.smallcage.org"
-BIN_FILES         = %w(smc)
-
-VERS              = SmallCage::VERSION::STRING
-REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-RDOC_OPTS = [
-  '--title', "#{NAME} documentation",
-  "--charset", "utf-8",
-  "--opname", "index.html",
-  "--line-numbers",
-  "--main", "README.rdoc",
-  "--inline-source",
-]
-
-SRC_FILES = FileList.new(%w{Rakefile README.rdoc History.txt License.txt})
-SRC_FILES.include("{bin,doc,lib,test,project,spec}/**/*")
-SRC_FILES.exclude(/~$/)
-
-spec = Gem::Specification.new do |s|
-  s.name              = NAME
-  s.version           = VERS
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = ["README.rdoc", "History.txt"]
-  s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples|extras)/']
-  s.summary           = DESCRIPTION
-  s.description       = DESCRIPTION
-  s.authors           = AUTHORS
-  s.email             = EMAIL
-  s.homepage          = HOMEPATH
-  s.executables       = BIN_FILES
-  s.rubyforge_project = RUBYFORGE_PROJECT
-  s.bindir            = "bin"
-  s.require_path      = "lib"
-  s.test_files        = Dir["spec/*_spec.rb"]
-  s.files             = SRC_FILES
-
-  #s.autorequire       = ""
-  #s.add_dependency('activesupport', '>=1.3.1')
-  #s.required_ruby_version = '>= 1.8.2'
-  #s.extensions = FileList["ext/**/extconf.rb"].to_a
-end
-
-task :default => [:spec]
-task :package => [:clean]
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
-
-task :install do
-  name = "#{NAME}-#{VERS}.gem"
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{name}}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'pkg/htdocs'
-  rdoc.options += RDOC_OPTS
-  #rdoc.template = "resh"
-  #rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  if ENV['DOC_FILES']
-    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-  else
-    rdoc.rdoc_files.include('README.rdoc', 'History.txt')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.include('ext/**/*.c')
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "smallcage"
+    gemspec.summary = "Lightweight CMS package."
+    gemspec.description = "Lightweight CMS package."
+    gemspec.email = "smallcage@googlegroups.com"
+    gemspec.homepage = "http://www.smallcage.org"
+    gemspec.authors = ["SAITO Toshihiro", "gommmmmm", "KOSEKI Kengo"]
+    gemspec.rubyforge_project = 'smallcage'
   end
-end
-
-desc "Publish to RubyForge"
-task :rubyforge => [:rdoc, :package] do
-  require 'rubyforge'
-  Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'bluemark').upload
-end
-
-desc 'Package and upload the release to rubyforge.'
-task :release => [:clean, :package] do |t|
-  v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
-  abort "Versions don't match #{v} vs #{VERS}" unless v == VERS
-  pkg = "pkg/#{NAME}-#{VERS}"
-
-  require 'rubyforge'
-  rf = RubyForge.new.configure
-  puts "Logging in"
-  rf.login
-
-  c = rf.userconfig
-#  c["release_notes"] = description if description
-#  c["release_changes"] = changes if changes
-  c["preformatted"] = true
-
-  files = [
-    "#{pkg}.tgz",
-    "#{pkg}.gem"
-  ].compact
-
-  puts "Releasing #{NAME} v. #{VERS}"
-  rf.add_release RUBYFORGE_PROJECT, NAME, VERS, *files
-end
-
-desc 'Show information about the gem.'
-task :debug_gem do
-  puts spec.to_ruby
-end
-
-desc 'Update gem spec'
-task :gemspec do
-  open("#{NAME}.gemspec", 'w').write spec.to_ruby
-end
-
-desc "Run the specs under ./spec/"
-Spec::Rake::SpecTask.new do |t|
-  t.libs << "lib"
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/*_spec.rb']
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -0,0 +1 @@
+0.1.8

data/lib/smallcage.rb

@@ -16,3 +16,4 @@ require 'smallcage/runner'
 require 'smallcage/document_path'
 require 'smallcage/http_server'
 require 'smallcage/application'
+require 'smallcage/update_list'

data/lib/smallcage/application.rb

@@ -1,10 +1,6 @@
-
-VERSION_NOTE = "SmallCage #{SmallCage::VERSION::STRING} - Lightweight CMS Package."
-OPTIONS = {}
-OPTIONS[:original_argv] = ARGV.clone
-
 class SmallCage::Application
   require 'optparse'
+  VERSION_NOTE = "SmallCage #{SmallCage::VERSION::STRING} - Lightweight CMS Package."
   
   @@signal_handlers = nil
 
@@ -31,12 +27,23 @@ class SmallCage::Application
   end
 
   def self.execute
+    STDOUT.sync = true
+    self.new.execute
+  end
 
-STDOUT.sync = true
-
-OptionParser.new do |opts|
+  def execute
+    @options = {}
+    @parser = create_main_parser
+    parse_main_options
+    @command_parsers = create_command_parsers
+    parse_command
+    parse_command_options
+    SmallCage::Runner.run(@options)
+  end
 
-  opts.banner =<<BANNER
+  def create_main_parser
+    parser = OptionParser.new
+    parser.banner =<<BANNER
 Usage: #{File.basename($0)} <subcommand> [options]
 #{VERSION_NOTE}
 Subcommands are:
@@ -50,115 +57,108 @@ Subcommands are:
 
 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
+    return parser
   end
+  private :create_main_parser
 
-  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
+  def parse_main_options
+    @parser.separator ""
+    @parser.on("-h", "--help", "Show this help message.") do
+      puts @parser
+      exit
+    end
+    @parser.on("-v", "--version", "Show version info.") do
+      puts VERSION_NOTE
+      exit
+    end
+    @parser.order!(ARGV)
   end
+  private :parse_main_options
+
+  def create_command_parsers
+    parsers = Hash.new do |h,k|
+      STDERR << "no such subcommand: #{k}\n"
+      exit 1
+    end
+
+    banners = {
+      :update => "smc update [path]\n",
+      :clean  => "smc clean [path]\n",
+      :server => "smc server [path] [port]\n",
+      :auto   => "smc auto [path] [port]\n",
+      :import => "smc import [name|uri]",
+      :export => "smc export [path] [outputpath]",
+      :help   => "smc help [command]\n",
+    }
   
-  subparsers[:server] = OptionParser.new do |subp|
-    subp.banner =<<EOT
-Usage: server [PATH] [PORT]
-EOT
-  end
+    banners.each do |k,v|
+      parsers[k] = OptionParser.new do |cp|
+        cp.banner = "Usage: " + v
+      end
+    end
 
-  subparsers[:auto] = OptionParser.new do |subp|
-    subp.banner =<<EOT
-Usage: auto [PATH]
-EOT
+    return parsers
   end
+  private :create_command_parsers
 
-  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
+  def parse_command
+    commands = Hash.new {|h,k| k}
+    commands.merge!({
+      :up => :update,
+      :sv => :server,
+      :au => :auto,
+    })
 
-  commands = Hash.new {|h,k| k}
-  commands.merge!({
-  	:up => :update,
-  	:sv => :server,
-  	:au => :auto,
-  	:gen => :generate,
-  	:rel => :release,
-  	:st => :status,
-  })
+    unless ARGV.empty?
+      @options[:command] = commands[ARGV.shift.to_sym]
+      @command_parsers[@options[:command]].parse!(ARGV)
+    end
 
-  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]
+    if @options[:command].nil?
+      puts @parser
+      exit
     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
+  private :parse_command
 
-SmallCage::Runner.run(OPTIONS)
+  def parse_command_options
+    if @options[:command] == :help
+      subcmd = ARGV.shift
+      if subcmd.nil?
+        puts @parser
+      else
+        puts @command_parsers[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
+  private :parse_command_options
 
 end
-end

data/lib/smallcage/commands/clean.rb

@@ -9,24 +9,37 @@ module SmallCage::Commands
     end
     
     def execute
+      start = Time.now
+      count = 0
+
       target = Pathname.new(@opts[:path])
       unless target.exist?
         raise "target directory or file does not exist.: " + target.to_s
       end
       
       loader = SmallCage::Loader.new(target)
-      loader.each_smc_obj do |obj|
-        if obj["path"].exist?
-          obj["path"].delete 
-          puts "D " + obj["uri"] unless @opts[:quiet]
+      root = loader.root
+      list = SmallCage::UpdateList.create(root, target)
+      uris = list.expire
+      uris.each do |uri|
+        file = root + uri[1..-1]
+        if file.exist?
+          puts "D #{uri}" unless @opts[:quiet]
+          file.delete
+          count += 1
         end
       end
       
-      tmpdir = loader.root + "./_smc/tmp"
+      tmpdir = root + "_smc/tmp"
       if tmpdir.exist?
         FileUtils.rm_r(tmpdir)
         puts "D /_smc/tmp" unless @opts[:quiet]
+        count += 1
       end
+
+      elapsed  = Time.now - start
+      puts "-- #{count} files.  #{"%.3f" % elapsed} sec." +
+        "  #{"%.3f" % (count == 0 ? 0 : elapsed/count)} sec/file." unless @opts[:quiet]
     end
   end
 end