Merge branch 'master' of github.com:neocities/neocities

Gemfile

@@ -14,7 +14,7 @@ gem 'mail'
 gem 'tilt'
 gem 'erubis'
 gem 'stripe', '4.2.0' #, source: 'https://code.stripe.com/'
-gem 'cocaine'
+gem 'terrapin'
 gem 'zipruby'
 gem 'sass', require: nil
 gem 'dav4rack', git: 'https://github.com/planio-gmbh/dav4rack.git', branch: 'redmine-storage'

Gemfile.lock

@@ -11,11 +11,10 @@ GIT
 
 GEM
   remote: https://rubygems.org/
-  remote: https://code.stripe.com/
   specs:
     acme-client (2.0.1)
       faraday (~> 0.9, >= 0.9.1)
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -43,8 +42,6 @@ GEM
     certified (1.0.0)
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.6.0)
-      terrapin (= 0.6.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.3)
     connection_pool (2.2.2)
@@ -107,7 +104,7 @@ GEM
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.5.1)
+    image_optim_pack (0.5.1.20181208)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (2.0.0)
@@ -297,7 +294,6 @@ DEPENDENCIES
   capybara
   capybara_minitest_spec
   certified
-  cocaine
   coveralls
   dav4rack!
   erubis
@@ -352,8 +348,9 @@ DEPENDENCIES
   sinatra (= 2.0.3)
   sinatra-flash
   sinatra-xsendfile
-  stripe (= 4.2.0)!
+  stripe (= 4.2.0)
   stripe-ruby-mock (= 2.5.6)
+  terrapin
   thread
   tilt
   timecop

models/archive.rb

@@ -34,7 +34,7 @@ class Archive < Sequel::Model
         rbox.disconnect
       end
     else
-      line = Cocaine::CommandLine.new('ipfs', 'pin rm :ipfs_hash')
+      line = Terrapin::CommandLine.new('ipfs', 'pin rm :ipfs_hash')
       response = line.run ipfs_hash: ipfs_hash
       output_array = response.to_s.split("\n")
     end

models/site.rb

@@ -667,7 +667,7 @@ class Site < Sequel::Model
     return true if ENV['TRAVIS'] == 'true'
 
     File.chmod 0666, uploaded_file[:tempfile].path
-    line = Cocaine::CommandLine.new(
+    line = Terrapin::CommandLine.new(
       "clamdscan", "-i --remove=no --no-summary --stdout :path",
       expected_outcodes: [0, 1]
     )
@@ -724,11 +724,11 @@ class Site < Sequel::Model
         rbox.disconnect
       end
     else
-      line = Cocaine::CommandLine.new('ipfs', 'add -r -Q :path')
+      line = Terrapin::CommandLine.new('ipfs', 'add -r -Q :path')
       response = line.run path: files_path
     end
 
-    response.first
+    response.strip
   end
 
   def purge_old_archives