RubyGems - smallcage - Versions diffs - 0.2.4 → 0.2.5 - Mend

smallcage 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

data/.gitignore +1 -0
data/.rubocop.yml +8 -0
data/.travis.yml +1 -1
data/Gemfile +16 -5
data/Guardfile +4 -0
data/History.rdoc +9 -5
data/README.rdoc +3 -3
data/Rakefile +1 -1
data/bin/smc +4 -12
data/lib/smallcage.rb +4 -1
data/lib/smallcage/anonymous_loader.rb +32 -0
data/lib/smallcage/application.rb +4 -5
data/lib/smallcage/commands/auto.rb +16 -17
data/lib/smallcage/commands/base.rb +4 -5
data/lib/smallcage/commands/clean.rb +5 -5
data/lib/smallcage/commands/export.rb +5 -5
data/lib/smallcage/commands/import.rb +25 -27
data/lib/smallcage/commands/manifest.rb +4 -4
data/lib/smallcage/commands/server.rb +4 -4
data/lib/smallcage/commands/update.rb +4 -5
data/lib/smallcage/commands/uri.rb +3 -5
data/lib/smallcage/document_path.rb +6 -9
data/lib/smallcage/http_server.rb +9 -10
data/lib/smallcage/loader.rb +19 -49
data/lib/smallcage/misc.rb +1 -1
data/lib/smallcage/renderer.rb +1 -1
data/lib/smallcage/resources/auto.html +7 -7
data/lib/smallcage/runner.rb +6 -6
data/lib/smallcage/update_list.rb +2 -3
data/lib/smallcage/version.rb +1 -1
data/project/base/_smc/helpers/base_helper.rb +8 -9
data/project/bluecloth/_smc/helpers/blue_cloth_helper.rb +2 -3
data/project/cache/_smc/filters/cache_filter.rb +10 -12
data/project/cache/_smc/rakelib/cache.rake +7 -8
data/project/gdata/_smc/rakelib/gdata.rake +3 -5
data/project/lang/_smc/helpers/lang_helper.rb +3 -3
data/project/news/_smc/helpers/news_helper.rb +3 -4
data/project/nkf/_smc/filters/nkf_filter.rb +6 -6
data/project/nkf/_smc/helpers/nkf_helper.rb +8 -9
data/project/rake/_smc/rakelib/svn.rake +5 -6
data/project/redcloth/_smc/helpers/red_cloth_helper.rb +3 -3
data/project/standard/_smc/helpers/menu_helper.rb +4 -5
data/project/standard/_smc/templates/redirect.rhtml +1 -1
data/spec/data/anonymous_loader/1/error1.rb +1 -0
data/spec/data/anonymous_loader/1/error2.rb +1 -0
data/spec/data/anonymous_loader/1/test1.rb +1 -0
data/spec/data/anonymous_loader/1/test2.rb +1 -0
data/spec/lib/smallcage/anonymous_loader_spec.rb +37 -0
data/spec/lib/smallcage/application_spec.rb +271 -0
data/spec/{smallcage → lib/smallcage}/commands/auto_spec.rb +0 -0
data/spec/{export_spec.rb → lib/smallcage/commands/export_spec.rb} +8 -10
data/spec/{import_spec.rb → lib/smallcage/commands/import_spec.rb} +5 -6
data/spec/{manifest_spec.rb → lib/smallcage/commands/manifest_spec.rb} +4 -3
data/spec/{smallcage → lib/smallcage}/commands/server_spec.rb +0 -0
data/spec/{update_spec.rb → lib/smallcage/commands/update_spec.rb} +15 -19
data/spec/{uri_spec.rb → lib/smallcage/commands/uri_spec.rb} +3 -4
data/spec/{document_path_spec.rb → lib/smallcage/document_path_spec.rb} +19 -31
data/spec/{loader_spec.rb → lib/smallcage/loader_spec.rb} +16 -18
data/spec/lib/smallcage/misc_spec.rb +18 -0
data/spec/{update_list_spec.rb → lib/smallcage/update_list_spec.rb} +18 -21
data/spec/{smallcage_spec.rb → lib/smallcage_spec.rb} +1 -1
data/spec/spec_helper.rb +5 -4
metadata +85 -55
checksums.yaml +0 -7
data/Gemfile.lock +0 -32
data/spec/misc_spec.rb +0 -25
data/spec/smallcage/application_spec.rb +0 -271

data/project/nkf/_smc/helpers/nkf_helper.rb CHANGED Viewed

@@ -6,15 +6,15 @@ module SmallCage
     def shift_jis(&block)
       nkf("-Wsm0", &block)
     end
     def iso_2022_jp(&block)
       nkf("-Wjm0", &block)
     end
     def euc_jp(&block)
       nkf("-Wem0", &block)
     end
     def nkf(opt, &block)
       src = _capture(&block)
       @erbout << NKF.nkf(opt, src)
@@ -25,15 +25,15 @@ module SmallCage
     end
     # Convert charset inside of block.
-    #
+    #
     #   <%- set_charset do -%>
     #      <%= header %>
     #      <%= body %>
     #      <%= footer %>
     #   <%- end -%>
-    #
+    #
     # In _dir.smc or other *.smc:
-    #
+    #
     #   charset: Shift_JIS
     #
     # In header.rhtml:
@@ -42,7 +42,7 @@ module SmallCage
     #
     # If you have to edit all templates to call set_charset method,
     # you should use nkf_filter.rb instead.
-    #
+    #
     def set_charset(&block)
       c = charset()
       if c =~ /^euc-jp$/i
@@ -55,6 +55,5 @@ module SmallCage
         yield
       end
     end
   end
-end
+end

data/project/rake/_smc/rakelib/svn.rake CHANGED Viewed

@@ -1,11 +1,11 @@
 namespace :svn do
-  # _dir.smc
+  # _dir.smc
   #   svnignore: *.html # set recursively.
-  #   svnignore_current: .project # add only current dir.
+  #   svnignore_current: .project # add only current dir.
   #   svnignore_reset: true # ignore parent directory settings.
-  #
+  #
   # You can use list.
   #   svnignore:
   #     - *.html
@@ -36,7 +36,7 @@ def load_svnignores(loader, path)
   unless data.to_s.empty?
     ignores << data
   end
   ignores.flatten!
   ignores.uniq!
   ignores.sort!
@@ -45,7 +45,7 @@ end
 def set_svnignore(dryrun = false)
   loader = SmallCage::Loader.new(".")
   exec_svn(loader, ".", dryrun)
   Dir.glob("**/") do |f|
     exec_svn(loader, f, dryrun)
@@ -61,4 +61,3 @@ def exec_svn(loader, f, dryrun)
   return if dryrun
   puts "FAILED: #{cmd}" unless system cmd
 end

data/project/redcloth/_smc/helpers/red_cloth_helper.rb CHANGED Viewed

@@ -1,10 +1,10 @@
 module SmallCage
   module RedClothHelper
     require "redcloth"
     def render_textile(str)
       RedCloth.new(str).to_html
     end
   end
-end
+end

data/project/standard/_smc/helpers/menu_helper.rb CHANGED Viewed

@@ -1,23 +1,22 @@
 module SmallCage
   module MenuHelper
     def menu_active(name)
       p = @obj["menu_path"]
       p ||= @obj["uri"]
       return p =~ %r{^/#{name}/} ? "active" : "inactive"
     end
     def menu_active_rex(rex)
       p = @obj["menu_path"]
       p ||= @obj["uri"]
       return p =~ rex ? "active" : "inactive"
     end
     def topic_dirs
       result = @obj["dirs"].dup
       result.reject! {|d| d["topic"].nil? }
       return result
     end
   end
-end
+end

data/project/standard/_smc/templates/redirect.rhtml CHANGED Viewed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
+<!DOCTYPE html
 	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja-JP" lang="ja-JP">

data/spec/data/anonymous_loader/1/error1.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ 1 / 0

data/spec/data/anonymous_loader/1/error2.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ require '_no_such_file_'

data/spec/data/anonymous_loader/1/test1.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ TEST_1 = 1

data/spec/data/anonymous_loader/1/test2.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ TEST_2 = 2

data/spec/lib/smallcage/anonymous_loader_spec.rb ADDED Viewed

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'smallcage'
+describe SmallCage::AnonymousLoader do
+  let(:root_dir) { File.join(SPEC_DATA_DIR, 'anonymous_loader') }
+  let(:dir1) { File.join(root_dir, '1') }
+  it 'loads ruby files' do
+    result = SmallCage::AnonymousLoader.load(dir1, /(test\d)\.rb\z/)
+    expect(result[:names]).to eq %w{Test1 Test2}
+    expect(result[:module]::TEST_1).to eq 1
+    expect(result[:module]::TEST_2).to eq 2
+  end
+  context 'when directory does not exist' do
+    it 'returns empty result' do
+      dir = File.join(root_dir, '0')
+      result = SmallCage::AnonymousLoader.load(dir, /(test\d)\.rb\z/)
+      expect(result[:names]).to eq []
+      expect(result[:module]).to be_a(Module)
+    end
+  end
+  context 'when loaded file cause error' do
+    subject { SmallCage::AnonymousLoader.load(dir1, pattern) }
+    context '1 / 0' do
+      let(:pattern) { /(error1)\.rb\z/ }
+      it { expect { subject }.to raise_error ZeroDivisionError }
+    end
+    context 'require "_no_such_file_"' do
+      let(:pattern) { /(error2)\.rb\z/ }
+      it { expect { subject }.to raise_error LoadError }
+    end
+  end
+end

data/spec/lib/smallcage/application_spec.rb ADDED Viewed

@@ -0,0 +1,271 @@
+require 'spec_helper.rb'
+require 'smallcage'
+describe SmallCage::Application do
+  def capture_result
+    status = nil
+    result = nil
+    tmpout = StringIO.new
+    tmperr = StringIO.new
+    original_out, $stdout = $stdout, tmpout
+    original_err, $stderr = $stderr, tmperr
+    begin
+      result = yield
+    rescue SystemExit => e
+      status = e.status
+    ensure
+      $stdout = original_out
+      $stderr = original_err
+    end
+    return {
+      :exit => status,
+      :result => result,
+      :stdout => tmpout.string,
+      :stderr => tmperr.string
+    }
+  end
+  before(:each) do
+    @target = SmallCage::Application.new
+  end
+  it 'should parse update command' do
+    options = @target.parse_options(['update', '.'])
+    options.should eq(:path => '.', :command => :update, :quiet => false)
+    options = @target.parse_options(['up', '.'])
+    options.should eq(:path => '.', :command => :update, :quiet => false)
+  end
+  it 'should parse clean command' do
+    options = @target.parse_options(['clean', '.'])
+    options.should eq(:path => '.', :command => :clean, :quiet => false)
+  end
+  it 'should parse server command' do
+    options = @target.parse_options(['server', '.'])
+    options.should eq(:path => '.', :command => :server, :quiet => false, :port => 8080) # num
+    options = @target.parse_options(['sv', '.', '8080'])
+    options.should eq(:path => '.', :command => :server, :quiet => false, :port => 8080) # string
+  end
+  it 'should accept only number port' do
+    result = capture_result { @target.parse_options(['server', '.', 'pot']) }
+    result[:exit].should eq 1
+    result[:stdout].should be_empty
+    result[:stderr].should eq "illegal port number: pot\n"
+  end
+  it 'should not accept port 0' do
+    result = capture_result { @target.parse_options(['server', '.', '0']) }
+    result[:exit].should eq 1
+    result[:stdout].should be_empty
+    result[:stderr].should eq "illegal port number: 0\n"
+  end
+  it 'should parse auto command' do
+    options = @target.parse_options(['auto', '.'])
+    options.should eq(:path => '.', :command => :auto, :port => nil, :bell => false, :quiet => false)
+    options = @target.parse_options(['au', '.', '8080'])
+    options.should eq(:path => '.', :command => :auto, :port => 8080, :bell => false, :quiet => false)
+  end
+  it 'should parse import command' do
+    options = @target.parse_options(['import', 'base', '.'])
+    options.should eq(:command => :import, :from => 'base', :to => '.', :quiet => false)
+    options = @target.parse_options(['import'])
+    options.should eq(:command => :import, :from => 'default', :to => '.', :quiet => false)
+  end
+  it 'should parse export command' do
+    options = @target.parse_options(['export', '.', 'path'])
+    options.should eq(:command => :export, :path => '.',  :out => 'path', :quiet => false)
+    options = @target.parse_options(['export'])
+    options.should eq(:command => :export, :path => '.',  :out => nil, :quiet => false)
+  end
+  it 'should parse uri command' do
+    options = @target.parse_options(['uri', './path/to/target'])
+    options.should eq(:command => :uri, :path => './path/to/target', :quiet => false)
+    options = @target.parse_options(['uri'])
+    options.should eq(:command => :uri, :path => '.', :quiet => false)
+  end
+  it 'should parse manifest command' do
+    options = @target.parse_options(['manifest', './path/to/target'])
+    options.should eq(:command => :manifest, :path => './path/to/target', :quiet => false)
+    options = @target.parse_options(['manifest'])
+    options.should eq( :command => :manifest, :path => '.', :quiet => false )
+  end
+  it 'should exit 1 if command is empty' do
+    result = capture_result { @target.parse_options([]) }
+    result[:exit].should eq 1
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+  it 'should show help' do
+    result = capture_result { @target.parse_options(['help']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+  it 'should show help if the arguments include --help' do
+    result = capture_result { @target.parse_options(['--help', 'update']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+  it 'should show subcommand help' do
+    result = capture_result { @target.parse_options(['help', 'update']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\AUsage: smc update \[path\]/
+    result[:stderr].should be_empty
+  end
+  it 'should exit if the command is unknown' do
+    result = capture_result { @target.parse_options(['xxxx']) }
+    result[:exit].should eq 1
+    result[:stdout].should be_empty
+    result[:stderr].should eq "no such subcommand: xxxx\n"
+  end
+  it 'should show version' do
+    result = capture_result { @target.parse_options(['--version', 'update']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\ASmallCage \d+\.\d+\.\d+ - /
+    result[:stderr].should be_empty
+  end
+  it 'should exit when subcommand is empty' do
+    result = capture_result { @target.parse_options(['', '--version']) }
+    result[:exit].should eq 1
+    result[:stdout].should =~ /\AUsage:/
+    result[:stdout].should =~ /^Subcommands are:/
+    result[:stderr].should be_empty
+  end
+  it 'should ignore subcommand with --version option' do
+    result = capture_result { @target.parse_options(['help', '--version']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\ASmallCage \d+\.\d+\.\d+ - /
+    result[:stderr].should be_empty
+  end
+  it 'should ignore subcommand with -v option' do
+    result = capture_result { @target.parse_options(['help', '-v']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\ASmallCage \d+\.\d+\.\d+ - /
+    result[:stderr].should be_empty
+  end
+  it 'should ignore subcommand with --help option' do
+    result = capture_result { @target.parse_options(['update', '--help']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\AUsage: smc update \[path\] \[options\]/
+    result[:stderr].should be_empty
+  end
+  it 'should ignore subcommand with -h option' do
+    result = capture_result { @target.parse_options(['update', '-h']) }
+    result[:exit].should eq 0
+    result[:stdout].should =~ /\AUsage: smc update \[path\] \[options\]/
+    result[:stderr].should be_empty
+  end
+  it 'should exit with unknown main option --QQQ' do
+    result = capture_result { @target.parse_options(['--QQQ']) }
+    result[:exit].should eq 1
+    result[:stdout].should be_empty
+    result[:stderr].should eq "invalid option: --QQQ\n"
+  end
+  it 'should exit with unknown sub option --QQQ' do
+    result = capture_result { @target.parse_options(['update', '--QQQ']) }
+    result[:exit].should eq 1
+    result[:stdout].should be_empty
+    result[:stderr].should eq "invalid option: --QQQ\n"
+  end
+  it 'should accept auto command --bell option' do
+    result = capture_result { @target.parse_options(['auto', '--bell']) }
+    result[:exit].should be_nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should eq(
+      :command => :auto,
+      :port => nil,
+      :path => '.',
+      :bell => true,
+      :quiet => false
+    )
+  end
+  it 'should set bell option false as default' do
+    result = capture_result { @target.parse_options(['auto']) }
+    result[:exit].should be_nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should eq(
+      :command => :auto,
+      :port => nil,
+      :path => '.',
+      :bell => false,
+      :quiet => false
+    )
+  end
+  it 'should accept --quiet option' do
+    result = capture_result { @target.parse_options(['--quiet', 'update']) }
+    result[:exit].should be_nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should eq(
+      :command => :update,
+      :path => '.',
+      :quiet => true
+    )
+  end
+  it 'should accept --quiet option after subcommand' do
+    result = capture_result { @target.parse_options(['update', '--quiet']) }
+    result[:exit].should be_nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should eq(
+      :command => :update,
+      :path => '.',
+      :quiet => true
+    )
+  end
+  it 'should accept --quiet option before and after subcommand' do
+    opts = %w{--quiet auto --quiet path --bell 80}
+    result = capture_result { @target.parse_options(opts) }
+    result[:exit].should be_nil
+    result[:stdout].should be_empty
+    result[:stderr].should be_empty
+    result[:result].should eq(
+      :command => :auto,
+      :path => 'path',
+      :port => 80,
+      :bell => true,
+      :quiet => true
+    )
+  end
+end