jumpstart 0.6.4 → 0.6.5

data/config/jumpstart_version.yml

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

data/lib/jumpstart/filetools.rb

@@ -122,36 +122,38 @@ module JumpStart::FileTools
   # Hello there NAME from COUNTRY
   # Will also replace strings present in the target_file path. so if the method call looked like: FileUtils.replace_strings(target_file, :name => "Ian", :country => "England")
   # and target_file was: /Users/name/Sites/country the strings matching NAME and COUNTRY inside the file would be swapped out and then a new file at the path: /Users/Ian/Sites/England would be created and populated with the contents. The file at the previous path would be deleted.
-  # Finally if you specify a symbol and append _CLASS in the template, that instance will be replace with a capitalized version of the string.
- 
-#TODO REMOVE DIRECTORY PATH FROM FILE NAME SO THAT FILE CREATION REMAINS CONSISTENT
- 
+  # Finally if you specify a symbol and append _CLASS in the template, that instance will be replace with a capitalized version of the string. 
   def replace_strings(target_file, args)
     if File.file?(target_file)
       permissions = File.executable?(target_file)
-      txt = IO.read(target_file)
+      original_txt = IO.read(target_file)
       old_dir = target_file.sub(/\/\w+\.*\w*$/, '')
-      new_file = target_file.gsub(/#{old_dir}/, '')
+      new_file = target_file.gsub(/#{old_dir}\//, '')
       new_dir = old_dir.dup
+      new_txt = original_txt.dup
       args.each do |x, y|
-        txt.gsub!(/#{x.to_s.upcase}_CLASS/, y.capitalize)
-        txt.gsub!(/#{x.to_s.upcase}/, y)
-        new_dir.gsub!(/\/#{x.to_s.downcase}/, "/#{y}")
+        new_txt.gsub!(/#{x.to_s.upcase}_CLASS/, y.capitalize)
+        new_txt.gsub!(/#{x.to_s.upcase}/, y)
+        new_dir.gsub!(/#{x.to_s.downcase}/, y)
         new_file.gsub!(/#{x.to_s.downcase}/, y)
       end
-      if old_dir.to_s != new_dir.to_s
+      if (old_dir <=> new_dir) != 0 && !File.directory?(new_dir)
         FileUtils.mkdir_p(new_dir)
       end
-      File.open(FileUtils.join_paths(new_dir, new_file), "w+") do |file|
-        file.puts txt
+      File.open("#{new_dir}/#{new_file}", "w") do |file|
+        file.puts new_txt
         file.chmod(0755) if permissions
       end
-      FileUtils.rm(target_file)            
-      if File.directory?(old_dir)
-        if (Dir.entries(old_dir) - JumpStart::IGNORE_DIRS).empty?
-          FileUtils.remove_dir(old_dir)
+      if (target_file <=> "#{new_dir}/#{new_file}") != 0
+        FileUtils.rm(target_file)
+        if File.directory?(old_dir)
+          if (Dir.entries(old_dir) - ['.', '..']).empty?
+            FileUtils.remove_dir(old_dir)
+          end
         end
-      end
+      end    
+    else
+      puts "#{target_file} is NOT a file"
     end
   end
 

data/test/jumpstart/test_base.rb

@@ -1197,6 +1197,8 @@ class TestJumpstartBase < Test::Unit::TestCase
           assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/normal_folder_name/test_whole_file_with_extension.txt")
           assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/normal_folder_name/test_whole_file_without_extension")
           assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/test_append_to_end_of_file_remove_last_line_1.txt")
+          assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/test_replace_strings/replace_strings_1.rb")
+          assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/test_replace_strings/replace_strings_2.txt")
           assert !File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/_L._test_append_to_end_of_file_remove_last_line_1.txt")
           assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/test_append_to_end_of_file_remove_last_line_2.txt")
           assert !File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/test_jumpstart_project/_l._test_append_to_end_of_file_remove_last_line_2.txt")

data/test/jumpstart/test_filetools.rb

@@ -236,21 +236,19 @@ class TestJumpstartFileTools < Test::Unit::TestCase
 
     setup do
       @source_file = IO.readlines("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/config_capistrano_source.rb")
+      @target_file_1 = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/config_capistrano_test.rb"
       @target_file_2 = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/replace_strings_test_app_name.rb"
       @target_file_3 = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name/app_name_replace_strings_test.txt"
+      @target_file_4 = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name/Rakefile"
       @new_file_2 = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/replace_strings_test_bungle.rb"
       @new_file_3 = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/bungle/bungle_replace_strings_test.txt"
-      @target_files = [@target_file_2, @target_file_3]
+      @target_files = [@target_file_1, @target_file_2, @target_file_3]
       FileUtils.mkdir_p("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_fileutils/app_name")
       @target_files.each do |t|
-        File.open(t, 'w+') do |file|
+        File.open(t, 'w') do |file|
           file.puts @source_file
         end
       end
-      @target_file_4 = "#{JumpStart::ROOT_PATH}/test/destination_dir/config_capistrano.rb"
-      File.open(@target_file_4, 'w+') do |file|
-        file.puts @source_file
-      end
     end
 
     teardown do
@@ -265,9 +263,24 @@ class TestJumpstartFileTools < Test::Unit::TestCase
         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
+      FileUtils.replace_strings(@target_file_1, {:app_name => 'test_app'})
+      file = IO.readlines(@target_file_1)
+      assert_equal "set :application, 'test_app'\n", file[0]
+      assert_equal "run \"\#{sudo} nginx_auto_config /usr/local/bin/nginx.remote.conf /opt/nginx/conf/nginx.conf test_app\"\n", file[44]
+    end
+    
+    should "replace strings with replace_strings method if the path does not contain the replacement strings and more than one replacement string is provided" do
+      FileUtils.replace_strings(@target_file_1, {:app_name => 'test_app', :REMOTE_SERVER => 'remote_box'})
+      file = IO.readlines(@target_file_1)
+      assert_equal "set :application, 'test_app'\n", file[0]
+      assert_equal "set :domain, 'remote_box'\n", file[1]
+      assert_equal "run \"\#{sudo} nginx_auto_config /usr/local/bin/nginx.remote.conf /opt/nginx/conf/nginx.conf test_app\"\n", file[44]
+    end
 
     should "replace strings inside the target path if the target is a file and there is more than one argument." do
-      FileUtils.replace_strings(@target_file_2, :app_name => 'bungle', :remote_server => 'boxy')
+      FileUtils.replace_strings(@target_file_2, {:app_name => 'bungle', :remote_server => 'boxy'})
       file = IO.readlines(@new_file_2)
       assert_equal "set :application, 'bungle'\n", file[0]
       assert_equal "set :domain, 'boxy'\n", file[1]
@@ -277,7 +290,7 @@ class TestJumpstartFileTools < Test::Unit::TestCase
     end
   
     should "replace strings inside the target path if the target is a file and there is more than one argument and the replacement string is found in the directory structure." do
-      FileUtils.replace_strings(@target_file_3, :app_name => 'bungle', :remote_server => 'boxy')
+      FileUtils.replace_strings(@target_file_3, {:app_name => 'bungle', :remote_server => 'boxy'})
       file = IO.readlines(@new_file_3)
       assert_equal "set :application, 'bungle'\n", file[0]
       assert_equal "set :domain, 'boxy'\n", file[1]
@@ -287,7 +300,7 @@ class TestJumpstartFileTools < Test::Unit::TestCase
     end
   
     should "replace strings that have _CLASS appended to them with a capitalised version of the replacement string." do
-      FileUtils.replace_strings(@target_file_3, :app_name => 'bungle', :remote_server => 'boxy')
+      FileUtils.replace_strings(@target_file_3, {:app_name => 'bungle', :remote_server => 'boxy'})
       file = IO.readlines(@new_file_3)
       assert_equal "set :application, 'bungle'\n", file[0]
       assert_equal "set :domain, 'boxy'\n", file[1]
@@ -299,13 +312,13 @@ class TestJumpstartFileTools < Test::Unit::TestCase
     end
     
     should "remove old dirs when empty after string replacement" do
-      FileUtils.replace_strings(@target_file_3, :app_name => 'bungle', :remote_server => 'boxy')
+      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')
+      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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Ian Alexander Wood (i0n)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +01:00
+date: 2010-09-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,6 @@ files:
 - lib/jumpstart/stringtools.rb
 - lib/jumpstart.rb
 - source_templates/template_config.yml
-- test/destination_dir/config_capistrano.rb
 - test/fake_nginx_path/local_nginx_1.conf
 - test/fake_nginx_path/remote_nginx_1.conf
 - test/helper.rb

data/test/destination_dir/config_capistrano.rb

@@ -1,65 +0,0 @@
-set :application, 'APP_NAME'
-set :domain, 'REMOTE_SERVER'
-set :user, 'i0n'
-
-set :repository,  "#{user}@#{domain}:/home/#{user}/git/#{application}.git"
-
-role :app, domain                           # This may be the same as the `Web` server
-role :web, domain                           # Your HTTP server, Apache/etc
-role :db,  domain , :primary => true        # This is where Rails migrations will run
-
-set :scm_verbose, true
-
-set :scm, :git
-set :scm_username, user
-set :runner, user
-set :use_sudo, false
-set :branch, "master"
-set :deploy_via, :checkout
-set :git_shallow_clone, 1
-set :deploy_to, "/home/#{user}/sites/#{application}"
-default_run_options[:pty] = true
-
-namespace :deploy do
-  #task which causes Passenger to initiate a restart
-  task  :restart do
-    run "mkdir -p #{release_path}/tmp && touch #{release_path}/tmp/restart.txt"
-  end
-    
-  namespace :db do
-    
-    desc "Create database for the production environment using the servers rake db:setup task.\n Loads the schema, and initializes with the seed data"
-    task :setup do
-      run "cd #{current_path}; rake db:setup RAILS_ENV=production"
-    end 
-        
-    desc "Populates the production database using lib/tasks/populate which I will use as my own internal convention for this process"
-    task :populate do
-      run "cd #{current_path}; rake db:populate RAILS_ENV=production"
-    end
-    
-  end
-  
-  desc "Task to set up the remote Nginx server for app deployment"
-  task :nginx do
-run "#{sudo} nginx_auto_config /usr/local/bin/nginx.remote.conf /opt/nginx/conf/nginx.conf APP_NAME"
-  end
-  
-  desc "Create bare remote git repo then add remote origin to local git repo and push to remote"
-  task :git do
-    run "cd /home/#{user}/git; mkdir #{application}.git; cd #{application}.git; git init --bare"
-    `git remote add origin ssh://#{user}@#{domain}/~/git/#{application}.git`
-    `git push origin master`
-  end
-  
-end
-
-# Reminder of default actions for cap deploy:
-# deploy:update_code
-# deploy:symlink
-# deploy:restart
-
-# eg: after 'deploy:symlink', 'deploy:restart'
-
-# This is a test string APP_NAME_CLASS
-# This is a test string REMOTE_SERVER_CLASS