chef-vpc-toolkit 2.5.0 → 2.5.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Thu Apr 16 2011 Dan Prince <dan.prince@rackspace.com> - 2.5.1
+  - Updates to support Ruby 1.9.2.
+
 * Thu Apr 14 2011 Dan Prince <dan.prince@rackspace.com> - 2.5.0
   - Make /root/cookbook-repos on the Chef server if it doesn't exist.
   - Add cache_file option to the VPC Client class.

data/VERSION

@@ -1 +1 @@
-2.5.0
+2.5.1

data/lib/chef-vpc-toolkit/chef_installer.rb

@@ -19,6 +19,16 @@ def self.load_configs
 
 end
 
+def self.get_cookbook_repos(options)
+	cookbook_repos_config=options["chef_cookbook_repos"]
+	return "" if cookbook_repos_config.nil?
+	if cookbook_repos_config.respond_to?(:inject) then
+		return options["chef_cookbook_repos"].inject { |sum, c| sum + " " + c }
+	else
+		return cookbook_repos_config.to_s
+	end
+end
+
 # validate the chef.json config file by parsing it
 def self.validate_json(options)
 
@@ -65,10 +75,7 @@ json.each_pair do |node_name, node_json|
 	knife_add_nodes_script+="knife_add_node '#{node_name}' '#{run_list}' '#{attributes}'\n"
 end
 
-cookbook_urls=""
-if options["chef_cookbook_repos"] then
-	cookbook_urls=options["chef_cookbook_repos"].inject { |sum, c| sum + " " + c }
-end
+cookbook_urls=self.get_cookbook_repos(options)
 os_type=machine_os_types[options['chef_server_name']]
 
 data=%x{
@@ -254,10 +261,7 @@ def self.rsync_cookbook_repos(options, local_dir="#{CHEF_VPC_PROJECT}/cookbook-r
 		puts "OK"
 	end
 
-	cookbook_urls=""
-	if options["chef_cookbook_repos"] then
-		cookbook_urls=options["chef_cookbook_repos"].inject { |sum, c| sum + " " + c }
-	end
+	cookbook_urls=self.get_cookbook_repos(options)
 
 	data=%x{
 	ssh -o "StrictHostKeyChecking no" root@#{options['ssh_gateway_ip']} bash <<-"EOF_SSH"

data/lib/chef-vpc-toolkit/cloud-servers-vpc/client.rb

@@ -25,10 +25,18 @@ class Client
 		@id=options[:id].to_i
 		@name=options[:name]
 		@description=options[:description]
+		if options[:status]
+			@status=options[:status]
+		else
+			@status = "Pending"
+		end
 		@status=options[:status] or @status = "Pending"
 		@server_group_id=options[:server_group_id]
-		@cache_file=options[:cache_file] or options[:server_group_id]
-
+		if options[:cache_file] then
+			@cache_file=options[:cache_file]
+		else
+			@cache_file=options[:server_group_id]
+		end
 		@vpn_network_interfaces=[]
 	end
 
@@ -52,17 +60,16 @@ class Client
 	end
 
 	def self.from_xml(xml)
-
 		client=nil
 		dom = REXML::Document.new(xml)
-		REXML::XPath.each(dom, "/client") do |client|
+		REXML::XPath.each(dom, "/client") do |cxml|
 
 			client=Client.new(
-				:id => XMLUtil.element_text(client,"id").to_i,
-				:name => XMLUtil.element_text(client, "name"),
-				:description => XMLUtil.element_text(client,"description"),
-				:status => XMLUtil.element_text(client,"status"),
-				:server_group_id => XMLUtil.element_text(client, "server-group-id").to_i
+				:id => XMLUtil.element_text(cxml,"id").to_i,
+				:name => XMLUtil.element_text(cxml, "name"),
+				:description => XMLUtil.element_text(cxml,"description"),
+				:status => XMLUtil.element_text(cxml,"status"),
+				:server_group_id => XMLUtil.element_text(cxml, "server-group-id").to_i
 			)
 			REXML::XPath.each(dom, "//vpn-network-interface") do |vni|
 				vni = VpnNetworkInterface.new(
@@ -75,10 +82,8 @@ class Client
 				)
 				client.vpn_network_interfaces << vni
 			end
-		end		 
-					
+		end
 		client
-					
 	end 
 
     def to_xml

data/rake/chef_vpc_toolkit.rake

@@ -222,7 +222,7 @@ namespace :chef do
 		timeout=ENV['CHEF_TIMEOUT']
 		group=ServerGroup.fetch(:source => "cache")
 		if server_list.nil? or server_list.empty?
-		    server_list=group.server_names.collect{|x| x+" "}.to_s
+		    server_list=group.server_names.collect{|x| x+" "}.join.to_s
 		end
 		if timeout.nil? or timeout.empty?
             timeout=600
@@ -341,7 +341,7 @@ namespace :vpn do
 			vpn_client_name=configs['vpn_client_name']
 		end
 
-		client=Client.create(group, vpn_client_name)
+		client=Client.create(group, vpn_client_name, true)
 		puts "Client ID #{client.id} created."
 		
 	end

data/test/client_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 module ChefVPCToolkit
 module CloudServersVPC

data/test/server_group_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 require 'fileutils'
 require 'tempfile'

data/test/server_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 module ChefVPCToolkit
 module CloudServersVPC

data/test/ssh_util_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 require 'tempfile'
 

data/test/test_helper.rb

@@ -3,9 +3,8 @@ require 'rubygems'
 require 'mocha'
 CHEF_VPC_PROJECT = "#{File.dirname(__FILE__)}" unless defined?(CHEF_VPC_PROJECT)
 
-Dir[File.join(File.dirname(__FILE__), '/../lib', '*.rb')].each do  |lib|
-    require(lib)
-end
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'chef-vpc-toolkit'
 
 require 'tempfile'
 require 'fileutils'

data/test/util_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 module ChefVPCToolkit
 

data/test/vpn_network_manager_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+$:.unshift File.dirname(__FILE__)
+require 'test_helper'
 
 require 'tempfile'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -04:00
+date: 2011-04-16 00:00:00 -04:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency