diff --git a/admin/Gemfile b/admin/Gemfile index 0dfe6961f..19ecfa7ef 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -48,7 +48,7 @@ gem 'aasm', '3.0.16' gem 'postgres-copy', '0.6.0' gem 'aws-sdk', '1.29.1' gem 'bugsnag' - +gem 'resque' gem 'eventmachine', '1.0.3' gem 'amqp', '0.9.8' diff --git a/ruby/Gemfile b/ruby/Gemfile index f8607162e..67494b693 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -24,7 +24,7 @@ gem 'carrierwave' gem 'aasm', '3.0.16' gem 'devise', '>= 1.1.2' gem 'postgres-copy' - +gem 'resque' gem 'geokit-rails' gem 'postgres_ext' diff --git a/ruby/config/resque.yml b/ruby/config/resque.yml index 834aace2c..408f57713 100644 --- a/ruby/config/resque.yml +++ b/ruby/config/resque.yml @@ -1,2 +1 @@ -test: - redis: localhost:6379 \ No newline at end of file +test: localhost:6379 diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb index dfc0d8c1d..53de28feb 100644 --- a/ruby/spec/support/utilities.rb +++ b/ruby/spec/support/utilities.rb @@ -13,6 +13,27 @@ def app_config def aws_secret_access_key 'h0V0ffr3JOp/UtgaGrRfAk25KHNiO9gm8Pj9m6v3' end + + def audiomixer_path + # you can specify full path to audiomixer with AUDIOMIXER_PATH env variable... + # or we check for audiomixer path in the user's workspace + # and finally the debian install path + ENV['AUDIOMIXER_PATH'] || audiomixer_workspace_path || "/var/lib/audiomixer/audiomixer/audiomixerapp" + end + + private + + def audiomixer_workspace_path + if ENV['WORKSPACE'] + dev_path = ENV['WORKSPACE'] + else + dev_path = ENV['HOME'] + end + + dev_path = "#{dev_path}/audiomixer/audiomixer/audiomixerapp" + dev_path if File.exist? dev_path + end + end return klass.new diff --git a/web/Gemfile b/web/Gemfile index 7a301fbb9..8d5ca4f50 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -58,6 +58,7 @@ gem 'postgres-copy' gem 'geokit-rails' gem 'postgres_ext' gem 'haml-rails' +gem 'resque' gem 'quiet_assets', :group => :development