tdiary 4.0.0 → 4.0.0.20130826

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c2ed4f31f551e1212ec131514ad46e818c11d05
-  data.tar.gz: bf0e9d489593f024774eb1f3a20896b312e3fd77
+  metadata.gz: 27cb77ac1fe50e8091bd34b3b73b9002b13d0260
+  data.tar.gz: a22c266f3cae33f27f0a067086568ca449a74752
 SHA512:
-  metadata.gz: 1777df3366fc61593667fc4fdb7ad3f54675b909a5c5b520d824d5bb94ab3cbfe7e266cac7ccaf25f30088de2ea3d0a14c38e73a462c749e8ccfa15e44bd1869
-  data.tar.gz: ec35de2d36352501a93c8db76c7f036bdf1dec823deab77289d311df337b2dfa7a5306ea7d842331369ff050236c2960bbd5a396a93f693a2fdfdbeba44e0a29
+  metadata.gz: 835577cb058663ce7db73d66c83bddc829f1c0f42485f8d81fe46f3bdc12c42d39ac7150f66fb54bee38b7720e9f169b2e8d7d2f9c55435f69cb3a5ccbbb6624
+  data.tar.gz: 1d8c2807485b4da29ed047030026b08d8b0d3f145e12ad34eaddb853dffbbdb92878c2285b8566ec10f2dd4889677aa6bde328f88d10740542cf47e32ad80525

data/.gitignore

@@ -14,3 +14,4 @@ vendor/bundle/
 spec/reports
 doc/*.html
 .rspec
+/Gemfile.local

data/.travis.yml

@@ -4,9 +4,13 @@ rvm:
   - 1.9.3
   - 2.0.0
 
+# ignored --deployment option
+bundler_args: ""
+
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - "echo 'gemspec' > Gemfile.local"
 
 before_script:
   - DAEMON=1 bundle exec rake server

data/Gemfile

@@ -1,21 +1,5 @@
 source 'https://rubygems.org'
 
-if File.exist?(File.expand_path('../tdiary.gemspec', __FILE__))
-	# directly installed (e.g. git clone, archive file)
-	gemspec
-else
-	# installed by gem
-	gem 'tdiary'
-
-	# use edge tDiary
-	# gem 'tdiary', :git => 'git@github.com:tdiary/tdiary-core.git'
-end
-
-# if you use tdiary-contrib gem, uncomment this line.
-# gem 'tdiary-contrib'
-# use edge tDiary contrib
-# gem 'tdiary-contrib', :git => 'git@github.com:tdiary/tdiary-contrib.git'
-
 gem 'rack'
 gem 'sprockets'
 gem 'hikidoc'
@@ -72,3 +56,10 @@ group :development do
     gem 'coveralls', :require => false
   end
 end
+
+# https://github.com/redmine/redmine/blob/master/Gemfile#L89
+local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+if File.exists?(local_gemfile)
+  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(local_gemfile)
+end

data/Gemfile.lock

@@ -1,10 +1,3 @@
-PATH
-  remote: .
-  specs:
-    tdiary (4.0.0)
-      bundler (~> 1.3)
-      thor (~> 0.18)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -33,8 +26,7 @@ GEM
     dalli (2.6.4)
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.0)
     fastimage (1.5.0)
     ffi (1.9.0)
     hike (1.2.3)
@@ -47,11 +39,11 @@ GEM
     jasmine-core (1.3.1)
     launchy (2.3.0)
       addressable (~> 2.3)
-    libv8 (3.11.8.17)
-    method_source (0.8.1)
-    mime-types (1.23)
+    libv8 (3.16.14.3)
+    method_source (0.8.2)
+    mime-types (1.24)
     mini_portile (0.5.1)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     pit (0.0.7)
@@ -73,7 +65,7 @@ GEM
     rdtool (0.6.38)
     redcarpet (3.0.0)
     redis (3.0.4)
-    redis-namespace (1.3.0)
+    redis-namespace (1.3.1)
       redis (~> 3.0.0)
     ref (1.0.5)
     rest-client (1.6.7)
@@ -82,17 +74,17 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec-mocks (2.14.3)
     rubyzip (0.9.9)
-    selenium-webdriver (2.33.0)
+    selenium-webdriver (2.35.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sequel (4.0.0)
+    sequel (4.1.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -103,12 +95,12 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     tapp (1.4.0)
       thor
     test-unit (2.5.5)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
       ref
     thin (1.5.1)
       daemons (>= 1.0.9)
@@ -155,7 +147,6 @@ DEPENDENCIES
   sprockets
   sqlite3
   tapp
-  tdiary!
   test-unit
   therubyracer
   thin

data/misc/templates/Gemfile.local.erb

@@ -0,0 +1,8 @@
+gem 'tdiary'
+# use edge tDiary
+# gem 'tdiary', :git => 'git@github.com:tdiary/tdiary-core.git'
+
+# if you use tdiary-contrib gem, uncomment this line.
+# gem 'tdiary-contrib'
+# use edge tDiary contrib
+# gem 'tdiary-contrib', :git => 'git@github.com:tdiary/tdiary-contrib.git'

data/tdiary/cli.rb

@@ -18,6 +18,7 @@ module TDiary
 			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'))
 
 			unless options[:'skip-bundle']
 				Bundler.with_clean_env do

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.0.0'
+	VERSION = '4.0.0.20130826'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.0.20130826
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -251,6 +251,7 @@ files:
 - misc/style/wiki/README.en
 - misc/style/wiki/wiki_parser.rb
 - misc/style/wiki/wiki_style.rb
+- misc/templates/Gemfile.local.erb
 - misc/theme_convert/Readme.rd
 - misc/theme_convert/append.rcss
 - misc/theme_convert/theme_convert.rb
@@ -454,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: a TSUKKOMI-able Web-log