jumpstart 0.1.13 → 0.1.14

data/config/jumpstart_version.yml

@@ -1,4 +1,4 @@
 --- 
 :jumpstart_version_major: 0
 :jumpstart_version_minor: 1
-:jumpstart_version_patch: 13
+:jumpstart_version_patch: 14

data/lib/jumpstart/base.rb

@@ -39,14 +39,14 @@ module JumpStart
     
     # Look into moving @install_path or refactoring to make setting this variable easier.
     def set_config_file_options
-      if @template_name.nil?
+      if @template_name.nil? || @template_path.nil?
         jumpstart_menu
-      elsif File.exists?(FileUtils.join_paths(JumpStart::Setup.templates_path, @template_name, "/jumpstart_config/", "#{@template_name}.yml"))
-        @config_file = YAML.load_file(FileUtils.join_paths(JumpStart::Setup.templates_path, @template_name, "/jumpstart_config/", "#{@template_name}.yml"))
+      elsif File.exists?(FileUtils.join_paths(@template_path, '/jumpstart_config/',"#{@template_name}.yml"))
+        @config_file = YAML.load_file(FileUtils.join_paths(@template_path, "/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}
-        @install_path ||= FileUtils.join_paths(@config_file[:install_path])
+        @install_path ||= @config_file[:install_path]
       else
         jumpstart_menu
       end

data/lib/jumpstart/filetools.rb

@@ -230,27 +230,36 @@ module JumpStart::FileTools
   # If too many or not enough forward slashes are provided at the start/end of the paths, this will be corrected.
   # Accidentally passing nil values mixed with strings/arrays will be corrected.
   # Whitespace and line breaks mixed with the path will be corrected.
-  # If too many files (paths containing one or more '.' fullstops) are specified in the supplied paths, the first one that creates a path will be returned.
   # If the path is an absolute path (starting with /) this will be preserved.
   def join_paths(*args)
-    paths = args.dup
-    paths.flatten!
+    paths = []
     full_path = []
-    file_detected = false
-    absolute_path = true if paths[0].to_s.start_with?('/')
+    temp_paths = []
+    args.each {|x| temp_paths << x }
+    temp_paths.flatten!
+    temp_paths.each do |x|
+      unless x.nil?
+        paths << x.to_s.dup
+      end
+    end
+    if paths[0].start_with?('/')
+      absolute_path = true
+    else
+      absolute_path = false
+    end
     paths.each do |path|
       unless path.nil?
         path.strip!
         path.slice!(0) while path.start_with?('/')
         path.chop! while path.end_with?('/')
-        if file_detected == false
-          file_detected = true if path =~ /\w*\.\w*/
-          full_path << path
-        end
+        full_path << path
       end
     end
-    full_path[0].insert(0, '/') if absolute_path
-    full_path.join('/')
+    full_path_string = full_path.join('/')
+    full_path_string.slice!(0) while full_path_string.start_with?('/')
+    full_path_string.chop! while full_path_string.end_with?('/')
+    full_path_string.insert(0, '/') if absolute_path == true
+    full_path_string
   end
   
   def sort_contained_files_and_dirs(path)

data/test/jumpstart/test_base.rb

@@ -1154,6 +1154,6 @@ class TestJumpstartBase < Test::Unit::TestCase
       end
       
     end
-                     
+                         
   end
 end

data/test/jumpstart/test_filetools.rb

@@ -328,21 +328,19 @@ class TestJumpstartFileTools < Test::Unit::TestCase
       assert_equal "this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j)
     end
     
-    should "return a valid path, even if too many files are specified" do
-      a,b,c,d,e,f,g,h,i,j,k = 'this/', '//array///', nil, %w[/of/], '/paths/', %w[/has// /far/], nil, '//too/', nil, %w[////many/ /forward// /slashes.txt], "another_file.rb"
-      assert_equal "this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j,k)
+    should "return a valid path, even if path ends with many forward slashes" do
+      a,b,c,d,e,f,g,h,i,j,k = 'this/', '//array///', nil, %w[/of/], '/paths/', %w[/has// /far/], nil, '//too/', nil, %w[////many/ /forward// /slashes.txt/////]
+      assert_equal "this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j)
     end
 
-    should "return a valid path, even if too many files are specified and the supplied paths contain whitespace and line breaks" do
-      a,b,c,d,e,f,g,h,i,k = "this/\n", '   //array///', nil, %w[/of/], '/paths/  ', %w[/has// /far/], nil, "//too/\n", nil, "another_file.rb"
-      j = ["////many/\n", "  /forward//  ", "\n  /slashes.txt\n\n\n"]
-      assert_equal "this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j,k)
+    should "return a valid path, even if the first path is all forward slashes and the supplied paths contain whitespace and line breaks" do
+      a,b,c,d,e,f,g,h,i,j,k = "////", '   this/array///', nil, %w[/of/], '/paths/  ', %w[/has// /far/], nil, "//too/\n", nil, ["////many/\n", "  /forward//  ", "\n  /slashes.txt\n\n\n"]
+      assert_equal "/this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j,k)
     end
     
-    should "return an absolute path" do
-      a,b,c,d,e,f,g,h,i,k = "///this/\n", '   //array///', nil, %w[/of/], '/paths/  ', %w[/has// /far/], nil, "//too/\n", nil, "another_file.rb"
-      j = ["////many/\n", "  /forward//  ", "\n  /slashes.txt\n\n\n"]
-      assert_equal "/this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j,k)
+    should "return an absolute path with symbols included in the values entered." do
+      a,b,c,d,e,f,g,h,i,j = "///this/\n", '   //array///', nil, %w[/of/], :paths, %w[/has// /far/], nil, "//too/\n", nil, ["////many/\n", :forward, "\n  /slashes.txt\n\n\n"]
+      assert_equal "/this/array/of/paths/has/far/too/many/forward/slashes.txt", FileUtils.join_paths(a,b,c,d,e,f,g,h,i,j)
     end
         
   end

metadata

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