- Moved to newer ruby build (sorry Loic ;) )

- fixed unicorn bug

.rvmrc

@@ -6,7 +6,7 @@
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
 # Only full ruby name is supported here, for short names use:
 #     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p125@rails-3.2"
+environment_id="ruby-1.9.3-p194"
 
 # Uncomment the following lines if you want to verify rvm version per project
 # rvmrc_rvm_version="1.10.3" # 1.10.1 seams as a safe start

Gemfile.lock

@@ -29,9 +29,9 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    authlogic (3.1.0)
-      activerecord (>= 3.0.7)
-      activerecord (>= 3.0.7)
+    authlogic (3.1.3)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
     builder (3.0.0)
     capistrano (2.12.0)
       highline
@@ -50,13 +50,13 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    commonjs (0.2.5)
+    coffee-script-source (1.3.3)
+    commonjs (0.2.6)
     curb (0.7.18)
     daemons (1.1.8)
     erubis (2.7.0)
     eventmachine (0.12.10)
-    execjs (1.3.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
     feedzirra (0.0.31)
       activesupport (>= 3.0.8)
@@ -68,44 +68,41 @@ GEM
       rake (>= 0.9.2)
       rdoc (~> 3.8)
       sax-machine (~> 0.0.20)
-    hashr (0.0.19)
+    hashr (0.0.21)
     high_voltage (1.1.1)
-    highline (1.6.12)
+    highline (1.6.13)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.3)
-    jquery-rails (2.0.1)
+    journey (1.0.4)
+    jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    jruby-pageant (1.0.2)
-    json (1.6.6)
+    json (1.7.3)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     kgio (2.7.4)
-    less (2.1.0)
-      commonjs (~> 0.2.0)
-      therubyracer (~> 0.10.0)
-    less-rails (2.2.0)
+    less (2.2.1)
+      commonjs (~> 0.2.6)
+    less-rails (2.2.3)
       actionpack (>= 3.1)
-      less (~> 2.1.0)
+      less (~> 2.2.0)
     libv8 (3.3.10.4)
     loofah (1.0.0)
       nokogiri (>= 1.3.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.2.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
     mysql (2.8.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.4.0)
-      jruby-pageant (>= 1.0.2)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.4.7)
@@ -138,30 +135,30 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    ruby-mysql (2.9.8)
-    rvm-capistrano (1.2.2)
+    ruby-mysql (2.9.10)
+    rvm-capistrano (1.2.5)
       capistrano (>= 2.0.0)
-    sass (3.1.15)
+    sass (3.1.20)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sax-machine (0.0.20)
       nokogiri (> 0.0.0)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    therubyracer (0.10.0)
+    sqlite3 (1.3.6)
+    therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thin (1.3.1)
+    thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
-    tire (0.4.0)
+    tire (0.4.2)
       activemodel (>= 3.0)
       hashr (~> 0.0.19)
       multi_json (~> 1.0)
@@ -170,14 +167,15 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    twitter-bootstrap-rails (2.0.5)
+    twitter-bootstrap-rails (2.1.1)
       actionpack (>= 3.1)
-      less-rails (~> 2.2.0)
+      less-rails (~> 2.2.2)
       railties (>= 3.1)
-    tzinfo (0.3.32)
-    uglifier (1.2.4)
+      therubyracer (= 0.10.1)
+    tzinfo (0.3.33)
+    uglifier (1.2.6)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack

config/deploy.rb

@@ -1,5 +1,5 @@
 # RVM
-set :rvm_ruby_string, 'ruby-1.9.3-p125@rails-3.2'
+set :rvm_ruby_string, 'ruby-1.9.3-p194'
 set :rvm_install_type, :stable
 
 set :bundle_without, [:development]
@@ -16,7 +16,6 @@
 set :scm,               'git'
 set :scm_verbose,       true
 set :repository,        'git://github.com/lschule/rssYeah.git'
-#set :repository,        'ssh://uwis-cx-dock-11-305.ethz.ch/~/Projects/rssYeah'
 set :branch,            'master'
 
 # roles (servers)

config/unicorn/production.rb

@@ -12,6 +12,9 @@
 
 rails_env = ENV['RAILS_ENV'] || 'production'
 
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', File.dirname(__FILE__))
+require 'bundler/setup'
+
 pid "#{shared_path}/pids/unicorn.pid"
 stderr_path "#{shared_path}/log/unicorn.stderr.log"
 stdout_path "#{shared_path}/log/unicorn.stdout.log"
@@ -25,7 +28,7 @@
 
   # Before forking, kill the master process that belongs to the .oldbin PID.
   # This enables 0 downtime deploys.
-  old_pid = "#{pid}.oldbin"
+  old_pid = app_root + '/shared/pids/unicorn.pid.oldbin'
   if File.exists?(old_pid) && server.pid != old_pid
     begin
       Process.kill("QUIT", File.read(old_pid).to_i)