From 231e4090a5a8b3196627a6f4e0fa7a3dc71b9dd9 Mon Sep 17 00:00:00 2001
From: Kenji Okimoto <okimoto@clear-code.com>
Date: Tue, 17 Apr 2018 14:53:36 +0900
Subject: [PATCH] Update sucker_punch and Fluentd

Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
---
 Gemfile.lock       | 58 ++++++++++++++++++++++++++++++----------------
 fluentd-ui.gemspec |  4 ++--
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 569490c..32cfa4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ PATH
       bundler
       diff-lcs
       draper (~> 1.3)
-      fluentd (>= 0.10.56, < 2)
+      fluentd (>= 0.10.56, < 0.14)
       font-awesome-rails
       haml-rails (~> 0.5.3)
       httpclient (~> 2.5)
@@ -19,7 +19,7 @@ PATH
       rubyzip (~> 1.1)
       sass-rails (~> 4.0.3)
       settingslogic
-      sucker_punch (~> 1.0.5)
+      sucker_punch (~> 1.6.0)
       thor
 
 GEM
@@ -78,12 +78,27 @@ GEM
     capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.17.3)
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.6)
+      timers (>= 4.1.1)
     cliver (0.3.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    cool.io (1.5.0)
+    cool.io (1.5.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -103,7 +118,7 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    fluentd (0.12.35)
+    fluentd (0.12.43)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -113,8 +128,8 @@ GEM
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
-    font-awesome-rails (4.7.0.1)
-      railties (>= 3.2, < 5.1)
+    font-awesome-rails (4.7.0.4)
+      railties (>= 3.2, < 6.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (4.0.7)
@@ -125,6 +140,7 @@ GEM
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
     hike (1.2.3)
+    hitimes (1.2.6)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
@@ -134,14 +150,14 @@ GEM
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.6.3)
-      activesupport (>= 3.0.0, < 5.2)
-      multi_json (~> 1.2)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
-    kramdown (1.13.2)
+    kramdown (1.16.2)
     kramdown-haml (0.0.3)
       haml
     launchy (2.4.3)
@@ -167,7 +183,7 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    msgpack (1.1.0)
+    msgpack (1.2.4)
     multi_json (1.13.1)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
@@ -185,7 +201,7 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (2.0.5)
-    puma (3.8.2)
+    puma (3.11.4)
     rack (1.6.9)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -214,7 +230,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.3.1)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -258,16 +275,17 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     string-scrub (0.0.5)
-    sucker_punch (1.0.5)
-      celluloid (~> 0.15.2)
+    sucker_punch (1.6.0)
+      celluloid (~> 0.17.2)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (1.4.1)
     timecop (0.8.1)
-    timers (1.1.0)
+    timers (4.1.2)
+      hitimes
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2017.2)
+    tzinfo-data (1.2018.4)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -286,7 +304,7 @@ GEM
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.3.0)
+    yajl-ruby (1.3.1)
 
 PLATFORMS
   ruby
diff --git a/fluentd-ui.gemspec b/fluentd-ui.gemspec
index b015aa7..ac9845b 100644
--- a/fluentd-ui.gemspec
+++ b/fluentd-ui.gemspec
@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", [">= 0.10.56", "< 2"]
+  spec.add_dependency "fluentd", [">= 0.10.56", "< 0.14"]
   spec.add_dependency 'rails', '~> 4.2.0'
-  spec.add_dependency 'sucker_punch', "~> 1.0.5"
+  spec.add_dependency 'sucker_punch', "~> 1.6.0"
   spec.add_dependency 'addressable'
   spec.add_dependency "font-awesome-rails"
   spec.add_dependency 'sass-rails', '~> 4.0.3'