From e97b19564c0836cdf950f9580c2826eb48549dca Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 31 Jan 2021 21:25:09 -0600 Subject: [PATCH] more changes --- admin/Gemfile | 7 +- db/.ruby-version | 1 - db/Gemfile | 21 +-- db/Gemfile.lock | 5 +- pb/.ruby-version | 1 - pb/Gemfile | 5 + pb/Gemfile.lock | 6 + ruby/.ruby-version | 1 - ruby/Gemfile | 33 ++-- ruby/Gemfile.lock | 383 +++++++++++++++++++++----------------- web/.ruby-version | 1 - web/Gemfile | 9 +- websocket-gateway/Gemfile | 11 +- 13 files changed, 278 insertions(+), 206 deletions(-) delete mode 100644 db/.ruby-version delete mode 100644 pb/.ruby-version delete mode 100644 ruby/.ruby-version delete mode 100644 web/.ruby-version diff --git a/admin/Gemfile b/admin/Gemfile index c07af8f93..a65db2a2c 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -1,6 +1,11 @@ source 'http://rubygems.org' source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' +ruby_version = ENV["JAM_RUBY_VERSION"] +ruby_version = "2.3.1" if ruby_version.nil? + +ruby ruby_version + devenv = ENV["BUILD_NUMBER"].nil? if devenv @@ -16,7 +21,7 @@ end gem 'activeadmin_addons' gem 'json', '1.8.6' -gem 'rails', '> 4.2' +gem 'rails', '= 4.2.8' gem 'protected_attributes' gem 'rails-observers' diff --git a/db/.ruby-version b/db/.ruby-version deleted file mode 100644 index cb506813e..000000000 --- a/db/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.0.0-p247 diff --git a/db/Gemfile b/db/Gemfile index 1d2ca33be..c4ef34209 100644 --- a/db/Gemfile +++ b/db/Gemfile @@ -1,22 +1,11 @@ source 'http://rubygems.org' +ruby_version = ENV["JAM_RUBY_VERSION"] +ruby_version = "2.3.1" if ruby_version.nil? + +ruby ruby_version + # Assumes you have already cloned pg_migrate_ruby in your workspace # $ cd [workspace] # $ git clone https://github.com/sethcall/pg_migrate_ruby -gem 'did_you_mean', '1.4.0' -gem 'etc', '1.1.0' -gem 'fileutils', '1.4.1' -gem 'delegate', '0.1.0' -gem 'timeout', '0.1.0' -gem 'uri', '0.10.0' -gem 'zlib', '1.1.0' -gem 'logging', '1.7.2' -gem 'stringio', '0.1.0' -gem 'date', '3.0.0' -gem 'ipaddr', '1.2.2' -gem 'openssl', '2.1.2' -gem 'cgi', '0.1.0' -gem 'strscan', '1.0.3' -gem 'forwardable', '1.3.1' - gem 'pg_migrate', '0.1.14', :source => 'http://rubygems.org/' diff --git a/db/Gemfile.lock b/db/Gemfile.lock index 649f3aaaf..aaee61c47 100644 --- a/db/Gemfile.lock +++ b/db/Gemfile.lock @@ -17,5 +17,8 @@ PLATFORMS DEPENDENCIES pg_migrate (= 0.1.14)! +RUBY VERSION + ruby 2.3.1p112 + BUNDLED WITH - 1.11.2 + 1.13.7 diff --git a/pb/.ruby-version b/pb/.ruby-version deleted file mode 100644 index cb506813e..000000000 --- a/pb/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.0.0-p247 diff --git a/pb/Gemfile b/pb/Gemfile index c5ba9b467..b3ddfbe5f 100644 --- a/pb/Gemfile +++ b/pb/Gemfile @@ -1,3 +1,8 @@ source 'https://rubygems.org' +ruby_version = ENV["JAM_RUBY_VERSION"] +ruby_version = "2.3.1" if ruby_version.nil? + +ruby ruby_version + gem 'ruby-protocol-buffers', '1.2.2' diff --git a/pb/Gemfile.lock b/pb/Gemfile.lock index 5151acc4d..8e5abacb3 100644 --- a/pb/Gemfile.lock +++ b/pb/Gemfile.lock @@ -8,3 +8,9 @@ PLATFORMS DEPENDENCIES ruby-protocol-buffers (= 1.2.2) + +RUBY VERSION + ruby 2.3.1p112 + +BUNDLED WITH + 2.1.4 diff --git a/ruby/.ruby-version b/ruby/.ruby-version deleted file mode 100644 index cb506813e..000000000 --- a/ruby/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.0.0-p247 diff --git a/ruby/Gemfile b/ruby/Gemfile index fe842048a..93132a5fa 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -4,8 +4,12 @@ unless ENV["LOCAL_DEV"] == "1" source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' end -devenv = ENV["BUILD_NUMBER"].nil? +ruby_version = ENV["JAM_RUBY_VERSION"] +ruby_version = "2.3.1" if ruby_version.nil? +ruby ruby_version + +devenv = ENV["BUILD_NUMBER"].nil? if devenv gem 'jam_db', :path=> "../db/target/ruby_package" gem 'jampb', :path => "../pb/target/ruby/jampb" @@ -15,18 +19,20 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end +# on mac, you have to do gem install pg:0.17.1 -- --with-cflags="-Wno-error=implicit-function-declaration" gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw] #gem 'jdbc_postgres', :platform => [:jruby] -gem 'activerecord', '> 4.2' -gem 'railties', '> 4.2' -gem 'actionmailer', '> 4.2' +gem 'activerecord', '= 4.2.8' +gem 'railties', '= 4.2.8' +gem 'actionmailer', '= 4.2.8' gem 'rails-observers', '0.1.2' gem 'protected_attributes' # needed to support attr_accessible - +gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above +gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5 gem "activerecord-import", "~> 0.4.1" gem "auto_strip_attributes" - +gem "json", "1.8.6" gem 'uuidtools', '2.1.2' gem 'bcrypt-ruby', '3.0.1' gem 'ruby-protocol-buffers', '1.2.2' @@ -43,25 +49,30 @@ gem 'postgres-copy' gem 'geokit' gem 'geokit-rails' gem 'postgres_ext' +gem 'redis', '3.3.0' # pinned until we are on 2.5; then remove +gem 'redis-namespace', '1.5.2' # pinned until we are on 2.5; then remove gem 'resque' gem 'resque-retry' gem 'resque-failed-job-mailer' #, :path => "/Users/seth/workspace/resque_failed_job_mailer" gem 'resque-lonely_job', '~> 1.0.0' gem 'resque_mailer' -gem 'oj' +gem 'oj', '2.17.1' # pinned until we are on 2.5; then remove gem 'builder' gem 'fog' +gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove +gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove +gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove +gem 'rubyzip', '1.2.0' gem 'rest-client' gem 'iso-639' -gem 'rubyzip' gem 'sanitize' #gem 'influxdb' -gem 'recurly' +gem 'recurly', '2.7.0' # should upgrade to 3.x when we have time to validaet gem 'sendgrid_toolkit', '>= 1.1.1' gem 'stripe' gem 'zip-codes' -gem 'icalendar' -gem 'email_validator' +gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove +gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove gem 'elasticsearch' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 326949cc5..1611e83ae 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -18,71 +18,74 @@ GEM remote: http://rubygems.org/ remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ specs: - CFPropertyList (2.3.2) - aasm (4.11.0) - actionmailer (4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) + CFPropertyList (2.3.6) + aasm (5.1.1) + concurrent-ruby (~> 1.0) + actionmailer (4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7) - actionview (= 4.2.7) - activesupport (= 4.2.7) + actionpack (4.2.8) + actionview (= 4.2.8) + activesupport (= 4.2.8) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7) - activesupport (= 4.2.7) + actionview (4.2.8) + activesupport (= 4.2.8) 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.7) - activesupport (= 4.2.7) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.8) + activesupport (= 4.2.8) globalid (>= 0.3.0) - activemodel (4.2.7) - activesupport (= 4.2.7) + activemodel (4.2.8) + activesupport (= 4.2.8) builder (~> 3.1) - activerecord (4.2.7) - activemodel (= 4.2.7) - activesupport (= 4.2.7) + activerecord (4.2.8) + activemodel (= 4.2.8) + activesupport (= 4.2.8) arel (~> 6.0) activerecord-import (0.4.1) activerecord (>= 3.0) - activesupport (4.2.7) + activesupport (4.2.8) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + aliyun-sdk (0.8.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) amq-client (1.0.4) amq-protocol (>= 1.9.0) eventmachine - amq-protocol (2.0.1) + amq-protocol (2.3.2) amqp (1.0.2) amq-client (~> 1.0.2) amq-protocol (>= 1.3.0) eventmachine - arel (6.0.3) - auto_strip_attributes (2.0.6) - activerecord (>= 3.0) - aws-sdk (1.66.0) - aws-sdk-v1 (= 1.66.0) - aws-sdk-v1 (1.66.0) + arel (6.0.4) + auto_strip_attributes (2.6.0) + activerecord (>= 4.0) + aws-sdk (1.67.0) + aws-sdk-v1 (= 1.67.0) + aws-sdk-v1 (1.67.0) json (~> 1.4) - nokogiri (>= 1.4.4) - bcrypt (3.1.11) + nokogiri (~> 1) + bcrypt (3.1.16) bcrypt-ruby (3.0.1) - builder (3.2.2) + builder (3.2.4) carrierwave (0.9.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) - coderay (1.1.1) - concurrent-ruby (1.0.2) - crass (1.0.2) + coderay (1.1.3) + concurrent-ruby (1.1.8) + crass (1.0.6) dante (0.2.0) database_cleaner (1.4.1) devise (3.3.0) @@ -92,7 +95,7 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.1.3) - domain_name (0.5.20160615) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) elasticsearch (7.4.0) elasticsearch-api (= 7.4.0) @@ -105,8 +108,10 @@ GEM email_validator (1.6.0) activemodel erubis (2.7.0) + et-orbi (1.2.4) + tzinfo eventmachine (1.0.4) - excon (0.51.0) + excon (0.78.1) factory_girl (4.5.0) activesupport (>= 3.0.0) faker (1.3.0) @@ -115,16 +120,20 @@ GEM multipart-post (>= 1.2, < 3) fission (0.5.0) CFPropertyList (~> 2.2) - fog (1.38.0) + fog (1.41.0) fog-aliyun (>= 0.1.0) fog-atmos fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.32) + fog-core (~> 1.45) + fog-digitalocean (>= 0.3.0) + fog-dnsimple (~> 1.0) fog-dynect (~> 0.0.2) fog-ecloud (~> 0.1) fog-google (<= 0.1.0) + fog-internet-archive + fog-joyent fog-json fog-local fog-openstack @@ -144,15 +153,17 @@ GEM fog-xenserver fog-xml (~> 0.1.1) ipaddress (~> 0.5) - fog-aliyun (0.1.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + json (>= 1.8, < 2.0) + fog-aliyun (0.3.19) + aliyun-sdk (~> 0.8.0) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.10.0) + fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -166,10 +177,18 @@ GEM fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.42.0) + fog-core (1.45.0) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) + fog-digitalocean (0.4.0) + fog-core + fog-json + fog-xml + ipaddress (>= 0.5) + fog-dnsimple (1.0.0) + fog-core (~> 1.38) + fog-json (~> 1.0) fog-dynect (0.0.3) fog-core fog-json @@ -181,24 +200,30 @@ GEM fog-core fog-json fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) + fog-internet-archive (0.0.2) + fog-core + fog-json + fog-xml + fog-joyent (0.0.1) + fog-core (~> 1.42) + fog-json (>= 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.8) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) fog-json (>= 1.0) ipaddress (>= 0.8) - fog-powerdns (0.1.1) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-profitbricks (0.0.5) + fog-powerdns (0.2.0) fog-core + fog-json fog-xml - nokogiri - fog-rackspace (0.1.1) + fog-profitbricks (4.1.1) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-rackspace (0.1.6) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -217,7 +242,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (1.1.3) + fog-softlayer (1.1.4) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -232,58 +257,68 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (0.8.0) + fog-vsphere (3.5.0) fog-core - rbvmomi (~> 1.8) - fog-xenserver (0.2.3) + rbvmomi (>= 1.9, < 3) + fog-xenserver (1.0.0) fog-core fog-xml - fog-xml (0.1.2) + xmlrpc + fog-xml (0.1.3) fog-core - nokogiri (~> 1.5, >= 1.5.11) + nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - geokit (1.10.0) - geokit-rails (2.2.0) + fugit (1.4.2) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.4) + geokit (1.13.1) + geokit-rails (2.3.2) geokit (~> 1.5) rails (>= 3.0) - globalid (0.3.6) - activesupport (>= 4.1.0) - http-cookie (1.0.2) + globalid (0.4.2) + activesupport (>= 4.2.0) + http-accept (1.7.0) + http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.13.7) - json (~> 1.8) + httparty (0.18.1) + mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) icalendar (2.4.0) inflecto (0.0.2) ipaddress (0.8.3) - iso-639 (0.2.8) - json (1.8.3) - kickbox (2.0.1) + iso-639 (0.3.5) + json (1.8.6) + kickbox (2.0.4) faraday (~> 0.9) - json (~> 1.8) + json (>= 1.8) little-plugger (1.1.4) logging (1.7.2) little-plugger (>= 1.1.3) - loofah (2.0.3) + loofah (2.9.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (2.99.2) - mini_portile2 (2.1.0) - minitest (5.9.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (1.0.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2020.1104) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.3) mono_logger (1.1.0) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) + multi_json (1.15.0) + multi_xml (0.6.0) + multipart-post (2.1.1) netrc (0.11.0) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nokogumbo (1.4.7) - nokogiri + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.4) + nokogiri (~> 1.8, >= 1.8.4) oj (2.17.1) + optimist (3.0.1) orm_adapter (0.5.0) pg (0.17.1) pg_array_parser (0.0.9) @@ -291,65 +326,65 @@ GEM logging (= 1.7.2) pg (= 0.17.1) thor - pkg-config (1.1.7) - postgres-copy (1.0.0) - activerecord (>= 4.0) + postgres-copy (1.2.0) + activerecord (>= 4.0, < 5.1) pg (>= 0.17) - rails (>= 4.0) responders - postgres_ext (3.0.0) - activerecord (>= 4.0.0) + postgres_ext (3.0.1) + activerecord (~> 4.0) arel (>= 4.0.1) pg_array_parser (~> 0.0.9) - protected_attributes (1.1.3) + protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rack (1.6.4) - rack-protection (1.5.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + raabro (1.4.0) + rack (1.6.13) + rack-protection (1.5.5) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.7) - actionmailer (= 4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) - activemodel (= 4.2.7) - activerecord (= 4.2.7) - activesupport (= 4.2.7) + rails (4.2.8) + actionmailer (= 4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + activemodel (= 4.2.8) + activerecord (= 4.2.8) + activesupport (= 4.2.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7) + railties (= 4.2.8) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-observers (0.1.2) activemodel (~> 4.0) - railties (4.2.7) - actionpack (= 4.2.7) - activesupport (= 4.2.7) + railties (4.2.8) + actionpack (= 4.2.8) + activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rbvmomi (1.8.2) - builder - nokogiri (>= 1.4.1) - trollop - recurly (2.7.0) + rake (13.0.3) + rbvmomi (2.4.1) + builder (~> 3.0) + json (>= 1.8) + nokogiri (~> 1.5) + optimist (~> 3.0) + recurly (3.18.0) redis (3.3.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - resque (1.26.0) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) + resque (1.27.4) mono_logger (~> 1.0) multi_json (~> 1.0) redis-namespace (~> 1.3) @@ -358,25 +393,27 @@ GEM resque-failed-job-mailer (0.0.3) resque-lonely_job (1.0.2) resque (>= 1.2) - resque-retry (1.5.0) - resque (~> 1.25) + resque-retry (1.7.4) + resque (>= 1.25, < 3.0) resque-scheduler (~> 4.0) - resque-scheduler (4.3.0) + resque-scheduler (4.4.0) mono_logger (~> 1.0) - redis (~> 3.3) - resque (~> 1.26) + redis (>= 3.3) + resque (>= 1.26) rufus-scheduler (~> 3.2) - resque_mailer (2.3.1) + resque_mailer (2.4.3) actionmailer (>= 3.0) + activesupport (>= 3.0) resque_spec (0.15.0) resque (>= 1.19.0) rspec-core (>= 2.5.0) rspec-expectations (>= 2.5.0) rspec-mocks (>= 2.5.0) - rest-client (1.8.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -391,11 +428,12 @@ GEM ruby-prof (0.15.9) ruby-protocol-buffers (1.2.2) rubyzip (1.2.0) - rufus-scheduler (3.2.1) - sanitize (4.0.1) + rufus-scheduler (3.7.0) + fugit (~> 1.1, >= 1.1.6) + sanitize (5.2.3) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sendgrid (1.2.0) json sendgrid_toolkit (1.4.0) @@ -406,44 +444,42 @@ GEM simplecov-html (0.7.1) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - slop (3.6.0) spork (0.9.0) sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - stripe (1.43.0) - rest-client (~> 1.4) - stripe-ruby-mock (2.3.0) + stripe (5.29.0) + stripe-ruby-mock (3.0.1) dante (>= 0.2.0) - multi_json (>= 1.0.0) - stripe (>= 1.31.0, <= 1.43) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - time_difference (0.4.2) + multi_json (~> 1.0) + stripe (> 5, < 6) + thor (1.1.0) + thread_safe (0.3.6) + tilt (2.0.10) + time_difference (0.5.0) activesupport - timecop (0.8.1) - trollop (2.1.2) - tzinfo (1.2.2) + timecop (0.9.2) + tzinfo (1.2.9) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.7) uuidtools (2.1.2) vegas (0.1.11) rack (>= 1.0.0) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) - will_paginate (3.1.0) - xml-simple (1.1.5) + will_paginate (3.3.0) + xml-simple (1.1.8) + xmlrpc (0.3.1) zip-codes (0.2.1) PLATFORMS @@ -451,8 +487,8 @@ PLATFORMS DEPENDENCIES aasm - actionmailer (> 4.2) - activerecord (> 4.2) + actionmailer (= 4.2.8) + activerecord (= 4.2.8) activerecord-import (~> 0.4.1) amqp (= 1.0.2) auto_strip_attributes @@ -463,28 +499,34 @@ DEPENDENCIES database_cleaner (= 1.4.1) devise (= 3.3.0) elasticsearch - email_validator + email_validator (= 1.6.0) eventmachine (= 1.0.4) factory_girl (= 4.5.0) faker (= 1.3.0) + faraday (= 0.9.2) fog + fog-brightbox (= 0.11.0) geokit geokit-rails - icalendar + icalendar (= 2.4.0) iso-639 jam_db! jam_ruby! jampb! + json (= 1.8.6) kickbox - oj + nokogiri (= 1.10.10) + oj (= 2.17.1) pg (= 0.17.1) postgres-copy postgres_ext protected_attributes pry rails-observers (= 0.1.2) - railties (> 4.2) + railties (= 4.2.8) recurly + redis (= 3.3.0) + redis-namespace (= 1.5.2) resque resque-failed-job-mailer resque-lonely_job (~> 1.0.0) @@ -494,14 +536,16 @@ DEPENDENCIES rest-client rspec (= 2.11) rspec-prof + ruby-prof (= 0.15.9) ruby-protocol-buffers (= 1.2.2) - rubyzip + rubyzip (= 1.2.0) sanitize sendgrid (= 1.2.0) sendgrid_toolkit (>= 1.1.1) simplecov (~> 0.7.1) simplecov-rcov spork (= 0.9.0) + sprockets (= 3.6.3) stripe stripe-ruby-mock time_difference @@ -510,5 +554,8 @@ DEPENDENCIES will_paginate zip-codes +RUBY VERSION + ruby 2.3.1p112 + BUNDLED WITH 1.17.1 diff --git a/web/.ruby-version b/web/.ruby-version deleted file mode 100644 index 2bf1c1ccf..000000000 --- a/web/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.3.1 diff --git a/web/Gemfile b/web/Gemfile index 9f7c35692..c8abf354b 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -3,6 +3,11 @@ source 'http://rubygems.org' devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable +ruby_version = ENV["JAM_RUBY_VERSION"] +ruby_version = "2.3.1" if ruby_version.nil? + +ruby ruby_version + if devenv gem 'jam_db', :path=> "../db/target/ruby_package" gem 'jampb', :path => "../pb/target/ruby/jampb" @@ -17,8 +22,8 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end end -gem 'rails', '> 4.2' -gem 'railties', '> 4.2' +gem 'rails', '= 4.2.8' +gem 'railties', '= 4.2.8' gem 'auto_strip_attributes', '2.6.0' gem 'protected_attributes' gem 'rails-observers' diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile index 5bd57a925..f0df7ed2c 100644 --- a/websocket-gateway/Gemfile +++ b/websocket-gateway/Gemfile @@ -4,6 +4,11 @@ unless ENV['LOCAL_DEV'] == '1' source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' end +ruby_version = ENV["JAM_RUBY_VERSION"] +ruby_version = "2.3.1" if ruby_version.nil? + +ruby ruby_version + # Look for $WORKSPACE, otherwise use "workspace" as dev path. devenv = ENV["BUILD_NUMBER"].nil? @@ -18,9 +23,9 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end -gem 'activerecord', '> 4.2' -gem 'actionpack', '> 4.2' -gem 'actionmailer', '> 4.2' +gem 'activerecord', '= 4.2.8' +gem 'actionpack', '= 4.2.8' +gem 'actionmailer', '= 4.2.8' gem 'protected_attributes' gem 'rails-observers' gem 'auto_strip_attributes', '2.6.0'