logaling/logaling-command [master] Use FileUtils#rm_rf instead of FileUtils#remove_entry_secure (logaling-commit) - logaling

SUZUKI Miho	2012-07-09 16:59:42 +0900 (Mon, 09 Jul 2012)

  New Revision: 3e010804fb753d1eb05a80893fede0b8fb1a2b4f
  https://github.com/logaling/logaling-command/commit/3e010804fb753d1eb05a80893fede0b8fb1a2b4f

  Merged 65c9145: Merge pull request #68 from logaling/use-rm_rf

  Log:
    Use FileUtils#rm_rf instead of FileUtils#remove_entry_secure

  Modified files:
    lib/logaling/repository.rb
    spec/logaling/glossary_spec.rb
    spec/logaling/project_spec.rb
    spec/logaling/repository_spec.rb
    spec/spec_helper.rb

  Modified: lib/logaling/repository.rb (+1 -1)
===================================================================

--- lib/logaling/repository.rb    2012-07-04 17:53:44 +0900 (2fa6b02)
+++ lib/logaling/repository.rb    2012-07-09 16:59:42 +0900 (26e8055)
@@ -41,7 +41,7 @@ module Logaling
 
     def unregister(project)
       raise Logaling::ProjectNotFound unless project
-      FileUtils.remove_entry_secure(project.path, true)
+      FileUtils.rm_rf(project.path, :secure => true)
     end
 
     def import(glossary_source)

  Modified: spec/logaling/glossary_spec.rb (+2 -2)
===================================================================
--- spec/logaling/glossary_spec.rb    2012-07-04 17:53:44 +0900 (d083eb2)
+++ spec/logaling/glossary_spec.rb    2012-07-09 16:59:42 +0900 (f24da4d)
@@ -26,7 +26,7 @@ module Logaling
     let(:glossary_source_path) { glossary.glossary_source.source_path }
 
     before do
-      FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+      FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
       FileUtils.mkdir_p(File.join(logaling_home, 'projects', 'spec'))
     end
 
@@ -170,7 +170,7 @@ module Logaling
     end
 
     after do
-      FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+      FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
     end
   end
 end

  Modified: spec/logaling/project_spec.rb (+1 -1)
===================================================================
--- spec/logaling/project_spec.rb    2012-07-04 17:53:44 +0900 (cba7e9a)
+++ spec/logaling/project_spec.rb    2012-07-09 16:59:42 +0900 (46eb7af)
@@ -26,7 +26,7 @@ module Logaling
     let(:project) { repository.find_project("spec") }
 
     before do
-      FileUtils.remove_entry_secure(project_path, true)
+      FileUtils.rm_rf(project_path, :secure => true)
       FileUtils.mkdir_p(File.join(project_path, "glossary"))
     end
 

  Modified: spec/logaling/repository_spec.rb (+6 -6)
===================================================================
--- spec/logaling/repository_spec.rb    2012-07-04 17:53:44 +0900 (7a64098)
+++ spec/logaling/repository_spec.rb    2012-07-09 16:59:42 +0900 (3060ba9)
@@ -26,7 +26,7 @@ module Logaling
     let(:glossary_source_path) { glossary.glossary_source.source_path }
 
     before do
-      FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+      FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
       FileUtils.mkdir_p(File.join(logaling_home, 'projects', 'spec'))
     end
 
@@ -103,7 +103,7 @@ module Logaling
         end
 
         after do
-          FileUtils.remove_entry_secure(tsv_path, true)
+          FileUtils.rm_rf(tsv_path, :secure => true)
         end
       end
     end
@@ -125,7 +125,7 @@ module Logaling
         end
 
         after do
-          FileUtils.remove_entry_secure(glossary_source_path, true)
+          FileUtils.rm_rf(glossary_source_path, :secure => true)
         end
       end
 
@@ -142,7 +142,7 @@ module Logaling
         end
 
         after do
-          FileUtils.remove_entry_secure(tsv_path, true)
+          FileUtils.rm_rf(tsv_path, :secure => true)
         end
       end
 
@@ -159,13 +159,13 @@ module Logaling
         end
 
         after do
-          FileUtils.remove_entry_secure(csv_path, true)
+          FileUtils.rm_rf(csv_path, :secure => true)
         end
       end
     end
 
     after do
-      FileUtils.remove_entry_secure(File.join(logaling_home, 'projects', 'spec'), true)
+      FileUtils.rm_rf(File.join(logaling_home, 'projects', 'spec'), :secure => true)
     end
   end
 end

  Modified: spec/spec_helper.rb (+1 -1)
===================================================================
--- spec/spec_helper.rb    2012-07-04 17:53:44 +0900 (93a599d)
+++ spec/spec_helper.rb    2012-07-09 16:59:42 +0900 (b69da69)
@@ -43,7 +43,7 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    FileUtils.remove_entry_secure(LOGALING_HOME, true)
+    FileUtils.rm_rf(LOGALING_HOME, :secure => true)
   end
 
   alias :silence :capture
-------------- next part --------------
An HTML attachment was scrubbed...
Download 


logaling

[logaling-commit] logaling/logaling-command [master] Use FileUtils#rm_rf instead of FileUtils#remove_entry_secure