scout 2.0.5 → 2.0.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.0.6
+
+* Adding plugin dependency support via the new needs() class method
+* Improved Scout error backtraces (patch from dougbarth)
+
 == 2.0.5
 
 * Another Version bump to update gem servers

data/Rakefile

@@ -86,10 +86,12 @@ task :publish_scout => [:package] do
   puts "Publishing on Scout Server"
 	sh "scp -r pkg/*.gem " +
 	   "deploy@gems.scoutapp.com:/var/www/gems/gems"
-	ssh = Net::SSH.start('gems.scoutapp.com','deploy')
-	ssh_shell = ssh.shell.sync
-	ssh_out = ssh_shell.send_command "/usr/bin/gem generate_index -d /var/www/gems"
-  puts "Published, and updated gem server." if ssh_out.stdout.empty? && !ssh_out.stderr
+	ssh_out = ""
+	Net::SSH.start('gems.scoutapp.com','deploy') do |session|
+	  ssh_out = session.exec!("/usr/bin/gem generate_index -d /var/www/gems").to_s.chomp
+  end
+  puts ssh_out
+  puts "Published, and updated gem server."
 end
 
 desc "Publishes Gem to Rubyforge"
@@ -141,17 +143,18 @@ task :publish_beta_scout => [:package] do
   puts "Publishing on Scout Server"
 	sh "scp -r pkg/*.gem " +
 	   "deploy@gems.scoutapp.com:/var/www/beta-gems/gems"
-	ssh = Net::SSH.start('gems.scoutapp.com','deploy')
-	ssh_shell = ssh.shell.sync
-	ssh_out = ssh_shell.send_command "/usr/bin/gem generate_index -d /var/www/beta-gems"
-  puts "Published, and updated gem server." if ssh_out.stdout.empty? && !ssh_out.stderr
+	ssh_out = ""
+	Net::SSH.start('gems.scoutapp.com','deploy') do |session|
+	  ssh_out = session.exec!("/usr/bin/gem generate_index -d /var/www/gems").to_s.chomp
+  end
+  puts ssh_out
+  puts "Published, and updated gem server."
 
 	sh "scp -r doc/html/* " +
 	   "deploy@gems.scoutapp.com:/var/www/beta-gems/docs"
 
 end
 
-
 desc "Add new files to Subersion"
 task :svn_add do
    system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"

data/lib/scout.rb

@@ -5,5 +5,5 @@ require "scout/plugin"
 require "scout/server"
 
 module Scout
-  VERSION = "2.0.5".freeze
+  VERSION = "2.0.6".freeze
 end

data/lib/scout/plugin.rb

@@ -12,6 +12,26 @@ module Scout
       def load(last_run, memory, options)
         new(last_run, memory, options)
       end
+      
+      # 
+      # You can use this method to indicate one or more libraries your plugin
+      # requires:
+      # 
+      #   class MyNeedyPlugin < Scout::Plugin
+      #     needs "faster_csv", "elif"
+      #     # ...
+      #   end
+      # 
+      # Your build_report() method will not be called if all libraries cannot
+      # be loaded.  RubyGems will be loaded if needed to find the libraries.
+      # 
+      def needs(*libraries)
+        if libraries.empty?
+          @needs ||= [ ]
+        else
+          needs.push(*libraries.flatten)
+        end
+      end
     end
 
     # Creates a new Scout Plugin to run.
@@ -114,8 +134,31 @@ module Scout
     # automatically be returned as the end result of the run.
     # 
     def run
-      build_report
+      build_report if self.class.needs.all? { |l| library_available?(l) }
       data_for_server
     end
+    
+    private
+    
+    #
+    # Returns true is a library can be loaded.  A bare require is made as the
+    # first attempt.  If that fails, RubyGems is loaded and another attempt is
+    # made.  If the library cannot be loaded either way, an error() is generated
+    # and build_report() will not be called.
+    # 
+    def library_available?(library)
+      begin
+        require library
+      rescue LoadError
+        begin
+          require "rubygems"
+          require library
+        rescue LoadError
+          error("Failed to load library", "Could not load #{library}")
+          return false
+        end
+      end
+      true
+    end
   end
 end

data/lib/scout/server.rb

@@ -116,7 +116,7 @@ module Scout
             return
           rescue Exception
             raise if $!.is_a? SystemExit
-            error "Plugin failed to run: #{$!.backtrace}"
+            error "Plugin failed to run: #{$!.class}: #{$!}\n#{$!.backtrace.join("\n")}"
           end
           info "Plugin completed its run."
           

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Highgroove Studios
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-31 00:00:00 -04:00
+date: 2008-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency