cloudler 0.1.5 → 0.2.0

data/bin/cloud

@@ -1,22 +1,44 @@
 #!/usr/bin/env ruby
 
 require 'cloudler'
-if ARGV.first == 'init'
+action = ARGV.shift
+if action == 'init'
 	Cloudler.init
-elsif ARGV.first == 'run'
+elsif action == 'test'
+	if File.exists? 'Cloudfile'
+		File.open 'Cloudfile', 'r' do |f|
+			config = f.read
+			eval config
+		end
+
+		Cloudler.test_connection
+	else
+		puts "It doesn't like this is a cloudler project. Try running 'cloud init'"
+	end
+elsif action == 'run'
 	if File.exists? 'Cloudfile'
 		File.open 'Cloudfile', 'r' do |f|
 			config = f.read
 			eval config
 		end
 		
-		Cloudler.run
+		if ARGV.length > 0
+			Cloudler.run ARGV.collect {|a| a.to_sym}
+		else
+			Cloudler.run
+		end
 	else
 		puts "It doesn't like this is a cloudler project. Try running 'cloud init'"
 	end
 else
-	puts "Usage: cloud [command]"
+	puts "Usage: cloud [command] [args]"
 	puts "  commands:"
 	puts "    init -- create a new cloudler project"
+	puts "    test -- test the cloudler settings"
 	puts "    run -- run a cloud project"
+	puts "      If you want to run only part of the actions, you can use:"
+	puts "        upload -- Upload files"
+	puts "        precommands -- Run the precommands"
+	puts "        gems -- Install the gems"
+	puts "        command -- Run the command"
 end

data/lib/cloudler.rb

@@ -3,41 +3,26 @@ require 'net/scp'
 
 class Cloudler
 
-	VERSION = '0.1.5'
+	VERSION = '0.2.0'
 
-	def self.hosts= hosts
-		@hosts = hosts
+	class << self
+		attr_accessor :hosts, :username, :command, :gems, :password, :files, :precommands, :path
 	end
-
-	def self.username= username
-		@username = username
-	end
-
-	def self.command= string
-		@command = string
-	end
-
-	def self.gems= array
-		@gems = array
-	end
-
-	def self.password= password
-		@password = password
-	end
-
-	def self.files= files
-		@files = files
-	end
-
-	def self.precommands= precommands
-		@precommands = precommands
-	end
-
-	def self.path= path
-		@path = path
+	
+	def self.test_connection
+		@hosts.each do |host|
+			begin
+				Net::SSH.start(host, @username, :password => @password) do |ssh|
+					puts "Connected to #{host} successfully."
+				end
+			rescue
+				puts "Error connecting to #{host}."
+			end
+		end
 	end
 
-	def self.run
+	def self.run to_run = [:upload, :precommands, :gems, :command]
+		# Set some defaults
 		@files ||= []
 		@gems ||= []
 		@precommands ||= []
@@ -50,44 +35,73 @@ class Cloudler
 
 		@hosts.each do |host|
 			Net::SSH.start(host, @username, :password => @password) do |ssh|
-				puts "Uploading files..."
-				ssh.exec! "rm -rf #{@path}"
-				ssh.exec! "mkdir #{@path}"
-				if @files.length > 0
-	  			ssh.scp.upload!(@files.join(' '), @path, :recursive => true)
-				else
-					ssh.scp.upload!('.', @path, :recursive => true)
+				if to_run.member? :upload
+					puts "Uploading files..."
+					upload_files ssh	
+					puts "Files uploaded."
 				end
-				
-				puts "Files uploaded."
 	
-				if @precommands.length > 0
-					puts "Executing pre-commands"
-					@precommands.each do |command|
-						ssh.exec "cd #{@path} && #{command}" do |ch,stream,data|
-							puts data
-						end
+				if to_run.member? :precommands
+					if @precommands.length > 0
+						puts "Executing pre-commands"
+						execute_precommands ssh
+						puts "Pre-commands executed."
 					end
-					puts "Pre-commands executed."
 				end
 
-				if @gems.length > 0 
-					puts "Installing gems..."
-					ssh.exec! "gem install #{@gems.join ' '}" do |ch, stream, data|
-						puts data
+				if to_run.member? :gems
+					if @gems.length > 0 
+						puts "Installing gems..."
+						install_gems ssh
+						puts "Gems installed"
 					end
-					puts "Gems installed"
 				end
 	
-				puts "Executing command..."
-				ssh.exec! "cd #{@path} && #{@command}" do |ch, stream, data|
-					puts data
+				if to_run.member? :command
+					puts "Executing command..."
+					execute_command ssh
+					puts "Command finished."
 				end
-				puts "Command finished."
 			end				
 		end
 	end
 
+	def self.upload_files ssh
+		ssh.exec! "rm -rf #{@path}"
+		ssh.exec! "mkdir #{@path}"
+
+		# By default, Cloudler uploads the entire current directory
+		if @files.length > 0
+	  	ssh.scp.upload!(@files.join(' '), @path, :recursive => true)
+		else
+			ssh.scp.upload!('.', @path, :recursive => true)
+		end
+	end
+
+	def self.execute_precommands ssh
+		@precommands.each do |command|
+			# We cd to @path so that the user can modify or run their uploaded files if
+			# they need to
+			ssh.exec "cd #{@path} && #{command}" do |ch,stream,data|
+				puts data
+			end
+		end
+	end
+
+	def self.install_gems ssh
+		ssh.exec! "gem install #{@gems.join ' '}" do |ch, stream, data|
+			puts data
+		end
+	end
+
+	def self.execute_command ssh
+		# We cd to @path so that the user has access to their uploaded files when
+		# they try to run them
+		ssh.exec! "cd #{@path} && #{@command}" do |ch, stream, data|
+			puts data
+		end
+	end
+
 	def self.init
 		File.open "Cloudfile", 'w' do |f|
 			f.write <<-EOS

metadata

@@ -2,7 +2,7 @@
 name: cloudler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bruce Spang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-02-24 00:00:00 -05:00
 default_executable: cloud
 dependencies: []