jumpstart 0.1.15 → 0.1.16

data/config/jumpstart_version.yml

@@ -1,4 +1,4 @@
 --- 
 :jumpstart_version_major: 0
 :jumpstart_version_minor: 1
-:jumpstart_version_patch: 15
+:jumpstart_version_patch: 16

data/lib/jumpstart.rb

@@ -21,6 +21,7 @@ module JumpStart
   LIB_PATH = File.expand_path(File.dirname(__FILE__))
   CONFIG_PATH = File.expand_path(File.join(File.dirname(__FILE__), '../config'))
   IGNORE_DIRS = ['.','..']
+  LAUNCH_PATH = FileUtils.pwd
   
   require 'jumpstart/setup'
   require 'jumpstart/base'

data/lib/jumpstart/base.rb

@@ -141,11 +141,12 @@ module JumpStart
       end
     end
 
+    # TODO FileUtils.pwd is not behaving as expected. find a way to set this.
     # Sets the install path to executing directory if @install_path varibale is nil or empty. This should result in projects being created in directory from which the jumpstart command was called, if the template specified does not set this option.
     # Checks the install path set in @install_path.
     # Checks that a directory with the same name as the project does not already exist in the install path.
     def check_install_path
-      @install_path = FileUtils.pwd if @install_path.nil? || @install_path.empty?
+      @install_path = JumpStart::LAUNCH_PATH 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
@@ -481,14 +482,17 @@ module JumpStart
       end
     end
     
+    # TODO needs more tests as nil values were slipping through
     # Removes files specified in templates YAML
     def remove_unwanted_files
       file_array = []
       root_path = FileUtils.join_paths(@install_path, @project_name)
-      @config_file[:remove_files].each do |file|
-        file_array << FileUtils.join_paths(root_path, file)
+      unless @config_file[:remove_files].nil?
+        @config_file[:remove_files].each do |file|
+          file_array << FileUtils.join_paths(root_path, file)
+        end
+        FileUtils.remove_files(file_array)
       end
-      FileUtils.remove_files(file_array)
     end
     
     # Runs additional scripts specified in YAML. Runs one set after the install command has executed, and another after the templates have been generated.
@@ -506,6 +510,7 @@ module JumpStart
       end
     end
     
+    # TODO Needs more tests as nil values slipped through before refactoring.
     # Looks for strings IN_CAPS that are specified for replacement in the templates YAML
     def check_for_strings_to_replace
       if @replace_strings.nil? || @replace_strings.empty?
@@ -513,16 +518,20 @@ module JumpStart
       else
         puts "\nChecking for strings to replace inside files...\n\n"
         @replace_strings.each do |file|
-          puts "Target file: #{file[:target_path].green}\n"
-          puts "Strings to replace:\n\n"
-          check_replace_string_pairs_for_project_name_sub(file[:symbols])
-          file[:symbols].each do |x,y|
-            puts "Key:    #{x.to_s.green}"
-            puts "Value:  #{y.to_s.green}\n\n"
+          if file[:target_path].nil? || file[:symbols].nil?
+            false
+          else
+            puts "Target file: #{file[:target_path].green}\n"
+            puts "Strings to replace:\n\n"
+            check_replace_string_pairs_for_project_name_sub(file[:symbols])
+            file[:symbols].each do |x,y|
+              puts "Key:    #{x.to_s.green}"
+              puts "Value:  #{y.to_s.green}\n\n"
+            end
+            puts "\n"
+            path = FileUtils.join_paths(@install_path, @project_name, file[:target_path])
+            FileUtils.replace_strings(path, file[:symbols]) 
           end
-          puts "\n"
-          path = FileUtils.join_paths(@install_path, @project_name, file[:target_path])
-          FileUtils.replace_strings(path, file[:symbols])
         end
       end
     end

data/test/jumpstart/test_base.rb

@@ -358,7 +358,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       should "set the install path to the current directory if @install_path is nil and then run the method again, checking the path of @install_path + @project_name" do
         @test_project.instance_variable_set(:@install_path, nil)
         assert(@test_project.instance_eval {check_install_path})
-        assert_equal FileUtils.pwd , @test_project.instance_variable_get(:@install_path)
+        assert_equal JumpStart::ROOT_PATH , @test_project.instance_variable_get(:@install_path)
       end
       
     end
@@ -469,15 +469,15 @@ class TestJumpstartBase < Test::Unit::TestCase
         @test_project.instance_eval {lookup_existing_templates}
       end
       
+      # TODO Look into testing this method in a different way. The fact that a new class object is instantiated makes it difficult to test with mocha.
       should "create a new project with the specified template name, checking that the project name is valid when a valid number is entered" do
         JumpStart::Setup.templates_path = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates"
         JumpStart::Setup.default_template_name = "test_template_1"
         @test_project.expects(:check_project_name).once
         @test_project.instance_variable_set(:@input, StringIO.new("1\n"))
         @test_project.instance_eval {new_project_from_template_options}
-        # project will be created from directory where command is run as @install_papth cannot currently be set for generated jumpstart project.
-        assert File.directory?("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_template_1/test_jumpstart_project")
-        FileUtils.remove_dir("#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_template_1/test_jumpstart_project")
+        assert File.directory?("#{JumpStart::ROOT_PATH}/test_jumpstart_project")
+        FileUtils.remove_dir("#{JumpStart::ROOT_PATH}/test_jumpstart_project")
       end
       
       should "launch the jumpstart_menu method if 'b' is entered" do

metadata

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