From 399af44c7143c73ba020ff7701a5801a3e5769e3 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Mon, 22 Apr 2013 22:22:36 -0700
Subject: [PATCH] update uglifier dep

---
 CHANGELOG.md                                      | 2 ++
 Gemfile                                           | 6 ++----
 middleman-core/middleman-core.gemspec             | 2 +-
 middleman-more/features/minify_javascript.feature | 6 +++---
 middleman-more/middleman-more.gemspec             | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26836c95..5d826ecb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ master
 * Update Rack dependency to 1.5.x
 * Update to Listen 1.0.x
 * Update to padrino-helpers 0.11.x
+* Update to Thor 0.17.x
+* Update uglifier to 2.0.x
 
 3.1.0.beta.1
 ===
diff --git a/Gemfile b/Gemfile
index 5929e5fb..3f641560 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,20 +1,18 @@
 source 'https://rubygems.org'
 
-# Make sure to use Haml 4 for tests
-gem "haml", "~> 4.0.0"
 
 # Build and doc tools
 gem "rake",     "~> 10.0.3"
 gem "yard",     "~> 0.8.0"
 
 # Test tools
-gem "cucumber", "~> 1.2.1"
+gem "cucumber", "~> 1.3.1"
 gem "fivemat"
 gem "aruba",    "~> 0.5.1"
 gem "rspec",    "~> 2.12"
-gem 'gherkin', '<= 2.11.6' # for annoying "eval" warnings
 
 # Optional middleman dependencies, included for tests
+gem "haml", "~> 4.0.0" # Make sure to use Haml 4 for tests
 gem "sinatra", :require => false
 gem "slim", :require => false
 gem "liquid", :require => false
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index a86cadfa..c9ccf47b 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", ["~> 1.5.2"])
+  s.add_dependency("rack", [">= 1.4.5"])
   s.add_dependency("tilt", ["~> 1.3.6"])
   
   # Builder
diff --git a/middleman-more/features/minify_javascript.feature b/middleman-more/features/minify_javascript.feature
index c56cc769..3fd147e0 100644
--- a/middleman-more/features/minify_javascript.feature
+++ b/middleman-more/features/minify_javascript.feature
@@ -133,14 +133,14 @@ Feature: Minify Javascript
     Then I should see:
     """
     <script>
-      (function(){this,should(),all.be(),on={one:line}})();
+      (function(){should(),all.be(),on={one:line}})();
     </script>
     <script>
-      (function(){this,should(),too()})();
+      (function(){should(),too()})();
     </script>
     <script type='text/javascript'>
       //<!--
-    (function(){one,line(),here()})();
+    (function(){line(),here()})();
       //-->
     </script>
     <script type='text/html'>
diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec
index 5d10f303..eeee1bee 100644
--- a/middleman-more/middleman-more.gemspec
+++ b/middleman-more/middleman-more.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)
-  s.add_dependency("uglifier", ["~> 1.3.0"])
+  s.add_dependency("uglifier", ["~> 2.0.1"])
   s.add_dependency("haml", [">= 3.1.6"])
   s.add_dependency("sass", [">= 3.1.20"])
   s.add_dependency("compass", [">= 0.12.2"])