Merge pull request #1847 from mehlah/fix-0.10-stable-build

Fix dependency and config issues in CI build

.travis.yml

@@ -1,25 +1,23 @@
 before_install:
   - gem install bundler
 
+cache: bundler
+
 notifications:
   email: false
 
 rvm:
  - 1.9.3
- - 2.0.0
- - 2.1.1
- - ruby-head
+ - 2.0
+ - 2.1
 
 gemfile:
   - Gemfile
   - gemfiles/rails-3-2-stable.gemfile
   - gemfiles/rails-4-0-stable.gemfile
   - gemfiles/rails-4-1-stable.gemfile
-  - gemfiles/rails-master.gemfile
 
 matrix:
-  allow_failures:
-    - rvm: ruby-head
   include:
     - rvm: 1.8.7
       gemfile: gemfiles/rails-3-2-stable.gemfile
@@ -29,4 +27,7 @@ matrix:
       gemfile: gemfiles/rails-3-2-stable.gemfile
 
 before_script:
-  - "mysql -e 'create database carrierwave_test;'"
+  - psql -c 'create database carrierwave_test;' -U postgres
+
+addons:
+  postgresql: "9.3"

carrierwave.gemspec

@@ -29,12 +29,14 @@ Gem::Specification.new do |s|
   s.add_dependency "json", ">= 1.7"
   s.add_dependency "mime-types", ">= 1.16"
 
-  s.add_development_dependency "mysql2"
+  s.add_development_dependency "pg"
   s.add_development_dependency "rails", ">= 3.2.0"
   s.add_development_dependency "cucumber", "~> 1.3.2"
   s.add_development_dependency "rspec", "~> 2.13.0"
   s.add_development_dependency "sham_rack"
-  s.add_development_dependency "fog", ">= 1.3.1"
+  s.add_development_dependency "fog", "~> 1.20.0"
+  s.add_development_dependency "unf"
+  s.add_development_dependency "net-ssh", "~> 2.9.0"
   s.add_development_dependency "mini_magick", ">= 3.6.0"
   s.add_development_dependency "rmagick"
   s.add_development_dependency "nokogiri", "~> 1.5.10" # 1.6 requires ruby > 1.8.7

gemfiles/rails-3-2-stable.gemfile

@@ -4,3 +4,12 @@ gem "rails", :git => "https://github.com/rails/rails.git", :branch => "3-2-stabl
 gem "carrierwave", :path => "../"
 
 gemspec :path => "../"
+
+if RUBY_VERSION <= "1.9.2"
+  gem "pg", "< 0.18.0"
+  gem "i18n", "< 0.7"
+  gem "mime-types", "< 2.0"
+  gem "mini_magick", "< 4"
+  gem "fog", "1.3.1"
+  gem "rack-cache", "< 1.3"
+end

gemfiles/rails-4-0-stable.gemfile

@@ -4,3 +4,12 @@ gem "rails", :github => "rails/rails", :branch => "4-0-stable"
 gem "carrierwave", :path => "../"
 
 gemspec :path => "../"
+
+if RUBY_VERSION <= "1.9.2"
+  gem "pg", "< 0.18.0"
+  gem "i18n", "< 0.7"
+  gem "mime-types", "< 2.0"
+  gem "mini_magick", "< 4"
+  gem "fog", "1.3.1"
+  gem "sprockets", "< 3"
+end

gemfiles/rails-4-1-stable.gemfile

@@ -4,3 +4,12 @@ gem "rails", :github => "rails/rails", :branch => "4-1-stable"
 gem "carrierwave", :path => "../"
 
 gemspec :path => "../"
+
+if RUBY_VERSION <= "1.9.2"
+  gem "pg", "< 0.18.0"
+  gem "i18n", "< 0.7"
+  gem "mime-types", "< 2.0"
+  gem "mini_magick", "< 4"
+  gem "fog", "1.3.1"
+  gem "sprockets", "< 3"
+end

spec/compatibility/paperclip_spec.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 
 require 'spec_helper'
-
+require 'rails'
 require 'carrierwave/orm/activerecord'
 
-module Rails; end unless defined?(Rails)
-
 describe CarrierWave::Compatibility::Paperclip do
 
   before do

spec/orm/activerecord_spec.rb

@@ -385,6 +385,14 @@ describe CarrierWave::ActiveRecord do
     end
 
     describe "#remote_image_url=" do
+      before do
+        sham_rack_app = ShamRack.at('www.example.com').stub
+        sham_rack_app.register_resource('/test.jpg', File.read(file_path('test.jpg')), 'image/jpg')
+      end
+
+      after do
+        ShamRack.unmount_all
+      end
 
       # FIXME ideally image_changed? and remote_image_url_changed? would return true
       it "should mark image as changed when setting remote_image_url" do

spec/spec_helper.rb

@@ -14,8 +14,6 @@ require 'sham_rack'
 require 'mini_magick'
 require 'generator_spec'
 
-require 'mysql2'
-
 require 'fog'
 require 'storage/fog_helper'
 
@@ -25,6 +23,8 @@ end
 
 require 'fog_credentials' # after Fog.mock!
 
+I18n.enforce_available_locales = false
+
 CARRIERWAVE_DIRECTORY = "carrierwave#{Time.now.to_i}" unless defined?(CARRIERWAVE_DIRECTORY)
 
 alias :running :lambda

spec/support/activerecord.rb

@@ -1,22 +1,15 @@
-require 'mysql2'
-require 'active_record'
+require 'pg'
+require 'rails'
 require 'carrierwave/orm/activerecord'
 
-# Change this if MySQL is unavailable
+# Change this if PG is unavailable
 dbconfig = {
-  :adapter  => 'mysql2',
+  :adapter  => 'postgresql',
   :database => 'carrierwave_test',
-  :username => 'root',
-  :encoding => 'utf8'
+  :encoding => 'utf8',
+  :username => 'postgres'
 }
 
-database = dbconfig.delete(:database)
-
 ActiveRecord::Base.establish_connection(dbconfig)
-begin
-  ActiveRecord::Base.connection.create_database database
-rescue ActiveRecord::StatementInvalid => e # database already exists
-end
-ActiveRecord::Base.establish_connection(dbconfig.merge(:database => database))
 
 ActiveRecord::Migration.verbose = false