zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Kyle Drake 2018-12-10 07:36:46 +00:00
commit e760f87bfb
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

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

11
Gemfile.lock
View file

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

2
models/archive.rb
View file

@ -34,7 +34,7 @@ class Archive < Sequel::Model
rbox.disconnect rbox.disconnect
end end
else 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 response = line.run ipfs_hash: ipfs_hash
output_array = response.to_s.split("\n") output_array = response.to_s.split("\n")
end end

6
models/site.rb
View file

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