From 7e2fb7b8a701c12007964de0fc8279dc50f3b415 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 5 Jul 2016 09:37:11 +0100 Subject: [PATCH] support for rails 5 and bump to v1.0.0 for release --- Gemfile.lock | 158 ++++++++++++++++++++++-------------------- lib/trough/version.rb | 2 +- trough.gemspec | 2 +- 3 files changed, 86 insertions(+), 76 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5ddb394..83cf7e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,144 +1,151 @@ PATH remote: . specs: - trough (0.0.1) + trough (0.0.14) aws-sdk cancancan - rails (~> 4.0) - refile + formtastic-bootstrap (~> 3.0) + rails (>= 4.0) + refile (~> 0.6.0) refile-s3 GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1) - actionview (= 4.2.1) - activesupport (= 4.2.1) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.1) - activesupport (= 4.2.1) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1) - activesupport (= 4.2.1) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.0) - aws-sdk (2.0.48) - aws-sdk-resources (= 2.0.48) - aws-sdk-core (2.0.48) - builder (~> 3.0) + arel (6.0.3) + aws-sdk (2.3.19) + aws-sdk-resources (= 2.3.19) + aws-sdk-core (2.3.19) jmespath (~> 1.0) - multi_json (~> 1.0) - aws-sdk-resources (2.0.48) - aws-sdk-core (= 2.0.48) + aws-sdk-resources (2.3.19) + aws-sdk-core (= 2.3.19) builder (3.2.2) - cancancan (1.10.1) - domain_name (0.5.24) + cancancan (1.15.0) + concurrent-ruby (1.0.2) + domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - globalid (0.3.5) + formtastic (3.1.4) + actionpack (>= 3.2.13) + formtastic-bootstrap (3.1.1) + formtastic (>= 3.0) + globalid (0.3.6) activesupport (>= 4.1.0) http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.7.0) - jmespath (1.0.2) - multi_json (~> 1.0) + jmespath (1.2.4) + json_pure (>= 1.8.1) json (1.8.3) - loofah (2.0.2) + json_pure (2.0.1) + loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - mini_portile (0.6.2) - minitest (5.7.0) - multi_json (1.11.0) - netrc (0.10.3) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - rack (1.6.1) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (2.99.2) + mini_portile2 (2.1.0) + minitest (5.9.0) + netrc (0.11.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + rack (1.6.4) rack-protection (1.5.3) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.1) - actionmailer (= 4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) - activemodel (= 4.2.1) - activerecord (= 4.2.1) - activesupport (= 4.2.1) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.6) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - refile (0.5.5) + rake (11.2.2) + refile (0.6.2) mime-types rest-client (~> 1.8) sinatra (~> 1.4.5) - refile-s3 (0.1.0) + refile-s3 (0.2.0) aws-sdk (~> 2.0) - refile (~> 0.5.0) + refile (~> 0.6.0) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - sinatra (1.4.6) - rack (~> 1.4) + sinatra (1.4.7) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - sprockets (3.2.0) - rack (~> 1.0) - sprockets-rails (2.3.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.10) thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.5) tzinfo (1.2.2) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) + unf_ext (0.0.7.2) PLATFORMS ruby @@ -146,3 +153,6 @@ PLATFORMS DEPENDENCIES sqlite3 trough! + +BUNDLED WITH + 1.12.5 diff --git a/lib/trough/version.rb b/lib/trough/version.rb index 9bb9d77..47a44c3 100644 --- a/lib/trough/version.rb +++ b/lib/trough/version.rb @@ -1,3 +1,3 @@ module Trough - VERSION = "0.0.14" + VERSION = "1.0.0" end diff --git a/trough.gemspec b/trough.gemspec index 76fdf8a..eafa2a3 100644 --- a/trough.gemspec +++ b/trough.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] s.test_files = Dir["test/**/*"] - s.add_dependency "rails", "~> 4.0" + s.add_dependency "rails", ">= 4.0" s.add_dependency "cancancan" s.add_dependency "refile", '~>0.6.0' s.add_dependency "refile-s3"