From 207e92a8eaf33d9d4fe4368d27a343f5b5bc190b Mon Sep 17 00:00:00 2001 From: Radan Skoric Date: Wed, 23 Jan 2013 08:35:39 +0100 Subject: [PATCH] Relaxing the aws-sdk version requirement to allow usage with the newest one and bumping the patch version of the gem. --- Gemfile.lock | 115 +++++++++++++++++++++-------------------- bcms_aws_s3.gemspec | 6 +-- lib/bcms_s3/version.rb | 2 +- 3 files changed, 62 insertions(+), 61 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 73db0e0..f9e8b29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,130 +1,131 @@ PATH remote: . specs: - bcms_aws_s3 (1.0.2) - aws-sdk (~> 1.5.0) + bcms_aws_s3 (1.0.3) + aws-sdk (>= 1.5.0) browsercms (>= 3.5.0.rc1, < 3.6.0) GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.2.1) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) ancestry (1.2.5) activerecord (>= 2.2.2) arel (3.0.2) - aws-sdk (1.5.2) + aws-sdk (1.8.0) httparty (~> 0.7) json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - browsercms (3.5.0.rc1) + browsercms (3.5.4) ancestry (~> 1.2.4) - ckeditor_rails (~> 3.6.2.2) + ckeditor_rails (~> 3.6.4) jquery-rails (~> 2.0) paperclip (~> 3.0.3) - rails (~> 3.2.0) + rails (>= 3.2.5, < 3.3.0) sass-rails term-ansicolor - builder (3.0.0) - ckeditor_rails (3.6.2.2) + builder (3.0.4) + ckeditor_rails (3.6.4.1) railties (~> 3.0) thor (~> 0.14) - cocaine (0.2.1) + cocaine (0.4.2) erubis (2.7.0) hike (1.2.1) - httparty (0.8.3) + httparty (0.9.0) multi_json (~> 1.0) multi_xml - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.7.3) + i18n (0.6.1) + journey (1.0.4) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.6) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) - multi_json (1.3.5) + mime-types (1.19) + multi_json (1.5.0) multi_xml (0.5.1) - nokogiri (1.5.2) - paperclip (3.0.3) + nokogiri (1.5.6) + paperclip (3.0.4) activemodel (>= 3.0.0) activerecord (>= 3.0.0) activesupport (>= 3.0.0) cocaine (>= 0.0.2) mime-types polyglot (0.3.3) - rack (1.4.1) + rack (1.4.4) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) + thor (>= 0.14.6, < 2.0) + rake (10.0.3) rdoc (3.12) json (~> 1.4) - sass (3.1.18) - sass-rails (3.2.5) + sass (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) term-ansicolor (1.0.7) - thor (0.14.6) + thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uuidtools (2.1.2) + tzinfo (0.3.35) + uuidtools (2.1.3) PLATFORMS ruby diff --git a/bcms_aws_s3.gemspec b/bcms_aws_s3.gemspec index 6f41f2e..dfbbed9 100644 --- a/bcms_aws_s3.gemspec +++ b/bcms_aws_s3.gemspec @@ -17,17 +17,17 @@ Gem::Specification.new do |s| s.files += Dir["app/**/*"] s.files += Dir["config/**/*"] s.files += Dir["db/**/*"] - s.files += Dir["lib/**/*"] + s.files += Dir["lib/**/*"] s.files += Dir["Gemfile", "LICENSE.txt", "COPYRIGHT.txt", "GPL.txt" ] s.test_files += Dir["test/**/*"] s.test_files -= Dir['test/dummy/**/*'] - + s.homepage = %q{https://github.com/browsermedia/bcms_s3} s.require_paths = ["lib"] s.rubyforge_project = s.name - s.add_dependency("aws-sdk", "~> 1.5.0") + s.add_dependency("aws-sdk", ">= 1.5.0") s.add_dependency("browsercms", "< 3.6.0", ">= 3.5.0.rc1") end diff --git a/lib/bcms_s3/version.rb b/lib/bcms_s3/version.rb index 9c4126e..6e85711 100644 --- a/lib/bcms_s3/version.rb +++ b/lib/bcms_s3/version.rb @@ -1,3 +1,3 @@ module BcmsS3 - VERSION = "1.0.2" + VERSION = "1.0.3" end