jumpstart 0.5.0 → 0.5.1

data/config/jumpstart_version.yml

@@ -1,4 +1,4 @@
 --- 
 :jumpstart_version_major: 0
 :jumpstart_version_minor: 5
-:jumpstart_version_patch: 0
+:jumpstart_version_patch: 1

data/lib/jumpstart/filetools.rb

@@ -125,18 +125,24 @@ module JumpStart::FileTools
   def replace_strings(target_file, args)
     if File.file?(target_file)
       txt = IO.read(target_file)
+      old_dir = target_file.sub(/\/\w+\.*\w*$/, '')
       new_file = target_file.dup
       args.each do |x, y|
         txt.gsub!(/#{x.to_s.upcase}_CLASS/, y.capitalize)
         txt.gsub!(/#{x.to_s.upcase}/, y)
         new_file.gsub!(/#{x.to_s.downcase}/, y)
       end
-      dir = new_file.sub(/\/\w+\.*\w*$/, '')
-      FileUtils.mkdir_p(dir)
+      new_dir = new_file.sub(/\/\w+\.*\w*$/, '')
+      FileUtils.mkdir_p(new_dir)
       FileUtils.rm(target_file)
       File.open(new_file, "w") do |file|
         file.puts txt
       end
+      if File.directory?(old_dir)
+        if (Dir.entries(old_dir) - JumpStart::IGNORE_DIRS).empty?
+          FileUtils.remove_dir(old_dir)
+        end
+      end
     end
   end
 

data/test/jumpstart/test_filetools.rb

@@ -243,6 +243,7 @@ class TestJumpstartFileTools < Test::Unit::TestCase
       @target_files = []
       @target_files << @target_file_1 << @target_file_2 << @target_file_3
       @source_file = IO.readlines("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/config_capistrano_source.rb")
+      FileUtils.mkdir_p("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name")
       @target_files.each do |x|
         File.open(x, 'w+') do |file|
           file.puts @source_file
@@ -258,6 +259,9 @@ class TestJumpstartFileTools < Test::Unit::TestCase
       if File.directory?("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/bungle")
         FileUtils.remove_dir("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/bungle")
       end
+      if File.directory?("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name")
+        FileUtils.remove_dir("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name")
+      end
     end
 
     should "replace strings with replace_strings method if the path does not contain the replacement strings and only one replacement string is provided" do
@@ -306,6 +310,18 @@ class TestJumpstartFileTools < Test::Unit::TestCase
       assert File.exists?(@new_file_3)
       assert !File.exists?(@target_file_3)
     end
+    
+    should "remove old dirs when empty after string replacement" do
+      FileUtils.replace_strings(@target_file_3, :app_name => 'bungle', :remote_server => 'boxy')
+      assert !File.directory?("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name")
+    end
+    
+    should "not remove old dirs after string replacement if they are not empty" do
+      FileUtils.touch("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name/another_file.txt")
+      FileUtils.replace_strings(@target_file_3, :app_name => 'bungle', :remote_server => 'boxy')
+      assert File.directory?("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name")
+      assert File.exists?(@new_file_3)
+    end
 
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ian Alexander Wood (i0n)