From 448a55cd8987216da520c2c619568ef4f6bb4906 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 12 Jul 2014 01:50:32 -0400
Subject: warbler

---
 .gitignore   | 1 +
 Gemfile      | 1 +
 Gemfile.lock | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/.gitignore b/.gitignore
index f73ed63..7d4753b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 /config/database.yml
 /vendor/bundle
 /public/assets
+/*.war
 
 # As noted above, you probably want to add the following to your global git config.
 nohup.out
diff --git a/Gemfile b/Gemfile
index 1610020..035fa31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,6 +66,7 @@ group :doc do
 	gem 'sdoc', require: false
 end
 
+gem "warbler", require: false, platforms: [ :jruby ], groups: [ :development ]
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b990ba5..b9547b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,6 +77,8 @@ GEM
     jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jruby-jars (1.7.13)
+    jruby-rack (1.1.14)
     json (1.8.1)
     json (1.8.1-java)
     libv8 (3.16.14.3)
@@ -113,6 +115,7 @@ GEM
     rdoc (4.1.1)
       json (~> 1.4)
     ref (1.0.5)
+    rubyzip (1.0.0)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -153,6 +156,11 @@ GEM
     uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    warbler (1.4.3)
+      jruby-jars (>= 1.5.6, < 2.0)
+      jruby-rack (>= 1.0.0)
+      rake (>= 0.9.6)
+      rubyzip (>= 0.9, < 1.1)
 
 PLATFORMS
   java
@@ -181,3 +189,4 @@ DEPENDENCIES
   therubyrhino
   turbolinks
   uglifier (>= 1.3.0)
+  warbler
-- 
cgit v1.2.3