clusterfuck 0.1.0 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.3

data/example/find_machines.cluster

@@ -0,0 +1,23 @@
+subnet_prefix = "129.215.59"
+range = (10..20)
+
+Clusterfuck::Task.new do |task|
+  # List of machines to use. Since we're using this clusterfile to find machines, build a list of legal ips for subnet/range.
+  task.hosts = range.map { |postfix| "#{subnet_prefix}.#{postfix}" }
+  
+  # List of jobs to run. Here, we want to find the hostname of each ip, so we build a list of size N (where N is the number of hosts we're using).
+  task.jobs = task.hosts.map { |host| "hostname" }
+  
+  # Where to store the result fragments
+  task.temp = "hosts"
+  
+  # SSH username/password
+  task.username = "SSH_USERNAME"
+  task.password = "SSH_PASSWORD"
+  
+  # Do a dry run -- just list jobs/machines and exit.
+  #task.debug = true
+
+  # Show performance report
+  task.show_report = false
+end

data/lib/clusterfuck.rb

@@ -31,6 +31,8 @@ module Clusterfuck
   # [jobs]        Array of Job objects, one per job, which will be allocated to the +hosts+. If you're lazy,
   #               you can also just use an array of strings (where each string is the command to run) -- a short
   #               name for each will be produced using the first 8 chars from the command.
+  # [jobnames]    Array of strings, one per job, which will be used as the short name for the corresponding
+  #               Job.
   # [verbose]     Level of message reporting. One of +VERBOSE_CANCEL+,+VERBOSE_FAIL+, or +VERBOSE_ALL+
   #               (DEFAULT: +VERBOSE_CANCEL+)
   # [username]    The SSH username to use to connect
@@ -75,15 +77,21 @@ module Clusterfuck
     
     # Convert array of string commands to Job objects if necessary
     def jobify!
-      @options["jobs"].map! do |job|
-        if not job.is_a?(Job) # Ah-ha, make this string into a job
-          short = job.downcase.gsub(/[^a-z]/,"")
-          short = job[0..7] if short.size > 8 
-          Job.new(short,job)
-        else # Don't change anything...
-          job
-        end
-      end
+    	jobs = []
+    	@options["jobs"].each_with_index do |job,index|
+    		if not job.is_a?(Job)
+    			short = nil
+    			if @options.include?("jobnames")
+    				short = @options["jobnames"][index]
+    			else
+  	        short = job.downcase.gsub(/[^a-z]/,"")
+	          short = job.gsub(/\s/,'')[0..7] if short.size > 8 
+    			end
+    			job = Job.new(short,job)
+    		end
+    		jobs.push job
+    	end
+	    @options["jobs"] = jobs
     end
   end
   
@@ -108,15 +116,20 @@ module Clusterfuck
       # Wait for jobs to terminate
       machines.each do |machine| 
         begin
+        	STDERR.puts "Waiting on #{machine.host}" if config.verbose >= VERBOSE_ALL
           machine.thread.join
+          STDERR.puts "#{machine.host} finished" if config.verbose >= VERBOSE_ALL
         rescue Timeout::Error
-          STDERR.puts machine.to_s
+          STDERR.puts machine.to_s if config.verbose >= VERBOSE_FAIL
+        rescue
+          STDERR.puts machine.to_s if config.verbose >= VERBOSE_FAIL
+        	raise $!
         end
       end
       
       # Print a report, if requested
       if config.show_report
-        puts " Machine\t| STARTED\t| COMPLETE\t| FAILED\t|"
+        puts " Machine[0..7]\t| STARTED\t| COMPLETE\t| FAILED\t|"
         machines.each { |machine| puts machine.report }
       end
     end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clusterfuck
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 29
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Trevor Fountain
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +01:00
+date: 2010-09-06 00:00:00 +01:00
 default_executable: clusterfuck
 dependencies: []
 
@@ -30,6 +36,7 @@ files:
 - Rakefile
 - VERSION
 - bin/clusterfuck
+- example/find_machines.cluster
 - lib/clusterfuck.rb
 - test/clusterfuck_test.rb
 - test/test_helper.rb
@@ -43,24 +50,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Run jobs across multiple machines via ssh
 test_files: 
-- test/test_helper.rb
 - test/clusterfuck_test.rb
+- test/test_helper.rb