memorack 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c45efe555619b9ccb0baf170a9ec452f0fa52e
-  data.tar.gz: b012723ff47cef6d9887501fd28c88d3d6a5fcfc
+  metadata.gz: 827dc521c8e16aa7f5f7689e32d91a0fc1918d57
+  data.tar.gz: b1cdbfa7c2a0674fe02b0279d62dcf6d9fa8d2f0
 SHA512:
-  metadata.gz: 5ca5bf21735546d0371a71efebad1c902b869283495a26b4c276442e0cb949169ddafd894479590c3d77bebf5c82479a9548346607f1f9321301a9e6f6390c21
-  data.tar.gz: dbfa869e5a135c9d5244d7b92cb65aab7634786b8a0361c643e2b9039de285074ab65f88834f60a3396d8a58013da548bf82c00517bb07c0d3d5ac0fad560f5b
+  metadata.gz: 032bb4527d6c6f494b47a6eb0476660721e1d7d1e8f1421414d43afb37d07e5b0b3101cbc0f56e7f38057173ae1ec50eb03002b469e6fe9919d3186c77eb87bb
+  data.tar.gz: bd75dbffa43ac28389a3243c6c1403bb746519a8e4f6112edd81b005bf3ce2f2995847a34eef9f8850549d5b17bac871431594a2fb97e4bf49679a63ba33a475

data/.gitignore

@@ -16,6 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor
 
 # editor noise
 *~

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/memorack/cli.rb

@@ -51,6 +51,7 @@ module MemoRack
 		def i18n_init
 			I18n.load_path = Dir[File.expand_path('../locales/*.yml', __FILE__)]
 			I18n.backend.load_translations
+			I18n.enforce_available_locales = false
 
 			locale = ENV['LANG'][0, 2].to_sym if ENV['LANG']
 			I18n.locale = locale if I18n.available_locales.include?(locale)
@@ -65,7 +66,7 @@ module MemoRack
 		# ディレクトリを繰返す
 		def dir_earch(dir, match = '**/*', flag = File::FNM_DOTMATCH)
 			Dir.chdir(dir) { |d|
-				Dir.glob(match, flag).each { |file|
+				Dir.glob(match, flag).sort.each { |file|
 					next if File.basename(file) =~ /^[.]{1,2}$/
 					file = File.join(file, '') if File.directory?(file)
 					yield(file)
@@ -79,9 +80,11 @@ module MemoRack
 
 			puts "#{domain}:"
 
-			Dir.foreach(themes) { |file|
-				next if /^\./ =~ file
-				puts "  #{file}"
+			Dir.open(themes) { |dir|
+				dir.sort.each { |file|
+					next if /^\./ =~ file
+					puts "  #{file}"
+				}
 			}
 		end
 

data/lib/memorack/core.rb

@@ -5,6 +5,7 @@ require 'pathname'
 require 'rubygems'
 require 'i18n'
 
+require 'mustache'
 require 'memorack/tilt-mustache'
 require 'memorack/mdmenu'
 require 'memorack/locals'
@@ -74,6 +75,7 @@ module MemoRack
 			# ロケールの読込み
 			I18n.load_path = @locale_paths
 			I18n.backend.load_translations
+			I18n.enforce_available_locales = false
 
 			@requires.each { |lib| require lib }
 			@locals = default_locals(@options)
@@ -599,7 +601,18 @@ module MemoRack
 		# Tilt に登録されている拡張子を集める
 		def extnames(extname)
 			klass = Tilt[extname]
-			Tilt.mappings.select { |key, value| value.member?(klass) }.collect { |key, value| key }
+			r = []
+
+			if Tilt.respond_to?(:mappings)
+				r |= Tilt.mappings.select { |key, value| value.member?(klass) }.collect { |key, value| key }
+			end
+
+			if Tilt.respond_to?(:default_mapping)
+				r |= Tilt.default_mapping.template_map.select { |key, value| value == klass }.collect { |key, value| key }
+				r |= Tilt.default_mapping.lazy_map.select { |key, value| value.assoc(klass.to_s) }.collect { |key, value| key }
+			end
+
+			r
 		end
 
 		# 対応フォーマットを取得する

data/memorack.gemspec

@@ -25,16 +25,16 @@ Gem::Specification.new do |gem|
   gem.add_dependency('tilt')
   gem.add_dependency('mustache')
   gem.add_dependency('redcarpet', '>= 2.0.0')
-  gem.add_dependency('json')
   gem.add_dependency('sass')
   gem.add_dependency('i18n')
 
   # for development
   gem.add_development_dependency('bundler', '~> 1.3')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('minitest')
+  gem.add_development_dependency('minitest', '~> 4.7') if Gem.ruby_version < Gem::Version.create('2.0')
   gem.add_development_dependency('turn')
   gem.add_development_dependency('rack-test')
+  gem.add_development_dependency('org-ruby')
 
   gem.post_install_message = %Q{
     ==================

data/spec/memorack_spec.rb

@@ -3,7 +3,9 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'memorack'
 require 'memorack/cli'
+require 'time'
 require 'cgi'
+require 'set'
 
 
 describe MemoRack do
@@ -60,16 +62,20 @@ describe MemoRack do
 	end
 
 	# git でパッチをあてる
-	def git_am(name)
+	def git_am(name, init = false)
+		FileUtils.remove_entry_secure('.git') if init && File.exists?('.git')
+
 		unless File.exists?('.git')
 			`git init`
+			`git config --local user.email "you@example.com"`
+			`git config --local user.name "Your Name"`
 			`git add .`
 			`git commit -m "first commit"`
 		end
 
 		path = File.expand_path("../patches/#{name}", __FILE__)
 		if File.directory?(path)
-			Dir[File.join(path, '*.patch')].each { |path|
+			Dir[File.join(path, '*.patch')].sort.each { |path|
 				`git am -3 "#{path}"`
 			}
 		else
@@ -78,6 +84,18 @@ describe MemoRack do
 		end
 	end
 
+	# ファイル構成が同じかチェックする
+	def must_files(path, files)
+		files = files.split("\n") if files.kind_of?(String)
+
+		Dir.chdir(path || '.') { |dir|
+			list = Dir.glob('**/*', File::FNM_DOTMATCH)
+			list.reject! { |item| item =~ %r[(^|/)\.{1,2}$] }
+			Set.new(list).must_equal Set.new(files)
+		}
+	end
+
+
 	before do
 		require 'tmpdir'
 		@tmpdir = Dir.mktmpdir
@@ -208,25 +226,24 @@ describe MemoRack do
 
 			Dir.chdir(@tmpdir) {
 				proc { memorack 'create', name }.must_output "Created '#{name}'\n"
-				`cd #{name}; find . -print`.must_equal <<-EOD.cut_indent
-					.
-					./.gitignore
-					./.powenv
-					./config.ru
-					./content
-					./content/README.md
-					./Gemfile
-					./plugins
-					./plugins/.gitkeep
-					./themes
-					./themes/custom
-					./themes/custom/config.json
-					./themes/custom/index.md
-					./themes/custom/locales
-					./themes/custom/locales/.gitkeep
-					./themes/custom/macro.yml
-					./themes/custom/pages
-					./themes/custom/pages/.gitkeep
+				must_files name, <<-EOD.cut_indent
+					.gitignore
+					.powenv
+					config.ru
+					content
+					content/README.md
+					Gemfile
+					plugins
+					plugins/.gitkeep
+					themes
+					themes/custom
+					themes/custom/config.json
+					themes/custom/index.md
+					themes/custom/locales
+					themes/custom/locales/.gitkeep
+					themes/custom/macro.yml
+					themes/custom/pages
+					themes/custom/pages/.gitkeep
 				EOD
 			}
 		end
@@ -283,16 +300,15 @@ describe MemoRack do
 			chmemo { |name|
 				proc { memorack 'theme', '-c', theme }.must_output "Created 'themes/#{theme}'\n"
 
-				`cd themes/#{theme}; find . -print`.must_equal <<-EOD.cut_indent
-					.
-					./404.md
-					./config.json
-					./css
-					./css/2-column.scss
-					./css/basic-styles.scss
-					./css/styles.scss
-					./error.html
-					./index.html
+				must_files File.join('themes', theme), <<-EOD.cut_indent
+					404.md
+					config.json
+					css
+					css/2-column.scss
+					css/basic-styles.scss
+					css/styles.scss
+					error.html
+					index.html
 				EOD
 			}
 		end
@@ -316,13 +332,12 @@ describe MemoRack do
 			@theme = 'oreilly'
 
 			@file_lists = <<-EOD.cut_indent
-				.
-				./css
-				./css/2-column.css
-				./css/basic-styles.css
-				./css/styles.css
-				./index.html
-				./README.html
+				css
+				css/2-column.css
+				css/basic-styles.css
+				css/styles.css
+				index.html
+				README.html
 			EOD
 		end
 
@@ -334,7 +349,7 @@ describe MemoRack do
 				proc { memorack 'build' }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal @file_lists
+					must_files nil, @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
 				}
 			}
@@ -354,7 +369,7 @@ describe MemoRack do
 				proc { memorack 'build', path }.must_output "Build '#{path}' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal @file_lists
+					must_files nil, @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
 				}
 			}
@@ -368,7 +383,7 @@ describe MemoRack do
 				proc { memorack 'build', '--output', output }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal @file_lists
+					must_files nil, @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
 				}
 			}
@@ -382,7 +397,7 @@ describe MemoRack do
 				proc { memorack 'build', '--theme', theme }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal @file_lists
+					must_files nil, @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
 				}
 			}
@@ -397,7 +412,7 @@ describe MemoRack do
 				proc { memorack 'build', '--url', url }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal @file_lists
+					must_files nil, @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
 					File.read('index.html').must_match %r[<a href="#{url}/README.html">MemoRack について</a>]
 				}
@@ -414,7 +429,7 @@ describe MemoRack do
 				proc { memorack 'build', '--local' }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal @file_lists
+					must_files nil, @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
 					File.read('index.html').must_match %r[<a href="#{url}/README.html">MemoRack について</a>]
 				}
@@ -430,15 +445,14 @@ describe MemoRack do
 				proc { memorack 'build', '--prettify' }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					`find . -print`.must_equal <<-EOD.cut_indent
-						.
-						./css
-						./css/2-column.css
-						./css/basic-styles.css
-						./css/styles.css
-						./index.html
-						./README
-						./README/index.html
+					must_files nil, <<-EOD.cut_indent
+						css
+						css/2-column.css
+						css/basic-styles.css
+						css/styles.css
+						index.html
+						README
+						README/index.html
 					EOD
 
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
@@ -482,16 +496,16 @@ describe MemoRack do
 			output = '_site'
 
 			chmemo { |name|
-				git_am 'git'
+				git_am 'git', true
 				proc { memorack 'build' }.must_output "Build 'content/' -> '#{output}'\n"
 
 				Dir.chdir(output) { |output|
-					ctime = '<div>作成時間：2013-05-11 18:47:31 +0900</div>'
-					mtime = '<div>更新時間：2013-05-11 18:49:46 +0900</div>'
+					ctime = Time.parse '2013-05-11 18:47:31 +0900'
+					mtime = Time.parse '2013-05-11 18:49:46 +0900'
 
 					history = File.read('HISTORY.html')
-					history.must_match /#{Regexp.escape ctime}/
-					history.must_match /#{Regexp.escape mtime}/
+					history.must_match /#{Regexp.escape "<div>作成時間：#{ctime}</div>"}/
+					history.must_match /#{Regexp.escape "<div>更新時間：#{mtime}</div>"}/
 				}
 			}
 		end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 require 'rack/test'
 
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memorack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - gnue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -165,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: org-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -187,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -267,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Rack Application for markdown memo