fluentd-ui 0.3.11 → 0.3.12

data/config/locales/translation_ja.yml

@@ -12,6 +12,8 @@ ja:
     fluentd_status_running: 稼働中
     fluentd_status_stopped: 停止中
     config_successfully_copied: "設定をコピーしました。反映させるには、 %{brand}を再起動してください。"
+    note_updating_success: "メモを更新しました。"
+    dryrun_is_passed: この設定でのdry-runが成功しました
 
   terms: &terms
     name: アカウント名
@@ -59,8 +61,11 @@ ja:
     notice_restart_for_config_edit: "※更新すると稼働中の%{brand}が再起動されます"
     lines: 行
     languages: 言語
+    backup_file: バックアップファイル
     backup_time: バックアップ日時
+    note: メモ
     reuse: 再利用
+    configtest: この設定を検証する(dry-run)
 
   plugins:
     view_on_rubygems_org: rubygems.orgで見る

data/config/routes.rb

@@ -66,10 +66,14 @@ Rails.application.routes.draw do
 
         resources :histories, only: [:index, :show], module: :settings, controller: :histories do
           post "reuse", action: 'reuse', on: :member, as: 'reuse'
+          post "configtest" , action: "configtest", on: :member, as: "configtest"
         end
 
+        resources :notes, only: [:update], module: :settings, controller: :notes
+
         resource :running_backup, only: [:show], module: :settings, controller: :running_backup do
           post "reuse", action: 'reuse', on: :member, as: 'reuse'
+          post "configtest" , action: "configtest", on: :member, as: "configtest"
         end
       end
     end

data/lib/file_reverse_reader.rb

@@ -7,26 +7,24 @@ class FileReverseReader
   end
 
   def each_line(&block)
+    #read from the end of file
     io.seek(0, IO::SEEK_END)
     buf = ""
     loop do
       if reach_start_of_file?
-        last_pos = io.pos
-        io.seek(0, IO::SEEK_SET)
-        buf.insert(0, io.read(last_pos))
-        split_each_line(buf, &block)
+        read_rest(buf, &block)
         break
       end
 
-      io.seek(-1 * step, IO::SEEK_CUR)
-      buf.insert(0, io.read(step))
-      io.seek(-1 * step, IO::SEEK_CUR)
-      next if buf[$/].nil?
-      gap = buf.index($/)
-      buf.gsub!(/\A.*?\n/, "")
-      split_each_line(buf, &block)
-      buf = ""
-      io.seek(gap, IO::SEEK_CUR)
+      read_to_buf_by_step(buf)
+
+      #if buffer dose not include multi lines, seek more.
+      if buf[$/].nil?
+        next
+      else
+        split_only_whole_lines(buf, &block)
+        buf = ""
+      end
     end
   end
 
@@ -43,6 +41,33 @@ class FileReverseReader
 
   private
 
+  def read_rest(buf, &block)
+    last_pos = io.pos
+    io.seek(0, IO::SEEK_SET)
+    buf.insert(0, io.read(last_pos))
+    split_each_line(buf, &block)
+  end
+
+  def read_to_buf_by_step(buf)
+    #move up file pointer by one step
+    io.seek(-1 * step, IO::SEEK_CUR) #point[A]
+    #read strings by one step from the pointer, and insert to buffer
+    #(on io.read, file pointer returns down to the point before [A])
+    buf.insert(0, io.read(step))
+    #forword file pointer to [A]
+    io.seek(-1 * step, IO::SEEK_CUR)
+  end
+
+  def split_only_whole_lines(buf, &block)
+    #if budder includes multi lines,
+    gap = buf.index($/)
+    #cut off first line (*first* line because it's seeking from end of file, and first line may be broken-line)
+    buf.gsub!(/\A.*?\n/, "")
+    split_each_line(buf, &block)
+    #move file pointer to the gap(= the end of *first* line)
+    io.seek(gap, IO::SEEK_CUR)
+  end
+
   def split_each_line(buf, &block)
     return unless buf.force_encoding('utf-8').valid_encoding?
     buf.split($/).reverse.each do |line|

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/spec/controllers/application_controller_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+class DummyController < ApplicationController; end
+
+describe DummyController do
+  controller DummyController do
+    skip_before_action :login_required
+    def index
+      render :text => "Hello World"
+    end
+  end
+
+  describe '#set_locale' do
+    let!(:default_locale) { :en }
+    let!(:available_locales) { [:en, :ja] }
+
+    before do
+      I18n.stub(:default_locale).and_return(default_locale)
+      I18n.stub(:available_locales).and_return(available_locales)
+
+      I18n.locale = I18n.default_locale #initialize
+    end
+
+    context 'with params[:lang]' do
+      before do
+        get 'index', lang: param_lang
+      end
+
+      context 'and in available_locales' do
+        let(:param_lang) { :ja }
+
+        it 'params[:lang] will be set as locale' do
+          expect(I18n.locale).to eq :ja
+        end
+      end
+
+      context 'and out of available_locales' do
+        let(:param_lang) { :ka }
+
+        it 'defalut locale will be set as locale' do
+          expect(I18n.locale).to eq default_locale
+        end
+      end
+    end
+
+    context 'with session[:prefer_lang]' do
+      before do
+        controller.session[:prefer_lang] = :ja
+      end
+
+      it 'session[:prefer_lang] will be set as locale' do
+        get 'index'
+        expect(I18n.locale).to eq :ja
+      end
+    end
+
+    context 'with request.env["HTTP_ACCEPT_LANGUAGE"]' do
+      before do
+        request.stub(:env).and_return({ "HTTP_ACCEPT_LANGUAGE" => accept_language })
+        get 'index'
+      end
+
+      context 'accept_language is available' do
+        let(:accept_language) { 'ja' }
+
+        it 'session[:prefer_lang] will be set as locale' do
+          expect(I18n.locale).to eq :ja
+        end
+      end
+
+      context 'accept_language is not available but start with en' do
+        let(:accept_language) { 'en-us' }
+
+        it ':en will be set as locale' do
+          expect(I18n.locale).to eq :en
+        end
+      end
+
+      context 'accept_language is not available' do
+        let(:accept_language) { 'ka' }
+
+        it 'default_locale will be set as locale' do
+          expect(I18n.locale).to eq default_locale
+        end
+      end
+    end
+  end
+end

data/spec/controllers/fluentd/agents_controller_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Fluentd::AgentsController do
+  before do
+    allow(controller).to receive(:current_user).and_return true
+    allow(controller).to receive(:find_fluentd).and_return(nil)
+    controller.instance_variable_set(:@fluentd, double(agent: @agent = double(:agent)))
+  end
+
+  describe "when the action succeeds" do
+    it "stops" do
+      expect(@agent).to receive(:stop).and_return true
+      put :stop
+    end
+
+    it "starts" do
+      expect(@agent).to receive(:start).and_return true
+      put :start
+    end
+
+    it "restarts" do
+      expect(@agent).to receive(:restart).and_return true
+      put :restart
+    end
+  end
+
+  describe "when the action does not succeed" do
+    it "stops" do
+      expect(@agent).to receive(:stop).and_return false
+      put :stop
+    end
+
+    it "starts" do
+      expect(@agent).to receive(:start).and_return false
+      expect(@agent).to receive(:log_tail).with(1).and_return ["some message"]
+      put :start
+    end
+
+    it "restarts" do
+      expect(@agent).to receive(:restart).and_return false
+      expect(@agent).to receive(:log_tail).with(1).and_return ["some message"]
+      put :restart
+    end
+  end
+end

data/spec/controllers/misc_controller_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe MiscController do
+  let(:instance) { Fluentd.new(id: nil, variant: "fluentd_gem", log_file: "dummy.log", pid_file: "dummy.pid", config_file: "dummy.conf") }
+
+  class DummyAagent
+    def log
+      "dummy_log_content"
+    end
+
+    def version
+      "dummy version"
+    end
+  end
+
+  let!(:dummy_agent) { DummyAagent.new }
+  let!(:fluentd_log_content) { dummy_agent.log }
+  let!(:fluentd_version) { dummy_agent.version }
+  let(:fluentd_ui_log_content) { <<-LOG.strip_heredoc }
+    log1
+    log2
+    log3
+  LOG
+
+  let!(:dummy_log_path) { "tmp/dummy.log" }
+  let!(:expand_dir) { Rails.root.join("tmp/system_info") }
+
+  before do
+    allow(controller).to receive(:current_user).and_return true
+
+    #dummy log for fluentd-ui.log
+    File.open(dummy_log_path, 'w') { |file| file.write(fluentd_ui_log_content) }
+    controller.stub(:log_path) { dummy_log_path }
+
+    instance.stub(:agent).and_return(dummy_agent)
+    Fluentd.stub(:instance).and_return(instance)
+  end
+
+  describe 'download_info' do
+    before do
+      get 'download_info'
+
+      #expand files in zip
+      Zip::File.open(Rails.root.join("tmp/system_info.zip")) do |zip_file|
+        FileUtils.mkdir_p(expand_dir)
+
+        zip_file.each do |f|
+          f_path = File.join(expand_dir, f.name)
+          zip_file.extract(f, f_path) unless File.exist?(f_path)
+        end
+      end
+    end
+
+    #remove all temp files for this spec
+    after do
+      FileUtils.rm Rails.root.join("tmp/system_info.zip")
+      FileUtils.rm_r expand_dir
+      FileUtils.rm dummy_log_path
+    end
+
+    it 'write files' do
+      expect(File.read(File.join(expand_dir, "fluentd.log"))).to eq "#{fluentd_log_content}\n"
+      expect(File.read(File.join(expand_dir, "fluentd-ui.log"))).to eq "#{fluentd_ui_log_content}"
+      expect(File.read(File.join(expand_dir, "env.txt"))).to match "RAILS_ENV=test"
+      expect(File.read(File.join(expand_dir, "versions.txt"))).to match "fluentd: #{fluentd_version}"
+    end
+  end
+end

data/spec/controllers/polling_controller_spec.rb

@@ -1,5 +1,39 @@
 require 'spec_helper'
 
 describe PollingController do
+  describe 'polling for alerts' do
+    before do
+      allow(controller).to receive(:current_user).and_return true
+    end
 
+    after do
+      response.should be_success
+    end
+
+    it 'may find nothing' do
+      expect(controller).to receive(:uninstalling_gems).and_return []
+      expect(controller).to receive(:installing_gems).and_return []
+      get :alerts
+    end
+
+    it 'may find gems being uninstalled' do
+      expect(controller).to receive(:uninstalling_gems).and_return [
+        double(gem_name: "foobar", version: "1.0.0")
+      ]
+
+      allow(controller).to receive(:installing_gems).and_return []
+
+      get :alerts
+    end
+
+    it 'may find gems being installed' do
+      expect(controller).to receive(:installing_gems).and_return [
+        double(gem_name: "bazbang", version: "0.0.1")
+      ]
+
+      allow(controller).to receive(:uninstalling_gems).and_return []
+
+      get :alerts
+    end
+  end
 end

data/spec/features/fluentd/setting/histories_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+
+describe "histories", stub: :daemon do
+  let!(:exists_user) { build(:user) }
+  include_context 'daemon has some config histories'
+
+  before do
+    login_with exists_user
+  end
+
+  describe 'index' do
+    before do
+      visit '/daemon/setting/histories'
+    end
+
+    it 'show histories#index' do
+      page.should have_css('h1', text: I18n.t('fluentd.settings.histories.index.page_title'))
+      expect(all('.row tr').count).to eq 9 + 1 # links to hisotries#show + 1 table header
+    end
+
+    it 'will go to histories#show' do
+      all('.row tr td a').first.click
+
+      page.should have_css('h1', text: I18n.t('fluentd.settings.histories.show.page_title'))
+    end
+  end
+
+  describe 'show' do
+    let(:last_backup_file) { Fluentd::SettingArchive::BackupFile.new(daemon.agent.backup_files_in_new_order.first) }
+
+    before do
+      visit "/daemon/setting/histories/#{last_backup_file.file_id}"
+    end
+
+    it 'show histories#show' do
+      page.should have_css('h1', text: I18n.t('fluentd.settings.histories.show.page_title'))
+      page.should have_text(last_backup_file.content)
+    end
+
+    it 'update config and redirect to setting#show' do
+      click_link I18n.t("terms.reuse")
+
+      page.should have_css('h1', text: I18n.t('fluentd.settings.show.page_title'))
+      page.should have_text(I18n.t('messages.config_successfully_copied', brand: 'fluentd') )
+      page.should have_text(last_backup_file.content)
+    end
+
+    describe "configtest" do
+      let(:daemon) { build(:fluentd, variant: "fluentd_gem") } # To use fluentd_gem for real dry-run checking
+      before do
+        daemon.agent.config_write config
+        daemon.agent.config_write "# dummy"
+        backup = Fluentd::SettingArchive::BackupFile.new(daemon.agent.backup_files_in_new_order.first)
+        visit "/daemon/setting/histories/#{backup.file_id}"
+        click_link I18n.t("terms.configtest")
+      end
+
+      context "invalid configfile" do
+        let(:config) { <<-CONFIG }
+        <source>
+          type aaaaaaaaaaaa
+        </source>
+        CONFIG
+
+        it do
+          page.should_not have_css('.alert-success')
+          page.should have_css('.alert-danger')
+          page.should have_text(%Q|Unknown input plugin 'aaaaaaaaaaaa'|)
+        end
+      end
+
+      context "valid configfile" do
+        let(:config) { <<-CONFIG }
+        <source>
+          type syslog
+          tag syslog
+        </source>
+        CONFIG
+
+        it do
+          page.should have_css('.alert-success')
+          page.should_not have_css('.alert-danger')
+        end
+      end
+    end
+  end
+end

data/spec/features/fluentd/setting/notes_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe "notes", stub: :daemon do
+  let!(:exists_user) { build(:user) }
+  include_context 'daemon has some config histories'
+
+  before { login_with exists_user }
+
+  describe 'update' do
+    let(:note_field) { ".note-content" }
+    let(:updating_content) { "This config file is for ..." }
+
+    before do
+      visit '/daemon/setting/histories'
+      within first("form") do
+        first(note_field).set updating_content
+        click_button(I18n.t('terms.save'))
+      end
+    end
+
+    it "update a content of a note" do
+      within first("form") do
+        first(note_field).value.should eq updating_content
+      end
+    end
+  end
+end