From 3750f4130fe52bbcb2fb806a98244da7c8644e46 Mon Sep 17 00:00:00 2001
From: Kosuke Tanabe <nabeta@fastmail.fm>
Date: Sun, 6 Jul 2014 21:48:15 +0900
Subject: [PATCH] updated gemspec

---
 enju_leaf.gemspec      |  2 +-
 spec/support/resque.rb | 46 ++++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/enju_leaf.gemspec b/enju_leaf.gemspec
index c5ddf96607..5372417e43 100644
--- a/enju_leaf.gemspec
+++ b/enju_leaf.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids}/*"]
 
   s.add_dependency "rails", "~> 3.2.19"
-  s.add_dependency "enju_biblio", "~> 0.1.0.pre53"
+  s.add_dependency "enju_biblio", "~> 0.1.0.pre54"
   s.add_dependency "enju_library", "~> 0.1.0.pre33"
   s.add_dependency "enju_manifestation_viewer", "~> 0.1.0.pre13"
   s.add_dependency "redcarpet"
diff --git a/spec/support/resque.rb b/spec/support/resque.rb
index 0bdea5def9..372ef030fd 100644
--- a/spec/support/resque.rb
+++ b/spec/support/resque.rb
@@ -3,28 +3,30 @@
   REDIS_PID = "#{Rails.root}/tmp/pids/redis-test.pid"
   REDIS_CACHE_PATH = "#{Rails.root}/tmp/cache/"
 
-  config.before(:suite) do
-    redis_options = {
-      "daemonize"     => 'yes',
-      "pidfile"       => REDIS_PID,
-      "port"          => 9736,
-      "timeout"       => 300,
-      "save 900"      => 1,
-      "save 300"      => 1,
-      "save 60"       => 10000,
-      "dbfilename"    => "dump.rdb",
-      "dir"           => REDIS_CACHE_PATH,
-      "loglevel"      => "debug",
-      "logfile"       => "stdout",
-      "databases"     => 16
-    }.map { |k, v| "#{k} #{v}" }.join("\n")
-    `echo '#{redis_options}' | redis-server -`
-  end
+  unless ENV["TRAVIS"]
+    config.before(:suite) do
+      redis_options = {
+        "daemonize"     => 'yes',
+        "pidfile"       => REDIS_PID,
+        "port"          => 9736,
+        "timeout"       => 300,
+        "save 900"      => 1,
+        "save 300"      => 1,
+        "save 60"       => 10000,
+        "dbfilename"    => "dump.rdb",
+        "dir"           => REDIS_CACHE_PATH,
+        "loglevel"      => "debug",
+        "logfile"       => "stdout",
+        "databases"     => 16
+      }.map { |k, v| "#{k} #{v}" }.join("\n")
+      `echo '#{redis_options}' | redis-server -`
+    end
 
-  config.after(:suite) do
-    %x{
-      cat #{REDIS_PID} | xargs kill -QUIT
-      rm -f #{REDIS_CACHE_PATH}dump.rdb
-    }
+    config.after(:suite) do
+      %x{
+        cat #{REDIS_PID} | xargs kill -QUIT
+        rm -f #{REDIS_CACHE_PATH}dump.rdb
+      }
+    end
   end
 end