jumpstart 0.1.10 → 0.1.11

data/Rakefile

@@ -0,0 +1,71 @@
+$:.unshift File.expand_path("../lib", __FILE__)
+
+require 'rubygems'
+require 'rake'
+require 'jumpstart'
+
+# Runs all tests
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+namespace :deploy do
+    
+  desc "Commits changes to local git repo and then pushes to remote"
+  task :git do
+    git_actions
+  end
+    
+  desc "Builds gemspec and deploys gem to RubyGems.org"
+  task :gem do
+    rubygems_actions
+  end
+  
+end
+
+namespace :version do
+  
+  namespace :bump do
+    
+    desc "Bumps major version number by 1"
+    task :major do
+      JumpStart::Setup.bump_version_major
+      git_actions
+    end
+
+    desc "Bumps minor version number by 1"
+    task :minor do
+      JumpStart::Setup.bump_version_minor
+      git_actions
+    end
+
+    desc "Bumps patch version number by 1"
+    task :patch do
+      JumpStart::Setup.bump_version_patch
+      git_actions
+    end
+    
+  end
+  
+end
+
+def git_actions
+  Dir.chdir("#{JumpStart::ROOT_PATH}")
+  system "git add ."
+  system "git commit -v -a -m 'commit for version: #{JumpStart.version}'"
+  system "git tag #{JumpStart.version}"
+  system "git push --tags"
+end
+
+def rubygems_actions
+  Dir.chdir("#{JumpStart::ROOT_PATH}")
+  system "gem build jumpstart.gemspec"
+  system "gem push jumpstart-#{JumpStart.version}.gem"      
+end
+
+def test
+  puts "YO YO YO"
+end

data/config/jumpstart_version.yml

@@ -0,0 +1,4 @@
+--- 
+:jumpstart_version_major: 0
+:jumpstart_version_minor: 1
+:jumpstart_version_patch: 11

data/lib/jumpstart.rb

@@ -20,32 +20,16 @@ module JumpStart
   CONFIG_PATH = File.expand_path(File.join(File.dirname(__FILE__), '../config'))
   IGNORE_DIRS = ['.','..']
   
+  require 'jumpstart/setup'
   require 'jumpstart/base'
   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 = 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 = jumpstart_setup_yaml[: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
-    
-  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
+  # Looks up the current version of JumpStart
+  def self.version 
+    "#{JumpStart::Setup.version_major}.#{JumpStart::Setup.version_minor}.#{JumpStart::Setup.version_patch}"
   end
-    
+  
 end
 
 module FileUtils
@@ -58,8 +42,3 @@ class String
   include JumpStart::StringTools
 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

@@ -19,19 +19,19 @@ module JumpStart
       @input  = $stdin
       # setup for testing output
       @output = $stdout
-      # 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.
+      # set the name of the project from the first argument passed, or from the module instance variable JumpStart::Setup.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 JumpStart.default_template_name.nil? != nil
-        @template_name = JumpStart.default_template_name
+      elsif JumpStart::Setup.default_template_name.nil? != nil
+        @template_name = JumpStart::Setup.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)
+      @template_path = FileUtils.join_paths(JumpStart::Setup.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 Ensure that if jumpstart is launched with one argument it is parsed as @project_name, and if JumpStart::Setup.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
@@ -41,8 +41,8 @@ module JumpStart
     def set_config_file_options
       if @template_name.nil?
         jumpstart_menu
-      elsif 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"))
+      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"))
         @install_command ||= @config_file[:install_command]
         @install_command_args ||= @config_file[:install_command_args]
         @replace_strings ||= @config_file[:replace_strings].each {|x| x}
@@ -64,11 +64,11 @@ module JumpStart
     # 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::Setup.templates_path) - IGNORE_DIRS
       template_dirs.each do |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"))
+        if File.directory?(FileUtils.join_paths(JumpStart::Setup.templates_path, x))
+          if Dir.entries(FileUtils.join_paths(JumpStart::Setup.templates_path, x)).include? "jumpstart_config"
+            if File.exists?(FileUtils.join_paths(JumpStart::Setup.templates_path, x, '/jumpstart_config/', "#{x}.yml"))
               @existing_templates << x
             end
           end
@@ -151,13 +151,13 @@ module JumpStart
     end
            
     def create_template
-      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."
+      if File.directory?(FileUtils.join_paths(JumpStart::Setup.templates_path, @template_name))
+        puts "\nThe directory #{FileUtils.join_paths(JumpStart::Setup.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::Setup.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::Setup.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"
@@ -258,9 +258,9 @@ module JumpStart
         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::Setup.templates_path, input, "jumpstart_config"))
+        FileUtils.cp(FileUtils.join_paths(ROOT_PATH, "source_templates/template_config.yml"), FileUtils.join_paths(JumpStart::Setup.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::Setup.templates_path.green_bold + " ready for editing.".green
         jumpstart_menu
       end
     end
@@ -284,9 +284,9 @@ module JumpStart
       input = gets.chomp.strip
       case
       when input.to_i <= @existing_templates.count && input.to_i > 0
-        JumpStart.default_template_name = @existing_templates[(input.to_i - 1)]
-        JumpStart::Setup.dump_global_yaml
-        puts "  The default jumpstart template has been set to: #{JumpStart.default_template_name.green}"
+        JumpStart::Setup.default_template_name = @existing_templates[(input.to_i - 1)]
+        JumpStart::Setup.dump_jumpstart_setup_yaml
+        puts "  The default jumpstart template has been set to: #{JumpStart::Setup.default_template_name.green}"
         jumpstart_menu
       when input == "b"
         jumpstart_menu
@@ -339,12 +339,12 @@ module JumpStart
         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::Setup.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
-          JumpStart::Setup.dump_global_yaml
+          files_and_dirs[:files].each {|x| FileUtils.cp(FileUtils.join_paths(JumpStart::Setup.templates_path, x), FileUtils.join_paths(input, x)) }
+          JumpStart::Setup.templates_path = input.to_s
+          JumpStart::Setup.dump_jumpstart_setup_yaml
           puts "\nTransfer complete!".green
           jumpstart_menu
         rescue
@@ -355,12 +355,12 @@ module JumpStart
     
     # 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"
+      if JumpStart::Setup.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::Setup.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"
         reset_templates_dir_to_default_set
@@ -374,9 +374,9 @@ module JumpStart
         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')
-        JumpStart::Setup.dump_global_yaml
+        @current_files_and_dirs[:files].each {|x| FileUtils.cp(FileUtils.join_paths(JumpStart::Setup.templates_path, x), FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates', x)) }
+        JumpStart::Setup.templates_path = FileUtils.join_paths(ROOT_PATH, '/jumpstart_templates')
+        JumpStart::Setup.dump_jumpstart_setup_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"
@@ -507,6 +507,7 @@ module JumpStart
       puts "\n\n  Exiting JumpStart...".purple
       puts "\n  Success! ".green + @project_name.green_bold + " has been created at: ".green + FileUtils.join_paths(@install_path, @project_name).green_bold + "\n\n".green
       puts "******************************************************************************************************************************************\n"
+      JumpStart::Setup.dump_jumpstart_setup_yaml
       exit
     end
 

data/lib/jumpstart/setup.rb

@@ -0,0 +1,59 @@
+module JumpStart
+  class Setup
+    
+    class << self
+      attr_accessor :templates_path, :default_template_name, :version_major, :version_minor, :version_patch
+    end
+    
+    jumpstart_setup_yaml = YAML.load_file("#{JumpStart::CONFIG_PATH}/jumpstart_setup.yml")
+    jumpstart_version_yaml = YAML.load_file("#{JumpStart::CONFIG_PATH}/jumpstart_version.yml")
+
+    @version_major = jumpstart_version_yaml[:jumpstart_version_major]
+    @version_minor = jumpstart_version_yaml[:jumpstart_version_minor]
+    @version_patch = jumpstart_version_yaml[:jumpstart_version_patch]
+    
+    
+    # The path to the jumpstart templates directory. 
+    # Set as a module instance variable.
+    @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 = jumpstart_setup_yaml[:jumpstart_default_template_name]
+
+    # Set the jumpstart templates path back to default if it has not been set
+    if @templates_path.nil? || @templates_path.empty?
+      @templates_path = "#{JumpStart::ROOT_PATH}/jumpstart_templates"
+    end
+        
+    # Method for writing to config/jumpstart_setup.yml
+    def self.dump_jumpstart_setup_yaml
+      File.open( "#{JumpStart::CONFIG_PATH}/jumpstart_setup.yml", 'w' ) do |out|
+        YAML.dump( {:jumpstart_templates_path => @templates_path, :jumpstart_default_template_name => @default_template_name}, out )
+      end      
+    end
+    
+    # Method for writing to config/jumpstart_version.yml
+    def self.dump_jumpstart_version_yaml
+      File.open( "#{JumpStart::CONFIG_PATH}/jumpstart_version.yml", 'w' ) do |out|
+        YAML.dump( {:jumpstart_version_major => @version_major, :jumpstart_version_minor => @version_minor, :jumpstart_version_patch => @version_patch}, out )
+      end
+    end
+    
+    # Method for bumping version number types.
+    def self.bump(version_type)
+      eval( "@#{version_type} += 1")
+      dump_jumpstart_version_yaml
+    end
+        
+    # Handles calls to JumpStart::Setup.bump_version_major, JumpStart::Setup.bump_version_minor and JumpStart::Setup.bump_version_patch class methods.
+    def self.method_missing(method, *args)
+      if method.match(/bump_version_(major|minor|patch)/)
+        version_type = method.to_s.sub('bump_', '')
+        self.send(:bump, "#{version_type}")
+      else
+        super
+      end
+    end
+    
+  end  
+end

data/test/jumpstart/test_base.rb

@@ -12,8 +12,8 @@ class TestJumpstartBase < Test::Unit::TestCase
       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"
+      JumpStart::Setup.templates_path = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates"
+      JumpStart::Setup.default_template_name = "test_template_1"
       input = StringIO.new
       output = StringIO.new
       @test_project = JumpStart::Base.new(["test_jumpstart_project"])
@@ -27,7 +27,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       @test_project.stubs(:exit_with_success)
     end
     
-    # A valid project but with an invalid template name passed in the argument with a valid project name. Project ends up valid as JumpStart.default_template_name is valid and it falls back on this.
+    # A valid project but with an invalid template name passed in the argument with a valid project name. Project ends up valid as JumpStart::Setup.default_template_name is valid and it falls back on this.
     # IO has been setup for testing
     # runs set_config_file_options to set all instance variables
     setup do
@@ -107,11 +107,11 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#intialize instance method. \n" do
             
       should "set @jumpstart_template_path" do
-        assert_equal "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates", @test_project.instance_eval {JumpStart.templates_path}
+        assert_equal "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates", @test_project.instance_eval {JumpStart::Setup.templates_path}
       end
       
-      should "set JumpStart.default_template_name" do
-        assert_equal "test_template_1", @test_project.instance_eval {JumpStart.default_template_name}
+      should "set JumpStart::Setup.default_template_name" do
+        assert_equal "test_template_1", @test_project.instance_eval {JumpStart::Setup.default_template_name}
       end
             
       should "set @project_name" do
@@ -314,7 +314,7 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#check_template_name instance method. \n" do
       
       should "launch jumpstart menu if nil" do
-        JumpStart.default_template_name = nil
+        JumpStart::Setup.default_template_name = nil
         @test_project.instance_variable_set(:@template_name, nil)
         @test_project.stubs(:jumpstart_menu).returns("jumpstart_menu")
         @test_project.expects(:jumpstart_menu).once
@@ -322,7 +322,7 @@ class TestJumpstartBase < Test::Unit::TestCase
       end
       
       should "launch jumpstart menu if empty" do
-        JumpStart.default_template_name = ""
+        JumpStart::Setup.default_template_name = ""
         @test_project.instance_variable_set(:@template_name, "")
         @test_project.stubs(:jumpstart_menu).returns("jumpstart_menu")
         @test_project.expects(:jumpstart_menu).once
@@ -366,16 +366,16 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#create_template instance method. \n" do
       
       setup do
-        JumpStart.templates_path = "#{JumpStart::ROOT_PATH}/test/destination_dir"
+        JumpStart::Setup.templates_path = "#{JumpStart::ROOT_PATH}/test/destination_dir"
         @test_project.instance_variable_set(:@template_name, "testing_create_template")
       end
       
-      should "create a template direcotry named after @template_name in the JumpStart.templates_path directory. Inside this dir it will create a /jumpstart_config directory, and inside that it will create a yaml config file called @template_name.yml and populated with JumpStart::ROOT_PATH/source_templates/template_config.yml " do
+      should "create a template direcotry named after @template_name in the JumpStart::Setup.templates_path directory. Inside this dir it will create a /jumpstart_config directory, and inside that it will create a yaml config file called @template_name.yml and populated with JumpStart::ROOT_PATH/source_templates/template_config.yml " do
         @test_project.instance_eval {create_template}
         assert File.exists?("#{JumpStart::ROOT_PATH}/test/destination_dir/testing_create_template/jumpstart_config/testing_create_template.yml")
       end
       
-      should "give a message and exit if a directory with the same name as @template_name exists in the JumpStart.templates_path dir" do
+      should "give a message and exit if a directory with the same name as @template_name exists in the JumpStart::Setup.templates_path dir" do
         FileUtils.mkdir("#{JumpStart::ROOT_PATH}/test/destination_dir/testing_create_template")
         @test_project.expects(:exit_normal).once
         @test_project.instance_eval {create_template}
@@ -470,8 +470,8 @@ class TestJumpstartBase < Test::Unit::TestCase
       end
       
       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.templates_path = "#{JumpStart::ROOT_PATH}/test/test_jumpstart_templates"
-        JumpStart.default_template_name = "test_template_1"
+        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}
@@ -518,7 +518,7 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#new_template_options instance method." do
       
       setup do
-        JumpStart.templates_path = "#{JumpStart::ROOT_PATH}/test/destination_dir"
+        JumpStart::Setup.templates_path = "#{JumpStart::ROOT_PATH}/test/destination_dir"
         @test_project.stubs(:jumpstart_menu).returns("jumpstart_menu")
         @test_project.instance_variable_set(:@existing_templates, %w[one two three])
       end
@@ -568,31 +568,31 @@ class TestJumpstartBase < Test::Unit::TestCase
       
       setup do
         @test_project.stubs(:jumpstart_menu)
-        JumpStart::Setup.stubs(:dump_global_yaml)
+        JumpStart::Setup.stubs(:dump_jumpstart_setup_yaml)
         @test_project.instance_variable_set(:@existing_templates, %w[template1 template2 template3])
-        JumpStart.default_template_name = "temp_default"
+        JumpStart::Setup.default_template_name = "temp_default"
       end
       
       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
-        JumpStart::Setup.expects(:dump_global_yaml).once
+        JumpStart::Setup.expects(:dump_jumpstart_setup_yaml).once
         @test_project.instance_eval {set_default_template_options}
-        assert_equal "template1", JumpStart.default_template_name
+        assert_equal "template1", JumpStart::Setup.default_template_name
       end
       
       should "go back to the main jumpstart menu if 'b' is entered." do
         @test_project.instance_variable_set(:@input, StringIO.new("b\n"))
         @test_project.expects(:jumpstart_menu).once
         @test_project.instance_eval {set_default_template_options}
-        assert_equal "temp_default", JumpStart.default_template_name
+        assert_equal "temp_default", JumpStart::Setup.default_template_name
       end
       
       should "exit jumpstart if 'x' is entered" do
         @test_project.instance_variable_set(:@input, StringIO.new("x\n"))
         @test_project.expects(:exit_normal).once
         @test_project.instance_eval {set_default_template_options}
-        assert_equal "temp_default", JumpStart.default_template_name        
+        assert_equal "temp_default", JumpStart::Setup.default_template_name        
       end
       
       # Due to the recursive nature of this code, the only successful way to test is to check for the NoMethodError that is raised when the method is called for a second time, this time with @input as nil. I'd be interested to find another way to test this.
@@ -657,7 +657,7 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#set_templates_dir instance method." do
       
       setup do
-        JumpStart::Setup.stubs(:dump_global_yaml)
+        JumpStart::Setup.stubs(:dump_jumpstart_setup_yaml)
         @test_project.stubs(:jumpstart_menu)
       end
       
@@ -667,9 +667,9 @@ class TestJumpstartBase < Test::Unit::TestCase
         assert_raises(NoMethodError) {@test_project.instance_eval {set_templates_dir}}
       end
       
-      should "create a new directory and copy existing templates into it, then set JumpStart.templates_path to the new location." do
+      should "create a new directory and copy existing templates into it, then set JumpStart::Setup.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"))
-        JumpStart::Setup.expects(:dump_global_yaml).once
+        JumpStart::Setup.expects(:dump_jumpstart_setup_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
@@ -685,15 +685,15 @@ class TestJumpstartBase < Test::Unit::TestCase
         @test_project.stubs(:reset_templates_dir_to_default_set)
       end
       
-      should "output a message and run templates_dir_menu if JumpStart.templates_path is set to it's standard starting position." do
-        JumpStart.templates_path = "#{JumpStart::ROOT_PATH}/jumpstart_templates"
+      should "output a message and run templates_dir_menu if JumpStart::Setup.templates_path is set to it's standard starting position." do
+        JumpStart::Setup.templates_path = "#{JumpStart::ROOT_PATH}/jumpstart_templates"
         @test_project.expects(:templates_dir_menu).once
         @test_project.instance_eval {reset_templates_dir_to_default_check}
         assert_equal "\e[31m  You do not need to reset the jumpstart templates directory, it is already set to: /Users/i0n/Sites/jumpstart/jumpstart_templates\n\n\e[0m\n", @test_project.output.string
       end
       
-      should "run reset_templates_dir_to_default_set if the current JumpStart.templates_path is not the default." do
-        JumpStart.templates_path = "#{JumpStart::ROOT_PATH}/test/destination_dir"
+      should "run reset_templates_dir_to_default_set if the current JumpStart::Setup.templates_path is not the default." do
+        JumpStart::Setup.templates_path = "#{JumpStart::ROOT_PATH}/test/destination_dir"
         @test_project.expects(:reset_templates_dir_to_default_set).once
         @test_project.instance_eval {reset_templates_dir_to_default_check}
         assert_equal "  Resetting the jumpstart templates directory to the default: /Users/i0n/Sites/jumpstart/jumpstart_templates\n\n\e[1m\e[33m  Moving your jumpstart templates back to the default directory will delete any templates that are currently there. Proceed?\n\e[0m\n  Type yes (\e[1m\e[33my\e[0m) or no (\e[1m\e[33mn\e[0m)\n\n", @test_project.output.string
@@ -704,12 +704,12 @@ class TestJumpstartBase < Test::Unit::TestCase
     context "Tests for the JumpStart::Base#reset_templates_dir_to_default_set instance method." do
       
       setup do
-        JumpStart::Setup.stubs(:dump_global_yaml)
+        JumpStart::Setup.stubs(:dump_jumpstart_setup_yaml)
         @test_project.stubs(:templates_dir_menu)
         FileUtils.mkdir("#{JumpStart::ROOT_PATH}/test/destination_dir/jumpstart_templates")
         @normal_root_path = JumpStart::ROOT_PATH.dup
         JumpStart::ROOT_PATH = "#{@normal_root_path}/test/destination_dir"
-        JumpStart.templates_path = "#{@normal_root_path}/test/test_jumpstart_templates/test_base"
+        JumpStart::Setup.templates_path = "#{@normal_root_path}/test/test_jumpstart_templates/test_base"
         @test_project.instance_variable_set(:@current_files_and_dirs, {:files => ['current_files_and_dirs_test_file.txt'], :dirs => ['current_files_and_dirs_test_dir']})
       end
     
@@ -1087,12 +1087,12 @@ class TestJumpstartBase < Test::Unit::TestCase
       
     end
     
-    context "Tests for the JumpStart::Setup#dump_global_yaml class method." do      
+    context "Tests for the JumpStart::Setup#dump_jumpstart_setup_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
+        JumpStart::Setup.dump_jumpstart_setup_yaml
       end
     end
      

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Ian Alexander Wood (i0n)
@@ -57,11 +57,12 @@ extra_rdoc_files: []
 files: 
 - bin/jumpstart
 - config/jumpstart_setup.yml
-- jumpstart_templates/empty_template/empty_template.yml
+- config/jumpstart_version.yml
+- jumpstart_templates/empty_template/jumpstart_config/empty_template.yml
 - lib/jumpstart/base.rb
 - lib/jumpstart/filetools.rb
+- lib/jumpstart/setup.rb
 - lib/jumpstart/stringtools.rb
-- lib/jumpstart/version.rb
 - lib/jumpstart.rb
 - source_templates/template_config.yml
 - test/fake_nginx_path/local_nginx_1.conf

data/lib/jumpstart/version.rb

@@ -1,3 +0,0 @@
-module JumpStart
-  VERSION = "0.1.10"
-end