Issue galetahub#794 replace cocaine gem with terrapin

feliperaul · Mar 2, 2018 · ff350bc · ff350bc
1 parent 32bc0c6
commit ff350bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     ckeditor (4.2.4)
-      cocaine
       orm_adapter (~> 0.5.0)
+      terrapin
 
 GEM
   remote: http://rubygems.org/
@@ -182,6 +182,8 @@ GEM
     sqlite3 (1.3.13)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.7)
@@ -222,4 +224,4 @@ DEPENDENCIES
   unicorn (~> 4.0.1)
 
 BUNDLED WITH
-   1.15.0
+   1.15.3
diff --git a/ckeditor.gemspec b/ckeditor.gemspec
@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("cocaine")
+  s.add_dependency("terrapin")
   s.add_dependency("orm_adapter", "~> 0.5.0")
 end
diff --git a/lib/ckeditor/utils/content_type_detector.rb b/lib/ckeditor/utils/content_type_detector.rb
@@ -1,5 +1,4 @@
-# encoding: utf-8
-require 'cocaine'
+require 'terrapin'
 
 module Ckeditor
   module Utils
@@ -29,8 +28,8 @@ def empty_file?
       end
 
       def content_type_from_file_command
-        Cocaine::CommandLine.new('file', '-b --mime-type :file').run(file: @file_path).strip
-      rescue Cocaine::CommandLineError
+        Terrapin::CommandLine.new('file', '-b --mime-type :path').run(path: @file_path).strip
+      rescue Terrapin::ExitStatusError
         DEFAULT_CONTENT_TYPE
       end
     end