gossip 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,9 @@
+Version 0.3.1
+  * Out of sync with name change in s4t-utils.
+  * Squish warning message from xmpp4r.
+  * Small updates to documentation.
+  * More improvements to Rakefile
+
 Version 0.3.0
   * Version from _Everyday Scripting with Ruby_ renamed from Watchdog to 
     to Gossip and made into a Gem.

data/Rakefile

@@ -45,8 +45,7 @@ def assert_in(dir, taskname)
   end
 end
 
-def confirmed_step(name, required_dir = nil)
-  assert_in(required_dir, name) if required_dir
+def confirmed_step(name)
   STDOUT.puts "** #{name} **"
   STDOUT.puts `rake #{name}`
   STDOUT.print 'OK? > '
@@ -80,12 +79,22 @@ class HoeLike
       S4tUtils.run_particular_tests('test', 'slow')
     end
     
-    desc "Upload all the web pages"
+    desc "Upload all the web pages (as part of release)"
     task 'upload_pages' do | task |
+      assert_in(project_exports, task.name)
       exec = "scp -r #{web_site_root}/* #{login}:/var/www/gforge-projects/#{project}/"
       puts exec
       system(exec)
     end
+    
+    desc "Upload all the web pages (not as part of release)"
+    task 'export_and_upload_pages' => 'export' do | task |
+      Dir.chdir(project_exports) do
+        exec = "scp -r #{web_site_root}/* #{login}:/var/www/gforge-projects/#{project}/"
+        puts exec
+        system(exec)
+      end
+    end
 
     desc "Tag release with current version."
     task 'tag_release' do
@@ -113,14 +122,14 @@ class HoeLike
     # won't stop for us.
     task 'release_everything' do  
       confirmed_step 'check_manifest'
-      confirmed_step 'test'
       confirmed_step 'export'
       Dir.chdir(project_exports) do
         puts "Working in #{Dir.pwd}"
-        confirmed_step 'upload_pages', project_exports
-        confirmed_step 'publish_docs', project_exports
+        confirmed_step 'test'
+        confirmed_step 'upload_pages'
+        confirmed_step 'publish_docs'
         ENV['VERSION'] = this_release
-        confirmed_step 'release', project_exports
+        confirmed_step 'release'
       end
       confirmed_step 'tag_release'
     end

data/lib/gossip/cronies/jabber.rb

@@ -50,7 +50,7 @@ module Gossip
     
     def hear(scandal, details)
       my_jid = JID.new(@user_choices[:jabber_account])
-      cl = Client.new(my_jid, false)
+      cl = quiet_client(my_jid)
       cl.connect
       cl.auth(@user_choices[:jabber_password])
       details = [scandal, details].join("\n")
@@ -61,6 +61,16 @@ module Gossip
       end
       cl.close
     end
+    
+    # Current XMPP4R (0.3.1) prints warning message that's not important.
+    def quiet_client(my_jid)
+      cl = nil
+      msg = capturing_stderr do
+        cl = Client.new(my_jid, false)
+      end
+      $stderr.puts msg unless msg =~ /Non-threaded mode is currently broken/
+      cl
+    end
 
   end
 end

data/lib/gossip/cronies/smtp.rb

@@ -110,7 +110,7 @@ module Gossip
                 . Subject: [watchdog] #{scandal}
                 .
                 . #{details}
-               ".without_pretty_margin('.')
+               ".without_pretty_indentation('.')
         smtp.send_message(mail, from, to)
       }
     end

data/lib/gossip/version.rb

@@ -4,5 +4,5 @@
 #  Copyright (c) 2007. All rights reserved.
 
 module Gossip
-  Version = '0.3.0'
+  Version = '0.3.1'
 end

data/pages/starting-to-use.html

@@ -125,13 +125,19 @@ The main Gossip configuration file is named <code>.gossip</code> (note the leadi
 
 	twitter-login: twittername
 	twitter-password: some password
+	
+	trac-admin-path: /usr/local/bin/trac-admin
+	trac-environment-path: /home/user/trac_env1
+	trac-page-name: AnnouncingSuccessfulDeployment
+	trac-content-file: /home/user/tmp/deployment.log
+	
 				</pre>
 
 <p>
 With luck, the names alone are enough for you to know what values to use. If not, <a href="cronies.html">look here</a> or ask for command-line help:
 </p>
 <pre>
-	$ scripts/fanout --help
+	$ ruby scripts/fanout --help
 	Usage: ruby scripts/fanout [options] program args...
 	Site-wide defaults are noted below.
 	Override them in the '.fanoutrc' or '.gossiprc' files in your home folder.
@@ -161,7 +167,7 @@ With luck, the names alone are enough for you to know what values to use. If not
 
 <p>If you make a typo in the configuration file, Gossip will not complain. So it's useful to use the <code>--choices</code> argument to see that it's gotten the values you want:</p>
 <pre>
-	$ scripts/fanout --choices
+	$ ruby scripts/fanout --choices
 	Looking for configuration information in:
 	  /Users/marick/.fanoutrc
 	  /Users/marick/.gossiprc

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gossip
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-09-28 00:00:00 -05:00
+  version: 0.3.1
+date: 2007-09-29 00:00:00 -05:00
 summary: Library to broadcast messages to multiple destinations + scripts that use it
 require_paths: 
 - lib