Prepare support for Rails 5

KaranN · Apr 13, 2016 · 8c9e5e0 · 8c9e5e0
1 parent 3e6ca3d
commit 8c9e5e0
Show file tree

Hide file tree

Showing 79 changed files with 1,316 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,10 @@ language: ruby
 rvm:
   - "2.0"
   - "2.1"
-  - "2.2"
+  - "2.2.2"
 gemfile:
   - gemfiles/Gemfile.rails-4.2.x
+  - gemfiles/Gemfile.rails-5.0.x
 install:
   - "sudo pip install --upgrade pip"
   - "sudo pip install awsebcli --ignore-installed"
@@ -16,3 +17,10 @@ script:
    - "export EXCEPT_DEPLOYED=true"
    - "if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then export EXCEPT_DEPLOYED=false; fi"
    - "bundle exec rspec spec"
+
+matrix:
+  exclude:
+    - rvm: "2.0"
+      gemfile: gemfiles/Gemfile.rails-5.0.x
+    - rvm: "2.1"
+      gemfile: gemfiles/Gemfile.rails-5.0.x
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rails', '5.0.0.beta3'
 gemspec
 gem 'bundler'
 gem 'rspec', '~> 3.4'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,59 +3,61 @@ PATH
   specs:
     active_elastic_job (1.4.4)
       aws-sdk (~> 2)
-      rails (~> 4.2)
+      rails (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    actioncable (5.0.0.beta3)
+      actionpack (= 5.0.0.beta3)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.beta3)
+      actionpack (= 5.0.0.beta3)
+      actionview (= 5.0.0.beta3)
+      activejob (= 5.0.0.beta3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
+    actionpack (5.0.0.beta3)
+      actionview (= 5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+      rack (~> 2.x)
+      rack-test (~> 0.6.3)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activejob (5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+    activerecord (5.0.0.beta3)
+      activemodel (= 5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+      arel (~> 7.0)
+    activesupport (5.0.0.beta3)
+      concurrent-ruby (~> 1.0)
       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.3)
-    aws-sdk (2.2.24)
-      aws-sdk-resources (= 2.2.24)
-    aws-sdk-core (2.2.24)
+    arel (7.0.0)
+    aws-sdk (2.2.34)
+      aws-sdk-resources (= 2.2.34)
+    aws-sdk-core (2.2.34)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.24)
-      aws-sdk-core (= 2.2.24)
+    aws-sdk-resources (2.2.34)
+      aws-sdk-core (= 2.2.34)
     benchmark-ips (2.3.0)
     builder (3.2.2)
     byebug (8.2.2)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     diff-lcs (1.2.5)
     dotenv (2.1.0)
     erubis (2.7.0)
@@ -65,31 +67,39 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    jmespath (1.1.3)
+    jmespath (1.2.4)
+      json_pure (>= 1.8.1)
     json (1.8.3)
+    json_pure (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.99)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
+    nio4r (1.2.1)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    rack (1.6.4)
+    rack (2.0.0.alpha)
+      json
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    rails (5.0.0.beta3)
+      actioncable (= 5.0.0.beta3)
+      actionmailer (= 5.0.0.beta3)
+      actionpack (= 5.0.0.beta3)
+      actionview (= 5.0.0.beta3)
+      activejob (= 5.0.0.beta3)
+      activemodel (= 5.0.0.beta3)
+      activerecord (= 5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
-      sprockets-rails
+      railties (= 5.0.0.beta3)
+      sprockets-rails (>= 2.0.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.7)
@@ -98,12 +108,13 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (5.0.0.beta3)
+      actionpack (= 5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.1.2)
     rdoc (4.2.1)
       json (~> 1.4)
     rspec (3.4.0)
@@ -120,17 +131,20 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     ruby-progressbar (1.7.5)
-    sprockets (3.5.2)
+    sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -143,6 +157,7 @@ DEPENDENCIES
   climate_control
   dotenv
   fuubar
+  rails (= 5.0.0.beta3)
   rdoc
   rspec (~> 3.4)
 

diff --git a/active-elastic-job.gemspec b/active-elastic-job.gemspec
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency 'aws-sdk', '~> 2'
-  spec.add_dependency 'rails', '~> 4.2'
+  spec.add_dependency 'rails', '>= 4.2'
 end
diff --git a/gemfiles/Gemfile.rails-5.0.x b/gemfiles/Gemfile.rails-5.0.x
@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails', '5.0.0.beta3'
+gemspec :path => '../'
+gem 'bundler'
+gem 'rspec', '~> 3.4'
+gem 'dotenv'
+gem 'fuubar'
+gem 'rdoc'
+gem 'benchmark-ips'
+gem 'climate_control'
diff --git a/spec/integration/rails-app-5.0/.ebextensions/https-instance-securitygroup.config b/spec/integration/rails-app-5.0/.ebextensions/https-instance-securitygroup.config
@@ -0,0 +1,67 @@
+Resources:
+  sslSecurityGroupIngress:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      GroupId: {"Fn::GetAtt" : ["AWSEBSecurityGroup", "GroupId"]}
+      IpProtocol: tcp
+      ToPort: 443
+      FromPort: 443
+      CidrIp: 0.0.0.0/0
+
+files:
+  /etc/pki/tls/certs/server.crt:
+    content: |
+      -----BEGIN CERTIFICATE-----
+      MIID8jCCAtoCCQCqaafjJrR/vTANBgkqhkiG9w0BAQUFADCBujELMAkGA1UEBhMC
+      QVQxDzANBgNVBAgTBlZpZW5uYTEPMA0GA1UEBxMGVmllbm5hMRUwEwYDVQQKEwxU
+      YXdhbiBTaWVyZWsxCzAJBgNVBAsTAklUMT4wPAYDVQQDEzVhY3RpdmUtZWxhc3Rp
+      Yy1qb2IyLmV1LWNlbnRyYWwtMS5lbGFzdGljYmVhbnN0YWxrLmNvbTElMCMGCSqG
+      SIb3DQEJARYWdGF3YW4uc2llcmVrQGdtYWlsLmNvbTAeFw0xNjAzMjkxNzAwNTNa
+      Fw0xNzAzMjkxNzAwNTNaMIG6MQswCQYDVQQGEwJBVDEPMA0GA1UECBMGVmllbm5h
+      MQ8wDQYDVQQHEwZWaWVubmExFTATBgNVBAoTDFRhd2FuIFNpZXJlazELMAkGA1UE
+      CxMCSVQxPjA8BgNVBAMTNWFjdGl2ZS1lbGFzdGljLWpvYjIuZXUtY2VudHJhbC0x
+      LmVsYXN0aWNiZWFuc3RhbGsuY29tMSUwIwYJKoZIhvcNAQkBFhZ0YXdhbi5zaWVy
+      ZWtAZ21haWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0rU+
+      81sJl5h4paH6H6KToR1M5RezjMXQo9GIUu2evgd9Li0nRFsm9EVKnhGAMKAVjxc+
+      NLrqB/hx7GYepLvioGG6L0YYadZxf5Tr9gDAYJ9v/+aaHZ9nVvxpkUn6fMyDHCNg
+      /XaQCUj+QvnqUoK7viX/H/oJfU+tRXFE74WRtB6UpeBKNs2VoGjw0Emf/I/Tuh3a
+      LGCdQs+jJObdXbxP0pXsRqUJOH1azJWv6CAA7JW+/RRog5maxJPx4VOXNO+S5vN4
+      hWySq/ILl97y2RAAoTLukTJaO3tGDsLfgw0/ocff6DUGtArj7lkdpc8vkR3/98fc
+      WuC2fNmwaDrXLb81ewIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAnD7u4ApQgKy1Z
+      f2z9oaR465XBChNUQ9CWwlSV8ihAuEzFe9u7lLvmDVy8bOTvqBM5EzYeXpJH0RVC
+      l6L1Y7RVpwPnU/4N1M04KO0oucn2ZTmfX/6lplJFB32/Gtg/XW2vULTb2wsOur2B
+      GIaEs3FSFFtAVCxKTYFkdkWBHzkCmvsJJco/En5+2OzqGU42ACL1WUQXQzG3MlLX
+      USXHWqyXy3KsAkZrtdVtbGKUFHqzKPEKaOs3mlKTC6Qix2ePAM/M/ymWGiBEqohf
+      tAQciTXi6lJk9QUwpECHTZTdx186BbA6p2wliAy3qqpi7eoOrfMEWbtJmdrbzK4K
+      Gz6RvK6u
+      -----END CERTIFICATE-----
+
+  /etc/pki/tls/certs/server.key:
+    content: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEpAIBAAKCAQEA0rU+81sJl5h4paH6H6KToR1M5RezjMXQo9GIUu2evgd9Li0n
+      RFsm9EVKnhGAMKAVjxc+NLrqB/hx7GYepLvioGG6L0YYadZxf5Tr9gDAYJ9v/+aa
+      HZ9nVvxpkUn6fMyDHCNg/XaQCUj+QvnqUoK7viX/H/oJfU+tRXFE74WRtB6UpeBK
+      Ns2VoGjw0Emf/I/Tuh3aLGCdQs+jJObdXbxP0pXsRqUJOH1azJWv6CAA7JW+/RRo
+      g5maxJPx4VOXNO+S5vN4hWySq/ILl97y2RAAoTLukTJaO3tGDsLfgw0/ocff6DUG
+      tArj7lkdpc8vkR3/98fcWuC2fNmwaDrXLb81ewIDAQABAoIBAEKXVVXDp7xpS3fN
+      QSdOUinRAMRGQVB0FAQx7EuJHWohI8a8LnTD+gOpAnQCQ+kaLrYSOm6fw+bQ9fAo
+      NfcKCg111UmrdXu9chFIF2qfwizHNrZBQuOpxRcQnqx0HN3kJGt4Iub32X2VvAWe
+      xhddicgGaiLI+sbHr5MKwSaRqAKsNIlCt9fDwbUKbe30JxQk2r8DrnwJUT6GSzDf
+      hx9Ayx+gqXPSBlHfynrDdRqfU1M0mEdI+AwPoW+js9kuD8Sv7dnXAEqb8U5cicw1
+      ogdA3nJig0z4nKuoxRbFTudcFhZLOgwjslJapCcNI+kc2BMryHihMLPCltZG+KzQ
+      hkWXhsECgYEA8y21qFh2JzmO9O6CvDQrdT6UiepcbN7dw+l4SvoJNcX6ZQWsbexi
+      H/6GcI2iop9emSAuQCksn+EmCIbgzKtTIA3p6+YAIhWPfs6FxjJzhc3uZJ5hhwwQ
+      P3sm/Ap4k/Ygt1GHynWn6hLsC2hAfdcGGuMr49yquKLC6Cwsse1/TGUCgYEA3dFE
+      OoIkGCstAZy7p3ZfPbScCGAtW05lC70Ho1AfWIk/joP3/KVRwfEv+nU7Pju29N6Q
+      iTF+UKBTRQ2xqsNcV9TsWniC756eXsxSX5zJTQDwORI2DsHKu27+ZtMeJSoapWIA
+      aY4FwDByX8isDAEKmZSjXsXCXnJkHoKKsi2WrF8CgYEA1lgF9Lr0eiKL1WyeI5HA
+      dHmSp/XBPd07j8GsXDoEADffO0hC8ikXXKgWjALrxXfABCyPV9JzGQF1arKoVv70
+      KB7bfyieGWzzrIwQ8d/qX5hidqH7yPNjJvFALYx1N8YMlEjy7gvC09mV4YAkyEbN
+      hMmUGCaa/F/KeKbnRnXWbNkCgYB/oWJ9u9Yi5ezuiY1cDPs+GQbStuxCJjhz6Z9U
+      c8yld8tPKFXvU/xX+Hwfw4aEB339JXbKyeShZa6kA/4fgGtIymX4pHDKiV0ctLoM
+      87zMBucyH21lTlJlSLcu2Pj2b2SHln0gPyzF6dpVjLSZ75t2xRS/elCdYXqEJ57A
+      aQTSRwKBgQCjWlOCIofSHzp+H5pgdKwSKTv6ZXb4mT2mEUZO70ShM6c6VfQzsZA2
+      oe+uDodKUVR0AoEgzltUxE9bFGIlDGjp5oLSuEsANfTf/q4qUOJFvGt2xcn4Ssax
+      1GFxUmCCDClWf+7AShA+NEd09ob4//IpyB5G31kyXA7ltNZCP3gcFA==
+      -----END RSA PRIVATE KEY-----
diff --git a/spec/integration/rails-app-5.0/.elasticbeanstalk/config.yml b/spec/integration/rails-app-5.0/.elasticbeanstalk/config.yml
@@ -0,0 +1,10 @@
+branch-defaults:
+  default:
+    environment: web-env
+    group_suffix: null
+global:
+  application_name: rails-eb-job-integration-testing
+  default_ec2_keyname: null
+  default_platform: Ruby 2.2 (Passenger Standalone)
+  default_region: eu-central-1
+  sc: null
diff --git a/spec/integration/rails-app-5.0/.gitignore b/spec/integration/rails-app-5.0/.gitignore
@@ -0,0 +1,24 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
+
+/vendor/gems/*
diff --git a/spec/integration/rails-app-5.0/Gemfile b/spec/integration/rails-app-5.0/Gemfile
@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '5.0.0.beta3'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# gem 'capistrano-rails', group: :development
+
+gem 'sass-rails'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'active_elastic_job', :path => 'vendor/gems/active_elastic_job-current'