scout 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 1.1.1
+
+* Fixed the double plugin load bug
+* Ensuring that plugins are unloaded, even on error
+
 == 1.1.0
 
 * Using better url.path + url.query if present to properly encode URLs.
@@ -11,7 +16,6 @@
  values (using reports, alerts, errors symbols).
 * Added test suite, which is now the default rake task.
 
-
 == 1.0.8
 
 * Added optional report field scout_time
@@ -56,5 +60,4 @@
 
 == 1.0.0
 
-* Initial public release.
-
+* Initial release.

data/Rakefile

@@ -10,6 +10,7 @@ require "rubyforge"
 dir     = File.dirname(__FILE__)
 lib     = File.join(dir, "lib", "scout.rb")
 version = File.read(lib)[/^\s*VERSION\s*=\s*(['"])(\d\.\d\.\d)\1/, 2]
+puts version
 history = File.read("CHANGELOG").split(/^(===.*)/)
 changes ||= history[0..2].join.strip
 
@@ -34,12 +35,6 @@ Rake::RDocTask.new do |rdoc|
 	                         "LICENSE", "lib/" )
 end
 
-desc "Upload current documentation to Scout Gem Server"
-task :upload_docs => [:rdoc] do
-	sh "scp -r doc/html/* " +
-	   "deploy@gems.scoutapp.com:/var/www/gems/docs"
-end
-
 spec = Gem::Specification.new do |spec|
 	spec.name    = "scout"
 	spec.version = version
@@ -98,7 +93,6 @@ task :publish => [:package] do
   rf.login
 
   c = rf.userconfig
-  puts rf.inspect
   c["release_notes"] = spec.description if spec.description
   c["release_changes"] = changes if changes
   c["preformatted"] = true
@@ -118,3 +112,17 @@ task :publish => [:package] do
 	ssh_out = ssh_shell.send_command "/usr/bin/index_gem_repository.rb -d /var/www/gems"
   puts "Published, and updated gem server." if ssh_out.stdout.empty? && !ssh_out.stderr
 end
+
+desc "Upload current documentation to Scout Gem Server and RubyForge"
+task :upload_docs => [:rdoc] do
+	sh "scp -r doc/html/* " +
+	   "deploy@gems.scoutapp.com:/var/www/gems/docs"
+	   
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+  host = "#{config["username"]}@rubyforge.org"
+
+  remote_dir = "/var/www/gforge-projects/#{spec.rubyforge_project}"
+  local_dir = 'doc/html'
+
+  sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
+end

data/lib/scout.rb

@@ -4,5 +4,5 @@ require "scout/plugin"
 require "scout/server"
 
 module Scout
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

data/lib/scout/server.rb

@@ -136,6 +136,14 @@ module Scout
         debug "Plugin does not need to be run at this time.  " +
               "(last run:  #{last_run || 'nil'})"
       end
+    ensure
+      debug "Removing plugin code..."
+      begin
+        Object.send(:remove_const, Plugin.last_defined.to_s.split("::").first)
+        info "Plugin Removed."
+      rescue
+        error "Unable to remove plugin."
+      end
       info "Plugin #{plugin[:name]} processing complete."
       data
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Highgroove Studios
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-13 00:00:00 -04:00
+date: 2008-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency