From 8fe92b146539f037e51e96349ae0c61b7fb090ea Mon Sep 17 00:00:00 2001 From: JC Date: Mon, 7 Nov 2016 14:07:34 +0100 Subject: [PATCH] Hack rubyzip version from Gemfile.lock, then install spreadsheet_architect --- Gemfile | 1 + Gemfile.lock | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b92fc4cbe..95f44b15d 100644 --- a/Gemfile +++ b/Gemfile @@ -86,6 +86,7 @@ gem "smart_listing" gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8' gem 'as_csv' +gem 'spreadsheet_architect' gem 'apipie-rails', '=0.3.1' gem "maruku" # for Markdown support in apipie diff --git a/Gemfile.lock b/Gemfile.lock index 706c620e8..c241db10b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,10 @@ GEM autoprefixer-rails (5.2.1) execjs json + axlsx (2.0.1) + htmlentities (~> 4.3.1) + nokogiri (>= 1.4.1) + rubyzip (~> 1.0.0) bcrypt (3.1.11) bindata (2.1.0) binding_of_caller (0.7.2) @@ -294,6 +298,7 @@ GEM haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) + htmlentities (4.3.4) http-cookie (1.0.2) domain_name (~> 0.5) httpclient (2.6.0.1) @@ -437,6 +442,10 @@ GEM rgeo (0.3.20) rgeo-geojson (0.3.1) rgeo (~> 0.3) + rodf (0.3.7) + activesupport (>= 3.0, < 6.0) + builder (~> 3.0) + rubyzip (~> 1.0) rspec (3.2.0) rspec-core (~> 3.2.0) rspec-expectations (~> 3.2.0) @@ -473,7 +482,7 @@ GEM sexp_processor (~> 4.0) ruby_parser (3.7.0) sexp_processor (~> 4.1) - rubyzip (1.1.7) + rubyzip (1.0.0) safe_yaml (1.0.4) sass (3.4.22) sass-rails (5.0.6) @@ -510,6 +519,9 @@ GEM jquery-rails kaminari (~> 0.16.1) rails (>= 3.2) + spreadsheet_architect (1.4.6) + axlsx (>= 2.0) + rodf (>= 0.3.6) spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -641,6 +653,7 @@ DEPENDENCIES shoulda-matchers simplecov smart_listing + spreadsheet_architect spring spring-commands-rspec therubyracer @@ -654,4 +667,4 @@ DEPENDENCIES will_paginate-bootstrap BUNDLED WITH - 1.12.5 + 1.13.6