tdiary 3.2.2.20130508 → 3.2.2.20130518

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c0f167d4db0629777e0f383c79907f184f46e7
-  data.tar.gz: b2be9c61baa9f47306566e2e78f1161a646afc81
+  metadata.gz: 02271eb97d061a659a842ab6325f5e78dd1e98cb
+  data.tar.gz: 170da4dde4d8c44873f97e7908d77a29069bc7b7
 SHA512:
-  metadata.gz: d843a86f963e6cbf0a604c912273fe0f58177d6fdf59575fadc49cabe41a0b28c67b69c0512de79595a3fb25a1b84e5aad87b1c0aa02dbd201bb716eca1b70b0
-  data.tar.gz: 1182962b5a7a170352307f22e4133d96cd3198691127750522caad28e963e56bd89f43f3d66582ce313f76405a2c14d97afc4f27e9c98dbfafe59106f3e18d9a
+  metadata.gz: 4a2c9008a97e1a7abd4e0bce476abc127752143131d5049c12ff9bd281e144caa5534f653a382d96ad44e39cc5dff67ec68a00d899a58f5208aafb61853510a7
+  data.tar.gz: 81135666766c82946bb6daaaaa3bf869c4878d7e925dc303e58d5d8b12851e9ba7f768b9bf1bfef4b8d2677f41a29b8982d4859f262661b60f301dd4887bc732

data/Gemfile

@@ -6,13 +6,21 @@ if File.exist?('tdiary.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 'rake'
 
 gem 'rack'
 gem 'sprockets'
-gem 'coffee-script'
+gem 'coffee-script', :group => [:development, :test]
 
 gem 'omniauth'
 gem 'omniauth-twitter'
@@ -38,9 +46,6 @@ platforms :jruby do
 end
 
 group :development do
-  gem 'capistrano', :require => false
-  gem 'capistrano_colors', :require => false
-  gem 'rvm-capistrano', :require => false
   gem 'pit', :require => false
   gem 'racksh', :require => false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tdiary (3.2.2.20130508)
+    tdiary (3.2.2.20130518)
       bundler (~> 1.3)
       thor (~> 0.18)
 
@@ -9,13 +9,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.4)
-    capistrano (2.14.2)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    capistrano_colors (0.5.5)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -30,23 +23,22 @@ GEM
       execjs
     coffee-script-source (1.6.2)
     colorize (0.5.8)
-    coveralls (0.6.6)
+    coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       thor
     daemons (1.1.9)
-    dalli (2.6.2)
+    dalli (2.6.3)
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    ffi (1.7.0)
-    hashie (2.0.3)
-    highline (1.6.18)
+    ffi (1.8.1)
+    hashie (2.0.5)
     hike (1.2.2)
     httpauth (0.2.0)
     jasmine (1.3.2)
@@ -60,16 +52,9 @@ GEM
     launchy (2.3.0)
       addressable (~> 2.3)
     method_source (0.8.1)
-    mime-types (1.22)
-    multi_json (1.7.2)
+    mime-types (1.23)
+    multi_json (1.7.3)
     multipart-post (1.2.0)
-    net-scp (1.1.0)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
     nokogiri (1.5.9)
     oauth (0.4.7)
     oauth2 (0.8.1)
@@ -95,7 +80,7 @@ GEM
       omniauth-oauth (~> 1.0)
     pit (0.0.7)
     posix-spawn (0.3.6)
-    pry (0.9.12)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -110,8 +95,8 @@ GEM
       rack-test (>= 0.5)
     rake (10.0.4)
     redcarpet (2.2.2)
-    redis (3.0.3)
-    redis-namespace (1.2.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -124,14 +109,12 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
     rubyzip (0.9.9)
-    rvm-capistrano (1.3.0)
-      capistrano (>= 2.0.0)
     selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sequel (3.46.0)
+    sequel (3.47.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -145,13 +128,15 @@ 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)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.18.1)
-    tilt (1.3.7)
+    tilt (1.4.1)
     twitter-text (1.6.1)
       unf (~> 0.0.5)
     unf (0.0.5)
@@ -166,8 +151,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano
-  capistrano_colors
   capybara
   coffee-script
   coveralls
@@ -187,7 +170,6 @@ DEPENDENCIES
   redis
   redis-namespace
   rspec
-  rvm-capistrano
   selenium-webdriver
   sequel
   simplecov
@@ -195,6 +177,7 @@ DEPENDENCIES
   sqlite3
   tapp
   tdiary!
+  tdiary-contrib
   test-unit
   thin
   trinidad

data/README.md

@@ -18,7 +18,7 @@ tDiaryには以下のような特徴があります。
 
 ### レンタルサーバーユーザにやさしい
 
-必要なのはRuby(1.8.5ないしは1.9.2以降に対応)だけ。単独でCGIとして動作し、基本機能はデータベースや追加のライブラリを必要としません。
+必要なのはRuby(1.9.2ないしは2.0.0以降に対応)だけ。単独でCGIとして動作し、基本機能はデータベースや追加のライブラリを必要としません。
 
 ### プラグインで拡張できます
 
@@ -30,4 +30,4 @@ tDiaryには以下のような特徴があります。
 
 ### その他
 
-インストールにはドキュメント(doc/INSTALL.html)を参照して下さい。動作にはruby(1.8.5以降または1.9.2以降)と、CGIをサポートするWebサーバが必要ですが、通常のレンタルサーバーであればたいていはこの環境があるはずです。
+インストールにはドキュメント(doc/INSTALL.html)を参照して下さい。動作にはruby(1.9.2以降または2.0.0以降)と、CGIをサポートするWebサーバが必要です。

data/config.ru

@@ -1,6 +1,5 @@
 $:.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'
@@ -38,6 +37,9 @@ map "#{base_dir}/assets" do
 	environment = Sprockets::Environment.new
 	%w(js theme).each {|path| environment.append_path File.join(TDiary.root, path) }
 
+	# FIXME: dirty hack, it should create TDiary::Server::Config.assets_path
+	TDiary::Contrib::Assets.setup(environment) if defined?(TDiary::Contrib)
+	
 	# if you need to auto compilation for CoffeeScript
 	# require 'tdiary/rack/assets/precompile'
 	# use TDiary::Rack::Assets::Precompile, environment

data/doc/HOWTO-testing-tDiary.md

@@ -18,7 +18,7 @@ tDiary-3.0.1.20101011 以降のバージョンでは tDiary を test するた
 
 tDiary でテストを実行するためには以下の環境を用意する必要があります。
 
-  - Ruby 1.8.7 以降または Ruby 1.9.2 以降
+  - Ruby 1.9.2 以降または Ruby 2.0.0 以降
   - RubyGems 1.3.7 以降
   - Bundler 1.0.0 以降
 

data/doc/INSTALL-paas.md

@@ -12,7 +12,7 @@ tDiary-3.1.3 以降のバージョンでは tDiary を [Heroku](http://www.herok
 tDiary を PaaS で動作させるためには以下のツールが必要となります。
 
   - [git](http://git-scm.com)
-  - Ruby 1.8.7 以降
+  - Ruby 1.9.2 以降
   - RubyGems 1.3.7 以降
   - Bundler 1.0.0 以降
 

data/doc/README.en.md

@@ -36,7 +36,7 @@ You can choice a grammar of writing your diary by 'Style' feature. Some style fi
 
 ### Written in Ruby
 
-Important :-). tDiary requires Ruby-1.8.2 or later.
+Important :-). tDiary requires Ruby-1.9.2 or later.
 
 ### Others
 

data/doc/README.md

@@ -36,7 +36,7 @@ iモードに限らず、ほとんどの携帯電話やPalm・ザウルスなど
 
 ### Rubyで書かれている
 
-重要なポイントでしょう:-)??実行にはruby 1.9.1-p378またはruby 1.8.7-p249以上が必要です。
+重要なポイントでしょう:-)??実行にはruby 1.9.2またはruby 2.0.0以上が必要です。
 
 セクション(段落)アンカーや過去の日記の参照など、一般的なWeb日記システムの持つ機能は基本的にサポートしています。
 

data/js/comment_emoji_autocomplete.js

@@ -0,0 +1,139 @@
+/*
+ * emoji_autocomplete.js : Support the automatic input of the emoji,
+ *                         using jQuery UI autocomplete.
+ *
+ * Copyright (C) 2013 by tamoot <tamoot+tdiary@gmail.com>
+ * You can distribute it under GPL.
+ */
+
+$(function() {
+   var config = new Object();
+   config.candidates = [":blush:",":scream:",":smirk:",":smiley:",":stuck_out_tongue_closed_eyes:",":stuck_out_tongue_winking_eye:",":rage:",":disappointed:",":sob:",":kissing_heart:",":wink:",":pensive:",":confounded:",":flushed:",":relaxed:",":mask:",":heart:",":broken_heart:",":sunny:",":umbrella:",":cloud:",":snowflake:",":snowman:",":zap:",":cyclone:",":foggy:",":ocean:",":cat:",":dog:",":mouse:",":hamster:",":rabbit:",":wolf:",":frog:",":tiger:",":koala:",":bear:",":pig:",":pig_nose:",":cow:",":boar:",":monkey_face:",":monkey:",":horse:",":racehorse:",":camel:",":sheep:",":elephant:",":panda_face:",":snake:",":bird:",":baby_chick:",":hatched_chick:",":hatching_chick:",":chicken:",":penguin:",":turtle:",":bug:",":honeybee:",":ant:",":beetle:",":snail:",":octopus:",":tropical_fish:",":fish:",":whale:",":whale2:",":dolphin:",":cow2:",":ram:",":rat:",":water_buffalo:",":tiger2:",":rabbit2:",":dragon:",":goat:",":rooster:",":dog2:",":pig2:",":mouse2:",":ox:",":dragon_face:",":blowfish:",":crocodile:",":dromedary_camel:",":leopard:",":cat2:",":poodle:",":paw_prints:",":bouquet:",":cherry_blossom:",":tulip:",":four_leaf_clover:",":rose:",":sunflower:",":hibiscus:",":maple_leaf:",":leaves:",":fallen_leaf:",":herb:",":mushroom:",":cactus:",":palm_tree:",":evergreen_tree:",":deciduous_tree:",":chestnut:",":seedling:",":blossom:",":ear_of_rice:",":shell:",":globe_with_meridians:",":sun_with_face:",":full_moon_with_face:",":new_moon_with_face:",":new_moon:",":waxing_crescent_moon:",":first_quarter_moon:",":waxing_gibbous_moon:",":full_moon:",":waning_gibbous_moon:",":last_quarter_moon:",":waning_crescent_moon:",":last_quarter_moon_with_face:",":first_quarter_moon_with_face:",":moon:",":earth_africa:",":earth_americas:",":earth_asia:",":volcano:",":milky_way:",":partly_sunny:",":octocat:",":squirrel:",":bamboo:",":gift_heart:",":dolls:",":school_satchel:",":mortar_board:",":flags:",":fireworks:",":sparkler:",":wind_chime:",":rice_scene:",":jack_o_lantern:",":ghost:",":santa:",":christmas_tree:",":gift:",":bell:",":no_bell:",":tanabata_tree:",":tada:",":confetti_ball:",":balloon:",":crystal_ball:",":cd:",":dvd:",":floppy_disk:",":camera:",":video_camera:",":movie_camera:",":computer:",":tv:",":iphone:",":phone:",":telephone:",":telephone_receiver:",":pager:",":fax:",":minidisc:",":vhs:",":sound:",":speaker:",":mute:",":loudspeaker:",":mega:",":hourglass:",":hourglass_flowing_sand:",":alarm_clock:",":watch:",":radio:",":satellite:",":loop:",":mag:",":mag_right:",":unlock:",":lock:",":lock_with_ink_pen:",":closed_lock_with_key:",":key:",":bulb:",":flashlight:",":high_brightness:",":low_brightness:",":electric_plug:",":battery:",":calling:",":email:",":mailbox:",":postbox:",":bath:",":bathtub:",":shower:",":toilet:",":wrench:",":nut_and_bolt:",":hammer:",":seat:",":moneybag:",":yen:",":dollar:",":pound:",":euro:",":credit_card:",":money_with_wings:",":e-mail:",":inbox_tray:",":outbox_tray:",":envelope:",":incoming_envelope:",":postal_horn:",":mailbox_closed:",":mailbox_with_mail:",":mailbox_with_no_mail:",":door:",":smoking:",":bomb:",":gun:",":hocho:",":pill:",":syringe:",":page_facing_up:",":page_with_curl:",":bookmark_tabs:",":bar_chart:",":chart_with_upwards_trend:",":chart_with_downwards_trend:",":scroll:",":clipboard:",":calendar:",":date:",":card_index:",":file_folder:",":open_file_folder:",":scissors:",":pushpin:",":paperclip:",":black_nib:",":pencil2:",":straight_ruler:",":triangular_ruler:",":closed_book:",":green_book:",":blue_book:",":orange_book:",":notebook:",":notebook_with_decorative_cover:",":ledger:",":books:",":bookmark:",":name_badge:",":microscope:",":telescope:",":newspaper:",":football:",":basketball:",":soccer:",":baseball:",":tennis:",":8ball:",":rugby_football:",":bowling:",":golf:",":mountain_bicyclist:",":bicyclist:",":horse_racing:",":snowboarder:",":swimmer:",":surfer:",":ski:",":spades:",":hearts:",":clubs:",":diamonds:",":gem:",":ring:",":trophy:",":musical_score:",":musical_keyboard:",":violin:",":space_invader:",":video_game:",":black_joker:",":flower_playing_cards:",":game_die:",":dart:",":mahjong:",":clapper:",":memo:",":pencil:",":book:",":art:",":microphone:",":headphones:",":trumpet:",":saxophone:",":guitar:",":shoe:",":sandal:",":high_heel:",":lipstick:",":boot:",":shirt:",":tshirt:",":necktie:",":womans_clothes:",":dress:",":running_shirt_with_sash:",":jeans:",":kimono:",":bikini:",":ribbon:",":tophat:",":crown:",":womans_hat:",":mans_shoe:",":closed_umbrella:",":briefcase:",":handbag:",":pouch:",":purse:",":eyeglasses:",":fishing_pole_and_fish:",":coffee:",":tea:",":sake:",":baby_bottle:",":beer:",":beers:",":cocktail:",":tropical_drink:",":wine_glass:",":fork_and_knife:",":pizza:",":hamburger:",":fries:",":poultry_leg:",":meat_on_bone:",":spaghetti:",":curry:",":fried_shrimp:",":bento:",":sushi:",":fish_cake:",":rice_ball:",":rice_cracker:",":rice:",":ramen:",":stew:",":oden:",":dango:",":egg:",":bread:",":doughnut:",":custard:",":icecream:",":ice_cream:",":shaved_ice:",":birthday:",":cake:",":cookie:",":chocolate_bar:",":candy:",":lollipop:",":honey_pot:",":apple:",":green_apple:",":tangerine:",":lemon:",":cherries:",":grapes:",":watermelon:",":strawberry:",":peach:",":melon:",":banana:",":pear:",":pineapple:",":sweet_potato:",":eggplant:",":tomato:",":corn:",":alien:",":angel:",":anger:",":angry:",":anguished:",":astonished:",":baby:",":blue_heart:",":blush:",":boom:",":bow:",":bowtie:",":boy:",":bride_with_veil:",":broken_heart:",":bust_in_silhouette:",":busts_in_silhouette:",":clap:",":cold_sweat:",":collision:",":confounded:",":confused:",":construction_worker:",":cop:",":couple_with_heart:",":couple:",":couplekiss:",":cry:",":crying_cat_face:",":cupid:",":dancer:",":dancers:",":dash:",":disappointed:",":dizzy_face:",":dizzy:",":droplet:",":ear:",":exclamation:",":expressionless:",":eyes:",":facepunch:",":family:",":fearful:",":feelsgood:",":feet:",":finnadie:",":fire:",":fist:",":flushed:",":frowning:",":girl:",":goberserk:",":godmode:",":green_heart:",":grey_exclamation:",":grey_question:",":grimacing:",":grin:",":grinning:",":guardsman:",":haircut:",":hand:",":hankey:",":hear_no_evil:",":heart_eyes_cat:",":heart_eyes:",":heart:",":heartbeat:",":heartpulse:",":hurtrealbad:",":hushed:",":imp:",":information_desk_person:",":innocent:",":japanese_goblin:",":japanese_ogre:",":joy_cat:",":joy:",":kiss:",":kissing_cat:",":kissing_closed_eyes:",":kissing_heart:",":kissing_smiling_eyes:",":kissing:",":laughing:",":lips:",":love_letter:",":man_with_gua_pi_mao:",":man_with_turban:",":man:",":mask:",":massage:",":metal:",":muscle:",":musical_note:",":nail_care:",":neckbeard:",":neutral_face:",":no_good:",":no_mouth:",":nose:",":notes:",":ok_hand:",":ok_woman:",":older_man:",":older_woman:",":open_hands:",":open_mouth:",":pensive:",":persevere:",":person_frowning:",":person_with_blond_hair:",":person_with_pouting_face:",":point_down:",":point_left:",":point_right:",":point_up_2:",":point_up:",":poop:",":pouting_cat:",":pray:",":princess:",":punch:",":purple_heart:",":question:",":rage:",":rage1:",":rage2:",":rage3:",":rage4:",":raised_hand:",":raised_hands:",":relaxed:",":relieved:",":revolving_hearts:",":runner:",":running:",":satisfied:",":scream_cat:",":scream:",":see_no_evil:",":shit:",":skull:",":sleeping:",":sleepy:",":smile_cat:",":smile:",":smiley_cat:",":smiley:",":smiling_imp:",":smirk_cat:",":smirk:",":sob:",":sparkling_heart:",":sparkles:",":speak_no_evil:",":speech_balloon:",":star:",":star2:",":stuck_out_tongue_closed_eyes:",":stuck_out_tongue_winking_eye:",":stuck_out_tongue:",":sunglasses:",":suspect:",":sweat_drops:",":sweat_smile:",":sweat:",":thought_balloon:",":-1:",":thumbsdown:",":thumbsup:",":+1:",":tired_face:",":tongue:",":triumph:",":trollface:",":two_hearts:",":two_men_holding_hands:",":two_women_holding_hands:",":unamused:",":v:",":walking:",":wave:",":weary:",":wink2:",":wink:",":woman:",":worried:",":yellow_heart:",":yum:",":zzz:",":109:",":house:",":house_with_garden:",":school:",":office:",":post_office:",":hospital:",":bank:",":convenience_store:",":love_hotel:",":hotel:",":wedding:",":church:",":department_store:",":european_post_office:",":city_sunrise:",":city_sunset:",":japanese_castle:",":european_castle:",":tent:",":factory:",":tokyo_tower:",":japan:",":mount_fuji:",":sunrise_over_mountains:",":sunrise:",":stars:",":statue_of_liberty:",":bridge_at_night:",":carousel_horse:",":rainbow:",":ferris_wheel:",":fountain:",":roller_coaster:",":ship:",":speedboat:",":boat:",":sailboat:",":rowboat:",":anchor:",":rocket:",":airplane:",":helicopter:",":steam_locomotive:",":tram:",":mountain_railway:",":bike:",":aerial_tramway:",":suspension_railway:",":mountain_cableway:",":tractor:",":blue_car:",":oncoming_automobile:",":car:",":red_car:",":taxi:",":oncoming_taxi:",":articulated_lorry:",":bus:",":oncoming_bus:",":rotating_light:",":police_car:",":oncoming_police_car:",":fire_engine:",":ambulance:",":minibus:",":truck:",":train:",":station:",":train2:",":bullettrain_front:",":bullettrain_side:",":light_rail:",":monorail:",":railway_car:",":trolleybus:",":ticket:",":fuelpump:",":vertical_traffic_light:",":traffic_light:",":warning:",":construction:",":beginner:",":atm:",":slot_machine:",":busstop:",":barber:",":hotsprings:",":checkered_flag:",":crossed_flags:",":izakaya_lantern:",":moyai:",":circus_tent:",":performing_arts:",":round_pushpin:",":triangular_flag_on_post:",":jp:",":kr:",":cn:",":us:",":fr:",":es:",":it:",":ru:",":gb:",":uk:",":de:",":100:",":1234:",":one:",":two:",":three:",":four:",":five:",":six:",":seven:",":eight:",":nine:",":keycap_ten:",":zero:",":hash:",":symbols:",":arrow_backward:",":arrow_down:",":arrow_forward:",":arrow_left:",":capital_abcd:",":abcd:",":abc:",":arrow_lower_left:",":arrow_lower_right:",":arrow_right:",":arrow_up:",":arrow_upper_left:",":arrow_upper_right:",":arrow_double_down:",":arrow_double_up:",":arrow_down_small:",":arrow_heading_down:",":arrow_heading_up:",":leftwards_arrow_with_hook:",":arrow_right_hook:",":left_right_arrow:",":arrow_up_down:",":arrow_up_small:",":arrows_clockwise:",":arrows_counterclockwise:",":rewind:",":fast_forward:",":information_source:",":ok:",":twisted_rightwards_arrows:",":repeat:",":repeat_one:",":new:",":top:",":up:",":cool:",":free:",":ng:",":cinema:",":koko:",":signal_strength:",":u5272:",":u5408:",":u55b6:",":u6307:",":u6708:",":u6709:",":u6e80:",":u7121:",":u7533:",":u7a7a:",":u7981:",":sa:",":restroom:",":mens:",":womens:",":baby_symbol:",":no_smoking:",":parking:",":wheelchair:",":metro:",":baggage_claim:",":accept:",":wc:",":potable_water:",":put_litter_in_its_place:",":secret:",":congratulations:",":m:",":passport_control:",":left_luggage:",":customs:",":ideograph_advantage:",":cl:",":sos:",":id:",":no_entry_sign:",":underage:",":no_mobile_phones:",":do_not_litter:",":non-potable_water:",":no_bicycles:",":no_pedestrians:",":children_crossing:",":no_entry:",":eight_spoked_asterisk:",":eight_pointed_black_star:",":heart_decoration:",":vs:",":vibration_mode:",":mobile_phone_off:",":chart:",":currency_exchange:",":aries:",":taurus:",":gemini:",":cancer:",":leo:",":virgo:",":libra:",":scorpius:",":sagittarius:",":capricorn:",":aquarius:",":pisces:",":ophiuchus:",":six_pointed_star:",":negative_squared_cross_mark:",":a:",":b:",":ab:",":o2:",":diamond_shape_with_a_dot_inside:",":recycle:",":end:",":on:",":soon:",":clock1:",":clock130:",":clock10:",":clock1030:",":clock11:",":clock1130:",":clock12:",":clock1230:",":clock2:",":clock230:",":clock3:",":clock330:",":clock4:",":clock430:",":clock5:",":clock530:",":clock6:",":clock630:",":clock7:",":clock730:",":clock8:",":clock830:",":clock9:",":clock930:",":heavy_dollar_sign:",":copyright:",":registered:",":tm:",":x:",":heavy_exclamation_mark:",":bangbang:",":interrobang:",":o:",":heavy_multiplication_x:",":heavy_plus_sign:",":heavy_minus_sign:",":heavy_division_sign:",":white_flower:",":heavy_check_mark:",":ballot_box_with_check:",":radio_button:",":link:",":curly_loop:",":wavy_dash:",":part_alternation_mark:",":trident:",":black_square:",":white_square:",":white_check_mark:",":black_square_button:",":white_square_button:",":black_circle:",":white_circle:",":red_circle:",":large_blue_circle:",":large_blue_diamond:",":large_orange_diamond:",":small_blue_diamond:",":small_orange_diamond:",":small_red_triangle:",":small_red_triangle_down:",":shipit:"];
+   var regrep  = ":.+$";
+   
+   function widgetPosition(){
+      var caretPosition = Measurement.caretPos($("textarea[name=body]"));
+      return {
+         left: caretPosition.left + "px",
+         top:  caretPosition.top + 20 + "px",
+         width: "auto"
+      };
+      
+   }
+   
+   function matchedEmoji(val){
+      terms = val.split("\n");
+      term  = terms[ terms.length - 1];
+      
+      var matched = term.match(regrep);
+      
+      if( matched == null ){
+         return false;
+         
+      }
+      
+      return true;
+      
+   }
+  
+   function typedEmoji( term ) {
+      var array = term.split(":");
+      return array[ array.length - 1 ];
+   }
+  
+   $( "textarea[name=body]" )
+      .bind( "keydown", function( event ) {
+         if ( event.keyCode === $.ui.keyCode.TAB &&
+            $( this ).data( "autocomplete" ).menu.active ) {
+            event.preventDefault();
+            
+         }
+      })
+      .autocomplete({
+         delay: 500,
+         
+         //filtering
+         source: function( request, response ) {
+            if(matchedEmoji(request.term)){
+               response( $.ui.autocomplete.filter(
+                  config.candidates, typedEmoji( request.term ) ) );
+            }
+         },
+         
+         // prevent value inserted on focus
+         focus: function() {
+            return false;
+         },
+         
+         // replace textarea
+         select: function( event, ui ) {
+            // no match data ...
+            if (ui.item.value == null){
+               return false;
+            }
+            
+            var terms = this.value.split(":");
+            // remove the current typed emoji
+            terms.pop();
+            // add the selected item
+            terms.push( ui.item.value.replace(/:/g, "") );
+            this.value = terms.join( ":" ) + ":";
+            
+            return false;
+         },
+         
+         // re-positioning supports excluding IE. 
+         open: function(){
+            if (! document.uniqueID) {
+               $(".ui-autocomplete").css(widgetPosition())
+               
+            }
+         }
+
+   })
+
+   // customize autocomplate item
+   $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
+      var icon_img = null;
+      
+      if (item.value != null){
+         png_basename = item.value.replace(/:/g, "");
+         
+         if (png_basename == '+1'){ png_basename = 'plus1' }
+         
+         icon_img = $("<img>").attr('src', 'http://www.emoji-cheat-sheet.com/graphics/emojis/' + png_basename + '.png')
+         .css('width', '20').css('height', '20');
+         
+      }
+      
+      var label_a  = $("<a></a>")
+         .append(icon_img)
+         .append(item.label)
+      
+      return $( "<li></li>" )
+         .data( "item.autocomplete", item )
+         .append(label_a)
+         .appendTo( ul );
+   };
+   
+   // customize filter and result
+   $.ui.autocomplete.filter = function(array, term) {
+      var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+      
+      var aryMatches = $.grep( array, function(value) {
+         return matcher.test(value.label || value.value || value);
+
+      });
+      
+      if (aryMatches.length == 0){
+         aryMatches.push({
+            label: '<span class="info" style="font-style: italic;">no match found</span>',
+            value: null
+         });
+
+      }
+      
+      return aryMatches;
+   };
+});
+

data/misc/migrate.rb

@@ -8,7 +8,6 @@
 # You can redistribute it and/or modify it under GPL2.
 #
 BEGIN { $stdout.binmode }
-$KCODE = 'n'
 
 require "fileutils"
 require "pstore"

data/misc/paas/cloudfoundry/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'http://rubygems.org'
 
 gem 'rake'
 
@@ -8,8 +8,11 @@ gem 'sprockets'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-github'
+gem 'twitter-text', :require => false
 
 gem 'dalli'
+gem 'redis'
+gem 'redis-namespace'
 
 gem 'coffee-script'
 gem 'therubyracer'

data/misc/paas/cloudfoundry/Gemfile.lock

@@ -7,6 +7,7 @@ GEM
       execjs
     coffee-script-source (1.3.3)
     daemons (1.1.9)
+    dalli (2.6.3)
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -50,6 +51,9 @@ GEM
     rack (1.4.1)
     rake (0.9.2.2)
     redcarpet (2.1.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
+      redis (~> 3.0.0)
     sequel (3.40.0)
     sprockets (2.6.0)
       hike (~> 1.2)
@@ -63,6 +67,11 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
+    twitter-text (1.6.1)
+      unf (~> 0.0.5)
+    unf (0.0.5)
+      unf_ext
+    unf_ext (0.0.6)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -71,6 +80,7 @@ PLATFORMS
 DEPENDENCIES
   cf-runtime
   coffee-script
+  dalli
   omniauth
   omniauth-github
   omniauth-twitter
@@ -79,7 +89,10 @@ DEPENDENCIES
   rack
   rake
   redcarpet
+  redis
+  redis-namespace
   sequel
   sprockets
   therubyracer
   thin
+  twitter-text

data/misc/paas/cloudfoundry/tdiary.conf

@@ -1,13 +1,13 @@
 require 'tempfile'
 @data_path = Dir.tmpdir
 
-psql_service = CFRuntime::CloudApp.service_names_of_type('postgresql')
-psql_options = CFRuntime::PGClient.options_for_svc(names[0])
+psql_services = CFRuntime::CloudApp.service_names_of_type('postgresql')
+psql_options = CFRuntime::PGClient.options_for_svc(psql_services[0])
 @database_url = "postgres://#{psql_options[:user]}:#{psql_options[:password]}@#{psql_options[:host]}:#{psql_options[:port]}/#{psql_options[:dbname]}"
 
 @style = 'GFM'
 
-require 'tdiary/io/cache/memcached'
+require 'tdiary/io/cache/file'
 require 'tdiary/io/rdb'
 @io_class = TDiary::RdbIO
 

data/misc/plugin/comment_emoji_autocomplete.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+#
+# comment_emoji_autocomplete.rb : Support the automatic input of the emoji
+#                                 using jQuery UI autocomplete.
+#
+# Copyright (C) 2013, tamoot <tamoot+tdiary@gmail.com>
+# You can redistribute it and/or modify it under GPL2.
+#
+
+if !@cgi.mobile_agent? && /\A(?:day)\z/ =~ @mode
+	add_header_proc do
+		%Q|<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css"/>|
+	end
+   
+	enable_js('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
+	enable_js('caretposition.js')
+	enable_js('comment_emoji_autocomplete.js')
+
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/misc/plugin/xmlrpc/xmlrpc.rb

@@ -7,7 +7,6 @@
 # require Ruby1.8 or xml-rpc(http://raa.ruby-lang.org/project/xml-rpc/)
 
 BEGIN { $stdout.binmode }
-$KCODE = 'n'
 
 if FileTest::symlink?( __FILE__ ) then
   org_path = File::dirname( File::readlink( __FILE__ ) )

data/misc/style/gfm/gfm_style.rb

@@ -13,8 +13,6 @@
 # You can distribute this under GPL.
 #
 
-$KCODE = 'u' if RUBY_VERSION < '1.9'
-
 begin
 	require 'rubygems'
 rescue LoadError

data/plugin/50sp.rb

@@ -8,6 +8,9 @@ SP_PREFIX = 'sp'
 end
 @sp_path << "#{TDiary::PATH}/misc/plugin" if @sp_path.include?('misc/plugin')
 
+# FIXME: dirty hack, it should create TDiary::Server::Config.plugin_path
+TDiary::Contrib::Plugin.setup( @sp_path ) if defined?(TDiary::Contrib)
+
 # get plugin option
 def sp_option( key )
 	@conf["#{SP_PREFIX}.#{key}"]

data/tdiary/admin.rb

@@ -73,7 +73,7 @@ module TDiary
 
 			@title = @cgi.params['title'][0]
 			@body = @cgi.params['body'][0]
-			if @cgi.mobile_agent? && String.method_defined?(:encode)
+			if @cgi.mobile_agent?
 				@title.force_encoding(@conf.mobile_encoding)
 				@body.force_encoding(@conf.mobile_encoding)
 			end
@@ -113,7 +113,7 @@ module TDiary
 		def initialize( cgi, rhtml, conf )
 			@title = cgi.params['title'][0]
 			@body = cgi.params['body'][0]
-			if cgi.mobile_agent? && String.method_defined?(:encode)
+			if cgi.mobile_agent?
 				@title.force_encoding(conf.mobile_encoding)
 				@body.force_encoding(conf.mobile_encoding)
 			end

data/tdiary/base.rb

@@ -125,11 +125,9 @@ module TDiary
 
 			begin
 				r = ERB.new(rhtml.untaint).result(binding)
-			rescue => e
+			rescue ::Encoding::CompatibilityError => e
 				# migration error on ruby 1.9 only 1st time, reload.
-				if defined?(::Encoding) && e.class == ::Encoding::CompatibilityError
-					raise ForceRedirect.new(base_url)
-				end
+				raise ForceRedirect.new(base_url)
 			end
 			ERB.new(r).src
 		end

data/tdiary/cli.rb

@@ -12,15 +12,21 @@ module TDiary
 		end
 
 		desc "new DIR_NAME", "Create a new tDiary directory"
+		method_option "skip-bundle", :type => :boolean, :banner =>
+			"don't run bundle and .htpasswd generation"
 		def new(name)
 			target = File.join(Dir.pwd, name)
 			deploy(target)
 
-			Bundler.with_clean_env do
-				inside(target) do
-					run('bundle install --without test development')
-					run('bundle exec tdiary htpasswd')
+			unless options[:'skip-bundle']
+				Bundler.with_clean_env do
+					inside(target) do
+						run('bundle install --without test development')
+						run('bundle exec tdiary htpasswd')
+					end
 				end
+			else
+				say "run `bundle install && bundle exec tdiary htpasswd` manually", :red
 			end
 			say 'install finished', :green
 			say "run `tdiary server` in #{name} directory to start server", :green
@@ -47,20 +53,35 @@ module TDiary
 			"start server with rack interface (default)"
 		method_option "cgi", :type => :string, :banner =>
 			"start server with cgi interface"
+		method_option "bind", :aliases => "b", :type => :string, :default => "0.0.0.0", :banner =>
+			"bind to the IP"
+		method_option "port", :aliases => "p", :type => :numeric, :default => 19292, :banner =>
+			"use PORT"
 		def server
 			if options[:cgi]
 				opts = {
 					:daemon => ENV['DAEMON'],
-					:bind   => ENV['BIND'] || '0.0.0.0',
-					:port   => ENV['PORT'] || 19292,
+					:bind   => options[:bind],
+					:port   => options[:port],
 					:logger => $stderr,
 					:access_log => $stderr,
 				}
 				TDiary::Server.run( opts )
 			elsif
 				# --rack option
-				# TODO: start rack server without run command
-				run 'bundle exec rackup'
+				require 'rack'
+				# Rack::Server reads ARGV as :config, so delete it
+				ARGV.shift
+				opts = {
+					:environment => ENV['RACK_ENV'] || "development",
+					:daemonize   => false,
+					:Host        => options[:bind],
+					:Port        => options[:port],
+					:pid         => File.expand_path("tdiary.pid"),
+					:AccessLog   => $stderr,
+					:config      => File.expand_path("config.ru")
+				}
+				Rack::Server.start( opts )
 			end
 		end
 
@@ -101,6 +122,7 @@ module TDiary
 				%w(
 				README.md
 				Gemfile
+				Gemfile.lock
 				config.ru
 				tdiary.conf.beginner
 				tdiary.conf.sample

data/tdiary/compatible.rb

@@ -17,50 +17,55 @@ end
 
 # for Ruby 1.9.X
 
+# preload transcodes outside $SAFE=4 environment, that is a workaround
+# for the possible SecurityError. see the following uri for the detail.
+# http://redmine.ruby-lang.org/issues/5279
+%w(utf-16be euc-jp iso-2022-jp Shift_JIS).each do |enc|
+	"\uFEFF".encode(enc) rescue nil
+end
+
 # Auto convert ASCII_8BIT pstore data (created by Ruby-1.8) to UTF-8.
-if ::String.method_defined?(:force_encoding)
-	require 'pstore'
-	class PStoreRuby18Exception < Exception; end
+require 'pstore'
+class PStoreRuby18Exception < Exception; end
 
-	class PStore
-		alias compatible_transaction_original transaction unless defined?(compatible_transaction_original)
-		def transaction(*args, &block)
-			begin
-				compatible_transaction_original(*args, &block)
-			rescue PStoreRuby18Exception => e
-				# first loaded the pstore file (it's created by Ruby-1.8)
-				# force convert ASCII_8BIT pstore data to UTF_8
-				file = open_and_lock_file(@filename, false)
-				table = Marshal::load(file, proc {|obj|
-					if obj.respond_to?('force_encoding') && obj.encoding == Encoding::ASCII_8BIT
-						obj.force_encoding('UTF-8')
-					end
-					obj
-				})
-				table[:__ruby_version] = RUBY_VERSION
-				if on_windows?
-					save_data_with_fast_strategy(Marshal::dump(table), file)
-				else
-					save_data_with_atomic_file_rename_strategy(Marshal::dump(table), file)
+class PStore
+	alias compatible_transaction_original transaction unless defined?(compatible_transaction_original)
+	def transaction(*args, &block)
+		begin
+			compatible_transaction_original(*args, &block)
+		rescue PStoreRuby18Exception => e
+			# first loaded the pstore file (it's created by Ruby-1.8)
+			# force convert ASCII_8BIT pstore data to UTF_8
+			file = open_and_lock_file(@filename, false)
+			table = Marshal::load(file, proc {|obj|
+				if obj.respond_to?('force_encoding') && obj.encoding == Encoding::ASCII_8BIT
+					obj.force_encoding('UTF-8')
 				end
-				retry
+				obj
+			})
+			table[:__ruby_version] = RUBY_VERSION
+			if on_windows?
+				save_data_with_fast_strategy(Marshal::dump(table), file)
+			else
+				save_data_with_atomic_file_rename_strategy(Marshal::dump(table), file)
 			end
+			retry
 		end
+	end
 
-		private
+	private
 
-		def load(content)
-			table = Marshal::load(content)
-			raise PStoreRuby18Exception.new if !table[:__ruby_version] || table[:__ruby_version] < '1.9'
-			# hide __ruby_version to caller
-			table.delete(:__ruby_version)
-			table
-		end
+	def load(content)
+		table = Marshal::load(content)
+		raise PStoreRuby18Exception.new if !table[:__ruby_version] || table[:__ruby_version] < '1.9'
+		# hide __ruby_version to caller
+		table.delete(:__ruby_version)
+		table
+	end
 
-		def dump(table)
-			table[:__ruby_version] = RUBY_VERSION
-			Marshal::dump(table)
-		end
+	def dump(table)
+		table[:__ruby_version] = RUBY_VERSION
+		Marshal::dump(table)
 	end
 end
 

data/tdiary/config.rb

@@ -65,50 +65,18 @@ module TDiary
 			@options2.delete( key )
 		end
 
-		if String.method_defined?(:encode)
-			# preload transcodes outside $SAFE=4 environment, that is a workaround
-			# for the possible SecurityError. see the following uri for the detail.
-			# http://redmine.ruby-lang.org/issues/5279
-			%w(utf-16be euc-jp iso-2022-jp Shift_JIS).each do |enc|
-				"\uFEFF".encode(enc) rescue nil
+		def to_native( str, charset = nil )
+			str = str.dup
+			if str.encoding == Encoding::ASCII_8BIT
+				str.force_encoding(charset || 'utf-8')
 			end
-
-			def to_native( str, charset = nil )
-				str = str.dup
-				if str.encoding == Encoding::ASCII_8BIT
-					str.force_encoding(charset || 'utf-8')
-				end
-				unless str.valid_encoding?
-					str.encode!('utf-16be', {:invalid => :replace, :undef => :replace})
-				end
-				unless str.encoding == Encoding::UTF_8
-					str.encode!('utf-8', {:invalid => :replace, :undef => :replace})
-				end
-				str
+			unless str.valid_encoding?
+				str.encode!('utf-16be', {:invalid => :replace, :undef => :replace})
 			end
-		else
-			require 'kconv'
-			require 'iconv'
-			require 'nkf'
-
-			def to_native( str, charset = nil )
-				return str if Kconv.isutf8(str)
-				begin
-					Iconv.conv('utf-8', charset || 'utf-8', str)
-				rescue
-					from = case charset
-						when /^utf-8$/i
-							'W'
-						when /^shift_jis/i
-							'S'
-						when /^EUC-JP/i
-							'E'
-						else
-							''
-					end
-					NKF::nkf("-m0 -#{from}w", str)
-				end
+			unless str.encoding == Encoding::UTF_8
+				str.encode!('utf-8', {:invalid => :replace, :undef => :replace})
 			end
+			str
 		end
 
 	private

data/tdiary/lang/ja.rb

@@ -22,29 +22,12 @@ def mobile_encoding
 	'Shift_JIS'
 end
 
-if String.method_defined?(:encode)
-	def to_mobile( str )
-		str.encode(mobile_encoding, {:invalid => :replace, :undef => :replace})
-	end
-
-	def to_mail( str )
-		str.encode('iso-2022-jp', {:invalid => :replace, :undef => :replace})
-	end
-else
-	require 'nkf'
-	require 'iconv'
-
-	def to_mobile( str )
-		NKF::nkf( '-m0 -W -s', str )
-	end
+def to_mobile( str )
+	str.encode(mobile_encoding, {:invalid => :replace, :undef => :replace})
+end
 
-	def to_mail( str )
-		begin
-			Iconv.conv('iso-2022-jp', 'utf-8', str)
-		rescue
-			NKF::nkf('-m0 -W -j', str)
-		end
-	end
+def to_mail( str )
+	str.encode('iso-2022-jp', {:invalid => :replace, :undef => :replace})
 end
 
 def migrate_to_utf8( str )

data/tdiary/referer_manager.rb

@@ -24,8 +24,8 @@ module TDiary
 			end
 			begin
 				uref = CGI::unescape( ref )
-			rescue => e
-				return if defined?(::Encoding) && e.class == ::Encoding::CompatibilityError
+			rescue ::Encoding::CompatibilityError => e
+				return
 			end
 			if pair = @referers[uref] then
 				pair = [pair, ref] if pair.class != Array # for compatibility

data/tdiary/version.rb

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

data/tdiary/view.rb

@@ -185,7 +185,7 @@ module TDiary
 			@name = @cgi.params['name'][0]
 			@mail = @cgi.params['mail'][0]
 			@body = @cgi.params['body'][0]
-			if @cgi.mobile_agent? && String.method_defined?(:encode)
+			if @cgi.mobile_agent?
 				@name.force_encoding(conf.mobile_encoding)
 				@body.force_encoding(conf.mobile_encoding)
 			end

data/tdiary.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["."]
 
+  spec.required_ruby_version = '>= 1.9.2'
+
   spec.add_dependency 'thor', '~> 0.18'
   spec.add_dependency "bundler", "~> 1.3"
 end

data/tdiary.rb

@@ -12,11 +12,7 @@ TDIARY_VERSION = TDiary::VERSION
 
 $:.unshift File.join(File::dirname(__FILE__), '/misc/lib').untaint
 Dir["#{File::dirname(__FILE__) + '/vendor/*/lib'}"].each {|dir| $:.unshift dir.untaint }
-begin
-	Encoding::default_external = 'UTF-8'
-rescue NameError
-	$KCODE = 'n'
-end
+Encoding::default_external = 'UTF-8'
 
 require 'cgi'
 require 'uri'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 3.2.2.20130508
+  version: 3.2.2.20130518
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -51,7 +51,6 @@ files:
 - .coveralls.yml
 - .gitignore
 - .travis.yml
-- Capfile
 - ChangeLog
 - Gemfile
 - Gemfile.lock
@@ -89,6 +88,7 @@ files:
 - js/category.js
 - js/category_autocomplete.js
 - js/comment_ajax.js
+- js/comment_emoji_autocomplete.js
 - js/draft.js
 - js/highlight.js
 - js/image.js
@@ -130,6 +130,7 @@ files:
 - misc/plugin/category.rb
 - misc/plugin/category_autocomplete.rb
 - misc/plugin/comment_ajax.rb
+- misc/plugin/comment_emoji_autocomplete.rb
 - misc/plugin/comment_mail-qmail.rb
 - misc/plugin/comment_mail-sendmail.rb
 - misc/plugin/comment_mail-smtp.rb
@@ -268,9 +269,6 @@ files:
 - plugin/ja/50sp.rb
 - plugin/ja/60sf.rb
 - public/.gitkeep
-- public/images/.gitkeep
-- public/javascripts/.gitkeep
-- public/stylesheets/.gitkeep
 - skel/category.rhtml
 - skel/conf.rhtml
 - skel/day.rhtml
@@ -362,7 +360,6 @@ files:
 - tdiary/compatible.rb
 - tdiary/config.rb
 - tdiary/core_ext.rb
-- tdiary/deploy.rb
 - tdiary/dispatcher.rb
 - tdiary/dispatcher/index_main.rb
 - tdiary/dispatcher/update_main.rb
@@ -570,7 +567,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -578,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: a TSUKKOMI-able Web-log

data/Capfile

@@ -1,2 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-load 'tdiary/deploy'

data/tdiary/deploy.rb

@@ -1,50 +0,0 @@
-# coding: utf-8
-
-require 'capistrano_colors'
-
-require 'rvm/capistrano'
-set :rvm_type, :system
-
-require 'pit'
-config = Pit.get('tdiary', :require => {
-    :username => 'your username',
-    :server => 'your server address'
-  })
-
-set :application, 'tdiary'
-
-set :scm, :git
-set :repository, 'git://github.com/tdiary/tdiary-core.git'
-set :branch, 'master'
-set :deploy_via, :remote_cache
-
-server config[:server], :app
-
-set :user, config[:username]
-set :deploy_to, defer { "/home/#{user}/app/#{application}" }
-
-namespace :deploy do
-  task :start do ; end
-  task :stop do ; end
-  task :restart, :roles => :app, :except => { :no_release => true } do
-    run "touch #{File.join(current_path, 'tmp', 'restart.txt')}"
-  end
-
-  desc 'update shared library'
-  task :update_library, :roles => :app do
-    run "cp -r #{shared_path}/lib/* #{latest_release}/misc/lib"
-    run "cp -r #{shared_path}/js/* #{latest_release}/js"
-  end
-
-  after 'deploy:finalize_update', 'deploy:update_library'
-  after 'deploy:update', 'deploy:cleanup'
-end
-
-namespace :httpd do
-  [:stop, :start, :restart, :reload].each do |action|
-    desc "#{action.to_s.capitalize} Apache"
-    task action, :roles => :app do
-      invoke_command "/etc/init.d/apache2 #{action.to_s}", :via => run_method
-    end
-  end
-end