jumpstart 0.1.0 → 0.1.1

data/.gitignore

@@ -20,6 +20,7 @@ pkg
 
 ## PROJECT::SPECIFIC
 test/destination_dir/*
+jumpstart_templates/*/*
 
 ## Bundler
 vendor/gems/gems 

data/Gemfile

@@ -3,6 +3,7 @@ source 'http://gemcutter.org'
 gem 'jumpstart'
 
 group :test do
-  require 'test/unit'
+  require 'minitest/unit'
   require 'shoulda'
+  require 'mocha'
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/config/jumpstart_setup.yml

@@ -1,2 +1,3 @@
 --- 
 :jumpstart_templates_path: /Users/i0n/Sites/jumpstart/jumpstart_templates
+:jumpstart_default_template_name: 

data/jumpstart.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jumpstart}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["i0n"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-05-27}
   s.default_executable = %q{jumpstart}
   s.description = %q{JumpStart is a script runner and template parser written in Ruby with Ruby projects in mind.
 
@@ -22,8 +22,7 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".bundle/config",
-     ".document",
+    ".document",
      ".gitignore",
      "Gemfile",
      "LICENSE",
@@ -33,91 +32,7 @@ Gem::Specification.new do |s|
      "bin/jumpstart",
      "config/jumpstart_setup.yml",
      "jumpstart.gemspec",
-     "jumpstart_templates/i0n_rails_3/.gitignore",
-     "jumpstart_templates/i0n_rails_3/_._Gemfile",
-     "jumpstart_templates/i0n_rails_3/app/views/home/index.haml",
-     "jumpstart_templates/i0n_rails_3/app/views/layouts/application.haml",
-     "jumpstart_templates/i0n_rails_3/config/_2._routes.rb",
-     "jumpstart_templates/i0n_rails_3/config/_L._database.yml",
-     "jumpstart_templates/i0n_rails_3/config/deploy.rb",
-     "jumpstart_templates/i0n_rails_3/config/environments/_18._development.rb",
-     "jumpstart_templates/i0n_rails_3/config/environments/_27._test.rb",
-     "jumpstart_templates/i0n_rails_3/config/environments/_41._production.rb",
-     "jumpstart_templates/i0n_rails_3/config/initializers/setup_mail.rb",
-     "jumpstart_templates/i0n_rails_3/jumpstart_config/i0n_rails_3.yml",
-     "jumpstart_templates/i0n_rails_3/jumpstart_config/nginx.local.conf",
-     "jumpstart_templates/i0n_rails_3/jumpstart_config/nginx.remote.conf",
-     "jumpstart_templates/i0n_rails_3/lib/development_mail_interceptor.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/authlogic.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/authlogic/session/session_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/authlogic/session/templates/session.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/migration/migration_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/migration/templates/migration.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/model/model_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/model/templates/migration.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/model/templates/model.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/observer/observer_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/datamapper/observer/templates/observer.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/factory_girl.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/factory_girl/model/model_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/factory_girl/model/templates/fixtures.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/USAGE",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/controller/controller_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/controller/templates/view.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/scaffold_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/templates/_form.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/templates/edit.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/templates/index.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/templates/layout.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/templates/new.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_erb/scaffold/templates/show.html.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/USAGE",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/controller/controller_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/controller/templates/view.html.haml",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/scaffold_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/templates/_form.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/templates/edit.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/templates/index.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/templates/layout.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/templates/new.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/formtastic_haml/scaffold/templates/show.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/controller/controller_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/controller/templates/view.html.haml",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/scaffold_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/templates/_form.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/templates/edit.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/templates/index.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/templates/layout.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/templates/new.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/haml/scaffold/templates/show.haml.erb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/machinist.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/machinist/model/model_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/machinist/model/templates/blueprint.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/machinist/model/templates/machinist_initializer.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/mongomapper.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/mongomapper/model/model_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/mongomapper/model/templates/model.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/mongomapper/observer/observer_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/shoulda.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/shoulda/controller/controller_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/shoulda/controller/templates/controller.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/shoulda/model/model_generator.rb",
-     "jumpstart_templates/i0n_rails_3/lib/generators/shoulda/model/templates/model.rb",
-     "jumpstart_templates/i0n_rails_3/lib/tasks/populate.rake",
-     "jumpstart_templates/i0n_rails_3/public/javascripts/init.js",
-     "jumpstart_templates/i0n_rails_3/public/javascripts/jquery-1.4.2.min.js",
-     "jumpstart_templates/i0n_rails_3/public/javascripts/jquery-ui-1.8.custom.min.js",
-     "jumpstart_templates/i0n_rails_3/public/javascripts/rails.js",
-     "jumpstart_templates/i0n_rails_3/public/stylesheets/sass/_setup.sass",
-     "jumpstart_templates/i0n_rails_3/public/stylesheets/sass/global.sass",
-     "jumpstart_templates/i0n_rails_3/public/stylesheets/sass/handheld.sass",
-     "jumpstart_templates/i0n_rails_3/public/stylesheets/sass/ie.sass",
-     "jumpstart_templates/i0n_rails_3/public/stylesheets/sass/print.sass",
-     "jumpstart_templates/i0n_rails_3/public/stylesheets/sass/screen.sass",
+     "jumpstart_templates/.gitignore",
      "lib/jumpstart.rb",
      "lib/jumpstart/base.rb",
      "lib/jumpstart/doc/JumpStart.html",
@@ -127,12 +42,15 @@ Gem::Specification.new do |s|
      "lib/jumpstart/doc/index.html",
      "lib/jumpstart/doc/rdoc.css",
      "lib/jumpstart/filetools.rb",
+     "lib/jumpstart/stringtools.rb",
      "source_templates/template_config.yml",
+     "test/destination_dir/.gitignore",
      "test/fake_nginx_path/local_nginx_1.conf",
      "test/fake_nginx_path/remote_nginx_1.conf",
      "test/helper.rb",
      "test/jumpstart/test_base.rb",
      "test/jumpstart/test_filetools.rb",
+     "test/jumpstart/test_stringutils.rb",
      "test/test_jumpstart.rb",
      "test/test_jumpstart_templates/test_base/_._test_file.txt",
      "test/test_jumpstart_templates/test_base/_._test_file_.txt",
@@ -141,6 +59,7 @@ Gem::Specification.new do |s|
      "test/test_jumpstart_templates/test_base/_10._test_file2.txt",
      "test/test_jumpstart_templates/test_base/_99999._test_file3.txt",
      "test/test_jumpstart_templates/test_base/_a._test_file4.txt",
+     "test/test_jumpstart_templates/test_base/current_files_and_dirs_test_file.txt",
      "test/test_jumpstart_templates/test_base/test_file",
      "test/test_jumpstart_templates/test_base/test_file5.txt",
      "test/test_jumpstart_templates/test_base/test_file_.6txt",
@@ -160,6 +79,12 @@ Gem::Specification.new do |s|
      "test/test_jumpstart_templates/test_fileutils/remove_files_test_3.txt",
      "test/test_jumpstart_templates/test_fileutils/remove_lines_test.txt",
      "test/test_jumpstart_templates/test_fileutils/replace_strings_test.rb",
+     "test/test_jumpstart_templates/test_fileutils/sort_contained_files_and_dirs_test/file_1.txt",
+     "test/test_jumpstart_templates/test_fileutils/sort_contained_files_and_dirs_test/file_2",
+     "test/test_jumpstart_templates/test_fileutils/sort_contained_files_and_dirs_test/folder_1/file_3.txt",
+     "test/test_jumpstart_templates/test_fileutils/sort_contained_files_and_dirs_test/folder_1/folder_2/file_4.txt",
+     "test/test_jumpstart_templates/test_fileutils/sort_contained_files_and_dirs_test/folder_1/folder_2/folder_3/file_5.txt",
+     "test/test_jumpstart_templates/test_fileutils/sort_contained_files_and_dirs_test/folder_1/folder_2/folder_4/file_6.txt",
      "test/test_jumpstart_templates/test_template_1/_._test_append_file_with_extension.txt",
      "test/test_jumpstart_templates/test_template_1/_._test_append_file_without_extension",
      "test/test_jumpstart_templates/test_template_1/_20._test_line_file_without_extension",
@@ -199,6 +124,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
      "test/jumpstart/test_base.rb",
      "test/jumpstart/test_filetools.rb",
+     "test/jumpstart/test_stringutils.rb",
      "test/test_jumpstart.rb",
      "test/test_jumpstart_templates/test_fileutils/config_capistrano_source.rb",
      "test/test_jumpstart_templates/test_fileutils/config_capistrano_test.rb",

data/lib/jumpstart.rb

@@ -19,6 +19,20 @@ module JumpStart
   
   require 'jumpstart/base'
   require 'jumpstart/filetools'
+  require 'jumpstart/stringtools'
+
+  # The path to the jumpstart templates directory. 
+  # Set as a module instance variable.
+  @templates_path = YAML.load_file("#{CONFIG_PATH}/jumpstart_setup.yml")[:jumpstart_templates_path]
+  # sets the default template to use if it has not been passed as an argument.
+  # Set as a module instance variable.
+  @default_template_name = YAML.load_file("#{CONFIG_PATH}/jumpstart_setup.yml")[:jumpstart_default_template_name]
+  
+  # Get and Set methods for module instance variables.
+  def self.templates_path; @templates_path; end
+  def self.templates_path=(value); @templates_path = value; end
+  def self.default_template_name; @default_template_name; end
+  def self.default_template_name=(value); @default_template_name = value; end
     
 end
 
@@ -29,43 +43,5 @@ module FileUtils
 end
 
 class String
-    
-  def red;          colourise(self, "\e[31m"); end
-  def red_bold;     colourise(self, "\e[1m\e[31m"); end
-  def green;        colourise(self, "\e[32m"); end
-  def green_bold;   colourise(self, "\e[1m\e[32m"); end
-  def yellow;       colourise(self, "\e[1m\e[33m"); end
-  def blue;         colourise(self, "\e[34m"); end
-  def blue_bold;    colourise(self, "\e[1m\e[34m"); end
-  def purple;       colourise(self, "\e[1m\e[35m"); end
-  
-  def colourise(text, colour_code)  "#{colour_code}#{text}\e[0m" end
-  
-  # Codes for changing output text:
-
-  # 0   Turn off all attributes
-  # 1   Set bright mode
-  # 4   Set underline mode
-  # 5   Set blink mode
-  # 7   Exchange foreground and background colors
-  # 8   Hide text (foreground colour would be the same as background)
-  # 30  Black text
-  # 31  Red text
-  # 32  Green text
-  # 33  Yellow text
-  # 34  Blue text
-  # 35  Magenta text
-  # 36  Cyan text
-  # 37  White text
-  # 39  Default text colour
-  # 40  Black background
-  # 41  Red background
-  # 42  Green background
-  # 43  Yellow background
-  # 44  Blue background
-  # 45  Magenta background
-  # 46  Cyan background
-  # 47  White background
-  # 49  Default background colour
-      
+  include JumpStart::StringTools
 end

data/lib/jumpstart/base.rb

@@ -2,54 +2,46 @@ module JumpStart
   class Base
         
     # Accessor methods to make testing input or output easier.
-    attr_accessor :input
-    attr_reader :output
-    
-    # Monkeypatch puts to make testing easier.
-    def puts(*args)
-      @output.puts(*args)    
-    end
+    attr_accessor :input, :output
 
     # Monkeypatch gets to make testing easier.
     def gets(*args)
       @input.gets(*args)
     end
     
-    # TODO initialize needs more tests
+    # Monkeypatch puts to make testing easier.
+    def puts(*args)
+      @output.puts(*args)    
+    end
+    
+    # TODO write a method to set :jumpstart_templates_path when the gem is run for the first time.
+    
     def initialize(args)
       # setup for testing input
       @input  = $stdin
       # setup for testing output
       @output = $stdout
-      # The path to the jumpstart templates directory
-      @jumpstart_templates_path = YAML.load_file("#{CONFIG_PATH}/jumpstart_setup.yml")[:jumpstart_templates_path]
-      # sets the default template to use if it has not been passed as an argument.
-      @default_template_name = YAML.load_file("#{CONFIG_PATH}/jumpstart_setup.yml")[:default_template_name]
-      # set the name of the project from the first argument passed, or from the constant @default_template_name if no argument passed.
+      # set the name of the project from the first argument passed, or from the module instance variable JumpStart.default_template_name if no argument passed.
       @project_name = args.shift.dup if args[0] != nil
       if args[0] != nil
         @template_name = args.shift.dup
-      elsif @default_template_name != nil
-        @template_name = @default_template_name
+      elsif JumpStart.default_template_name != nil
+        @template_name = JumpStart.default_template_name
       end
       # set instance variable @template_path as the directory to read templates from.
-      @template_path = FileUtils.join_paths(@jumpstart_templates_path, @template_name)
-      # set up instance variable containing an array that will be populated with existing jumpstart templates
+      @template_path = FileUtils.join_paths(JumpStart.templates_path, @template_name)
     end
-    
-    # TODO Refactor startup so that if one argument is passed to the jumpstart command it will assume that it is the projects name.
-    # If a default template has been set, jumpstart should create the project.
-    # If a default template has not been set then the user should be asked to select an existing template. This could be the same menu as displayed for option 1 above.
-    
+        
     # TODO Ensure that if jumpstart is launched with two arguments they are parsed as @project_name and @template_name, and the command is launched without any menu display.
-    # TODO Ensure that if jumpstart is launched with one argument it is parsed as @project_name, and if @default_template_name exists then the command is launched without any menu display.
+    # TODO Ensure that if jumpstart is launched with one argument it is parsed as @project_name, and if JumpStart.default_template_name exists then the command is launched without any menu display.
+    # TODO Write integration tests.
     # TODO Document methods for RDOC
     # Finish README etc for github
     
-    # TODO set_config_file_options needs tests
+    # Look into moving @install_path or refactoring to make setting this variable easier.
     def set_config_file_options
-      if File.exists?(FileUtils.join_paths(@jumpstart_templates_path, @template_name, "/jumpstart_config/", "#{@template_name}.yml"))
-        @config_file = YAML.load_file(FileUtils.join_paths(@jumpstart_templates_path, @template_name, "/jumpstart_config/", "#{@template_name}.yml"))
+      if File.exists?(FileUtils.join_paths(JumpStart.templates_path, @template_name, "/jumpstart_config/", "#{@template_name}.yml"))
+        @config_file = YAML.load_file(FileUtils.join_paths(JumpStart.templates_path, @template_name, "/jumpstart_config/", "#{@template_name}.yml"))
         @install_command ||= @config_file[:install_command]
         @install_command_args ||= @config_file[:install_command_args]
         @replace_strings ||= @config_file[:replace_strings].each {|x| x}
@@ -59,7 +51,6 @@ module JumpStart
       end
     end
     
-    # TODO check_setup needs tests
     def check_setup
       set_config_file_options
       lookup_existing_templates
@@ -69,14 +60,16 @@ module JumpStart
       check_install_path
     end
     
-    # TODO lookup_existing_templates needs tests
+    # set up instance variable containing an array that will be populated with existing jumpstart templates
     def lookup_existing_templates
       @existing_templates = []
-      template_dirs = Dir.entries(@jumpstart_templates_path) - IGNORE_DIRS
+      template_dirs = Dir.entries(JumpStart.templates_path) - IGNORE_DIRS
       template_dirs.each do |x|
-        if Dir.entries(FileUtils.join_paths(@jumpstart_templates_path, x)).include? "jumpstart_config"
-          if File.exists?(FileUtils.join_paths(@jumpstart_templates_path, x, '/jumpstart_config/', "#{x}.yml"))
-            @existing_templates << x
+        if File.directory?(FileUtils.join_paths(JumpStart.templates_path, x))
+          if Dir.entries(FileUtils.join_paths(JumpStart.templates_path, x)).include? "jumpstart_config"
+            if File.exists?(FileUtils.join_paths(JumpStart.templates_path, x, '/jumpstart_config/', "#{x}.yml"))
+              @existing_templates << x
+            end
           end
         end
       end
@@ -89,10 +82,8 @@ module JumpStart
       execute_install_command
       run_scripts_from_yaml(:run_after_install_command)
       parse_template_dir
-      # makes folders for the project
-      @dir_list.each {|dir| FileUtils.mkdir_p(FileUtils.join_paths(@install_path, @project_name, dir)) }
-      # create files from whole templates
-      @whole_templates.each {|x| FileUtils.cp(FileUtils.join_paths(@template_path, x), FileUtils.join_paths(@install_path, @project_name, x)) }
+      create_dirs
+      populate_files_from_whole_templates
       populate_files_from_append_templates
       populate_files_from_line_templates
       remove_unwanted_files
@@ -115,7 +106,6 @@ module JumpStart
     
     private
     
-    # TODO check_project_name needs extra tests for the match elsif
     def check_project_name
       if @project_name.nil? || @project_name.empty?
         puts "\n  Enter a name for your project.".yellow
@@ -127,55 +117,52 @@ module JumpStart
         check_project_name
       elsif @project_name.match(/^\W/)
         puts "\n  #{@project_name} begins with an invalid character. Please enter a name thats starts with a letter or a number.".red
+        @project_name = gets.chomp.strip
         check_project_name
       else
         @project_name
       end
     end
     
-    # TODO check_template_name needs tests.
     def check_template_name
       if @template_name.nil? || @template_name.empty?
         jumpstart_menu
       end
     end
     
-    # TODO check_template_path needs tests
     def check_template_path
       begin
         Dir.chdir(@template_path)
       rescue
-        puts "\nThe directory #{x.red} could not be found, or you do not have the correct permissions to access it."
+        puts "\nThe directory #{@template_path.red} could not be found, or you do not have the correct permissions to access it."
         exit_normal
       end
     end
-        
-    # TODO check_install_path needs tests
+
+    # TODO test check_install_path setting @install_path = FileUtils.pwd from prompt.
     def check_install_path
-      @install_path = FileUtils.pwd if @install_path.nil?
-      if Dir.exists?(FileUtils.join_paths(@install_path, @project_name))
-        puts
-        puts "The directory #{FileUtils.join_paths(@install_path, @project_name).red} already exists.\nAs this is the location you have specified for creating your new project jumpstart will now exit to avoid overwriting anything."
+      @install_path = FileUtils.pwd if @install_path.nil? || @install_path.empty?
+      if File.directory?(FileUtils.join_paths(@install_path, @project_name))
+        puts "\nThe directory #{FileUtils.join_paths(@install_path, @project_name).red} already exists.\nAs this is the location you have specified for creating your new project jumpstart will now exit to avoid overwriting anything."
         exit_normal
-      end      
+      end
+      true
     end
            
-    # TODO create_template needs tests
     def create_template
-      if Dir.exists?(FileUtils.join_paths(@jumpstart_templates_path, @template_name))
-        puts "\nThe directory #{FileUtils.join_paths(@jumpstart_templates_path, @template_name).red} already exists. The template will not be created."
+      if File.directory?(FileUtils.join_paths(JumpStart.templates_path, @template_name))
+        puts "\nThe directory #{FileUtils.join_paths(JumpStart.templates_path, @template_name).red} already exists. The template will not be created."
         exit_normal
       else
-        FileUtils.mkdir_p(FileUtils.join_paths(@jumpstart_templates_path, @template_name, "/jumpstart_config"))
+        FileUtils.mkdir_p(FileUtils.join_paths(JumpStart.templates_path, @template_name, "/jumpstart_config"))
         yaml = IO.read(FileUtils.join_paths(ROOT_PATH, "/source_templates/template_config.yml"))
-        File.open(FileUtils.join_paths(@jumpstart_templates_path, @template_name, "/jumpstart_config", "#{@template_name}.yml"), 'w') do |file|
+        File.open(FileUtils.join_paths(JumpStart.templates_path, @template_name, "/jumpstart_config", "#{@template_name}.yml"), 'w') do |file|
           file.puts yaml
         end
         puts "The template #{@template_name.green} has been generated.\n"
       end
     end
         
-    # TODO jumpstart_menu needs tests
     def jumpstart_menu
       puts "\n\n******************************************************************************************************************************************\n\n"
       puts "  JUMPSTART MENU\n".purple
@@ -189,7 +176,6 @@ module JumpStart
       jumpstart_menu_options
     end
     
-    # TODO jumpstart_menu_options needs tests
     def jumpstart_menu_options
       lookup_existing_templates
       input = gets.chomp.strip
@@ -210,16 +196,16 @@ module JumpStart
       end
     end
     
-    # TODO Check/finish methods for creating a new project through the menu
-    # TODO new_project_from_template_menu needs tests
     def new_project_from_template_menu
       puts "\n\n******************************************************************************************************************************************\n\n"
       puts "  CREATE A NEW JUMPSTART PROJECT FROM AN EXISTING TEMPLATE\n\n".purple
       puts "  Type a number for the template that you want.\n\n"
       count = 0
-      @existing_templates.each do |t|
-        count += 1
-        puts "  #{count.to_s.yellow} #{t}"
+      unless @existing_templates.nil? || @existing_templates.empty?
+        @existing_templates.each do |t|
+          count += 1
+          puts "  #{count.to_s.yellow} #{t}"
+        end
       end
       puts "\n  b".yellow + " Back to main menu."
       puts "\n  x".yellow + " Exit jumpstart\n\n"
@@ -227,7 +213,6 @@ module JumpStart
       new_project_from_template_options
     end
     
-    # TODO new_project_from_template_options needs tests
     def new_project_from_template_options
       input = gets.chomp.strip
       case
@@ -246,7 +231,6 @@ module JumpStart
       end
     end
     
-    # TODO write tests for new_template_menu
     def new_template_menu
       puts "\n\n******************************************************************************************************************************************\n\n"
       puts "  CREATE A NEW JUMPSTART TEMPLATE\n".purple
@@ -258,28 +242,28 @@ module JumpStart
       new_template_options
     end
     
-    # TODO write tests for new_template_options
+    # TODO add functionality for duplicating an existing template
     def new_template_options
       puts "\n  Enter a unique name for the new template.\n".yellow
       input = gets.chomp.strip
-      if @existing_templates.include?(input)
+      case
+      when @existing_templates.include?(input)
         puts "  A template of the name ".red + input.red_bold + " already exists.".red
         new_template_options
-      elsif input.length < 3
+      when input.length < 3
         puts "  The template name ".red + input.red_bold + " is too short. Please enter a name that is at least 3 characters long.".red
         new_template_options
-      elsif input.match(/^\W/)
+      when input.match(/^\W/)
         puts "  The template name ".red + input.red_bold + " begins with an invalid character. Please enter a name that begins with a letter or a number.".red
         new_template_options
       else
-        FileUtils.mkdir_p(FileUtils.join_paths(@jumpstart_templates_path, input, "jumpstart_config"))
-        FileUtils.cp(FileUtils.join_paths(ROOT_PATH, "source_templates/template_config.yml"), FileUtils.join_paths(@jumpstart_templates_path, input, "jumpstart_config", "#{input}.yml"))
-        puts "  The template ".green + input.green_bold + " has been created in your default jumpstart template directory ".green + @jumpstart_templates_path.green_bold + " ready for editing.".green
+        FileUtils.mkdir_p(FileUtils.join_paths(JumpStart.templates_path, input, "jumpstart_config"))
+        FileUtils.cp(FileUtils.join_paths(ROOT_PATH, "source_templates/template_config.yml"), FileUtils.join_paths(JumpStart.templates_path, input, "jumpstart_config", "#{input}.yml"))
+        puts "  The template ".green + input.green_bold + " has been created in your default jumpstart template directory ".green + JumpStart.templates_path.green_bold + " ready for editing.".green
         jumpstart_menu
       end
     end
     
-    # TODO Write method(s) for setting the default template
     def set_default_template_menu
       puts "\n\n******************************************************************************************************************************************\n\n"
       puts "  JUMPSTART DEFAULT TEMPLATE OPTIONS\n\n".purple
@@ -299,9 +283,9 @@ module JumpStart
       input = gets.chomp.strip
       case
       when input.to_i <= @existing_templates.count && input.to_i > 0
-        @default_template_name = @existing_templates[(input.to_i - 1)]
+        JumpStart.default_template_name = @existing_templates[(input.to_i - 1)]
         dump_global_yaml
-        puts "  The default jumpstart template has been set to: #{@default_template_name.green}"
+        puts "  The default jumpstart template has been set to: #{JumpStart.default_template_name.green}"
         jumpstart_menu
       when input == "b"
         jumpstart_menu
@@ -313,7 +297,6 @@ module JumpStart
       end
     end
     
-    # TODO write tests for templates_dir_menu
     def templates_dir_menu
       puts "\n\n******************************************************************************************************************************************\n\n"
       puts "  JUMPSTART TEMPLATES DIRECTORY OPTIONS\n\n".purple
@@ -325,14 +308,13 @@ module JumpStart
       templates_dir_options
     end
     
-    # TODO templates_dir_options needs tests
     def templates_dir_options
       input = gets.chomp.strip
       case
       when input == "1"
         set_templates_dir
       when input == "2"
-        reset_templates_dir_to_default
+        reset_templates_dir_to_default_check
       when input == "b"
         jumpstart_menu
       when input == "x"
@@ -343,25 +325,24 @@ module JumpStart
       end
     end
     
-    # TODO set_templates_dir needs tests
     # Sets the path for templates to be used by JumpStart.
     def set_templates_dir
       puts "Please enter the absolute path for the directory that you would like to contain your jumpstart templates."
       input = gets.chomp.strip
       root_path = input.sub(/\/\w*\/*$/, '')
       case
-      when Dir.exists?(input)
+      when File.directory?(input)
         puts "A directory of that name already exists, please choose a directory that does not exist."
-        set_template_dir
-      when Dir.exists?(root_path)
+        set_templates_dir
+      when File.directory?(root_path)
         begin
           Dir.chdir(root_path)
           Dir.mkdir(input)
-          files_and_dirs = FileUtils.sort_contained_files_and_dirs(@jumpstart_templates_path)
+          files_and_dirs = FileUtils.sort_contained_files_and_dirs(JumpStart.templates_path)
           puts "\nCopying existing templates to #{input}"
           files_and_dirs[:dirs].each {|x| FileUtils.mkdir_p(FileUtils.join_paths(input, x))}
-          files_and_dirs[:files].each {|x| FileUtils.cp(FileUtils.join_paths(@jumpstart_templates_path, x), FileUtils.join_paths(input, x)) }
-          @jumpstart_templates_path = input.to_s
+          files_and_dirs[:files].each {|x| FileUtils.cp(FileUtils.join_paths(JumpStart.templates_path, x), FileUtils.join_paths(input, x)) }
+          JumpStart.templates_path = input.to_s
           dump_global_yaml
           puts "\nTransfer complete!".green
           jumpstart_menu
@@ -371,45 +352,55 @@ module JumpStart
       end
     end
     
-    # TODO reset_templates_dir_to_default needs tests
-    # Resets the JumpStart template directory to the default location. (within the gem.)
-    def reset_templates_dir_to_default
-      if @jumpstart_templates_path == "#{ROOT_PATH}/jumpstart_templates"
+    # Checks to see if the JumpStart template directory should be reset to the default location. (within the gem.)
+    def reset_templates_dir_to_default_check
+      if JumpStart.templates_path == "#{ROOT_PATH}/jumpstart_templates"
         puts "  You do not need to reset the jumpstart templates directory, it is already set to: #{ROOT_PATH}/jumpstart_templates\n\n".red
+        templates_dir_menu
       else  
         puts "  Resetting the jumpstart templates directory to the default: #{ROOT_PATH}/jumpstart_templates\n\n"
-        current_files_and_dirs = FileUtils.sort_contained_files_and_dirs(@jumpstart_templates_path)
+        @current_files_and_dirs = FileUtils.sort_contained_files_and_dirs(JumpStart.templates_path)
         puts "  Moving your jumpstart templates back to the default directory will delete any templates that are currently there. Proceed?\n".yellow
         puts "  Type yes (" + "y".yellow + ") or no (" + "n".yellow + ")\n\n"
-        input = gets.chomp.strip
-        if input == "yes" || input == "y"
-          FileUtils.delete_dir_contents(FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates'))
-          current_files_and_dirs[:dirs].each {|x| FileUtils.mkdir_p(FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates', x))}
-          current_files_and_dirs[:files].each {|x| FileUtils.cp(FileUtils.join_paths(@jumpstart_templates_path, x), FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates', x)) }
-          @jumpstart_templates_path = FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates')
-          dump_global_yaml
-          puts "\n  SUCCESS! the jumpstart templates directory has been set to the default: #{ROOT_PATH}/jumpstart_templates".green
-        end
+        reset_templates_dir_to_default_set
       end
-      templates_dir_menu
     end
-            
-    # TODO execute_install_command needs tests
+    
+    # Resets the JumpStart template directory to the default location. (within the gem.)
+    def reset_templates_dir_to_default_set
+      input = gets.chomp.strip
+      if input == "yes" || input == "y"
+        FileUtils.delete_dir_contents(FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates'))
+        FileUtils.touch(FileUtils.join_paths(ROOT_PATH, '.gitignore'))
+        @current_files_and_dirs[:dirs].each {|x| FileUtils.mkdir_p(FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates', x))}
+        @current_files_and_dirs[:files].each {|x| FileUtils.cp(FileUtils.join_paths(JumpStart.templates_path, x), FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates', x)) }
+        JumpStart.templates_path = FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates')
+        dump_global_yaml
+        puts "\n  SUCCESS! the jumpstart templates directory has been set to the default: #{ROOT_PATH}/jumpstart_templates".green
+        templates_dir_menu
+      elsif input == "no" || input == "n"
+        puts "\n You have chosen not to move the jumpstart templates directory, nothing has been changed."
+        templates_dir_menu
+      else
+        puts "\n The command you entered could not be understood, please enter yes '" + "y".yellow + "' or no '" + "n".yellow + "'"
+        reset_templates_dir_to_default_set
+      end
+    end
+
     def execute_install_command
       Dir.chdir(@install_path)
-      unless @install_command.nil?
+      unless @install_command.nil? || @install_command.empty?
         puts "Executing command: #{@install_command.green} #{@project_name.green} #{@install_command_args.green}"
         system "#{@install_command} #{@project_name} #{@install_command_args}"
       end
     end
-            
-    # TODO parse_template_dir needs tests
+
     def parse_template_dir
       @dir_list = []
       file_list = []
-      @whole_templates = []
       @append_templates = []
       @line_templates = []
+      @whole_templates = []
       Find.find(@template_path) do |x|
         case
         when File.file?(x) && x !~ /\/jumpstart_config/ then
@@ -432,8 +423,17 @@ module JumpStart
         end
       end
     end
-                              
-    #TODO populate_files_from_append_templates needs tests
+    
+    # makes folders for the project
+    def create_dirs
+      @dir_list.each {|dir| FileUtils.mkdir_p(FileUtils.join_paths(@install_path, @project_name, dir)) } unless @dir_list.nil?
+    end
+    
+    # create files from whole templates
+    def populate_files_from_whole_templates
+      @whole_templates.each {|x| FileUtils.cp(FileUtils.join_paths(@template_path, x), FileUtils.join_paths(@install_path, @project_name, x)) } unless @whole_templates.nil?
+    end
+
     def populate_files_from_append_templates
       @append_templates.each do |x|
         new_name = x.sub(/_([lL]?)\._{1}/, '')
@@ -442,7 +442,6 @@ module JumpStart
       end
     end
     
-    # TODO populate_files_from_line_templates needs tests
     def populate_files_from_line_templates
       @line_templates.each do |x|
         new_name = x.sub(/_(\d+)\._{1}/, '')
@@ -450,10 +449,11 @@ module JumpStart
         FileUtils.insert_text_at_line_number(FileUtils.join_paths(@template_path, x), FileUtils.join_paths(@install_path, @project_name, new_name), JumpStart::Base.get_line_number(x))
       end
     end
-    
-    # TODO check_local_nginx_configuration needs tests
+
     def check_local_nginx_configuration
-      unless @nginx_local_template.nil? && @config_file[:local_nginx_conf].nil?
+      if @nginx_local_template.nil? || @config_file[:local_nginx_conf].nil?
+        puts "  \nNginx will not be configured as options have not been set for this."
+      else
         FileUtils.config_nginx(@nginx_local_template, @config_file[:local_nginx_conf], @project_name)
         FileUtils.config_hosts("/etc/hosts", @project_name)
       end
@@ -501,10 +501,10 @@ module JumpStart
         end
       end
     end
-        
+
     def dump_global_yaml
       File.open( "#{CONFIG_PATH}/jumpstart_setup.yml", 'w' ) do |out|
-        YAML.dump( {:jumpstart_templates_path => @jumpstart_templates_path, :default_template_name => @default_template_name}, out )
+        YAML.dump( {:jumpstart_templates_path => JumpStart.templates_path, :jumpstart_default_template_name => JumpStart.default_template_name}, out )
       end
     end
     
@@ -514,7 +514,7 @@ module JumpStart
       puts "******************************************************************************************************************************************\n"
       exit
     end
-    
+
     def exit_normal
       puts "\n\n  Exiting JumpStart...".purple
       puts "\n  Goodbye!\n\n"