Merge branch 'rubinius18'

* rubinius18:
  Add puma to bundle
  Make it work on rubinius in 1.8 mode
  Use draper from git
  Don't use twitter bootstrap js bundle
  Update gem dependencies to work on rubinius

Conflicts:
	Gemfile
	Gemfile.lock

Gemfile

@@ -15,6 +15,7 @@ gem 'fog'
 gem 'simple_form'
 gem 'girl_friday'
 gem 'puma'
+gem 'open4'
 
 platforms :mri do
   gem 'mysql2'
@@ -25,6 +26,7 @@ end
 platforms :rbx do
   gem 'mysql2'
   gem 'redcarpet'
+  gem 'draper'
 end
 
 platforms :jruby do

Gemfile.lock

@@ -141,6 +141,7 @@ GEM
     jruby-rack (1.1.6)
     json (1.6.5)
     json (1.6.5-java)
+    json (1.7.3)
     json_pure (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
@@ -155,7 +156,7 @@ GEM
     mime-types (1.17.2)
     multi_json (1.0.4)
     multipart-post (1.1.5)
-    mysql2 (0.3.10)
+    mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -183,6 +184,7 @@ GEM
       omniauth (~> 1.0)
     omniauth-twitter (0.0.8)
       omniauth-oauth (~> 1.0)
+    open4 (1.3.0)
     polyglot (0.3.3)
     puma (1.4.0)
       rack (~> 1.2)
@@ -302,6 +304,7 @@ DEPENDENCIES
   omniauth
   omniauth-github
   omniauth-twitter
+  open4
   puma
   rails
   rake

app/workers/snapshot_worker.rb

@@ -24,12 +24,20 @@ class SnapshotWorker
   end
 
   def prepare_files
-    in_data_file = Tempfile.new('asciiio-data', :encoding => 'ascii-8bit')
+    if RUBY_VERSION < '1.9'
+      in_data_file = Tempfile.new('asciiio-data')
+    else
+      in_data_file = Tempfile.new('asciiio-data', :encoding => 'ascii-8bit')
+    end
     in_data_file.write(@asciicast.stdout.read)
     in_data_file.close
     @in_data_path = in_data_file.path
 
-    in_timing_file = Tempfile.new('asciiio-timing', :encoding => 'ascii-8bit')
+    if RUBY_VERSION < '1.9'
+      in_timing_file = Tempfile.new('asciiio-timing')
+    else
+      in_timing_file = Tempfile.new('asciiio-timing', :encoding => 'ascii-8bit')
+    end
     in_timing_file.write(@asciicast.stdout_timing.read)
     in_timing_file.close
     @in_timing_path = in_timing_file.path
@@ -56,16 +64,15 @@ class SnapshotWorker
               "DELAY=#{delay} ./script/capture.sh'"
 
     lines = []
-    status = nil
+    pid, stdin, stdout, stderr = open4(command)
 
-    Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-      while !stdout.eof?
-        lines << stdout.readline
-      end
-
-      status = wait_thr.value.exitstatus
+    while !stdout.eof?
+      lines << stdout.readline
     end
 
+    Process.waitpid pid
+    status = $?.exitstatus
+
     raise "Can't capture output of asciicast ##{@asciicast.id}" if status != 0
 
     lines.join('')