fluentd-ui 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd82626dac8fa5a41f6a2f86269c6a312da42528
-  data.tar.gz: 111ca2fe63f517dff32c5d3102ae51dc325b29ad
+  metadata.gz: 0331a441430ebf79173a5f487edb2a3c27e39153
+  data.tar.gz: f163ed82b19a95b3855e9b4498bab294464253b6
 SHA512:
-  metadata.gz: a24ea27306a2f29f56d11915cfe75d34645aba7ecf3fdc4fdb6babc5170781a7e0c234a475b375a334d285bd67c6103165e43220ef2780835953c46e10fb38f3
-  data.tar.gz: d91e0b3c499494c524c58bd92d056ee7841a9b70d20c278bedaf83329974e4a71a2f05d191c0c93fc8fc719caffbe51f8c1c263958767e100fb1230286f55b45
+  metadata.gz: e220e3a0da1426600ae7ff2a9b17ad69b42da407a1f21ef67f489dfe87ec75a702dc9b3ede54273350f555b71bc716322d54d548edb2c31f493f122b0dce1dfa
+  data.tar.gz: 3d6c95420e6981e516806ee6da6922ead65d08548d554b593a0c50d4ae269d5cd7e5c27d6c607bdab7d0d3132b3c56041930b01e1c82c8583b7f55dce4c5f7c7

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.3.2 - 2014/11/10
+
+* [fixed] Auto update fluentd-ui feature
+
+
 Release 0.3.1 - 2014/11/05
 
 * [maintenance] Update dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.1)
+    fluentd-ui (0.3.2)
       addressable
       bundler
       draper (~> 1.3)
@@ -103,7 +103,7 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
-    httpclient (2.5.3.1)
+    httpclient (2.5.3.2)
     i18n (0.6.11)
     i18n_generators (1.2.1)
       mechanize

data/app/views/misc/information.html.haml

@@ -3,11 +3,12 @@
     = icon('fa-download')
     = t('.download_system_information')
 
-- if FluentdUI.update_available?
+- if FluentdUI.update_available? && !FluentdUI.td_agent_ui?
+  - # NOTE: td-agent-ui shouldn't have auto update feature
   .row
     .col-xs-12
       %p
-        = link_to misc_update_daemon_ui_path, class: "btn btn-primary btn-lg", method: :post do
+        = link_to misc_update_fluentd_ui_path, class: "btn btn-primary btn-lg", method: :post do
           = t('.update_fluentd_ui', version: FluentdUI.latest_version, title: fluentd_ui_title)
         = t('.update_fluentd_ui_caution', brand: fluentd_ui_brand)
 

data/app/workers/fluentd_ui_update_check.rb

@@ -3,7 +3,7 @@ class FluentdUiUpdateCheck
 
   def perform
     pl = Plugin.new(gem_name: "fluentd-ui")
-    if pl.gem_versions # NOTE: fluentd-ui is not released yet, so `pl.latest_version` will fail for now
+    if pl.gem_versions
       FluentdUI.latest_version = pl.latest_version
     end
     later(3600) # will be checked every hour

data/config/initializers/fluentd_ui_update_check.rb

@@ -0,0 +1,6 @@
+unless Rails.env.test?
+  unless FluentdUI.td_agent_ui?
+    # td-agent-ui shouldn't auto update
+    FluentdUiUpdateCheck.new.async.perform
+  end
+end

data/lib/fluentd-ui.rb

@@ -25,4 +25,8 @@ module FluentdUI
     FileUtils.mkdir_p(dir) # ensure directory exists
     dir
   end
+
+  def self.td_agent_ui?
+    ENV["FLUENTD_UI_TD_AGENT"].present?
+  end
 end

data/lib/fluentd-ui/version.rb

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

data/spec/features/fluentd_ui_update_available_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe "fluentd-ui updates checking" do
+  let(:exists_user) { build(:user) }
+  before { login_with(exists_user) }
+
+  describe "Show popup if newer version is available" do
+    let(:version) { "9999.99" }
+    let(:message) { I18n.t("messages.available_new_fluentd_ui", version: FluentdUI.latest_version, update_url: misc_information_path, title: "dummy") }
+    before { FluentdUI.latest_version = version }
+    after { FluentdUI.latest_version = ::FluentdUI::VERSION }
+
+    it do
+      visit root_path
+      page.should have_css('.alert-info')
+      page.should have_content(version)
+      page.body.should include(message)
+    end
+  end
+
+  describe "Not shown popup if newer version is not available" do
+    let(:version) { ::FluentdUI::VERSION }
+    let(:message) { I18n.t("messages.available_new_fluentd_ui", version: FluentdUI.latest_version, update_url: misc_information_path, title: "dummy") }
+
+    it do
+      visit root_path
+      page.should_not have_css('.alert-info')
+      page.should_not have_content(version)
+      page.body.should_not include(message)
+    end
+  end
+
+end

data/spec/features/users_spec.rb

@@ -1,6 +1,6 @@
-describe "users" do
-  let(:exists_user) { create(:user) }
+require "spec_helper"
 
+describe "users" do
   describe "edit" do
     let(:url) { user_path }
     it_should_behave_like "login required"

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ RSpec.configure do |config|
 
   # Syntax sugar to use the FactoryGirl methods directly instead FactoryGirl.create ete.
   config.include FactoryGirl::Syntax::Methods
+  config.include LoginMacro
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of

data/spec/support/login_macro.rb

@@ -0,0 +1,10 @@
+module LoginMacro
+  def login_with(user)
+    visit '/sessions/new'
+    within("form") do
+      fill_in 'session_name', :with => exists_user.name
+      fill_in 'session_password', :with => exists_user.password
+    end
+    click_button I18n.t("terms.sign_in")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -412,6 +412,7 @@ files:
 - config/initializers/backtrace_silencers.rb
 - config/initializers/cookies_serializer.rb
 - config/initializers/filter_parameter_logging.rb
+- config/initializers/fluentd_ui_update_check.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
 - config/initializers/prefetch_gem_updates.rb
@@ -463,6 +464,7 @@ files:
 - spec/features/fluentd/setting/out_elasticsearch_spec.rb
 - spec/features/fluentd/setting/out_forward_spec.rb
 - spec/features/fluentd/setting/out_td_spec.rb
+- spec/features/fluentd_ui_update_available_spec.rb
 - spec/features/sessions_spec.rb
 - spec/features/shared_examples/login_required.rb
 - spec/features/users_spec.rb
@@ -482,6 +484,7 @@ files:
 - spec/support/fixtures/error2.log
 - spec/support/fluentd_agent_common_behavior.rb
 - spec/support/fluentd_agent_restart_strategy.rb
+- spec/support/login_macro.rb
 - tmp/.gitkeep
 - vendor/assets/javascripts/.keep
 - vendor/assets/javascripts/bower/es6-promise/.bower.json
@@ -626,6 +629,7 @@ test_files:
 - spec/features/fluentd/setting/out_elasticsearch_spec.rb
 - spec/features/fluentd/setting/out_forward_spec.rb
 - spec/features/fluentd/setting/out_td_spec.rb
+- spec/features/fluentd_ui_update_available_spec.rb
 - spec/features/sessions_spec.rb
 - spec/features/shared_examples/login_required.rb
 - spec/features/users_spec.rb
@@ -645,3 +649,4 @@ test_files:
 - spec/support/fixtures/error2.log
 - spec/support/fluentd_agent_common_behavior.rb
 - spec/support/fluentd_agent_restart_strategy.rb
+- spec/support/login_macro.rb