smallcage 0.2.4 → 0.2.5

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 .bundle

data/.rubocop.yml

@@ -0,0 +1,8 @@
+ClassLength:
+  Max: 300
+
+MethodLength:
+  Max: 50
+
+HashSyntax:
+  Enabled: false

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-
+  - 2.0.0

data/Gemfile

@@ -1,10 +1,21 @@
 source "https://rubygems.org"
 
-gem 'syck', :platforms => [:ruby_20]
+gem 'syck', :platforms => :ruby_20
 
-group :test do
-  gem 'rake'
+group :development, :test do
   gem 'rspec'
-  gem 'rcov',      :platforms => :ruby_18, :require => false
-  gem 'simplecov', :platforms => [:ruby_19, :ruby_20], :require => false
+end
+
+group :development do
+  gem 'rake'
+
+  platforms :ruby_19, :ruby_20 do
+    gem 'simplecov', :require => false
+    gem 'rubocop', :require => false
+
+    if RUBY_VERSION >= '1.9.3'
+      gem 'guard', :require => false
+      gem 'guard-rspec', :require => false
+    end
+  end
 end

data/Guardfile

@@ -0,0 +1,4 @@
+guard :rspec, :cmd => 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+end

data/History.rdoc

@@ -1,5 +1,9 @@
 = History
 
+== 0.2.5 2014-03-08
+
+* fix ignoring LoadError bug. When LoadError occurred in the helper modules, smc finished without any message.
+
 == 0.2.4 2014-01-06
 
 * install syck gem only when the Ruby version is 2.0.0 or above.
@@ -54,12 +58,12 @@
 * add get directory config method to base_helper.rb.
 * add NKF helper to nkf project template.
 * avoid error when filter config is empty.
-* add statistics line to update command. 
+* add statistics line to update command.
 * do not abort auto update server when ERB error occurred.
 
 == 0.1.4 2009-07-27
 
-* add cache control filter and rake task (for CDN, etag, etc.). 
+* add cache control filter and rake task (for CDN, etag, etc.).
 * add csv rake task which creates smc files from csv file.
 * move rake tasks into *.rake files.
 * switch 'smc import' default answer to 'Yes'.
@@ -67,8 +71,8 @@
 * add project template to explain smc object and template: tutorial2.
 * added 'body' to default smc object keys.
 * avoid error when helper directory doesn't exist.
-* show smc filename when template error occurs. 
- 
+* show smc filename when template error occurs.
+
 == 0.1.3 2009-05-01
 
 * moved to github.
@@ -77,7 +81,7 @@
 
 == 0.1.2 2009-01-16
 
-* stop using /dev/null for WEBrick access log. 
+* stop using /dev/null for WEBrick access log.
 
 == 0.1.1 2008-09-22
 

data/README.rdoc

@@ -35,14 +35,14 @@ If successfully installed, smc command will be available.
       export [path] [outputpath]       Export project.
       uri    [path]                    Print URIs.
       manifest [path]                  Generate Manifest.html file.
-  
+
   Options are:
-  
+
       -h, --help                       Show this help message.
       -v, --version                    Show version info.
 
 Create document root.
-  
+
   $ mkdir htdocs
   $ cd htdocs
 

data/Rakefile

@@ -3,7 +3,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) 
+RSpec::Core::RakeTask.new(:spec)
 
 desc "-> spec"
 task :default => :spec

data/bin/smc

@@ -1,16 +1,8 @@
 #!/usr/bin/env ruby
-#
-#  Created on 2007-8-22.
-#  Copyright (c) 2007. All rights reserved.
 
-unless defined? Gem
-  $:.unshift File.dirname(__FILE__) + "/../lib"
-end
+$:.unshift(File.join(File.dirname( __FILE__), '../lib'))
 
-begin
-  require 'rubygems'
-  require 'smallcage'
-  SmallCage::Application.execute
-rescue LoadError
-end
+require 'rubygems'
+require 'smallcage'
 
+SmallCage::Application.execute

data/lib/smallcage.rb

@@ -1,4 +1,4 @@
-$:.unshift File.dirname(__FILE__)
+$:.unshift(File.dirname( __FILE__)) if __FILE__ == $0
 
 require 'yaml'
 require 'syck'
@@ -11,6 +11,7 @@ require 'delegate'
 require 'smallcage/version'
 require 'smallcage/misc'
 require 'smallcage/loader'
+require 'smallcage/anonymous_loader'
 require 'smallcage/erb_base'
 require 'smallcage/renderer'
 require 'smallcage/runner'
@@ -18,3 +19,5 @@ require 'smallcage/document_path'
 require 'smallcage/http_server'
 require 'smallcage/application'
 require 'smallcage/update_list'
+
+SmallCage::Application.execute if __FILE__ == $0

data/lib/smallcage/anonymous_loader.rb

@@ -0,0 +1,32 @@
+module SmallCage
+  # load files into anonymous module
+  class AnonymousLoader
+    attr_reader :module, :module_names
+
+    def initialize
+      @module = Module.new
+      @module_names = []
+    end
+
+    def load_match_files(dir, rex)
+      return unless File.exist?(dir)
+
+      Dir.entries(dir).sort.each do |h|
+        next unless h =~ rex
+
+        module_name = Regexp.last_match(1).camelize
+        path = File.join(dir, h)
+        src = File.read(path)
+
+        @module.module_eval(src, path)
+        @module_names << module_name
+      end
+    end
+
+    def self.load(dir, rex)
+      loader = new
+      loader.load_match_files(dir, rex)
+      { :module => loader.module, :names => loader.module_names }
+    end
+  end
+end

data/lib/smallcage/application.rb

@@ -1,7 +1,7 @@
 class SmallCage::Application
   require 'optparse'
   VERSION_NOTE = "SmallCage #{SmallCage::VERSION} - a simple website generator"
-  
+
   @@signal_handlers = nil
 
   def self.init_signal_handlers
@@ -18,7 +18,7 @@ class SmallCage::Application
       end
     end
   end
-  
+
   def self.add_signal_handler(signal, handler)
     init_signal_handlers if @@signal_handlers.nil?
     signal.to_a.each do |s|
@@ -76,7 +76,7 @@ BANNER
       puts VERSION_NOTE
       exit(true)
     end
-    
+
     @options[:quiet] = false
     parser.on("-q", "--quiet", "Do not print message.") do |boolean|
       @options[:quiet] = boolean
@@ -254,7 +254,7 @@ EOT
 
   def get_port_number(default)
     return default if @argv.empty?
-      
+
     port = @argv.shift
     if port.to_i == 0
       $stderr.puts "illegal port number: #{port}"
@@ -263,5 +263,4 @@ EOT
     return port.to_i
   end
   private :get_port_number
-
 end

data/lib/smallcage/commands/auto.rb

@@ -1,6 +1,6 @@
 module SmallCage::Commands
   class Auto < SmallCage::Commands::Base
-    
+
     def initialize(opts)
       super(opts)
       @target = Pathname.new(opts[:path])
@@ -29,10 +29,10 @@ module SmallCage::Commands
         sleep @sleep
       end
     end
-    
+
     def modified_special_files
       root = @loader.root
-      
+
       result = []
       Dir.chdir(root) do
         Dir.glob("_smc/{templates,filters,helpers}/*") do |f|
@@ -44,7 +44,7 @@ module SmallCage::Commands
           end
         end
       end
-      
+
       return result
     end
     private :modified_special_files
@@ -61,11 +61,11 @@ module SmallCage::Commands
       return result
     end
     private :modified_files
-    
+
     def update_target
       # load @mtimes
       modified_special_files
-      target_files = modified_files 
+      target_files = modified_files
 
       runner = SmallCage::Runner.new({ :path => @target, :quiet => @opts[:quiet] })
       begin
@@ -75,7 +75,7 @@ module SmallCage::Commands
         STDERR.puts $@[0..4].join("\n")
         STDERR.puts ":"
       end
-      
+
       update_http_server(target_files)
       puts_line
       notify
@@ -91,7 +91,7 @@ module SmallCage::Commands
         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"
@@ -101,7 +101,7 @@ module SmallCage::Commands
         end
         runner.update
       end
-      
+
       if reload
         @http_server.reload
       else
@@ -118,7 +118,7 @@ module SmallCage::Commands
       notify
     end
     private :update_modified_files
-    
+
     def puts_banner
       return if quiet?
       puts "SmallCage Auto Update"
@@ -126,13 +126,13 @@ module SmallCage::Commands
       puts
     end
     private :puts_banner
-    
+
     def puts_line
       return if quiet?
       puts "-" * 60
     end
     private :puts_line
-    
+
     def notify
       return unless @opts[:bell]
       print "\a" # Bell
@@ -162,17 +162,16 @@ module SmallCage::Commands
     end
     private :init_sig_handler
 
-    def start_http_server 
+    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    
+        @http_server.start
       end
     end
     private :start_http_server
-    
   end
 end

data/lib/smallcage/commands/base.rb

@@ -3,17 +3,16 @@ module SmallCage::Commands
     def self.execute(opts)
       self.new(opts).execute
     end
-    
+
     def initialize(opts)
       @opts = opts
     end
-    
+
     def execute
     end
-    
+
     def quiet?
       return @opts[:quiet]
     end
-    
   end
-end
+end

data/lib/smallcage/commands/clean.rb

@@ -3,11 +3,11 @@ module SmallCage::Commands
     def self.execute(opts)
       self.new(opts).execute
     end
-    
+
     def initialize(opts)
       @opts = opts
     end
-    
+
     def execute
       start = Time.now
       count = 0
@@ -16,7 +16,7 @@ module SmallCage::Commands
       unless target.exist?
         raise "target directory or file does not exist.: " + target.to_s
       end
-      
+
       loader = SmallCage::Loader.new(target)
       root = loader.root
       list = SmallCage::UpdateList.create(root, target)
@@ -29,7 +29,7 @@ module SmallCage::Commands
           count += 1
         end
       end
-      
+
       tmpdir = root + "_smc/tmp"
       if tmpdir.exist?
         FileUtils.rm_r(tmpdir)
@@ -42,4 +42,4 @@ module SmallCage::Commands
         "  #{"%.3f" % (count == 0 ? 0 : elapsed/count)} sec/file." unless @opts[:quiet]
     end
   end
-end
+end

data/lib/smallcage/commands/export.rb

@@ -5,10 +5,10 @@ module SmallCage::Commands
       unless target.exist?
         raise target.to_s + " does not exist."
       end
-      
+
       loader = SmallCage::Loader.new(target)
       root = loader.root
-      
+
       if @opts[:out].nil?
         out = root + ("./_smc/tmp/export/" + Time.now.strftime("%Y%m%d%H%M%S"))
       else
@@ -19,7 +19,7 @@ module SmallCage::Commands
       end
       FileUtils.makedirs(out)
       out = out.realpath
-      
+
       # TODO create empty directories
       loader.each_not_smc_file do |docpath|
         dir = Pathname.new(docpath.uri).parent
@@ -30,7 +30,7 @@ module SmallCage::Commands
       end
 
       unless quiet?
-        puts "" 
+        puts ""
         puts "All contents exported to:"
         puts " #{out.to_s}"
       end
@@ -38,4 +38,4 @@ module SmallCage::Commands
     end
 
   end
-end
+end