chef-vpc-toolkit in chef-vpc-toolkit-2.1.0

- old
+ new

@@ -11,21 +11,21 @@
 options = {}
 opts = OptionParser.new
 
 options[:name] = ""
 opts.on("-n name", "--name", String,
-	"Create a new cloud project with the given directory name.") do |name|
+	"Create a new project with the given directory name.") do |name|
 	options[:name] = name
 end
 
 options[:upgrade] = false
-opts.on("-u", "--upgrade", "Upgrade a cloud project to work with the latest Cloud Toolkit.") do
+opts.on("-u", "--upgrade", "Upgrade a project to work with the latest Chef VPC Toolkit.") do
 	options[:upgrade] = true
 end
 
 opts.on_tail("-v", "--version", "Print version") do
-puts "Cloud Toolkit Version: #{Version::VERSION}"
+puts "Chef VPC Toolkit Version: #{Version::VERSION}"
 exit
 end
 
 opts.on_tail("-h", "--help", "Show help") do
 puts opts
@@ -45,19 +45,21 @@
 
 if options[:upgrade]
 
 	# Rakefile
 	if not File.exists?("Rakefile") then
-		puts "Unable to find Rakefile. Run the 'cloud-toolkit -u' commmand from within a cloud project directory."
+		puts "Unable to find Rakefile. Run the 'chef-vpc-toolkit -u' commmand from within a project directory."
 		exit 1
 	else
-		FileUtils.cp("#{Version::CHEF_VPC_TOOLKIT_ROOT}/contrib/Rakefile", "Rakefile")
+		FileUtils.cp("#{Version::CHEF_VPC_TOOLKIT_ROOT}/contrib/rake/Rakefile", "Rakefile")
 	end
 
 	# chef_installer.yml
 	if File.exists?("config/chef_installer.conf") then
 		FileUtils.mv("config/chef_installer.conf", "config/chef_installer.yml")
 	end
+
+	FileUtils.cp("#{Version::CHEF_VPC_TOOLKIT_ROOT}/VERSION", File.join("config", "TOOLKIT_VERSION"))
 
 else
 	exit_if_nil_or_empty(options, :name)
 
 	if File.exists?(options[:name]) then