Merge branch 'master' into extract-coffeescript

.travis.yml

@@ -19,9 +19,6 @@ cache:
 # ignored --deployment option
 bundler_args: "--without server --jobs=3 --retry=3"
 
-before_install:
-  - "echo 'gemspec' > Gemfile.local"
-
 before_script:
   - npm install
   - grunt

ChangeLog

@@ -1,3 +1,11 @@
+2015-11-26  MATSUOKA Kohei <kohei@machu.jp>
+	* move gems dependency from Gemfile to .gemspec
+	* specify spec.files without git command
+	* remove specs from gem
+
+2015-09-29  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+	* release 4.2.0
+
 2015-06-29  MATSUOKA Kohei <kohei@machu.jp>
 	* release 4.1.3
 	* Gemfile: use rack 1.6.4 which sepatates params with ';'. see #485
@@ -55,7 +63,7 @@
 
 2014-12-27  MATSUOKA Kohei <kohei@machu.jp>
 	* lib/tdiary/application.rb: fix #442: call extensions setup before the core setup
-	* lib/tdiary/application/extensions/omniauth.rb: fix error with base_dir 
+	* lib/tdiary/application/extensions/omniauth.rb: fix error with base_dir
 	* lib/tdiary/rack/auth/omniauth.rb: remove github authentication
 
 2014-12-22  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
@@ -724,9 +732,9 @@
 	* plugin/00default.rb: fixed bug of no saved referer under new navi_user plugin.
 
 2009-11-24  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-	* tdiary.rb, plugin/00default.rb, 
+	* tdiary.rb, plugin/00default.rb,
 	plugin/{ja,en,zh}/00default.rb: change logger implementation.
-	* tdiary.rb, plugin/00default.rb: change implemention of 
+	* tdiary.rb, plugin/00default.rb: change implemention of
 	navi_user_day to navi_user.rb.
 
 2009-08-26  Kazuhiko  <kazuhiko@fdiary.net>
@@ -878,7 +886,7 @@
 	* **/*.rb: insert magic comment.
 
 2008-11-17 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
-	* index.rb, update.rb: replaced $defout to $stdout. ($defout is obsolete in ruby1.8) 
+	* index.rb, update.rb: replaced $defout to $stdout. ($defout is obsolete in ruby1.8)
 
 2008-10-31 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
 	* plugin/00default.rb: escaped comment_form_text. thx fudan.
@@ -955,7 +963,7 @@
 	* skel/footer.rhtml: using rescue on display to RUBY_PATCHLEVEL.
 
 2008-06-23 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
-	* tdiary.rb: add 'Semulator', 'Vemulator', 'J-EMULATOR' and 'emobile' to 
+	* tdiary.rb: add 'Semulator', 'Vemulator', 'J-EMULATOR' and 'emobile' to
 	mobile user agent.
 	* skel/footer.rhtml: display RUBY_PATCHLEVEL in footer.
 
@@ -1310,7 +1318,7 @@
 
 2006-11-11  Tanaka Akira <akr at fsij.org>
 	* tdiary/wiki_style.rb: support here document ends without CR/LF in plugin.
- 
+
 2006-11-10 TADA Tadashi <sho@spc.gr.jp>
 	* style/wiki_style.rb: fix bug when plugin specified in subtitle.
 
@@ -1320,13 +1328,13 @@
 2006-11-06  Tanaka Akira <akr at fsij.org>
 	* tdiary/hikidoc.rb, tdiary/wiki_style.rb: support here document in wiki
 	style plugin syntax.
- 
-2006-09-13 Shun-ichi TAHARA  <jado at flowernet.gr.jp> 
+
+2006-09-13 Shun-ichi TAHARA  <jado at flowernet.gr.jp>
 	* style/etdiary/etdiary_style.rb: fix bug for mobile mode.
- 
-2006-09-13 Masahiro Sakai  <sakai at tom.sfc.keio.ac.jp> 
+
+2006-09-13 Masahiro Sakai  <sakai at tom.sfc.keio.ac.jp>
 	* style/rd/rd_style.rb: unescapeHTML for parameters of plugins.
- 
+
 2006-09-05 TADA Tadashi <sho@spc.gr.jp>
 	* skel/i.*.rhtml: add navigation link to bottom of pages.
 

Gemfile

@@ -1,16 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'rack'
-gem 'sprockets'
-gem 'hikidoc'
-gem 'fastimage'
-gem 'emot'
-gem 'mail'
+gemspec
 
 group :development do
   gem 'pit', require: false
   gem 'racksh', require: false
-  gem 'rake'
   gem 'redcarpet'
 
   group :test do

Gemfile.lock

@@ -1,3 +1,17 @@
+PATH
+  remote: .
+  specs:
+    tdiary (4.2.0.20151126)
+      bundler (~> 1.3)
+      emot
+      fastimage
+      hikidoc
+      mail
+      rack
+      rake
+      sprockets
+      thor (~> 0.18)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -41,11 +55,11 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_portile (0.6.2)
     multi_json (1.11.2)
     netrc (0.11.0)
-    nokogiri (1.6.6.3)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     phantomjs (1.9.8.0)
     pit (0.0.7)
@@ -73,15 +87,15 @@ GEM
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.0)
+    rspec-core (3.4.1)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-support (3.4.0)
+    rspec-support (3.4.1)
     rubyzip (1.1.7)
     selenium-webdriver (2.48.1)
       childprocess (~> 0.5)
@@ -95,7 +109,7 @@ GEM
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    sprockets (3.4.0)
+    sprockets (3.4.1)
       rack (> 1, < 3)
     sqlite3 (1.3.11)
     term-ansicolor (1.3.2)
@@ -117,24 +131,18 @@ PLATFORMS
 DEPENDENCIES
   capybara
   coveralls (~> 0.7.12)
-  emot
-  fastimage
-  hikidoc
   jasmine
   launchy
-  mail
   pit
   pry-byebug
-  rack
   racksh
-  rake
   redcarpet
   rspec
   selenium-webdriver
   sequel
   simplecov
-  sprockets
   sqlite3
+  tdiary!
   test-unit
 
 BUNDLED WITH

lib/tdiary/cli.rb

@@ -18,7 +18,7 @@ def new(name)
 			target = File.join(Dir.pwd, name)
 			deploy(target)
 			copy_file('tdiary.conf.beginner', File.join(target, 'tdiary.conf'))
-			template('misc/templates/Gemfile.local.erb', File.join(target, 'Gemfile.local'))
+			template('misc/templates/Gemfile.erb', File.join(target, 'Gemfile'))
 
 			unless options[:'skip-bundle']
 				Bundler.with_clean_env do
@@ -75,7 +75,12 @@ def assets_copy
 		def test
 			target = File.join(Dir.pwd, 'tmp/test')
 			deploy(target)
-			append_to_file(File.join(target, 'Gemfile'), "path '#{CLI::source_root}'")
+			copy_file('Gemfile', File.join(target, 'Gemfile'))
+			gsub_file(File.join(target, 'Gemfile'),
+				/^gemspec$/,
+				"gemspec path: '#{CLI::source_root}'"
+			)
+			copy_file('Rakefile', File.join(target, 'Rakefile'))
 			directory('spec', File.join(target, 'spec'))
 			directory('test', File.join(target, 'test'))
 
@@ -171,8 +176,6 @@ def deploy(target)
 				empty_directory(File.join(target, 'theme'))
 				%w(
 				README.md
-				Gemfile
-				Gemfile.lock
 				config.ru
 				tdiary.conf.beginner
 				tdiary.conf.sample

lib/tdiary/environment.rb

@@ -19,3 +19,18 @@ module TDiary::Cache; end
   env = env.reject{|e| Bundler.settings.without.include? e }
   Bundler.require *env
 end
+
+# Bundler.require doesn't load gems specified in .gemspec
+# see: https://github.com/bundler/bundler/issues/1041
+#
+# load gems dependented by tdiary
+Bundler.definition.specs.find {|spec|
+  spec.name == 'tdiary'
+}.dependent_specs.each {|spec|
+  begin
+    require spec.name
+  rescue LoadError => e
+    STDERR.puts "failed require '#{spec.name}'"
+    STDERR.puts e
+  end
+}

lib/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.2.0'
+	VERSION = '4.2.0.20151126'
 end

misc/templates/Gemfile.erb

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'tdiary'
+# gem 'tdiary', github: 'tdiary/tdiary-core'
+gem 'tdiary-contrib', github: 'tdiary/tdiary-contrib'
+gem 'tdiary-style-gfm'

tdiary.gemspec

@@ -13,13 +13,39 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://www.tdiary.org/"
   spec.license       = "GPL2"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = Dir[
+    'ChangeLog',
+    'config.ru',
+    'Gemfile',
+    'Gemfile.lock',
+    'README.md',
+    'Rakefile',
+    'tdiary.conf*',
+    'bin/**/*',
+    'doc/**/*',
+    'js/**/*',
+    'lib/**/*',
+    'misc/**/*',
+    'public/**/*',
+    'theme/**/*',
+    'vendor/**/*',
+    'views/**/*'
+  ]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_ruby_version = '>= 2.0.0'
 
+  # for tdiary command
   spec.add_dependency 'thor', '~> 0.18'
   spec.add_dependency "bundler", "~> 1.3"
+
+  # for tdiary application
+  spec.add_dependency 'rack'
+  spec.add_dependency 'rake'
+  spec.add_dependency 'sprockets'
+  spec.add_dependency 'hikidoc'
+  spec.add_dependency 'fastimage'
+  spec.add_dependency 'emot'
+  spec.add_dependency 'mail'
 end