jumpstart 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/jumpstart.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jumpstart}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["i0n"]
@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
      "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",

data/lib/jumpstart.rb

@@ -24,12 +24,13 @@ module JumpStart
   require 'jumpstart/filetools'
   require 'jumpstart/stringtools'
 
+  jumpstart_setup_yaml = YAML.load_file("#{CONFIG_PATH}/jumpstart_setup.yml")
   # 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]
+  @templates_path = jumpstart_setup_yaml[: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]
+  @default_template_name = jumpstart_setup_yaml[:jumpstart_default_template_name]
   
   # Get and Set methods for module instance variables.
   def self.templates_path; @templates_path; end
@@ -37,6 +38,14 @@ module JumpStart
   def self.default_template_name; @default_template_name; end
   def self.default_template_name=(value); @default_template_name = value; end
     
+  class Setup 
+    def self.dump_global_yaml
+      File.open( "#{CONFIG_PATH}/jumpstart_setup.yml", 'w' ) do |out|
+        YAML.dump( {:jumpstart_templates_path => JumpStart.templates_path, :jumpstart_default_template_name => JumpStart.default_template_name}, out )
+      end
+    end
+  end
+    
 end
 
 module FileUtils
@@ -47,4 +56,10 @@ end
 
 class String
   include JumpStart::StringTools
-end
+end
+
+# Set the jumpstart templates path back to default if it has not been set
+if JumpStart.templates_path.nil? || JumpStart.templates_path.empty?
+  JumpStart.templates_path = "#{JumpStart::ROOT_PATH}/jumpstart_templates"
+  JumpStart::Setup.dump_global_yaml
+end

data/lib/jumpstart/base.rb

@@ -31,7 +31,7 @@ module JumpStart
       # set instance variable @template_path as the directory to read templates from.
       @template_path = FileUtils.join_paths(JumpStart.templates_path, @template_name)
     end
-        
+
     # 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 JumpStart.default_template_name exists then the command is launched without any menu display.
     # TODO Write integration tests.
@@ -77,7 +77,7 @@ module JumpStart
     
     def start
       puts "\n******************************************************************************************************************************************\n\n"
-      puts "JumpStarting....\n".purple
+      puts "  JumpStarting....\n".purple
       check_setup
       execute_install_command
       run_scripts_from_yaml(:run_after_install_command)
@@ -284,7 +284,7 @@ module JumpStart
       case
       when input.to_i <= @existing_templates.count && input.to_i > 0
         JumpStart.default_template_name = @existing_templates[(input.to_i - 1)]
-        dump_global_yaml
+        JumpStart::Setup.dump_global_yaml
         puts "  The default jumpstart template has been set to: #{JumpStart.default_template_name.green}"
         jumpstart_menu
       when input == "b"
@@ -343,7 +343,7 @@ module JumpStart
           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
-          dump_global_yaml
+          JumpStart::Setup.dump_global_yaml
           puts "\nTransfer complete!".green
           jumpstart_menu
         rescue
@@ -375,7 +375,7 @@ module JumpStart
         @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
+        JumpStart::Setup.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"
@@ -501,12 +501,6 @@ 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, :jumpstart_default_template_name => JumpStart.default_template_name}, out )
-      end
-    end
     
     def exit_with_success
       puts "\n\n  Exiting JumpStart...".purple

data/test/jumpstart/test_base.rb

@@ -8,11 +8,14 @@ class TestJumpstartBase < Test::Unit::TestCase
     # IO has been setup for testing
     # runs set_config_file_options to set all instance variables
     setup do
+      # Creates destination_dir if it does not exist
+      unless File.directory?("#{JumpStart::ROOT_PATH}/test/destination_dir")
+        Dir.mkdir("#{JumpStart::ROOT_PATH}/test/destination_dir")
+      end
       JumpStart.templates_path = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates"
       JumpStart.default_template_name = "test_template_1"
       input = StringIO.new
       output = StringIO.new
-      FileUtils.delete_dir_contents("#{JumpStart::ROOT_PATH}/test/destination_dir")
       @test_project = JumpStart::Base.new(["test_jumpstart_project"])
       @test_project.instance_variable_set(:@input, input)
       @test_project.instance_variable_set(:@output, output)
@@ -30,7 +33,6 @@ class TestJumpstartBase < Test::Unit::TestCase
     setup do
       input = StringIO.new
       output = StringIO.new
-      FileUtils.delete_dir_contents("#{JumpStart::ROOT_PATH}/test/destination_dir")
       @test_project_2 = JumpStart::Base.new(["test_jumpstart_project", "a_name_that_does_not_exist"])
       @test_project_2.instance_eval do
         @input = input
@@ -46,7 +48,6 @@ class TestJumpstartBase < Test::Unit::TestCase
     
     # An invalid project (@template_name), with the project name passed as the argument
     setup do
-      FileUtils.delete_dir_contents("#{JumpStart::ROOT_PATH}/test/destination_dir")
       @test_project_3 = JumpStart::Base.new(["test_jumpstart_project"])
       @test_project_3.instance_variable_set(:@template_name, "a_name_that_does_not_exist")
       @test_project_3.instance_variable_set(:@template_path, "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_template_2")
@@ -56,7 +57,6 @@ class TestJumpstartBase < Test::Unit::TestCase
     
     # A valid project with the project name passed as the argument 
     setup do
-      FileUtils.delete_dir_contents("#{JumpStart::ROOT_PATH}/test/destination_dir")
       @test_project_4 = JumpStart::Base.new(["test_jumpstart_project"])
       @test_project_4.instance_variable_set(:@template_name, "test_template_2")
       @test_project_4.instance_variable_set(:@template_path, "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates/test_template_2")
@@ -102,7 +102,6 @@ class TestJumpstartBase < Test::Unit::TestCase
             
     teardown do
       FileUtils.delete_dir_contents("#{JumpStart::ROOT_PATH}/test/destination_dir")
-      FileUtils.touch("#{JumpStart::ROOT_PATH}/test/destination_dir/.gitignore")
     end
     
     context "Tests for the JumpStart::Base#intialize instance method. \n" do
@@ -569,7 +568,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       
       setup do
         @test_project.stubs(:jumpstart_menu)
-        @test_project.stubs(:dump_global_yaml)
+        JumpStart::Setup.stubs(:dump_global_yaml)
         @test_project.instance_variable_set(:@existing_templates, %w[template1 template2 template3])
         JumpStart.default_template_name = "temp_default"
       end
@@ -577,7 +576,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       should "set the default template if a number corresponding to an existing template is entered." do
         @test_project.instance_variable_set(:@input, StringIO.new("1\n"))
         @test_project.expects(:jumpstart_menu).once
-        @test_project.expects(:dump_global_yaml).once
+        JumpStart::Setup.expects(:dump_global_yaml).once
         @test_project.instance_eval {set_default_template_options}
         assert_equal "template1", JumpStart.default_template_name
       end
@@ -658,7 +657,7 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#set_templates_dir instance method." do
       
       setup do
-        @test_project.stubs(:dump_global_yaml)
+        JumpStart::Setup.stubs(:dump_global_yaml)
         @test_project.stubs(:jumpstart_menu)
       end
       
@@ -670,7 +669,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       
       should "create a new directory and copy existing templates into it, then set JumpStart.templates_path to the new location." do
         @test_project.instance_variable_set(:@input, StringIO.new("#{JumpStart::ROOT_PATH}/test/destination_dir/a_name_that_does_not_exist"))
-        @test_project.expects(:dump_global_yaml).once
+        JumpStart::Setup.expects(:dump_global_yaml).once
         @test_project.expects(:jumpstart_menu).once
         @test_project.instance_eval {set_templates_dir}
         assert_equal "Please enter the absolute path for the directory that you would like to contain your jumpstart templates.\n\nCopying existing templates to /Users/i0n/Sites/jumpstart/test/destination_dir/a_name_that_does_not_exist\n\e[32m\nTransfer complete!\e[0m\n", @test_project.output.string
@@ -705,7 +704,7 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#reset_templates_dir_to_default_set instance method." do
       
       setup do
-        @test_project.stubs(:dump_global_yaml)
+        JumpStart::Setup.stubs(:dump_global_yaml)
         @test_project.stubs(:templates_dir_menu)
         FileUtils.mkdir("#{JumpStart::ROOT_PATH}/test/destination_dir/jumpstart_templates")
         @normal_root_path = JumpStart::ROOT_PATH.dup
@@ -1034,18 +1033,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       end
       
     end
-    
-    context "Tests for the JumpStart::Base#dump_global_yaml instance method." do
-      
-      should "call File.open and Yaml.dump for jumpstart_setup.yml" do
-        YAML.stubs(:dump)
-        File.stubs(:open)
-        File.expects(:open).once
-        @test_project.instance_eval {dump_global_yaml}
-      end
-      
-    end
-    
+        
     context "Tests for the JumpStart::Base#exit_with_success instance method." do
       # As these methods are very simple exit (end script) methods, and are already patched for testing, seems pointless to write tests for them.
     end
@@ -1097,7 +1085,16 @@ class TestJumpstartBase < Test::Unit::TestCase
         assert JumpStart::Base.remove_last_line?("_l._file.txt")
       end
       
-    end 
+    end
+    
+    context "Tests for the JumpStart::Setup#dump_global_yaml class method." do      
+      should "call File.open and Yaml.dump for jumpstart_setup.yml" do
+        YAML.stubs(:dump)
+        File.stubs(:open)
+        File.expects(:open).once
+        JumpStart::Setup.dump_global_yaml
+      end
+    end
      
     context "Tests for initializing and running JumpStart instances\n" do
      

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jumpstart
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - i0n
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,7 +66,6 @@ files:
 - 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
@@ -152,7 +149,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -161,7 +157,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"