From 77e1b6a8bf5730f8099468f3581c03be2de7cf4b Mon Sep 17 00:00:00 2001 From: Sami Chakroun Date: Mon, 17 Aug 2020 10:41:38 +0200 Subject: [PATCH] Fix dependency issues with backup gem --- Gemfile | 2 +- Gemfile.lock | 269 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 268 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index bc7b5d1..13978a5 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem "dotenv-rails" gem "rest-client" # Backup files and database -# gem "backup", git: "https://github.com/backup/backup.git" +gem "backup", git: "https://github.com/backup/backup.git" # Background and reccurent gem "whenever", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 7e77ad8..7fb7260 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,27 @@ +GIT + remote: https://github.com/backup/backup.git + revision: 35c63584c72014ef2401a5b45cf45eaafa9166dd + specs: + backup (5.0.0.beta.2) + aws-sdk (~> 2) + dogapi (= 1.40.0) + dropbox-sdk (= 1.6.5) + excon (~> 0.71) + flowdock (= 0.4.0) + fog (~> 1.42) + hipchat (= 1.0.1) + mail (~> 2.6, >= 2.6.6) + net-scp (~> 2.0.0) + net-sftp (= 2.1.2) + net-ssh (= 5.2.0) + nokogiri (~> 1.10, >= 1.10.9) + open4 (= 1.3.0) + pagerduty (= 2.0.0) + qiniu (~> 6.5) + thor (~> 0.18, >= 0.18.1) + twitter (~> 6.0) + unf (= 0.1.3) + GIT remote: https://github.com/seuros/capistrano-puma.git revision: 87bfd747bd43a19b5d214e0272b76fb723cf1f5f @@ -10,6 +34,7 @@ GIT GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.6) actioncable (5.2.4.2) actionpack (= 5.2.4.2) nio4r (~> 2.0) @@ -51,14 +76,29 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) + aliyun-sdk (0.8.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) arel (9.0.0) autoprefixer-rails (9.7.6) execjs + aws-eventstream (1.1.0) + aws-sdk (2.11.567) + aws-sdk-resources (= 2.11.567) + aws-sdk-core (2.11.567) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.11.567) + aws-sdk-core (= 2.11.567) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.13) betterlorem (0.1.2) bindex (0.8.1) @@ -67,6 +107,7 @@ GEM bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) + buftok (0.2.0) builder (3.2.4) byebug (11.1.1) capistrano (3.13.0) @@ -105,35 +146,218 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) + dogapi (1.40.0) + multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) dotenv-rails (2.7.5) dotenv (= 2.7.5) railties (>= 3.2, < 6.1) + dropbox-sdk (1.6.5) + json + dry-inflector (0.2.0) + equalizer (0.0.11) erubi (1.9.0) + excon (0.76.0) execjs (2.7.0) ffi (1.12.2) + fission (0.5.0) + CFPropertyList (~> 2.2) + flowdock (0.4.0) + httparty (~> 0.7) + multi_json + fog (1.42.1) + fog-aliyun (>= 0.1.0) + fog-atmos + fog-aws (>= 0.6.0) + fog-brightbox (~> 0.4) + fog-cloudatcost (~> 0.1.0) + fog-core (~> 1.45) + fog-digitalocean (>= 0.3.0) + fog-dnsimple (~> 1.0) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) + fog-internet-archive + fog-joyent + fog-json + fog-local + fog-openstack + fog-ovirt + fog-powerdns (>= 0.1.1) + fog-profitbricks + fog-rackspace + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + json (~> 2.0) + fog-aliyun (0.3.19) + aliyun-sdk (~> 0.8.0) + fog-core + fog-json + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (2.0.1) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.16.1) + dry-inflector + fog-core + fog-json + mime-types + fog-cloudatcost (0.1.2) + fog-core (~> 1.36) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.45.0) + builder + excon (~> 0.58) + formatador (~> 0.2) + fog-digitalocean (0.4.0) + fog-core + fog-json + fog-xml + ipaddress (>= 0.5) + fog-dnsimple (1.0.0) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-dynect (0.0.3) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) + fog-core + fog-xml + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-internet-archive (0.0.1) + fog-core + fog-json + fog-xml + fog-joyent (0.0.1) + fog-core (~> 1.42) + fog-json (>= 1.0) + fog-json (1.2.0) + fog-core + multi_json (~> 1.10) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-ovirt (1.2.5) + fog-core + fog-json + fog-xml + ovirt-engine-sdk (>= 4.1.3) + rbovirt (~> 0.1.5) + fog-powerdns (0.2.0) + fog-core + fog-json + fog-xml + fog-profitbricks (4.1.1) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-rackspace (0.1.6) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-radosgw (0.0.5) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.7.5) + fog-core + fog-json + fog-serverlove (0.1.2) + fog-core + fog-json + fog-softlayer (1.1.4) + fog-core + fog-json + fog-storm_on_demand (0.1.1) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-vsphere (3.4.0) + fog-core + rbvmomi (>= 1.9, < 3) + fog-xenserver (1.0.0) + fog-core + fog-xml + xmlrpc + fog-xml (0.1.3) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) font-awesome-rails (4.7.0.5) railties (>= 3.2, < 6.1) + formatador (0.2.5) globalid (0.4.2) activesupport (>= 4.2.0) haml (5.1.2) temple (>= 0.8.0) tilt + hipchat (1.0.1) + httparty + http (3.3.0) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) + http-form_data (2.3.0) + http_parser.rb (0.6.0) + httparty (0.18.1) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) i18n (1.8.2) concurrent-ruby (~> 1.0) + ipaddress (0.8.3) jbuilder (2.10.0) activesupport (>= 5.0.0) + jmespath (1.4.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) + json (2.3.1) kaminari (1.2.0) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.0) @@ -156,6 +380,8 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -165,15 +391,27 @@ GEM mini_portile2 (2.4.0) minitest (5.14.0) msgpack (1.3.3) + multi_json (1.15.0) + multi_xml (0.6.0) + multipart-post (2.1.1) + naught (1.1.0) nested_form (0.3.2) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) net-ssh (5.2.0) netrc (0.11.0) nio4r (2.5.2) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) + open4 (1.3.0) + optimist (3.0.1) orm_adapter (0.5.0) + ovirt-engine-sdk (4.4.0) + json (>= 1, < 3) + pagerduty (2.0.0) + json (>= 1.7.7) paperclip (5.2.1) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -181,8 +419,12 @@ GEM mime-types mimemagic (~> 0.3.0) pg (0.21.0) + public_suffix (4.0.5) puma (4.3.3) nio4r (~> 2.0) + qiniu (6.9.0) + mime-types (~> 3.1) + rest-client (~> 2.0) rack (2.2.2) rack-pjax (1.1.0) nokogiri (~> 1.5) @@ -235,6 +477,14 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) + rbovirt (0.1.7) + nokogiri + rest-client (> 1.7.0) + rbvmomi (2.4.1) + builder (~> 3.0) + json (>= 1.8) + nokogiri (~> 1.5) + optimist (~> 3.0) redcarpet (3.5.0) remotipart (1.4.4) responders (3.0.0) @@ -259,6 +509,7 @@ GEM tilt (>= 1.1, < 3) sassc (2.2.1) ffi (~> 1.9) + simple_oauth (0.3.1) simple_xlsx_reader (1.0.4) nokogiri rubyzip @@ -279,17 +530,28 @@ GEM sshkit-interactive (0.3.0) sshkit (~> 1.12) temple (0.8.2) - thor (1.0.1) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) + twitter (6.2.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) + unf (0.1.3) unf_ext unf_ext (0.0.7.7) warden (1.2.8) @@ -304,12 +566,15 @@ GEM websocket-extensions (0.1.4) whenever (1.0.0) chronic (>= 0.6.3) + xml-simple (1.1.5) + xmlrpc (0.3.0) PLATFORMS ruby DEPENDENCIES annotate + backup! betterlorem bootsnap bootstrap-sass (~> 3.4.1)