From 94d44105289488bca75ae16fbe6130f1953dc4ec Mon Sep 17 00:00:00 2001
From: Al Snow <jasnow@hotmail.com>
Date: Mon, 28 Oct 2013 19:32:59 -0400
Subject: [PATCH 1/2] 1. Changed 1.9.3 to 2.0.0 in .rvmrc, .travis.yml,
 Gemfile, README.md. 2. Rebuilt Gemfile.lock file. 3. Changed "@@" (class var)
 to "$" (global var) in spec/support/capybara_shared.rb

---
 .rvmrc                          | 2 +-
 .travis.yml                     | 2 +-
 Gemfile                         | 3 ++-
 Gemfile.lock                    | 8 ++++----
 README.md                       | 2 +-
 spec/support/capybara_shared.rb | 6 +++---
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.rvmrc b/.rvmrc
index bf053af..8adb56f 100755
--- a/.rvmrc
+++ b/.rvmrc
@@ -1 +1 @@
-rvm use 1.9.3@railsgoat --create
+rvm use 2.0.0@railsgoat --create
diff --git a/.travis.yml b/.travis.yml
index 4ae7691..cbbdb66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - "1.9.3"
+  - "2.0.0"
 before_script: rake db:setup
 env: RAILSGOAT_MAINTAINER=true
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 131581f..7bffb9c 100755
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,14 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.15'
 
+ruby '2.0.0'
+
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'sqlite3'
 gem 'foreman'
 
-
 group :development do
   gem 'brakeman'
   gem 'bundler-audit'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5af26a4..aed7bd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,11 +40,11 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (2.1.2)
+    brakeman (2.2.0)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
-      highline (~> 1.6.19)
+      highline (~> 1.6.20)
       multi_json (~> 1.2)
       ruby2ruby (~> 2.0.5)
       ruby_parser (~> 3.2.2)
@@ -91,7 +91,7 @@ GEM
     eventmachine (1.0.3)
     execjs (2.0.2)
     fastercsv (1.5.5)
-    ffi (1.9.1)
+    ffi (1.9.0)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
@@ -136,7 +136,7 @@ GEM
     launchy (2.3.0)
       addressable (~> 2.3)
     libv8 (3.16.14.3)
-    listen (2.1.1)
+    listen (2.1.2)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
diff --git a/README.md b/README.md
index 10fe978..67afc81 100755
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 	cd railsgoat
 
-	rvm use 1.9.3@railsgoat --create # https://rvm.io/
+	rvm use 2.0.0@railsgoat --create # https://rvm.io/
 
 	bundle
 
diff --git a/spec/support/capybara_shared.rb b/spec/support/capybara_shared.rb
index 2f982f9..1b323ba 100644
--- a/spec/support/capybara_shared.rb
+++ b/spec/support/capybara_shared.rb
@@ -5,12 +5,12 @@
 # However, RailsGoat maintainers need the Capybara features to pass to indicate
 # changes to the site have not inadvertently removed or fixed any vulnerabilities
 # since the whole point is to provide a site for a developer to fix.
-@@displayed_spec_notice = false
+$displayed_spec_notice = false
 
 def verifying_fixed?
   maintainer_env_name = 'RAILSGOAT_MAINTAINER'
   result = !ENV[maintainer_env_name]
-  if !@@displayed_spec_notice && result
+  if !$displayed_spec_notice && result
     puts <<-NOTICE
 
 ******************************************************************************
@@ -30,7 +30,7 @@ def verifying_fixed?
   a 'pending' state.
 ******************************************************************************
     NOTICE
-    @@displayed_spec_notice = true
+    $displayed_spec_notice = true
   end
   result
 end

From 1aec17184d43238dca74a874484aa6e27772ce47 Mon Sep 17 00:00:00 2001
From: Al Snow <jasnow@hotmail.com>
Date: Mon, 31 Mar 2014 09:02:58 -0400
Subject: [PATCH 2/2] Rebuilt Gemfile.lock file. Upgraded 2 gems.

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e0f8d1b..0cbaddd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,7 +67,7 @@ GEM
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    childprocess (0.5.1)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.0)
@@ -212,7 +212,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.13.0)
-    rake (10.2.1)
+    rake (10.2.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)