fluentd-server 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bdb2c370dae1201863b40f1c52925dd7b7faf9c
-  data.tar.gz: 123bb993f7412ed3401680b766e675ee1ffa5874
+  metadata.gz: d24dfc4f888469d4cd08a0a60a5963c15b1e7cb1
+  data.tar.gz: cc9acfe2cfbe34e3607ff72ab5a1c3ec455a430d
 SHA512:
-  metadata.gz: 9ce9d5de9c3f5237a703c5987a0eb49762233fa6140ae8fa074486206840c404b2f22bb42a6182501e3eae889e05d2ca22d48303d9286b776b84d689857f63e4
-  data.tar.gz: 4a173696a16bf08097d2771761d511f123d4918b6d07986b48c9bb3a0b05c6b731aa8181cd62f1f72c38a6d43ad2ea2ad72efabb03727854fe5eb42177c72aee
+  metadata.gz: 40d9a520d3492776c34f167c70c2273851adb0928c7860ef3e95a0b832e4485657f7e103b11d16085d1b295ba8719d8b11b6655a9a1166815f2e9fe8deaed99a
+  data.tar.gz: 2e4254a5f50df4c377771eeda77d05502ae9a39f0715403235e932c589b93c381379864b085679821ea7515811433dd121d75ce9b08c3590ec01646cfcd45697

data/.env

@@ -6,6 +6,6 @@ HOST=0.0.0.0
 # LOG_LEVEL=debug
 # LOG_SHIFT_AGE=0
 # LOG_SHIFT_SIZE=1048576
-# LOCAL_STORAGE=false
+# FILE_STORAGE=false
 # DATA_DIR=data
 # SYNC_INTERVAL=60

data/.travis.yml

@@ -4,5 +4,5 @@ rvm:
 gemfile:
   - Gemfile
 env:
-  - LOCAL_STORAGE=false
-  - LOCAL_STORAGE=true DATA_DIR=spec/tmp
+  - FILE_STORAGE=false
+  - FILE_STORAGE=true DATA_DIR=spec/tmp

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.2 (2014/06/08)
+
+Changes:
+
+* Rename `LOCAL_STORAGE` to `FILE_STORAGE`
+
 # 0.3.1
 
 Enhancements:

data/README.md

@@ -108,26 +108,29 @@ See [API.md](API.md).
 
 ### Use Fluentd Server from Command Line
 
-For the case you want to edit Fluentd configuration files from your favorite editors rather than from the Web UI, `LOCAL STORAGE` feature is available.
+For the case you want to edit Fluentd configuration files from your favorite editors rather than from the Web UI, `FILE STORAGE` feature is available.
 With this feature, you should also be able to manage your configuration files with git (or any VCS).
 
-To use this feature, enable `LOCAL_STORAGE` in `.env` file as:
+To use this feature, enable `FILE_STORAGE` in `.env` file as:
 
 ```
-LOCAL_STORAGE=true
+FILE_STORAGE=true
 DATA_DIR=data
 SYNC_INTERVAL=60
 ```
 
 where the `DATA_DIR` is the location to place your configuration files locally, and the `SYNC_INTERVAL` is the interval where a synchronization worker works.
 
-Putting any files whose name ends with `.erb` in `DATA_DIR` is automatically synchronized with DB by the synchronization worker. Removing `.erb` files is also synchronized with DB.
-For the case you want to synchronize immediately, `sync` command is also available.
+Place your `erb` files in the `DATA_DIR` directory, and please execute `sync` command to synchronize the file existence information with DB
+when you newly add or remove the configuration files.
 
 ```
 $ fluentd-server sync
 ```
 
+Or, you may just wait `SYNC_INTERVAL` senconds until a synchronization worker automatically synchronizes the information.
+Please note that modifying the file content does not require to synchronize because the content is read from the local file directly.
+
 NOTE: Enabling this feature disables to edit the Fluentd configuration from the Web UI.
 
 ### CLI (Command Line Interface)
@@ -159,6 +162,9 @@ Commands:
 
 * Automatic deployment (restart) support like the one of chef-server
 
+  * Need a notification function for when configtest or restart failed
+  * Pipe the resulted json to a command (I may prepare email.rb as an example).
+
 ## ChangeLog
 
 See [CHANGELOG.md](CHANGELOG.md) for details.

data/lib/fluentd_server/cli.rb

@@ -23,7 +23,7 @@ LOG_PATH=#{LOG_FILE}
 LOG_LEVEL=warn
 LOG_SHIFT_AGE=0
 LOG_SHIFT_SIZE=1048576
-LOCAL_STORAGE=false
+FILE_STORAGE=false
 DATA_DIR=#{DATA_DIR}
 SYNC_INTERVAL=60
 EOS

data/lib/fluentd_server/config.rb

@@ -33,8 +33,8 @@ module FluentdServer::Config
     ENV.fetch('TASK_MAX_NUM', '20').to_i
   end
 
-  def self.local_storage
-    ENV.fetch('LOCAL_STORAGE', 'false') == 'true' ? true : false
+  def self.file_storage
+    ENV.fetch('FILE_STORAGE', 'false') == 'true' ? true : false
   end
 
   def self.data_dir

data/lib/fluentd_server/model.rb

@@ -12,7 +12,7 @@ class Post < ActiveRecord::Base
 
   validates :name, presence: true
 
-  if FluentdServer::Config.local_storage
+  if FluentdServer::Config.file_storage
     include ActsAsFile
 
     def filename

data/lib/fluentd_server/sync_runner.rb

@@ -13,14 +13,14 @@ class FluentdServer::SyncRunner
 
   def run
     logger.debug "[sync] sync runner started"
-    return nil unless FluentdServer::Config.local_storage
+    return nil unless FluentdServer::Config.file_storage
     plus, minus = find_diff
     create(plus)
     delete(minus)
   end
 
   def find_locals
-    return [] unless FluentdServer::Config.local_storage
+    return [] unless FluentdServer::Config.file_storage
     names = []
     Dir.chdir(FluentdServer::Config.data_dir) do
       Dir.glob("*.erb") do |filename|

data/lib/fluentd_server/version.rb

@@ -1,3 +1,3 @@
 module FluentdServer
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/spec_helper.rb

@@ -14,6 +14,10 @@ require 'sinatra/activerecord/rake'
 Rake::Task['db:schema:load'].invoke
 
 if ENV['TRAVIS']
+  require 'simplecov'
   require 'coveralls'
-  Coveralls.wear!
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter 'spec'
+  end
 end

data/spec/sync_runner_spec.rb

@@ -1,25 +1,26 @@
 require_relative 'spec_helper'
 require 'fluentd_server/sync_runner'
 
-if FluentdServer::Config.local_storage
+if FluentdServer::Config.file_storage
   describe 'SyncRunner' do
-    around {
+    def clean
       filenames = File.join(FluentdServer::Config.data_dir, '*.erb') 
       Dir.glob(filenames).each { |f| File.delete(f) rescue nil }
       Post.delete_all
-    }
+    end
+    around {|example| clean; example.run; clean }
     let(:runner) { FluentdServer::SyncRunner.new }
 
     context '#find_locals' do
-      before { Post.create(name: 'post1') }
-      before { Post.create(name: 'post2') }
+      before { Post.create(name: 'post1', body: 'a') }
+      before { Post.create(name: 'post2', body: 'a') }
       let(:subject) { runner.find_locals }
       it { should =~ ['post1', 'post2' ] }
     end
 
     context '#find_diff' do
       before { Post.new(name: 'post1').save_without_file }
-      before { Post.create(name: 'post2') }
+      before { Post.create(name: 'post2', body: 'a') }
       before { File.open(Post.new(name: 'post3').filename, "w") {} }
       it {
         plus, minus = runner.find_diff
@@ -29,7 +30,7 @@ if FluentdServer::Config.local_storage
     end
 
     context '#create' do
-      before { Post.create(name: 'post1') }
+      before { Post.create(name: 'post1', body: 'a') }
       before { runner.create(%w[post1 post2]) }
       it {
         expect(Post.find_by(name: 'post1').body).not_to be_nil
@@ -39,8 +40,8 @@ if FluentdServer::Config.local_storage
 
     context '#delete' do
       before {
-        post1 = Post.create(name: 'post1')
-        post2 = Post.create(name: 'post2')
+        post1 = Post.create(name: 'post1', body: 'a')
+        post2 = Post.create(name: 'post2', body: 'a')
         runner.delete(%w[post1])
       }
       it {
@@ -51,7 +52,7 @@ if FluentdServer::Config.local_storage
 
     context '#run' do
       before { Post.new(name: 'post1').save_without_file }
-      before { Post.create(name: 'post2') }
+      before { Post.create(name: 'post2', body: 'a') }
       before { File.open(Post.new(name: 'post3').filename, "w") {} }
       it {
         runner.run
@@ -68,8 +69,8 @@ else
       it { should be_nil }
     end
     context '#find_locals' do
-      before { Post.create(name: 'post1') }
-      before { Post.create(name: 'post2') }
+      before { Post.create(name: 'post1', body: 'a') }
+      before { Post.create(name: 'post2', body: 'a') }
       let(:subject) { FluentdServer::SyncRunner.new.find_locals }
       it { should == [] }
     end

data/spec/web_spec.rb

@@ -30,6 +30,14 @@ describe 'Post' do
         click_button('Submit')
       }.to change(Post, :count).by(1)
     end
+
+    it 'fails to create' do
+      expect {
+        fill_in "post[name]", with: ''
+        fill_in "post[body]", with: ''
+        click_button('Submit')
+      }.to change(Post, :count).by(0)
+    end
   end
   
   context 'edit post' do
@@ -50,6 +58,15 @@ describe 'Post' do
       expect(edit.body).to eql('bbbb')
     end
 
+    it 'fails to edit' do
+      fill_in "post[name]", with: ''
+      fill_in "post[body]", with: ''
+      click_button('Submit')
+      edit = Post.find(post.id)
+      expect(edit.name).not_to eql('')
+      expect(edit.body).not_to eql('')
+    end
+
     # javascript click for `Really?` is required
     #it 'delete' do
     #  click_link('Delete')
@@ -93,6 +110,21 @@ describe 'Task' do
     end
   end
 
+  context '/json/tasks/:id/body' do
+    include Rack::Test::Methods
+    def app; FluentdServer::Web; end
+
+    before { @task = Task.create }
+    it 'visit' do
+      get "/json/tasks/#{@task.id}/body"
+      expect(last_response.status).to eql(200)
+      body = JSON.parse(last_response.body)
+      expect(body).to be_has_key('body')
+      expect(body).to be_has_key('bytes')
+      expect(body).to be_has_key('moreData')
+    end
+  end
+
   context 'task button' do
     include Rack::Test::Methods
     def app; FluentdServer::Web; end
@@ -152,6 +184,3 @@ describe 'API' do
     end
   end
 end
-
-
-

data/views/_js.slim

@@ -28,7 +28,7 @@ javascript:
     form.submit();
     return false;
   });
-- if FluentdServer::Config.local_storage
+- if FluentdServer::Config.file_storage
   javascript:
     $('#post_name').attr("disabled", "disabled");
     $('#post_body').attr("disabled", "disabled");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-server
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler