diff --git a/admin/.gitignore b/admin/.gitignore index d70c888de..d747d53e8 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -21,3 +21,4 @@ artifacts .idea BUILD_NUMBER # Gemfile.lock +Gemfile.alt.lock diff --git a/admin/Gemfile.alt b/admin/Gemfile.alt new file mode 100644 index 000000000..a5dd3519b --- /dev/null +++ b/admin/Gemfile.alt @@ -0,0 +1,172 @@ +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 + #gem 'jam_db', :path=> "../db/target/ruby_package" + gem 'jampb', :path => "../pb/target/ruby/jampb" + gem 'jam_ruby', :path => "../ruby" +else + source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' do + #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" + end +end + +gem 'activeadmin_addons' +gem 'json', '1.8.6' +gem 'rails', '= 4.2.8' +gem 'protected_attributes' +gem 'rails-observers' + + +# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously +# This should be the same in ruby/admin/web/websocket-gateway +####### +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 '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.1' # pinned until we are on ruby 2.5; then remove +gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate +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 'redis', '3.3.3' # pinned until we are on 2.5; then remove +gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove +gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove +gem 'bcrypt', '3.1.15' +gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www +gem 'sass', '3.5.5 '# compiler mismatch issue between build and www +####### + +gem 'bootstrap-sass', '2.0.4' + +gem 'coffee-rails' #, '~> 3.2.1' + +# See https://github.com/sstephenson/execjs#readme for more supported runtimes +# gem 'therubyracer', :platforms => :ruby + +gem 'kickbox' +gem 'uglifier' #, '>= 1.0.3' +gem 'net-ssh' +gem 'sprockets-rails', '2.3.2' + +# this version is pinned due to this: https://github.com/gregbell/active_admin/issues/1939 +gem 'coffee-script-source' #, '~> 1.4.0' # ADD THIS LINE, 1.5.0 doesn't compile ActiveAdmin JavaScript files +gem 'devise' #, '3.3.0' +gem 'will_paginate' #, '3.0.3' +gem 'bootstrap-will_paginate', '0.0.6' +gem 'carrierwave', '0.11.2' #, '0.9.0' +gem 'carrierwave_direct' +gem 'uuidtools', '2.1.2' +gem 'jquery-ui-rails'# , '5.0.5' #, '4.2.1' +gem 'jquery-rails'# , '4.1.1' # both this and jquery-ui-rails are pinned; if you unpin, jquery/autocomplete is missing during precomplie +gem 'rails-jquery-autocomplete' # This is the maintained version of rails3-jquery-autocomplete +gem 'activeadmin' #, '1.0.0.pre4'# github: 'activeadmin', branch: 'master' +gem 'activeadmin-searchable_select' +gem 'mime-types', '1.25' +#gem 'meta_search' +gem 'fog' +gem 'xmlrpc' +gem 'unf', '0.1.3' #optional fog dependency +gem 'country-select' +gem 'aasm' #, '3.0.16' +gem 'postgres-copy', '0.6.0' +gem 'aws-sdk', '~> 1' +gem 'bugsnag', '5.3.2' +gem 'gon' +gem 'cocoon' +gem 'haml-rails' +gem 'resque' +gem 'resque-retry' +gem 'resque-failed-job-mailer' +gem 'resque-lonely_job', '~> 1.0.0' +gem 'eventmachine', '1.2.3' +gem 'amqp', '0.9.8' +#gem 'logging-rails', :require => 'logging/rails' +#gem 'pg_migrate', '0.1.14' +if ENV["MODERN_OS"] == "1" + gem 'pg', '0.21.0' +else + # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration" + gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw] +end +gem 'ruby-protocol-buffers', '1.2.2' +gem 'sendgrid', '1.2.0' +gem 'geokit-rails' +gem 'postgres_ext' #, '1.0.0' +gem 'resque_mailer' +gem 'rest-client' +gem 'iso-639' +gem 'sanitize' +gem 'slim' +#gem 'influxdb', '0.1.8' +#gem 'influxdb-rails', '0.1.10' +gem 'influxdb', '0.3.14' +gem 'influxdb-rails', '0.1.12' +gem 'sendgrid_toolkit', '>= 1.1.1' +gem 'stripe' +gem 'zip-codes' +gem 'best_in_place' #, github: 'bernat/best_in_place' +gem 'auto_strip_attributes', '2.6.0' +gem 'elasticsearch' + +gem 'logging', '1.7.2' + +#group :libv8 do +# gem 'libv8', "~> 4.5.95" +#end + + +# To use Jbuilder templates for JSON +# gem 'jbuilder' + +group :production do + gem 'unicorn' +end + +group :package do + gem 'fpm' +end + +# Deploy with Capistrano +# gem 'capistrano' + +# To use debugger +#gem 'debugger' # not working with 2.1.2p95 + +group :development, :test do + gem 'capybara', '2.13.0' + gem 'rspec-rails' #, '2.14.2' + gem 'jasmine', '1.3.1' + gem 'execjs', '1.4.0' + #gem 'therubyracer' #, '0.11.0beta8' + gem 'factory_girl_rails' # , '4.1.0' + gem 'database_cleaner' #, '0.7.0' + gem 'launchy', '2.4.3' # can unpin when go to ruby 2.4+ + gem 'faker', '1.3.0' + gem 'puma' + gem 'test-unit' +end + +group :test do + gem 'simplecov', '~> 0.7.1' + gem 'simplecov-rcov' +# gem 'capybara-webkit' +# gem 'capybara-screenshot', '0.3.22' # 1.0.0 broke compat with rspec. maybe we need newer rspec +# gem 'poltergeist' +end + +gem 'pry' +gem 'pry-remote' +gem 'pry-stack_explorer' +#gem 'pry-debugger' diff --git a/admin/Gemfile.lock b/admin/Gemfile.lock index dabb5e6da..8abef39c6 100644 --- a/admin/Gemfile.lock +++ b/admin/Gemfile.lock @@ -1,9 +1,19 @@ +PATH + remote: ../pb/target/ruby/jampb + specs: + jampb (0.1.1) + +PATH + remote: ../ruby + specs: + jam_ruby (0.1.1) + GEM remote: http://rubygems.org/ remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ specs: CFPropertyList (2.3.6) - aasm (5.2.0) + aasm (5.1.1) concurrent-ruby (~> 1.0) actionmailer (4.2.8) actionpack (= 4.2.8) @@ -24,7 +34,7 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_material (1.5.2) + active_material (1.4.2) activeadmin (1.4.3) arbre (>= 1.1.1) coffee-rails @@ -37,7 +47,7 @@ GEM ransack (>= 1.8.7) sass (~> 3.1) sprockets (< 4.1) - activeadmin-searchable_select (1.5.0) + activeadmin-searchable_select (1.4.0) activeadmin (>= 1.x, < 3) jquery-rails (>= 3.0, < 5) select2-rails (~> 4.0) @@ -88,7 +98,7 @@ GEM aws-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) - backports (3.21.0) + backports (3.20.2) bcrypt (3.1.15) best_in_place (3.1.1) actionpack (>= 3.2) @@ -134,8 +144,8 @@ GEM country-select (1.2.1) crass (1.0.6) database_cleaner (1.99.0) - debug_inspector (1.1.0) - devise (4.8.0) + debug_inspector (1.0.0) + devise (4.7.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -159,7 +169,7 @@ GEM et-orbi (1.2.4) tzinfo eventmachine (1.2.3) - excon (0.81.0) + excon (0.79.0) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.9.0) @@ -337,7 +347,7 @@ GEM pleaserun (~> 0.0.29) ruby-xz (~> 0.2.3) stud - fugit (1.4.5) + fugit (1.4.2) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) geokit (1.13.1) @@ -394,8 +404,6 @@ GEM io-like (0.3.1) ipaddress (0.8.3) iso-639 (0.3.5) - jam_ruby (0.1.1173) - jampb (0.1.1173) jasmine (1.3.1) jasmine-core (~> 1.3.1) rack (~> 1.0) @@ -430,37 +438,35 @@ GEM little-plugger (1.1.4) logging (1.7.2) little-plugger (>= 1.1.3) - loofah (2.9.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) method_source (1.0.0) mime-types (1.25) - mimemagic (0.4.3) - nokogiri (~> 1) - rake - mini_mime (1.1.0) + mimemagic (0.3.5) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.4) - mono_logger (1.1.1) + minitest (5.14.3) + mono_logger (1.1.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) mustache (0.99.8) net-ssh (6.1.0) netrc (0.11.0) - nio4r (2.5.7) + nio4r (2.5.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.5) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) oj (3.1.3) optimist (3.0.1) orm_adapter (0.5.0) - pg (0.21.0) + pg (0.17.1) pg_array_parser (0.0.9) - pleaserun (0.0.32) + pleaserun (0.0.31) cabin (> 0) clamp dotenv @@ -479,7 +485,7 @@ GEM power_assert (2.0.0) protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - pry (0.14.1) + pry (0.14.0) coderay (~> 1.1) method_source (~> 1.0) pry-remote (0.1.8) @@ -489,7 +495,7 @@ GEM binding_of_caller (~> 0.7) pry (~> 0.13) public_suffix (4.0.6) - puma (5.3.2) + puma (5.2.1) nio4r (~> 2.0) raabro (1.4.0) rack (1.6.13) @@ -508,7 +514,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.8) sprockets-rails - rails-deprecated_sanitizer (1.0.4) + rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) @@ -532,7 +538,7 @@ GEM activerecord (>= 3.0, < 5.2) activesupport (>= 3.0, < 5.2) i18n - rb-fsevent (0.11.0) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rbvmomi (2.4.1) @@ -588,7 +594,7 @@ GEM rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-rails (4.1.2) + rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -602,8 +608,8 @@ GEM ruby-xz (0.2.3) ffi (~> 1.9) io-like (~> 0.3) - ruby_parser (3.16.0) - sexp_processor (~> 4.15, >= 4.15.1) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) rubyzip (1.2.1) rufus-scheduler (3.7.0) fugit (~> 1.1, >= 1.1.6) @@ -630,7 +636,7 @@ GEM json sendgrid_toolkit (1.4.0) httparty (>= 0.7.6) - sexp_processor (4.15.3) + sexp_processor (4.15.2) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -652,10 +658,10 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - stripe (5.33.0) + stripe (5.29.1) stud (0.0.23) temple (0.8.2) - test-unit (3.4.1) + test-unit (3.4.0) power_assert thor (1.1.0) thread_safe (0.3.6) @@ -667,7 +673,7 @@ GEM unf (0.1.3) unf_ext unf_ext (0.0.7.7) - unicorn (6.0.0) + unicorn (5.8.0) kgio (~> 2.6) raindrops (~> 0.7) uuidtools (2.1.2) @@ -729,8 +735,8 @@ DEPENDENCIES influxdb (= 0.3.14) influxdb-rails (= 0.1.12) iso-639 - jam_ruby (= 0.1.1173)! - jampb (= 0.1.1173)! + jam_ruby! + jampb! jasmine (= 1.3.1) jquery-rails jquery-ui-rails @@ -742,7 +748,7 @@ DEPENDENCIES net-ssh nokogiri (= 1.10.10) oj (= 3.1.3) - pg (= 0.21.0) + pg (= 0.17.1) postgres-copy (= 0.6.0) postgres_ext protected_attributes diff --git a/ruby/.gitignore b/ruby/.gitignore index 203591512..048a017ca 100644 --- a/ruby/.gitignore +++ b/ruby/.gitignore @@ -4,6 +4,7 @@ .config .yardoc # Gemfile.lock +Gemfile.alt.lock InstalledFiles _yardoc coverage diff --git a/ruby/Gemfile.alt b/ruby/Gemfile.alt new file mode 100644 index 000000000..78b244e46 --- /dev/null +++ b/ruby/Gemfile.alt @@ -0,0 +1,115 @@ +#ruby=1.9.3 +source 'http://rubygems.org' +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? +if devenv + #gem 'jam_db', :path=> "../db/target/ruby_package" + gem 'jampb', :path => "../pb/target/ruby/jampb" +else + #gem 'jam_db' + gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" +end + +if ENV['MODERN_OS'] == "1" + gem 'pg', '0.21.0' +else + # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration" + gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw] +end +#gem 'jdbc_postgres', :platform => [:jruby] + +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 + +# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously +# This should be the same in ruby/admin/web/websocket-gateway +####### +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 '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' # pinned until we are on ruby 2.5; then remove +gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate +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 '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 'oj', '2.17.1' # pinned until we are on 2.5; then remove +####### + +gem "activerecord-import", "~> 0.4.1" +gem "auto_strip_attributes" +gem "json", "1.8.6" +gem 'uuidtools', '2.1.2' +gem 'bcrypt', '3.1.15' +gem 'bcrypt-ruby' #, '3.0.1' +gem 'ruby-protocol-buffers', '1.2.2' +gem 'eventmachine', '1.0.4' +gem 'amqp', '1.0.2' +gem 'kickbox' +gem 'will_paginate' +gem 'sendgrid', '1.2.0' +gem 'aws-sdk', '~> 1' +gem 'carrierwave', '0.9.0' +gem 'aasm' +gem 'devise', '3.3.0' # 3.4.0 causes: uninitialized constant ActionController::Metal (NameError) +gem 'postgres-copy' +gem 'geokit' +gem 'geokit-rails' +gem 'postgres_ext' +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 'builder' +gem 'fog' +gem 'rest-client' +gem 'iso-639' +gem 'sanitize' +#gem 'influxdb' +gem 'sendgrid_toolkit', '>= 1.1.1' +gem 'stripe' +gem 'zip-codes' + + +gem 'elasticsearch' + +gem 'logging', '1.7.2' + +group :test do + gem 'pry' + gem 'simplecov', '~> 0.7.1' + gem 'simplecov-rcov' + gem 'factory_girl', '4.5.0' + gem "rspec", "2.11" + gem 'spork', '0.9.0' + gem 'database_cleaner', '1.4.1' + gem 'faker', '1.3.0' + gem 'resque_spec' #, :path => "/home/jam/src/resque_spec/" + gem 'timecop' + gem 'rspec-prof' + gem 'time_difference' +# gem 'byebug' + gem 'stripe-ruby-mock' + gem 'webmock', '~> 3.11', '>= 3.11.2' + +end + +# Specify your gem's dependencies in jam_ruby.gemspec +gemspec diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 3348f8b32..7632c7aa6 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -1,3 +1,8 @@ +PATH + remote: ../pb/target/ruby/jampb + specs: + jampb (0.1.1) + PATH remote: . specs: @@ -8,7 +13,7 @@ GEM remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ specs: CFPropertyList (2.3.6) - aasm (5.2.0) + aasm (5.1.1) concurrent-ruby (~> 1.0) actionmailer (4.2.8) actionpack (= 4.2.8) @@ -105,7 +110,7 @@ GEM et-orbi (1.2.4) tzinfo eventmachine (1.0.4) - excon (0.81.0) + excon (0.78.1) factory_girl (4.5.0) activesupport (>= 3.0.0) faker (1.3.0) @@ -262,7 +267,7 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - fugit (1.4.5) + fugit (1.4.2) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) geokit (1.13.1) @@ -284,7 +289,6 @@ GEM inflecto (0.0.2) ipaddress (0.8.3) iso-639 (0.3.5) - jampb (0.1.1173) json (1.8.6) kickbox (2.0.4) faraday (~> 0.9) @@ -292,7 +296,7 @@ GEM little-plugger (1.1.4) logging (1.7.2) little-plugger (>= 1.1.3) - loofah (2.9.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -300,23 +304,23 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) - mini_mime (1.1.0) + mime-types-data (3.2020.1104) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.4) - mono_logger (1.1.1) + minitest (5.14.3) + mono_logger (1.1.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) netrc (0.11.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.5) + 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.21.0) + pg (0.17.1) pg_array_parser (0.0.9) postgres-copy (1.2.0) activerecord (>= 4.0, < 5.1) @@ -328,7 +332,7 @@ GEM pg_array_parser (~> 0.0.9) protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - pry (0.14.1) + pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) @@ -349,7 +353,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.8) sprockets-rails - rails-deprecated_sanitizer (1.0.4) + rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) @@ -407,7 +411,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) + rexml (3.2.4) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -450,7 +454,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - stripe (5.33.0) + stripe (5.29.0) stripe-ruby-mock (3.0.1) dante (>= 0.2.0) multi_json (~> 1.0) @@ -460,7 +464,7 @@ GEM tilt (2.0.10) time_difference (0.5.0) activesupport - timecop (0.9.4) + timecop (0.9.2) tzinfo (1.2.9) thread_safe (~> 0.1) unf (0.1.4) @@ -471,15 +475,13 @@ GEM rack (>= 1.0.0) warden (1.2.7) rack (>= 1.0) - webmock (3.13.0) + webmock (3.11.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) will_paginate (3.3.0) xml-simple (1.1.8) - xmlrpc (0.3.2) - webrick + xmlrpc (0.3.1) zip-codes (0.2.1) PLATFORMS @@ -512,13 +514,13 @@ DEPENDENCIES icalendar (= 2.4.0) iso-639 jam_ruby! - jampb (= 0.1.1173) + jampb! json (= 1.8.6) kickbox logging (= 1.7.2) nokogiri (= 1.10.10) oj (= 2.17.1) - pg (= 0.21.0) + pg (= 0.17.1) postgres-copy postgres_ext protected_attributes diff --git a/web/.gitignore b/web/.gitignore index d8f22f053..585c62dfb 100644 --- a/web/.gitignore +++ b/web/.gitignore @@ -30,6 +30,7 @@ jt_metadata.json artifacts #Gemfile.lock +Gemfile.alt.lock .sass-cache log/development.log.age log/test.log.age diff --git a/web/Gemfile.alt b/web/Gemfile.alt new file mode 100644 index 000000000..5f5c068a7 --- /dev/null +++ b/web/Gemfile.alt @@ -0,0 +1,249 @@ +source 'http://rubygems.org' +# Look for $WORKSPACE, otherwise use "workspace" as dev path. + +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" + gem 'jam_ruby', :path => "../ruby" + gem 'jam_websockets', :path => "../websocket-gateway" +else + source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' do + #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jam_websockets', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" + end +end +gem 'rails', '= 4.2.8' +gem 'railties', '= 4.2.8' +gem 'auto_strip_attributes', '2.6.0' +gem 'protected_attributes' +gem 'rails-observers' + +# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously +# This should be the same in ruby/admin/web/websocket-gateway +####### +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 '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.1' # pinned until we are on ruby 2.5; then remove +gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate +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 'redis', '3.3.3' # pinned until we are on 2.5; then remove +gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove +gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove +gem 'bcrypt', '3.1.13' +gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www +gem 'sass', '3.5.5 '# compiler mismatch issue between build and www +#1###### + +gem 'responders', '~> 2.0' +#gem 'sprockets', '3.2.0' +gem 'sprockets-es6', require: 'sprockets/es6' +gem 'sprockets-rails', '2.3.2' +gem 'non-stupid-digest-assets' +#gem 'license_finder' +#gem 'pg_migrate', '0.1.14' +#gem 'paypal-sdk-rest' +gem 'paypal-sdk-merchant-jk', '1.118.1' +gem 'kickbox' +#gem 'oj' # '2.10.2' +gem 'builder' +gem 'jquery-rails' +gem 'jquery-ui-rails', '4.2.1' +#gem 'bootstrap-sass', '2.0.4' +#gem 'bcrypt-ruby', '3.1.14' +gem 'faker', '1.3.0' +gem 'will_paginate' #, '3.0.3' +gem 'bootstrap-will_paginate', '0.0.6' +gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket' +gem 'uuidtools', '2.1.2' +gem 'ruby-protocol-buffers', '1.2.2' + +if ENV["MODERN_OS"] == "1" + gem 'pg', '0.21.0' +else + gem 'pg', '0.17.1' +end + +#gem 'compass-rails' #, '1.1.3' # 1.1.4 throws an exception on startup about !initialize on nil +#gem "compass-rails", github: "Compass/compass-rails", branch: "master" +gem 'rabl', '0.13.1' # 0.14.3 has error on jenkins build server in ubuntu 12 +gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables +gem 'eventmachine', "1.2.3" #, '1.0.4' +#gem 'faraday', '~>0.9.0' +gem 'amqp', '0.9.8' +#gem 'logging-rails', :require => 'logging/rails' +#gem 'omniauth', '1.1.1' +#gem 'omniauth-facebook', '1.4.1' +#======= +#gem 'logging-rails', :require => 'logging/rails' +gem 'omniauth' +gem 'omniauth-facebook' +#>>>>>>> develop +gem 'omniauth-twitter' +gem 'omniauth-google-oauth2' +gem 'omniauth-stripe-connect' +gem 'google-api-client' #, '0.7.1' +gem 'retriable', '3.0.1' # this is necessary because 3.0.2 has a bug when used by google-api-client +#gem 'google-api-omniauth' #, '0.1.1' +gem 'signet', '0.5.0' +gem 'twitter' +gem 'fb_graph', '2.5.9' +gem 'sendgrid', '1.2.0' +gem 'filepicker-rails', '0.1.0' +gem 'aws-sdk', '~> 1' +gem 'aasm' #, '3.0.16' +gem 'carmen' +gem 'carrierwave', '0.11.2' #, '0.9.0' +gem 'carrierwave_direct' +gem 'fog' +#gem 'jquery-payment-rails', github: 'sethcall/jquery-payment-rails' +gem 'haml-rails', '0.9.0' # pinned because upgrading lets u not do = "{% if(data.feed_item['has_mount?']) { %}" . ? is bad +gem 'unf' #optional fog dependency +gem 'devise', '3.3.0' #3.4.0 causes uninitialized constant ActionController::Metal (NameError) +gem 'postgres-copy' +gem 'prawn-table' +#group :libv8 do +# gem 'libv8', "~> 3.11.8" +#end +gem 'geokit-rails' +gem 'postgres_ext' +gem 'resque' +gem 'resque-scheduler', '4.3.0' # a bug in 4.4.0 stops resque schedule from starting. 4.3.0 is very old compared to 4.4.0 though +gem 'resque-retry' +gem 'resque-failed-job-mailer' +gem 'resque-dynamic-queues' +gem 'resque-lonely_job', '~> 1.0.0' +gem 'resque_mailer' +gem 'netaddr', '1.5.1' +gem 'quiet_assets', :group => :development +gem 'bugsnag', '5.3.2' +gem 'multi_json' #, '1.9.0' +gem 'rest-client' +gem 'iso-639' +gem 'language_list' +#gem 'rubyzip' +gem 'slim' +gem 'htmlentities' +gem 'sanitize' +#gem 'recurly', '~> 2' +#gem 'guard', '2.7.3' +#gem 'influxdb' #, '0.1.8' +gem 'cause' # needed by influxdb +gem 'influxdb', '0.3.14' +gem 'influxdb-rails', '0.1.12' +gem 'sitemap_generator' +gem 'bower-rails', "~> 0.9.2" +gem 'react-rails', '1.3.3' #'~> 1.0' +gem 'sendgrid_toolkit', '>= 1.1.1' +gem 'stripe' +gem 'zip-codes' +#gem 'email_validator' +#gem "browserify-rails", "~> 0.7" + +gem 'elasticsearch' + +gem 'logging', '1.7.2' + + +if ENV['FASTER_PATH'] == '1' + # https://github.com/danielpclark/faster_path + # supposed to dramatically speed up page load time. Gotta install rust. go to github if interested + #gem 'faster_path', '~> 0.1.0', :group => :development +end + +source 'https://rails-assets.org' do + gem 'rails-assets-reflux', '0.3.0' + gem 'rails-assets-classnames' +#<<<<<<< HEAD +# gem 'rails-assets-react-select' + #gem "rails-assets-regenerator" + gem 'rails-assets-bluebird' +#======= + gem 'rails-assets-react-select', '0.6.7' +#>>>>>>> develop +end + +#group :development, :production do +# gem 'rack-timeout' +#end + +group :development, :test do + gem 'rspec-rails' #, require: "rspec/rails" #, '2.14.2' + gem 'rspec-collection_matchers' + gem "activerecord-import", "~> 0.4.1" +# gem 'guard-rspec', '0.5.5' +# gem 'jasmine', '1.3.1' + gem 'pry' + gem 'execjs', '2.6.0 ' #, '1.4.0' + gem 'factory_girl_rails' # , '4.1.0' # in dev because in use by rake task + gem 'database_cleaner', '1.3.0' #in dev because in use by rake task + gem 'test-unit' + # gem 'teaspoon' + # gem 'teaspoon-jasmine' + gem 'puma' + gem 'byebug' +end +group :unix do +# gem 'therubyracer' #, '0.11.0beta8' +end + +# Gems used only for assets and not required +# in production environments by default. + +gem 'coffee-rails' +gem 'uglifier' +gem 'coffee-script-source', '1.12.2' +group :test, :cucumber do + gem 'simplecov', '~> 0.7.1' + gem 'simplecov-rcov' + gem 'capybara' + #gem 'rails-assets-sinon', source: 'https://rails-assets.org' + #gem 'sinon-rails' +#if ENV['JAMWEB_QT5'] == '1' +# # necessary on platforms such as arch linux, where pacman -S qt5-webkit is your easiet option +# gem "capybara-webkit", :git => 'git://github.com/thoughtbot/capybara-webkit.git' +#else +# gem "capybara-webkit" +#end + gem 'capybara-screenshot', '1.0.25' #, '0.3.22' # 1.0.0 broke compat with rspec. maybe we need newer rspec + gem 'selenium-webdriver' + gem 'webdrivers', '~> 4.0', require: false + gem "show_me_the_cookies" +# gem 'geckodriver-helper' # firefox + + # gem 'cucumber-rails', :require => false #, '1.3.0', :require => false +# gem 'guard-spork', '0.3.2' + gem 'spork', '0.9.0' + gem 'launchy', '2.1.1' + gem 'rack-test' + # gem 'rb-fsevent', '0.9.1', :require => false + # gem 'growl', '1.0.3' + gem 'resque_spec' + gem 'timecop' + gem 'webmock', '~> 3.11', '>= 3.11.2' +# gem 'thin' +end + + +group :production do + gem 'unicorn' + gem 'newrelic_rpm' + gem 'god' +end + +group :package do + #gem 'fpm' +end diff --git a/web/Gemfile.lock b/web/Gemfile.lock index 9345e640b..1a150ba57 100644 --- a/web/Gemfile.lock +++ b/web/Gemfile.lock @@ -1,10 +1,24 @@ +PATH + remote: ../pb/target/ruby/jampb + specs: + jampb (0.1.1) + +PATH + remote: ../ruby + specs: + jam_ruby (0.1.1) + +PATH + remote: ../websocket-gateway + specs: + jam_websockets (0.1.1) + GEM remote: http://rubygems.org/ - remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ remote: https://rails-assets.org/ specs: CFPropertyList (2.3.6) - aasm (5.2.0) + aasm (5.1.1) concurrent-ruby (~> 1.0) actionmailer (4.2.8) actionpack (= 4.2.8) @@ -57,6 +71,8 @@ GEM amq-protocol (>= 0.9.4) eventmachine arel (6.0.4) + arr-pm (0.0.10) + cabin (> 0) attr_required (1.0.1) auto_strip_attributes (2.6.0) activerecord (>= 4.0) @@ -73,22 +89,24 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) + backports (3.20.2) bcrypt (3.1.13) - bindata (2.4.10) + bindata (2.4.8) bootstrap-will_paginate (0.0.6) will_paginate bower-rails (0.9.2) buftok (0.2.0) bugsnag (5.3.2) builder (3.2.4) - byebug (11.1.3) - capybara (3.32.2) + byebug (11.0.1) + cabin (0.9.0) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (~> 1.2) xpath (~> 3.2) capybara-screenshot (1.0.25) capybara (>= 1.0, < 4) @@ -107,6 +125,7 @@ GEM cause (0.1) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) + clamp (1.0.1) coderay (1.1.3) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -116,7 +135,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.8) - connection_pool (2.2.5) + connection_pool (2.2.3) crack (0.4.5) rexml crass (1.0.6) @@ -130,6 +149,7 @@ GEM diff-lcs (1.4.4) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.6) elasticsearch (7.4.0) elasticsearch-api (= 7.4.0) elasticsearch-transport (= 7.4.0) @@ -148,7 +168,7 @@ GEM et-orbi (1.2.4) tzinfo eventmachine (1.2.3) - excon (0.81.0) + excon (0.79.0) execjs (2.6.0) extlib (0.9.16) factory_girl (4.9.0) @@ -165,7 +185,7 @@ GEM json rack-oauth2 (>= 0.14.4) tzinfo - ffi (1.15.0) + ffi (1.12.2) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -322,13 +342,27 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - fugit (1.4.5) + fpm (1.12.0) + arr-pm (~> 0.0.10) + backports (>= 2.6.2) + cabin (>= 0.6.0) + childprocess (< 1.0.0) + clamp (~> 1.0.0) + ffi (~> 1.12.0) + git (>= 1.3.0, < 2.0) + json (>= 1.7.7, < 3.0) + pleaserun (~> 0.0.29) + ruby-xz (~> 0.2.3) + stud + 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) + git (1.8.1) + rchardet (~> 1.8) globalid (0.4.2) activesupport (>= 4.2.0) god (0.13.7) @@ -388,11 +422,10 @@ GEM influxdb-rails (0.1.12) influxdb (~> 0.3.0) railties + insist (1.0.0) + io-like (0.3.1) ipaddress (0.8.3) iso-639 (0.3.5) - jam_ruby (0.1.1173) - jam_websockets (0.1.1173) - jampb (0.1.1173) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -400,11 +433,11 @@ GEM jquery-ui-rails (4.2.1) railties (>= 3.2.16) json (1.8.6) - json-jwt (1.13.0) + json-jwt (1.12.0) activesupport (>= 4.2) aes_key_wrap bindata - jwt (2.2.3) + jwt (2.2.2) kgio (2.11.3) kickbox (2.0.4) faraday (~> 0.9) @@ -415,7 +448,7 @@ GEM little-plugger (1.1.4) logging (1.7.2) little-plugger (>= 1.1.3) - loofah (2.9.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -425,30 +458,29 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) - mimemagic (0.4.3) - nokogiri (~> 1) - rake - mini_mime (1.1.0) + mime-types-data (3.2021.0212) + mimemagic (0.3.5) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.4) - mono_logger (1.1.1) + minitest (5.14.3) + mono_logger (1.1.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) + mustache (0.99.8) naught (1.1.0) netaddr (1.5.1) netrc (0.11.0) - newrelic_rpm (7.0.0) - nio4r (2.5.7) + newrelic_rpm (6.15.0) + nio4r (2.5.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.5) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) non-stupid-digest-assets (1.0.9) sprockets (>= 2.0) - oauth (0.5.6) - oauth2 (1.4.7) + oauth (0.5.5) + oauth2 (1.4.4) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) @@ -460,10 +492,10 @@ GEM rack (>= 1.6.2, < 3) omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.8.2) + omniauth-google-oauth2 (0.8.1) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (~> 1.1) + omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.6) omniauth-oauth (1.2.0) oauth @@ -485,8 +517,15 @@ GEM paypal-sdk-merchant-jk (1.118.1) paypal-sdk-core (~> 0.3.0) pdf-core (0.7.0) - pg (0.21.0) + pg (0.17.1) pg_array_parser (0.0.9) + pleaserun (0.0.31) + cabin (> 0) + clamp + dotenv + insist + mustache (= 0.99.8) + stud postgres-copy (1.2.0) activerecord (>= 4.0, < 5.1) pg (>= 0.17) @@ -503,11 +542,11 @@ GEM prawn (>= 1.3.0, < 3.0.0) protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - pry (0.14.1) + pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - puma (5.3.2) + puma (5.2.0) nio4r (~> 2.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) @@ -543,7 +582,7 @@ GEM rails-assets-classnames (>= 1.2.2, < 2) rails-assets-react-input-autosize (>= 0.4.3, < 0.5) rails-assets-reflux (0.3.0) - rails-deprecated_sanitizer (1.0.4) + rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) @@ -560,7 +599,7 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.19.1) rake (13.0.3) - rb-fsevent (0.11.0) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rbvmomi (2.4.1) @@ -568,6 +607,7 @@ GEM json (>= 1.8) nokogiri (~> 1.5) optimist (~> 3.0) + rchardet (1.8.0) react-rails (1.3.3) babel-transpiler (>= 0.7.0) coffee-script-source (~> 1.8) @@ -627,7 +667,7 @@ GEM rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-rails (4.1.2) + rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -638,8 +678,11 @@ GEM rspec-support (3.10.2) ruby-prof (0.15.9) ruby-protocol-buffers (1.2.2) - ruby_parser (3.16.0) - sexp_processor (~> 4.15, >= 4.15.1) + ruby-xz (0.2.3) + ffi (~> 1.9) + io-like (~> 0.3) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) rubyzip (1.2.1) rufus-scheduler (3.7.0) fugit (~> 1.1, >= 1.1.6) @@ -665,7 +708,7 @@ GEM json sendgrid_toolkit (1.4.0) httparty (>= 0.7.6) - sexp_processor (4.15.3) + sexp_processor (4.15.2) show_me_the_cookies (5.0.1) capybara (>= 2, < 4) signet (0.5.0) @@ -701,15 +744,16 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - stripe (5.33.0) + stripe (5.29.0) + stud (0.0.23) temple (0.8.2) - test-unit (3.4.1) + test-unit (3.4.0) power_assert thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - timecop (0.9.4) - ttfunk (1.6.2.1) + timecop (0.9.2) + ttfunk (1.5.1) twitter (7.0.0) addressable (~> 2.3) buftok (~> 0.2.0) @@ -728,7 +772,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicorn (6.0.0) + unicorn (5.8.0) kgio (~> 2.6) raindrops (~> 0.7) uuidtools (2.1.2) @@ -740,15 +784,13 @@ GEM nokogiri (~> 1.6) rubyzip (~> 1.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.13.0) + webmock (3.12.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) will_paginate (3.3.0) xml-simple (1.1.8) - xmlrpc (0.3.2) - webrick + xmlrpc (0.3.1) xpath (3.2.0) nokogiri (~> 1.8) zip-codes (0.2.1) @@ -790,6 +832,7 @@ DEPENDENCIES filepicker-rails (= 0.1.0) fog fog-brightbox (= 0.11.0) + fpm geokit-rails god gon (~> 4.1.0) @@ -800,9 +843,9 @@ DEPENDENCIES influxdb (= 0.3.14) influxdb-rails (= 0.1.12) iso-639 - jam_ruby (= 0.1.1173)! - jam_websockets (= 0.1.1173)! - jampb (= 0.1.1173)! + jam_ruby! + jam_websockets! + jampb! jquery-rails jquery-ui-rails (= 4.2.1) kickbox @@ -821,7 +864,7 @@ DEPENDENCIES omniauth-stripe-connect omniauth-twitter paypal-sdk-merchant-jk (= 1.118.1) - pg (= 0.21.0) + pg (= 0.17.1) postgres-copy postgres_ext prawn-table diff --git a/websocket-gateway/.gitignore b/websocket-gateway/.gitignore index 9dec59c30..f2b32455d 100644 --- a/websocket-gateway/.gitignore +++ b/websocket-gateway/.gitignore @@ -4,6 +4,7 @@ .config .yardoc #Gemfile.lock +Gemfile.alt.lock InstalledFiles _yardoc coverage diff --git a/websocket-gateway/Gemfile.alt b/websocket-gateway/Gemfile.alt new file mode 100644 index 000000000..db64d6b8c --- /dev/null +++ b/websocket-gateway/Gemfile.alt @@ -0,0 +1,126 @@ +#ruby=1.9.3-p327 +source 'http://rubygems.org' +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? +if devenv + #gem 'jam_db', :path=> "../db/target/ruby_package" + gem 'jampb', :path => "../pb/target/ruby/jampb" + gem 'jam_ruby', :path => "../ruby" +else + #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" +end + +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' + +# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously +# This should be the same in ruby/admin/web/websocket-gateway +####### +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 '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.1' # pinned until we are on ruby 2.5; then remove +gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate +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 'redis', '3.3.3' # pinned until we are on 2.5; then remove +gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove +gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove +gem 'bcrypt', '3.1.13' +gem 'mimemagic', :source => 'https://int.jamkazam.com/gems/' +####### + + +#gem 'license_finder' +gem 'zip-codes' +gem 'stripe' +gem 'kickbox' +gem 'uuidtools', '2.1.2' +# On MacOSX: gem install bcrypt-ruby -v '3.0.1' -- --with-cflags=-Wno-implicit-function-declaration +gem 'ruby-protocol-buffers', '1.2.2' +gem 'em-websocket', '>=0.4.0' #, :path=> "#{workspace}/em-websocket-jam" +gem 'amqp' +gem 'logging' +gem 'will_paginate' +gem 'sendgrid' +gem 'rb-readline' +gem 'aasm' #, '3.0.16' +gem 'carrierwave', '0.11.2' +gem 'fog' +gem 'devise', '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError) +gem 'postgres-copy' +gem 'aws-sdk', '~> 1' +gem 'bugsnag', '5.3.2' +gem 'postgres_ext' +gem 'resque' +gem 'resque-retry' +gem 'resque-failed-job-mailer' +gem 'resque-lonely_job', '~> 1.0.0' +gem 'resque_mailer' +gem 'geokit' +gem 'geokit-rails' #, '2.0.1' +gem 'mime-types', '1.25.1' +gem 'rest-client' +gem 'netaddr', '1.5.1' +gem 'iso-639' +gem 'language_list' +gem 'sanitize' +#gem 'influxdb' +gem 'cause' # needed by influxdb +gem 'sendgrid_toolkit', '>= 1.1.1' +gem 'elasticsearch' + +if ENV["MODERN_OS"] == "1" + gem 'pg', '0.21.0' +else + gem 'pg', '0.17.1' +end + +group :development do + gem 'pry' +end + +group :test do + gem 'simplecov', '~> 0.7.1' + gem 'simplecov-rcov' + gem 'cucumber' + gem 'rspec', '2.14.1' # can go to 3.0, but requires changes to tests due to should removal, be_truthy, and other changes + gem 'factory_girl' + #gem 'spork', '0.9.0' +#<<<<<<< HEAD + gem 'database_cleaner' #, '0.7.0' +# gem 'guard', '>= 0.10.0' +# gem 'guard-rspec', '>= 0.7.3' +# gem 'pg_migrate','0.1.13' #:path => "#{workspace}/pg_migrate_ruby" +#======= +# gem 'database_cleaner', '0.7.0' + #gem 'pg_migrate','0.1.14' #:path => "#{workspace}/pg_migrate_ruby" +#>>>>>>> develop + gem 'evented-spec' +end + +group :production do + gem 'newrelic_rpm' +end + +group :package do + gem 'fpm' +end diff --git a/websocket-gateway/Gemfile.lock b/websocket-gateway/Gemfile.lock index 8f2fdd1c1..fb4987b4f 100644 --- a/websocket-gateway/Gemfile.lock +++ b/websocket-gateway/Gemfile.lock @@ -1,10 +1,20 @@ +PATH + remote: ../pb/target/ruby/jampb + specs: + jampb (0.1.1) + +PATH + remote: ../ruby + specs: + jam_ruby (0.1.1) + GEM remote: http://rubygems.org/ remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ remote: https://int.jamkazam.com/gems/ specs: CFPropertyList (2.3.6) - aasm (5.2.0) + aasm (5.1.1) concurrent-ruby (~> 1.0) actionmailer (4.2.8) actionpack (= 4.2.8) @@ -57,7 +67,7 @@ GEM aws-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) - backports (3.21.0) + backports (3.20.2) bcrypt (3.1.13) bugsnag (5.3.2) builder (3.2.4) @@ -135,7 +145,7 @@ GEM tzinfo evented-spec (0.9.0) eventmachine (1.2.7) - excon (0.81.0) + excon (0.79.0) factory_girl (4.9.0) activesupport (>= 3.0.0) faraday (0.9.2) @@ -303,7 +313,7 @@ GEM pleaserun (~> 0.0.29) ruby-xz (~> 0.2.3) stud - fugit (1.4.5) + fugit (1.4.2) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) geokit (1.13.1) @@ -328,18 +338,15 @@ GEM io-like (0.3.1) ipaddress (0.8.3) iso-639 (0.3.5) - jam_ruby (0.1.1173) - jampb (0.1.1173) json (1.8.6) kickbox (2.0.4) faraday (~> 0.9) json (>= 1.8) language_list (1.2.1) little-plugger (1.1.4) - logging (2.3.0) - little-plugger (~> 1.1) - multi_json (~> 1.14) - loofah (2.9.1) + logging (1.7.2) + little-plugger (>= 1.1.3) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -347,13 +354,11 @@ GEM method_source (1.0.0) middleware (0.1.0) mime-types (1.25.1) - mimemagic (0.4.3) - nokogiri (~> 1) - rake - mini_mime (1.1.0) + mimemagic (0.3.5) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.4) - mono_logger (1.1.1) + minitest (5.14.3) + mono_logger (1.1.0) multi_json (1.15.0) multi_test (0.1.2) multi_xml (0.6.0) @@ -361,17 +366,17 @@ GEM mustache (0.99.8) netaddr (1.5.1) netrc (0.11.0) - newrelic_rpm (7.0.0) + newrelic_rpm (6.15.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.5) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) oj (3.1.3) optimist (3.0.1) orm_adapter (0.5.0) - pg (0.21.0) + pg (0.17.1) pg_array_parser (0.0.9) - pleaserun (0.0.32) + pleaserun (0.0.31) cabin (> 0) clamp dotenv @@ -393,7 +398,7 @@ GEM middleware thor thread_safe - pry (0.14.1) + pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) raabro (1.4.0) @@ -413,7 +418,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.8) sprockets-rails - rails-deprecated_sanitizer (1.0.4) + rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) @@ -509,7 +514,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - stripe (5.33.0) + stripe (5.29.0) stud (0.0.23) sys-uname (1.2.2) ffi (~> 1.1) @@ -526,11 +531,9 @@ GEM rack (>= 1.0.0) warden (1.2.7) rack (>= 1.0) - webrick (1.7.0) will_paginate (3.3.0) xml-simple (1.1.8) - xmlrpc (0.3.2) - webrick + xmlrpc (0.3.1) zip-codes (0.2.1) PLATFORMS @@ -564,8 +567,8 @@ DEPENDENCIES geokit-rails icalendar (= 2.4.0) iso-639 - jam_ruby (= 0.1.1173) - jampb (= 0.1.1173) + jam_ruby! + jampb! kickbox language_list logging @@ -575,7 +578,6 @@ DEPENDENCIES newrelic_rpm nokogiri (= 1.10.10) oj (= 3.1.3) - pg (= 0.21.0) postgres-copy postgres_ext protected_attributes