From 7b65e03cc82e06cce3ad34f0fe791cab13011cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B3=A5=E4=BA=95=20=E9=9B=AA?= <yuki.torii.23@gmail.com>
Date: Wed, 17 Dec 2014 18:19:01 +0900
Subject: [PATCH] Change to use File.join instead of string concatenation

because File.join makes the purpose of code clear and do it safely
---
 app/models/fluentd/agent/common.rb             | 6 +++---
 app/models/fluentd/agent/local_common.rb       | 4 ++--
 spec/models/fluentd/agent/local_common_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/fluentd/agent/common.rb b/app/models/fluentd/agent/common.rb
index af66b1f..1b2609a 100644
--- a/app/models/fluentd/agent/common.rb
+++ b/app/models/fluentd/agent/common.rb
@@ -58,19 +58,19 @@ class Fluentd
       end
 
       def config_backup_dir
-        dir = FluentdUI.data_dir + "/#{Rails.env}_confg_backups"
+        dir = File.join(FluentdUI.data_dir, "#{Rails.env}_confg_backups")
         FileUtils.mkdir_p(dir)
         dir
       end
 
       def running_config_backup_dir
-        dir = FluentdUI.data_dir + "/#{Rails.env}_running_confg_backup"
+        dir = File.join(FluentdUI.data_dir, "#{Rails.env}_running_confg_backup")
         FileUtils.mkdir_p(dir)
         dir
       end
 
       def running_config_backup_file
-        running_config_backup_dir + "/running.conf"
+        File.join(running_config_backup_dir, "running.conf")
       end
 
       # define these methods on each Agent class
diff --git a/app/models/fluentd/agent/local_common.rb b/app/models/fluentd/agent/local_common.rb
index a4b6cbd..6157e04 100644
--- a/app/models/fluentd/agent/local_common.rb
+++ b/app/models/fluentd/agent/local_common.rb
@@ -64,7 +64,7 @@ class Fluentd
       end
 
       def backup_files
-        Dir.glob("#{config_backup_dir}/*")
+        Dir.glob(File.join("#{config_backup_dir}", "*.conf"))
       end
 
       def backup_files_in_old_order
@@ -80,7 +80,7 @@ class Fluentd
       def backup_config
         return unless File.exists? config_file
 
-        FileUtils.cp config_file, config_backup_dir + "/#{Time.zone.now.strftime('%Y%m%d_%H%M%S')}.conf"
+        FileUtils.cp config_file, File.join(config_backup_dir, "#{Time.zone.now.strftime('%Y%m%d_%H%M%S')}.conf")
 
         remove_over_backup_files
       end
diff --git a/spec/models/fluentd/agent/local_common_spec.rb b/spec/models/fluentd/agent/local_common_spec.rb
index 2665198..d6a0990 100644
--- a/spec/models/fluentd/agent/local_common_spec.rb
+++ b/spec/models/fluentd/agent/local_common_spec.rb
@@ -49,7 +49,7 @@ describe 'Fluentd::Agent::LocalCommon' do
     before do
       Fluentd::Agent::LocalCommon::MAX_BACKUP_FILE_NUM.times do |i|
         backpued_time = now - (i + 1).hours
-        FileUtils.touch daemon.agent.config_backup_dir + "/#{backpued_time.strftime('%Y%m%d_%H%M%S')}.conf"
+        FileUtils.touch File.join(daemon.agent.config_backup_dir , "#{backpued_time.strftime('%Y%m%d_%H%M%S')}.conf")
       end
 
       daemon.agent.config_write config_contents #add before conf
@@ -61,7 +61,7 @@ describe 'Fluentd::Agent::LocalCommon' do
     end
 
     it 'backed up old conf' do
-      backup_file = daemon.agent.config_backup_dir + "/#{now.strftime('%Y%m%d_%H%M%S')}.conf"
+      backup_file = File.join(daemon.agent.config_backup_dir, "#{now.strftime('%Y%m%d_%H%M%S')}.conf")
       expect(File.exists? backup_file).to be_truthy
       expect(File.read(backup_file)).to eq config_contents
     end