Merge pull request peritor#12 from hayashima/develop

Develop
insoul · Oct 17, 2013 · 1f08652 · 1f08652
2 parents f3b253e + 53f97ca
commit 1f08652
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,9 +4,9 @@ gem "rails", '3.2.13'
 
 gem "exception_notification"
 
-gem "capistrano"
+gem "capistrano", "2.15.4"
 gem "open4"
-gem "syntax"
+gem "coderay"
 gem "version_fu", :git => "https://github.com/jmckible/version_fu.git"
 gem "devise", "3.0.3"
 gem "devise-encryptable"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/sosedoff/capistrano-unicorn.git
-  revision: df652095214dbc3a841d98aa2f8112602a754ed8
+  revision: 3dc0459a9092aa2802286063e703ef807a83a057
   specs:
     capistrano-unicorn (0.2.0)
       capistrano
@@ -45,7 +45,7 @@ GEM
     arel (3.0.2)
     bcrypt-ruby (3.1.2)
     builder (3.0.4)
-    capistrano (2.15.5)
+    capistrano (2.15.4)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -60,8 +60,8 @@ GEM
     coderay (1.0.9)
     columnize (0.3.6)
     daemons (1.1.9)
-    database_cleaner (1.1.1)
-    debugger (1.6.1)
+    database_cleaner (1.2.0)
+    debugger (1.6.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.2.3)
@@ -76,10 +76,10 @@ GEM
       devise (>= 2.1.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    exception_notification (4.0.0)
+    exception_notification (4.0.1)
       actionmailer (>= 3.0.4)
       activesupport (>= 3.0.4)
-    execjs (2.0.1)
+    execjs (2.0.2)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.2.1)
@@ -94,7 +94,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    kgio (2.8.0)
+    kgio (2.8.1)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -103,24 +103,24 @@ GEM
     method_source (0.8.2)
     mime-types (1.25)
     minitest (4.7.5)
-    minitest-reporters (0.14.20)
+    minitest-reporters (0.14.23)
       ansi
       builder
       minitest (>= 2.12, < 5.0)
       powerbar
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
+    multi_json (1.8.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     open4 (1.3.0)
     orm_adapter (0.4.0)
-    pg (0.16.0)
+    pg (0.17.0)
     polyglot (0.3.3)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
@@ -158,15 +158,14 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    rvm-capistrano (1.5.0)
-      capistrano (>= 2.15.4)
+    rvm-capistrano (1.5.1)
+      capistrano (~> 2.15.4)
     slop (3.4.6)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    syntax (1.0.0)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
@@ -179,7 +178,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -197,9 +196,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano
+  capistrano (= 2.15.4)
   capistrano-rbenv
   capistrano-unicorn!
+  coderay
   database_cleaner
   debugger
   devise (= 3.0.3)
@@ -215,7 +215,6 @@ DEPENDENCIES
   pry-rails
   rails (= 3.2.13)
   rvm-capistrano
-  syntax
   therubyracer
   thin
   uglifier

diff --git a/app/assets/images/favicon.png b/app/assets/images/favicon.png
diff --git a/app/helpers/recipes_helper.rb b/app/helpers/recipes_helper.rb
@@ -1,7 +1,6 @@
 module RecipesHelper
   def highlight_syntax(code)
-    require 'syntax/convertors/html'
-    raw Syntax::Convertors::HTML.for_syntax("ruby").convert(code)
+    raw CodeRay.scan(code, :ruby).div
   end
 
   def all_recipe_versions

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title><%= content_for?(:page_title) ? @page_title : "Webistrano" %></title>
     <%= csrf_meta_tags %>
-    <link rel="shortcut icon" href="/favicon.ico" />
+    <%= favicon_link_tag 'favicon.png' %>
     <%= stylesheet_link_tag 'application' %>
   </head>
   <body>

diff --git a/lib/webistrano/configuration.rb b/lib/webistrano/configuration.rb
@@ -10,6 +10,7 @@ class Configuration < Capistrano::Configuration
     def self.default_io_proc
       Proc.new do |ch, stream, out|
         level = stream == :err ? :important : :info
+        out = out.force_encoding("UTF-8")
         ch[:options][:logger].send(level, out, "#{stream} :: #{ch[:server]}")
       end
     end