From efe3dea8e3fac43027a1ab3466cb1fbb967e2e61 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 16 Jul 2015 10:58:03 -0500 Subject: [PATCH] * updating Rails to 3.2.22 to allow compat with ruby 2.2.2 --- admin/Gemfile | 9 +++++---- db/Gemfile | 2 +- db/Gemfile.lock | 4 ++-- ruby/Gemfile | 4 ++-- ruby/jt_metadata.json | 2 +- ruby/lib/jam_ruby/models/band.rb | 4 ++-- ruby/lib/jam_ruby/models/music_session.rb | 6 +++--- web/Gemfile | 6 +++--- websocket-gateway/Gemfile | 4 ++-- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/admin/Gemfile b/admin/Gemfile index 96f2e1ecd..46bacc343 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -14,7 +14,7 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end -gem 'rails', '~> 3.2.11' +gem 'rails', '~> 3.2.22' gem 'bootstrap-sass', '2.0.4' gem 'bcrypt-ruby', '3.0.1' @@ -77,7 +77,7 @@ gem 'influxdb-rails', '0.1.10' gem 'recurly' group :libv8 do - gem 'libv8', "~> 3.11.8" + gem 'libv8', "~> 4.5.95" end @@ -101,15 +101,16 @@ end group :development, :test do gem 'capybara' gem 'rspec-rails', '2.14.2' - gem 'guard-rspec', '0.5.5' + gem 'guard-rspec' gem 'jasmine', '1.3.1' gem 'execjs', '1.4.0' - gem 'therubyracer' #, '0.11.0beta8' + #gem 'therubyracer' #, '0.11.0beta8' gem 'factory_girl_rails', '4.1.0' gem 'database_cleaner', '0.7.0' gem 'launchy' gem 'faker', '1.3.0' gem 'puma' + gem 'test-unit' end group :test do diff --git a/db/Gemfile b/db/Gemfile index 903a1c2dc..79ec5bca4 100644 --- a/db/Gemfile +++ b/db/Gemfile @@ -3,4 +3,4 @@ source 'http://rubygems.org' # Assumes you have already cloned pg_migrate_ruby in your workspace # $ cd [workspace] # $ git clone https://github.com/sethcall/pg_migrate_ruby -gem 'pg_migrate', '0.1.13' +gem 'pg_migrate', '0.1.13', :source => 'http://rubygems.org/' diff --git a/db/Gemfile.lock b/db/Gemfile.lock index 8d6d039c2..88080fb81 100644 --- a/db/Gemfile.lock +++ b/db/Gemfile.lock @@ -15,7 +15,7 @@ PLATFORMS ruby DEPENDENCIES - pg_migrate (= 0.1.13) + pg_migrate (= 0.1.13)! BUNDLED WITH - 1.10.3 + 1.10.5 diff --git a/ruby/Gemfile b/ruby/Gemfile index f88a63b22..dc66cc735 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -18,7 +18,7 @@ end gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw] gem 'jdbc_postgres', :platform => [:jruby] -gem 'activerecord', '3.2.13' +gem 'activerecord', '3.2.22' gem "activerecord-import", "~> 0.4.1" gem 'uuidtools', '2.1.2' gem 'bcrypt-ruby', '3.0.1' @@ -26,7 +26,7 @@ gem 'ruby-protocol-buffers', '1.2.2' gem 'eventmachine', '1.0.4' gem 'amqp', '1.0.2' gem 'will_paginate' -gem 'actionmailer', '3.2.13' +gem 'actionmailer', '3.2.22' gem 'sendgrid', '1.2.0' gem 'aws-sdk', '~> 1' gem 'carrierwave', '0.9.0' diff --git a/ruby/jt_metadata.json b/ruby/jt_metadata.json index 55ddeef8e..dfaa6ab96 100644 --- a/ruby/jt_metadata.json +++ b/ruby/jt_metadata.json @@ -1 +1 @@ -{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/jam-track-90.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/623cd29a-51fc-4185-89ed-99a88f3c7fb0.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpbM4F2I"} \ No newline at end of file +{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/jam-track-75.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/a3ecd76f-6176-4595-8bee-ddc9896685fe.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpmYAmj7"} \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/band.rb b/ruby/lib/jam_ruby/models/band.rb index 251a88e5e..e822df6a5 100644 --- a/ruby/lib/jam_ruby/models/band.rb +++ b/ruby/lib/jam_ruby/models/band.rb @@ -49,10 +49,10 @@ module JamRuby has_many :recordings, :class_name => "JamRuby::Recording", :foreign_key => "band_id", dependent: :destroy # self.id = likable_id in likes table - has_many :likers, :as => :likable, :class_name => "JamRuby::Like", :dependent => :destroy, dependent: :destroy + has_many :likers, :as => :likable, :class_name => "JamRuby::Like", :dependent => :destroy # self.id = followable_id in follows table - has_many :followers, :as => :followable, :class_name => "JamRuby::Follow", :dependent => :destroy, dependent: :destroy + has_many :followers, :as => :followable, :class_name => "JamRuby::Follow", :dependent => :destroy # invitations has_many :invitations, :inverse_of => :band, :class_name => "JamRuby::BandInvitation", :foreign_key => "band_id", dependent: :destroy diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 94b2295d4..1f56efc08 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -44,10 +44,10 @@ module JamRuby has_one :share_token, :class_name => "JamRuby::ShareToken", :inverse_of => :shareable, :foreign_key => 'shareable_id' has_one :feed, :class_name => "JamRuby::Feed", :inverse_of => :music_session, :foreign_key => 'music_session_id', :dependent => :destroy belongs_to :genre, :class_name => "JamRuby::Genre", :inverse_of => :music_sessions, :foreign_key => 'genre_id' - has_many :join_requests, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::JoinRequest", :foreign_key => "music_session_id" - has_many :invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::Invitation", :foreign_key => "music_session_id" + has_many :join_requests, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::JoinRequest" + has_many :invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::Invitation" has_many :invited_musicians, :through => :invitations, :class_name => "JamRuby::User", :foreign_key => "receiver_id", :source => :receiver - has_many :fan_invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::FanInvitation", :foreign_key => "music_session_id" + has_many :fan_invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::FanInvitation" has_many :invited_fans, :through => :fan_invitations, :class_name => "JamRuby::User", :foreign_key => "receiver_id", :source => :receiver has_many :rsvp_slots, :class_name => "JamRuby::RsvpSlot", :foreign_key => "music_session_id", :dependent => :destroy has_many :music_notations, :class_name => "JamRuby::MusicNotation", :foreign_key => "music_session_id" diff --git a/web/Gemfile b/web/Gemfile index 89cb15aac..e157c4c12 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -20,8 +20,8 @@ end gem 'oj', '2.10.2' gem 'builder' -gem 'rails', '~>3.2.11' -gem 'railties', '~>3.2.11' +gem 'rails', '~>3.2.22' +gem 'railties', '~>3.2.22' gem 'jquery-rails' gem 'jquery-ui-rails', '4.2.1' gem 'bootstrap-sass', '2.0.4' @@ -107,7 +107,7 @@ group :development, :test do gem 'execjs', '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' diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile index 77ce57cc3..d36369f2c 100644 --- a/websocket-gateway/Gemfile +++ b/websocket-gateway/Gemfile @@ -24,8 +24,8 @@ gem 'bcrypt-ruby', '3.0.1' gem 'ruby-protocol-buffers', '1.2.2' gem 'em-websocket', '>=0.4.0' #, :path=> "#{workspace}/em-websocket-jam" gem 'amqp' -gem 'activerecord', '3.2.13' -gem 'actionpack', '3.2.13' +gem 'activerecord', '3.2.22' +gem 'actionpack', '3.2.22' gem 'logging' gem 'will_paginate' gem 'actionmailer'