fluentd-ui 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bd1ea18819e32b9455400f25a12171bbac521d
-  data.tar.gz: b1bce06af9405bdaf2ec28da59633a09306bc4b2
+  metadata.gz: bfc5d71254ec159408b192782e55e4b53596a8bf
+  data.tar.gz: c1313a23cd01315dc7938b711ae5678872fab3ed
 SHA512:
-  metadata.gz: 9f55f9200efb1ae1144ccce419169d3984e649526280928f4d1ab999494eed28078b33acbbac0a2680b542d4ca0dc95d4ff5f1a7b7a4eae664e03bf2066ab6f4
-  data.tar.gz: aee4e40d091ac025b15bb6cecdfd3b9d323977c6b4cb605591930a03c2e1f3ead755a8708f43076f855bf847526379f02526348c71b20712d13990c765d50ec0
+  metadata.gz: d4bd9cb12a0b8cdc5758a3d12b55bdf8bfcae191c562ef7b95fa9347a47d93d4de3a207f1053063cad90b49c9dadbda51a7ee482371a306b0be316c9f44bad64
+  data.tar.gz: 44c51caff4d975031de2eb28c3d73eed6c5702bdde623697b5eccbcbef5ce2abb847da8d8bcebe0dddb3238691ddf230adad5fb5d4db8fb8c5ff33963789f78c

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.3.21 - 2015/04/15
+* [maintenance] #187 Remove needless gem
+* [fixed] #186 Fix the bug when server restart while logged in and "Config File" page is visited
+* [fixed] #184 Focus some inputboxes when its label is clicked
+* [improve] #180 #181 #183 #185 Tweak design
+
 Release 0.3.20 - 2015/04/10
 * [fixed] #175 Fix the bug password can be changed without match between new password and password confirmation.
 * [fixed] #177 Use '0.0.0.0' as host not 'localhost' (If you want to change host, you can use `--host` option with `start` command)

data/Gemfile

@@ -17,7 +17,6 @@ end
 
 group :test do
   gem "factory_girl_rails"
-  gem "database_cleaner", "~> 1.2.0"
   gem "capybara", "~> 2.4.0"
   gem "capybara-screenshot"
   gem "simplecov", "~> 0.7.1", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.20)
+    fluentd-ui (0.3.21)
       addressable
       bundler
       diff-lcs
@@ -79,7 +79,6 @@ GEM
     cool.io (1.3.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    database_cleaner (1.2.0)
     diff-lcs (1.2.5)
     domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
@@ -275,7 +274,6 @@ PLATFORMS
 DEPENDENCIES
   capybara (~> 2.4.0)
   capybara-screenshot
-  database_cleaner (~> 1.2.0)
   factory_girl_rails
   fluentd-ui!
   i18n_generators (= 1.2.1)

data/app/assets/stylesheets/common.css.scss

@@ -1,3 +1,7 @@
+.bottom-margin {
+  margin-bottom: 10px;
+}
+
 table {
   // mainly for /misc/information page
   td {

data/app/controllers/fluentd/settings_controller.rb

@@ -6,7 +6,7 @@ class Fluentd::SettingsController < ApplicationController
   before_action :set_config, only: [:show, :edit, :update]
 
   def show
-    @backup_files = @fluentd.agent.backup_files_in_new_order.first(Settings.histories_count_in_preview).map do |file_path|
+    @backup_files = @fluentd.agent.backup_files_in_new_order.first(::Settings.histories_count_in_preview).map do |file_path|
       Fluentd::SettingArchive::BackupFile.new(file_path)
     end
 

data/app/views/fluentd/settings/in_tail/_form.html.haml

@@ -34,8 +34,8 @@
       = f.label :rotate_wait
       = f.text_field :rotate_wait, class: "form-control"
     .form-group
+      = f.check_box :read_from_head
       = f.label :read_from_head
-      = f.check_box :read_from_head, class: "form-control"
     .form-group
       = f.label :refresh_interval
       = f.text_field :refresh_interval, class: "form-control"

data/app/views/fluentd/settings/source_and_output.html.haml

@@ -33,8 +33,9 @@
 #vue-setting.current-settings
   %h2
     = t('.current')
-    %span{"v-on" => "click: update", "v-if" => "!loading"}= icon('fa-refresh')
-    %span{"v-if" => "loading"}= icon('fa-spin fa-refresh')
+    .pull-right
+      %button.btn.btn-default.btn-sm{"v-on" => "click: update", "v-if" => "!loading"}= icon('fa-refresh')
+      %button.btn.btn-default.btn-sm{"v-if" => "loading"}= icon('fa-spin fa-refresh')
   .row
     .col-xs-6.input
       %h3= t('.in')

data/app/views/shared/vue/_fluent_log.html.erb

@@ -1,17 +1,17 @@
 <!-- vue.js -->
 <% auto_reload ||= true %>
 <div id="fluent-log" logUrl="<%= log_tail_daemon_agent_path(fluentd) %>" initialAutoReload="<%= auto_reload ? "true" : "" %>">
-  <p>
+  <div class="bottom-margin form-inline">
     <button class="btn btn-primary" v-on="click: fetchLogs">
       <%= t "terms.reload_log" %>
     </button>
-    <input type="text" v-model="limit" size="4" v-on="keyup: fetchLogs | key enter" />
+    <input type="text" v-model="limit" size="4" v-on="keyup: fetchLogs | key enter" class="form-control"/>
     <%= t('terms.lines') %>
     <label>
       <input type="checkbox" v-model="autoFetch" /> <%= t "terms.auto_reload", seconds: 1 %>
     </label>
     <span v-if="processing"><%= icon('fa-spin fa-refresh') %></span>
-  </p>
+  </div>
 
 <pre v-if="isPresentedLogs"><!-- be careful indent -->
 <div class="log"><span v-repeat="logs">{{ $value }}

data/app/views/shared/vue/_in_tail_format.html.erb

@@ -1,17 +1,17 @@
 <script type="text/template" id="format-bundle">
-    <div class="form-group">
-      <label>format</label>
-      <select name="setting[format]" v-model="format">
+    <div class="form-inline form-group">
+      <label for="in_tail_setting_format">format</label>
+      <select id="in_tail_setting_format" name="setting[format]" v-model="format" class="form-control">
         <option v-repeat="selectableFormats" value="{{ $value }}" v-attr="selected: format==$value">{{ $value }}</option>
       </select>
     </div>
-    <div class="form-group" v-repeat="options">
-      <label>{{ $value }} </label>
-      <input type="text" name="setting[{{ $value }}]" v-model="params.setting[$value]" size="100%" />
+    <div class="form-inline form-group" v-repeat="options">
+      <label for="in_tail_setting_{{ $value }}">{{ $value }} </label>
+      <input id="in_tail_setting_{{ $value }}" type="text" name="setting[{{ $value }}]" v-model="params.setting[$value]" size="100%" class="form-control" />
     </div>
 </script>
 
-<div id="in_tail_format" class="form-group"
+<div id="in_tail_format"
   formatOptionsJson="<%= formats.to_json %>"
   initialSelected="<%= initialSelected %>"
   targetFile="<%= file %>"

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.20"
+  VERSION = "0.3.21"
 end

data/lib/tasks/release.rake

@@ -0,0 +1,52 @@
+namespace :release do
+  desc "Add header of now version release to ChangeLog and bump up version"
+  task :prepare do
+    raise "Use this task in development only" unless Rails.env.development?
+
+    # Fetch remote
+    system("git fetch origin")
+
+    # detect merged PR
+    old_version = FluentdUI::VERSION
+    pr_numbers = `git log v#{old_version}..origin/master --oneline`.scan(/#[0-9]+/)
+
+    if !$?.success? || pr_numbers.empty?
+      puts "Detecting PR failed. Please confirm if any PR were merged after the latest release."
+      exit(false)
+    end
+
+    # Generate new version
+    /\.([0-9]+)\z/.match(old_version)
+    old_revision = $1
+    new_version = old_version.gsub(/\.#{old_revision}\z/, ".#{old_revision.to_i + 1}")
+
+    # Update ChangeLog
+    changelog_filename = Rails.root.join('ChangeLog')
+    changelog = File.read(changelog_filename)
+
+    pr_descriptions = pr_numbers.map do |number|
+      "* [] #{number} https://github.com/fluent/fluentd-ui/pull/#{number.gsub('#', '')}"
+    end.join("\n")
+
+    new_changelog = <<-HEADER
+Release #{new_version} - #{Time.now.strftime("%Y/%m/%d")}
+#{pr_descriptions}
+
+#{changelog.chomp}
+HEADER
+
+    File.open(changelog_filename, "w") {|f| f.write(new_changelog)}
+
+    # Update version.rb
+    version_filename = Rails.root.join("lib", "fluentd-ui", "version.rb")
+    version_class = File.read(version_filename)
+    new_version_class = version_class.gsub(/VERSION = \"#{old_version}\"/, "VERSION = \"#{new_version}\"")
+
+    File.open(version_filename, 'w') {|f| f.write(new_version_class)}
+
+    # Update Gemfile.lock
+    system("bundle install")
+
+    puts "ChangeLog, version and Gemfile.lock were updated. New version is #{new_version}."
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -499,6 +499,7 @@ files:
 - lib/tasks/.keep
 - lib/tasks/clean.rake
 - lib/tasks/dep.rake
+- lib/tasks/release.rake
 - lib/treeview.rb
 - log/.keep
 - public/404.html