fluentd-ui 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5210ae2603368a390f09da9318c5a81f2eeacf
-  data.tar.gz: 5193b86a5f75effaec831a90a911ab0231378e0e
+  metadata.gz: 8b0f1b68a4e226bf802f55f575819573167d0a07
+  data.tar.gz: 2dc75b1106dc8043fd4e6f90ca2e464265fecdff
 SHA512:
-  metadata.gz: 0979f30e382c16a0519e2b3f556b92ff0c8df67208fd556d05e766b1c74d5e0f79a0f3c6ea84a733bba9f4538db65a20d84c7e5d6df8b235cb77a0454bb42e57
-  data.tar.gz: 502e7a129252caf39c4f73423d5ffa4080477844578ead61113b9c8d7aaf28d2622c762ef0cd7111e6516d661e2639c545a6fc20ab0cc0aa01326f3e1a24f0d2
+  metadata.gz: b3a5a339fbed830c5ece5f51c624673dac914cb7989769ba717a55b8695efec0acb59411746be05f78c4fe18d4e5861cb7e86d8dc822b94f0cf40f75c2e85a7c
+  data.tar.gz: 20799f4df412c8e75568a727ebdbe5fd6c3ee410f9ee896ea1b311ea3d3b3c3bcbcb657a5b2f57d5e27d3fd17e1ec410b0f3023b3cb5cac72758b95c5dcc44ee

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.3.19 - 2015/04/08
+* [maintenance] #170 Update some gems
+* [maintenance] #171 Update Rails to 4.2.1
+* [maintenance] #173 Add Rake task to clean files under tmp/ directory (for packaging)
+
 Release 0.3.18 - 2015/04/02
 * [fixed] #167 Apply bootstrap css to inputboxes in signin form
 * [fixed] #168 Fix the behavor mismatch between configtest and update (update failed but configtest is OK)

data/Gemfile

@@ -8,7 +8,7 @@ group :development, :test do
   gem "rake"
   gem "pry"
   gem "pry-rails"
-  gem "rspec-rails", "~> 2.99"
+  gem "rspec-rails", "~> 3.0"
 end
 
 group :development do
@@ -16,10 +16,9 @@ group :development do
 end
 
 group :test do
-  gem "rspec-its"
   gem "factory_girl_rails"
   gem "database_cleaner", "~> 1.2.0"
-  gem "capybara", "~> 2.2.1"
+  gem "capybara", "~> 2.4.0"
   gem "capybara-screenshot"
   gem "simplecov", "~> 0.7.1", require: false
   gem "webmock", "~> 1.18.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.18)
+    fluentd-ui (0.3.19)
       addressable
       bundler
       diff-lcs
@@ -15,7 +15,7 @@ PATH
       kramdown (> 1.0.0)
       kramdown-haml
       puma
-      rails (~> 4.1.7)
+      rails (~> 4.2.0)
       rubyzip (~> 1.1)
       sass-rails (~> 4.0.3)
       settingslogic
@@ -25,50 +25,57 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.9)
-      actionview (= 4.1.9)
-      activesupport (= 4.1.9)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.9)
-      activesupport (= 4.1.9)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.9)
-      activesupport (= 4.1.9)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.9)
-      activemodel (= 4.1.9)
-      activesupport (= 4.1.9)
-      arel (~> 5.0.0)
-    activesupport (4.1.9)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
+    addressable (2.3.8)
+    arel (6.0.0)
     builder (3.2.2)
-    capybara (2.2.1)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.4)
+    capybara-screenshot (1.0.7)
       capybara (>= 1.0, < 3)
-      colored
       launchy
     celluloid (0.15.2)
       timers (~> 1.1.0)
     cliver (0.3.2)
     coderay (1.1.0)
-    colored (1.2)
     cool.io (1.3.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -99,6 +106,8 @@ GEM
       yajl-ruby (~> 1.0)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
     haml-rails (0.5.3)
@@ -127,6 +136,8 @@ GEM
       haml
     launchy (2.4.3)
       addressable (~> 2.3)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mechanize (2.7.3)
@@ -143,13 +154,13 @@ GEM
     mini_portile (0.6.2)
     minitest (5.5.1)
     msgpack (0.5.11)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
-    poltergeist (1.5.1)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -158,48 +169,56 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rails (0.3.2)
+    pry-rails (0.3.4)
       pry (>= 0.9.10)
     puma (2.11.1)
       rack (>= 1.1, < 2.0)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.9)
-      actionmailer (= 4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
-      activemodel (= 4.1.9)
-      activerecord (= 4.1.9)
-      activesupport (= 4.1.9)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.9)
-      sprockets-rails (~> 2.0)
-    railties (4.1.9)
-      actionpack (= 4.1.9)
-      activesupport (= 4.1.9)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     request_store (1.1.0)
-    rspec-collection_matchers (1.1.2)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-its (1.0.1)
-      rspec-core (>= 2.99.0.beta1)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (2.99.3)
-    rspec-rails (2.99.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
     sass (3.2.19)
@@ -228,9 +247,9 @@ GEM
     sucker_punch (1.0.5)
       celluloid (~> 0.15.2)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    timecop (0.7.1)
+    timecop (0.7.3)
     timers (1.1.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -243,9 +262,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     webrobots (0.1.1)
-    websocket-driver (0.5.1)
+    websocket-driver (0.5.4)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.1)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.2.1)
@@ -254,7 +273,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.2.1)
+  capybara (~> 2.4.0)
   capybara-screenshot
   database_cleaner (~> 1.2.0)
   factory_girl_rails
@@ -264,8 +283,7 @@ DEPENDENCIES
   pry
   pry-rails
   rake
-  rspec-its
-  rspec-rails (~> 2.99)
+  rspec-rails (~> 3.0)
   simplecov (~> 0.7.1)
   timecop
   webmock (~> 1.18.0)

data/app/controllers/api/settings_controller.rb

@@ -4,9 +4,11 @@ class Api::SettingsController < ApplicationController
   before_action :set_config
   before_action :set_section, only: [:show, :update, :destroy]
   helper_method :element_id
-  respond_to :json
 
   def index
+    respond_to do |format|
+      format.json
+    end
   end
 
   def update

data/bin/rails

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/bin/rake

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/config/boot.rb

@@ -1,4 +1,3 @@
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/config/environments/production.rb

@@ -16,13 +16,18 @@ Rails.application.configure do
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = true
+
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true

data/config/environments/test.rb

@@ -12,8 +12,8 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -32,6 +32,9 @@ Rails.application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 

data/config/initializers/cookies_serializer.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :json
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_fluentd-ui_session'
+Rails.application.config.session_store :cookie_store, key: '_fluentd_ui_session'

data/fluentd-ui.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "fluentd", [">= 0.10.56", "< 2"]
-  spec.add_dependency 'rails', '~> 4.1.7'
+  spec.add_dependency 'rails', '~> 4.2.0'
   spec.add_dependency 'sucker_punch', "~> 1.0.5"
   spec.add_dependency 'addressable'
   spec.add_dependency "font-awesome-rails"

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.18"
+  VERSION = "0.3.19"
 end

data/lib/tasks/clean.rake

@@ -0,0 +1,6 @@
+desc "clean all files/directories in tmp/ directory (use carefully)"
+task :clean do
+  tmp_directory = Rails.root.join("tmp")
+  tmp_directory.rmtree
+  tmp_directory.mkdir
+end

data/spec/models/fluentd/agent/common_spec.rb

@@ -13,21 +13,27 @@ describe 'Fluentd::Agent::Common' do
 
   describe '#pid' do
     context 'no pid file exists' do
-      its(:pid) { should be_nil }
+      it "should be nil" do
+        expect(subject.pid).to be_nil
+      end
     end
 
     context 'empty pid file given' do
       before { FileUtils.touch pid_file_path }
       after  { FileUtils.rm pid_file_path }
 
-      its(:pid) { should be_nil }
+      it "should be nil" do
+        expect(subject.pid).to be_nil
+      end
     end
 
     context 'valid pid file given' do
       before { File.write pid_file_path, '9999' }
       after  { FileUtils.rm pid_file_path }
 
-      its(:pid) { should eq(9999) }
+      it "should be 9999" do
+        expect(subject.pid).to eq(9999)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ end
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/its'
 require 'webmock/rspec'
 WebMock.disable_net_connect!(allow_localhost: true)
 require 'capybara/poltergeist'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
@@ -448,6 +448,7 @@ files:
 - bin/fluentd-ui-restart
 - bin/rails
 - bin/rake
+- bin/setup
 - bin/spring
 - bower.json
 - circle.yml
@@ -496,6 +497,7 @@ files:
 - lib/grok_converter.rb
 - lib/regexp_preview.rb
 - lib/tasks/.keep
+- lib/tasks/clean.rake
 - lib/tasks/dep.rake
 - lib/treeview.rb
 - log/.keep