tdiary 3.2.2.20130518 → 3.2.2.20130527

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02271eb97d061a659a842ab6325f5e78dd1e98cb
-  data.tar.gz: 170da4dde4d8c44873f97e7908d77a29069bc7b7
+  metadata.gz: 19b4424595a75104abf81e2f9e801bfb51f171fb
+  data.tar.gz: ea408333082ecda85f4b93858b9bf7dedab70b7f
 SHA512:
-  metadata.gz: 4a2c9008a97e1a7abd4e0bce476abc127752143131d5049c12ff9bd281e144caa5534f653a382d96ad44e39cc5dff67ec68a00d899a58f5208aafb61853510a7
-  data.tar.gz: 81135666766c82946bb6daaaaa3bf869c4878d7e925dc303e58d5d8b12851e9ba7f768b9bf1bfef4b8d2677f41a29b8982d4859f262661b60f301dd4887bc732
+  metadata.gz: 62bda4f8c2f4d28a1cb9a2fde6ad4850bb45f8f5fb8052a241b50be548ccc57fffffc6e135e55c5ca67cc749ecb813f1dc00a0bf777cbbf55abcedbf07edb36f
+  data.tar.gz: f23245dc830edc9df127542f8c4158ea7583c09f428724ea6977efe34c5791ae492000d034f51d90a15bcf9774d84526284e1fa2d15aa14e7b1599c1c28fefcf

data/Gemfile

@@ -12,7 +12,7 @@ else
 end
 
 # if you use tdiary-contrib gem, uncomment this line.
-gem 'tdiary-contrib'
+# gem 'tdiary-contrib'
 # use edge tDiary contrib
 # gem 'tdiary-contrib', :git => 'git@github.com:tdiary/tdiary-contrib.git'
 

data/Gemfile.lock

@@ -1,8 +1,14 @@
 PATH
   remote: .
   specs:
-    tdiary (3.2.2.20130518)
+    tdiary (3.2.2.20130527)
       bundler (~> 1.3)
+      hikidoc
+      imagesize
+      rack
+      rake
+      rdtool
+      thor
       thor (~> 0.18)
 
 GEM
@@ -30,7 +36,7 @@ GEM
       simplecov (>= 0.7)
       thor
     daemons (1.1.9)
-    dalli (2.6.3)
+    dalli (2.6.4)
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
     execjs (1.4.0)
@@ -40,7 +46,9 @@ GEM
     ffi (1.8.1)
     hashie (2.0.5)
     hike (1.2.2)
+    hikidoc (0.0.6)
     httpauth (0.2.0)
+    imagesize (0.1.1)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -53,7 +61,7 @@ GEM
       addressable (~> 2.3)
     method_source (0.8.1)
     mime-types (1.23)
-    multi_json (1.7.3)
+    multi_json (1.7.4)
     multipart-post (1.2.0)
     nokogiri (1.5.9)
     oauth (0.4.7)
@@ -94,7 +102,8 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (10.0.4)
-    redcarpet (2.2.2)
+    rdtool (0.6.38)
+    redcarpet (2.3.0)
     redis (3.0.4)
     redis-namespace (1.3.0)
       redis (~> 3.0.0)
@@ -109,7 +118,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
     rubyzip (0.9.9)
-    selenium-webdriver (2.32.1)
+    selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -119,8 +128,8 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.4)
-    sprockets (2.9.3)
+    slop (3.4.5)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -128,9 +137,7 @@ GEM
     sqlite3 (1.3.7)
     tapp (1.4.0)
       thor
-    tdiary-contrib (3.2.2.20130511)
-      tdiary (>= 3.2.2.20130511)
-    test-unit (2.5.4)
+    test-unit (2.5.5)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -177,7 +184,6 @@ DEPENDENCIES
   sqlite3
   tapp
   tdiary!
-  tdiary-contrib
   test-unit
   thin
   trinidad

data/Rakefile

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+$LOAD_PATH.unshift '.'
+
 require 'tdiary/environment'
 require 'tdiary/tasks'
 

data/config.ru

@@ -1,5 +1,6 @@
 $:.unshift( File::dirname( __FILE__ ).untaint )
-require 'tdiary/environment'
+
+require 'tdiary'
 require 'tdiary/rack/html_anchor'
 require 'tdiary/rack/valid_request_path'
 require 'tdiary/rack/auth/basic'

data/tdiary.gemspec

@@ -20,6 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.2'
 
+  spec.add_dependency 'rack'
+  spec.add_dependency 'rake'
+  spec.add_dependency 'thor'
+  spec.add_dependency 'hikidoc'
+  spec.add_dependency 'rdtool'
+  spec.add_dependency 'imagesize'
+
   spec.add_dependency 'thor', '~> 0.18'
   spec.add_dependency "bundler", "~> 1.3"
 end

data/tdiary.rb

@@ -7,12 +7,15 @@ Copyright (C) 2001-2013, TADA Tadashi <t@tdtds.jp>
 You can redistribute it and/or modify it under GPL2.
 =end
 
+Encoding::default_external = 'UTF-8'
+
 require 'tdiary/version'
 TDIARY_VERSION = TDiary::VERSION
 
 $:.unshift File.join(File::dirname(__FILE__), '/misc/lib').untaint
-Dir["#{File::dirname(__FILE__) + '/vendor/*/lib'}"].each {|dir| $:.unshift dir.untaint }
-Encoding::default_external = 'UTF-8'
+['/misc/lib/*/lib', '/vendor/*/lib'].each do |path|
+	Dir["#{File::dirname(__FILE__) + path}"].each {|dir| $:.unshift dir.untaint }
+end
 
 require 'cgi'
 require 'uri'
@@ -20,6 +23,7 @@ require 'fileutils'
 require 'pstore'
 require 'json'
 require 'erb'
+require 'tdiary/environment'
 require 'tdiary/compatible'
 require 'tdiary/core_ext'
 

data/tdiary/cli.rb

@@ -17,6 +17,7 @@ module TDiary
 		def new(name)
 			target = File.join(Dir.pwd, name)
 			deploy(target)
+			copy_file('tdiary.conf.beginner', File.join(target, 'tdiary.conf'))
 
 			unless options[:'skip-bundle']
 				Bundler.with_clean_env do
@@ -32,6 +33,28 @@ module TDiary
 			say "run `tdiary server` in #{name} directory to start server", :green
 		end
 
+		desc "update", "update tDiary"
+		method_option "skip-bundle", :type => :boolean, :banner =>
+			"don't run bundle"
+		def update
+			target = Dir.pwd
+			unless in_tdiary_dir?(target)
+				say "please run update command in your tdiary directory", :red
+				return 1
+			end
+
+			deploy(target)
+
+			unless options[:'skip-bundle']
+				Bundler.with_clean_env do
+					inside(target) do
+						run('bundle install --without test development')
+					end
+				end
+			end
+			say 'update finished', :green
+		end
+
 		desc "test", "Create test server and run tDiary test"
 		def test
 			target = File.join(Dir.pwd, 'tmp/test')
@@ -130,9 +153,12 @@ module TDiary
 				).each do |file|
 					copy_file(file, File.join(target, file))
 				end
-				copy_file('tdiary.conf.beginner', File.join(target, 'tdiary.conf'))
 				directory('doc', File.join(target, 'doc'))
 			end
+
+			def in_tdiary_dir?(target)
+				File.exist?(File.join(target, 'tdiary.conf'))
+			end
 		end
 	end
 end

data/tdiary/environment.rb

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'rubygems'
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

data/tdiary/tasks/release.rake

@@ -14,7 +14,7 @@ TARBALLS = []
 def fetch_files( repo )
 	Dir.chdir("tmp") do
 		rm_rf repo rescue true
-		sh "git clone git://github.com/tdiary/#{repo}.git #{repo}"
+		sh "git clone --depth 1 git://github.com/tdiary/#{repo}.git #{repo}"
 	end
 end
 
@@ -42,6 +42,12 @@ def make_tarball( repo, version = nil )
 		Dir.chdir 'tdiary-core' do
 			sh "chmod +x index.rb index.fcgi update.rb update.fcgi"
 			sh 'rake doc'
+			Bundler.with_clean_env do
+				sh 'bundle --path .bundle --without development:test'
+			end
+			Dir.chdir 'misc/lib' do
+				sh 'gem unpack bundler'
+			end
 		end
 	end
 

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '3.2.2.20130518'
+	VERSION = '3.2.2.20130527'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 3.2.2.20130518
+  version: 3.2.2.20130527
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,8 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  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: rake
+  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: thor
+  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: hikidoc
+  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: rdtool
+  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: imagesize
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -424,137 +508,8 @@ files:
 - theme/tdiary2/tdiary2.css
 - update.fcgi
 - update.rb
-- vendor/hikidoc-0.0.6/COPYING
-- vendor/hikidoc-0.0.6/NEWS
-- vendor/hikidoc-0.0.6/NEWS.ja
-- vendor/hikidoc-0.0.6/README
-- vendor/hikidoc-0.0.6/README.ja
-- vendor/hikidoc-0.0.6/Rakefile
-- vendor/hikidoc-0.0.6/TextFormattingRules
-- vendor/hikidoc-0.0.6/TextFormattingRules.ja
-- vendor/hikidoc-0.0.6/bin/hikidoc
-- vendor/hikidoc-0.0.6/lib/hikidoc.rb
-- vendor/hikidoc-0.0.6/setup.rb
-- vendor/hikidoc-0.0.6/test/run-test.rb
-- vendor/hikidoc-0.0.6/test/test_hikidoc.rb
-- vendor/imagesize-0.1.1/Manifest.txt
-- vendor/imagesize-0.1.1/README.txt
-- vendor/imagesize-0.1.1/lib/image_size.rb
-- vendor/imagesize-0.1.1/lib/image_size/version.rb
-- vendor/imagesize-0.1.1/setup.rb
-- vendor/imagesize-0.1.1/test/2-4-7.png
-- vendor/imagesize-0.1.1/test/4_1_2.gif
-- vendor/imagesize-0.1.1/test/bmp.bmp
-- vendor/imagesize-0.1.1/test/cursor.xbm
-- vendor/imagesize-0.1.1/test/detect.swf
-- vendor/imagesize-0.1.1/test/pbm.pbm
-- vendor/imagesize-0.1.1/test/pcx.pcx
-- vendor/imagesize-0.1.1/test/pgm.pgm
-- vendor/imagesize-0.1.1/test/test.xpm
-- vendor/imagesize-0.1.1/test/test_helper.rb
-- vendor/imagesize-0.1.1/test/test_image_size.rb
-- vendor/imagesize-0.1.1/test/tiff.tiff
-- vendor/imagesize-0.1.1/test/tokyo_tower.jpg
-- vendor/imagesize-0.1.1/test/tower_e.gif.psd
 - vendor/jasmine-jquery-1.4.2/jasmine-jquery.js
 - vendor/jquery-1.8/jquery.js
-- vendor/rdtool-0.6.38/COPYING.txt
-- vendor/rdtool-0.6.38/Gemfile
-- vendor/rdtool-0.6.38/HISTORY
-- vendor/rdtool-0.6.38/LGPL-2.1
-- vendor/rdtool-0.6.38/LICENSE.txt
-- vendor/rdtool-0.6.38/README.html
-- vendor/rdtool-0.6.38/README.ja.html
-- vendor/rdtool-0.6.38/README.rd
-- vendor/rdtool-0.6.38/README.rd.ja
-- vendor/rdtool-0.6.38/Rakefile
-- vendor/rdtool-0.6.38/TODO
-- vendor/rdtool-0.6.38/bin/rd2
-- vendor/rdtool-0.6.38/bin/rdswap.rb
-- vendor/rdtool-0.6.38/doc/rd-draft.html
-- vendor/rdtool-0.6.38/doc/rd-draft.ja.html
-- vendor/rdtool-0.6.38/doc/rd-draft.rd
-- vendor/rdtool-0.6.38/doc/rd-draft.rd.ja
-- vendor/rdtool-0.6.38/lib/rd/block-element.rb
-- vendor/rdtool-0.6.38/lib/rd/complex-list-item.rb
-- vendor/rdtool-0.6.38/lib/rd/desclist.rb
-- vendor/rdtool-0.6.38/lib/rd/document-struct.rb
-- vendor/rdtool-0.6.38/lib/rd/dot.rd2rc
-- vendor/rdtool-0.6.38/lib/rd/element.rb
-- vendor/rdtool-0.6.38/lib/rd/filter.rb
-- vendor/rdtool-0.6.38/lib/rd/head-filter.rb
-- vendor/rdtool-0.6.38/lib/rd/inline-element.rb
-- vendor/rdtool-0.6.38/lib/rd/labeled-element.rb
-- vendor/rdtool-0.6.38/lib/rd/list.rb
-- vendor/rdtool-0.6.38/lib/rd/loose-struct.rb
-- vendor/rdtool-0.6.38/lib/rd/methodlist.rb
-- vendor/rdtool-0.6.38/lib/rd/output-format-visitor.rb
-- vendor/rdtool-0.6.38/lib/rd/package.rb
-- vendor/rdtool-0.6.38/lib/rd/parser-util.rb
-- vendor/rdtool-0.6.38/lib/rd/post-install
-- vendor/rdtool-0.6.38/lib/rd/pre-setup.rb
-- vendor/rdtool-0.6.38/lib/rd/rbl-file.rb
-- vendor/rdtool-0.6.38/lib/rd/rbl-suite.rb
-- vendor/rdtool-0.6.38/lib/rd/rd-struct.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2html-ext-lib.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2html-ext-opt.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2html-lib.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2html-opt.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2man-lib.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2rdo-lib.rb
-- vendor/rdtool-0.6.38/lib/rd/rd2rmi-lib.rb
-- vendor/rdtool-0.6.38/lib/rd/rdblockparser.ry
-- vendor/rdtool-0.6.38/lib/rd/rdblockparser.tab.rb
-- vendor/rdtool-0.6.38/lib/rd/rdfmt.rb
-- vendor/rdtool-0.6.38/lib/rd/rdinlineparser.ry
-- vendor/rdtool-0.6.38/lib/rd/rdinlineparser.tab.rb
-- vendor/rdtool-0.6.38/lib/rd/rdvisitor.rb
-- vendor/rdtool-0.6.38/lib/rd/reference-resolver.rb
-- vendor/rdtool-0.6.38/lib/rd/search-file.rb
-- vendor/rdtool-0.6.38/lib/rd/tree.rb
-- vendor/rdtool-0.6.38/lib/rd/version.rb
-- vendor/rdtool-0.6.38/lib/rd/visitor.rb
-- vendor/rdtool-0.6.38/rdtool.gemspec
-- vendor/rdtool-0.6.38/setup.rb
-- vendor/rdtool-0.6.38/test/data/includee1.html
-- vendor/rdtool-0.6.38/test/data/includee2.html
-- vendor/rdtool-0.6.38/test/data/includee3.nothtml
-- vendor/rdtool-0.6.38/test/data/includee4.xhtml
-- vendor/rdtool-0.6.38/test/data/label.rbl
-- vendor/rdtool-0.6.38/test/data/label2.rbl
-- vendor/rdtool-0.6.38/test/data/sub/includee2.html
-- vendor/rdtool-0.6.38/test/data/sub/includee4.html
-- vendor/rdtool-0.6.38/test/dummy-observer.rb
-- vendor/rdtool-0.6.38/test/dummy.rb
-- vendor/rdtool-0.6.38/test/temp-dir.rb
-- vendor/rdtool-0.6.38/test/test-block-parser.rb
-- vendor/rdtool-0.6.38/test/test-desclist-item.rb
-- vendor/rdtool-0.6.38/test/test-document-element.rb
-- vendor/rdtool-0.6.38/test/test-document-struct.rb
-- vendor/rdtool-0.6.38/test/test-element.rb
-- vendor/rdtool-0.6.38/test/test-headline.rb
-- vendor/rdtool-0.6.38/test/test-inline-parser.rb
-- vendor/rdtool-0.6.38/test/test-list-item.rb
-- vendor/rdtool-0.6.38/test/test-list.rb
-- vendor/rdtool-0.6.38/test/test-methodlist-item.rb
-- vendor/rdtool-0.6.38/test/test-nonterminal-element.rb
-- vendor/rdtool-0.6.38/test/test-nonterminal-inline.rb
-- vendor/rdtool-0.6.38/test/test-output-format-visitor.rb
-- vendor/rdtool-0.6.38/test/test-parser-util.rb
-- vendor/rdtool-0.6.38/test/test-rbl-file.rb
-- vendor/rdtool-0.6.38/test/test-rbl-suite.rb
-- vendor/rdtool-0.6.38/test/test-rd2html-lib.rb
-- vendor/rdtool-0.6.38/test/test-rdtree.rb
-- vendor/rdtool-0.6.38/test/test-rdvisitor.rb
-- vendor/rdtool-0.6.38/test/test-reference-resolver.rb
-- vendor/rdtool-0.6.38/test/test-reference.rb
-- vendor/rdtool-0.6.38/test/test-search-file.rb
-- vendor/rdtool-0.6.38/test/test-terminal-inline.rb
-- vendor/rdtool-0.6.38/test/test-textblock.rb
-- vendor/rdtool-0.6.38/test/test-tree.rb
-- vendor/rdtool-0.6.38/test/test-version.rb
-- vendor/rdtool-0.6.38/test/test-visitor.rb
-- vendor/rdtool-0.6.38/utils/rd-mode.el
 homepage: http://www.tdiary.org/
 licenses:
 - GPL-2
@@ -575,7 +530,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: a TSUKKOMI-able Web-log