mailmanager 1.0.12 → 1.0.13

data/.gitignore

@@ -2,3 +2,4 @@
 pkg/mailmanager-*.gem
 html/*
 doc/*
+results/*

data/Changelog

@@ -1,4 +1,8 @@
-Current version is 1.0.12
+Current version is 1.0.13
+
+changes since 1.0.12
+- added list description= setter method to List class
+- added subject_prefix & subject_prefix= methods to List class
 
 changes since 1.0.11
 - should now be compatible with Python 2.4+ (was 2.6+); 2.4 requires simplejson

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mailmanager (1.0.11)
+    mailmanager (1.0.13)
       json (~> 1.4.6)
       open4 (~> 1.0.1)
 
@@ -10,6 +10,9 @@ GEM
   specs:
     ZenTest (4.4.2)
     archive-tar-minitar (0.5.2)
+    builder (3.0.0)
+    ci_reporter (1.6.4)
+      builder (>= 2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
     json (1.4.6)
@@ -40,8 +43,7 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest (~> 4.4.2)
-  json (~> 1.4.6)
+  ci_reporter
   mailmanager!
-  open4 (~> 1.0.1)
   rspec (~> 2.4.0)
   ruby-debug19

data/Rakefile

@@ -1,7 +1,12 @@
+APP_ROOT = File.expand_path( File.dirname(__FILE__) )
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require 'mailmanager/version'
 require 'rake'
 require 'rake/rdoctask'
+require 'rspec/core/rake_task'
+
+# load all .rake files in the tasks dir
+Dir["#{APP_ROOT}/tasks/**/*.rake"].each { |task| load task }
 
 desc "Build gem locally"
 task :build do
@@ -25,7 +30,13 @@ task :release => :build do
   system "gem push pkg/mailmanager-#{MailManager::VERSION}.gem"
 end
 
+desc "Generate rdoc html"
 Rake::RDocTask.new do |rd|
   rd.main = "lib/mailmanager.rb"
   rd.rdoc_files.include("lib/**/*.rb")
 end
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end

data/lib/mailmanager/lib.rb

@@ -99,6 +99,8 @@ module MailManager
       command(cmd, params)
     end
 
+    # TODO: DRY this up!
+
     def web_page_url(list)
       cmd = :withlist
       out = command(cmd, :name => list.name, :wlcmd => 'web_page_url')
@@ -117,6 +119,24 @@ module MailManager
       parse_json_output(out)
     end
 
+    def subject_prefix(list)
+      cmd = :withlist
+      out = command(cmd, :name => list.name, :wlcmd => :subject_prefix)
+      parse_json_output(out)
+    end
+
+    def set_description(list, desc)
+      cmd = :withlist
+      out = command(cmd, :name => list.name, :wlcmd => :description, :arg => desc)
+      parse_json_output(out)
+    end
+
+    def set_subject_prefix(list, sp)
+      cmd = :withlist
+      out = command(cmd, :name => list.name, :wlcmd => :subject_prefix, :arg => sp)
+      parse_json_output(out)
+    end
+
     def command(cmd, opts = {})
       mailman_cmd = "#{mailmanager.root}/bin/#{cmd.to_s} "
       # delete opts as we handle them explicitly

data/lib/mailmanager/list.rb

@@ -118,16 +118,37 @@ EOF
       "#{root}listinfo/#{name}"
     end
 
+    # Returns the request email address for the list
     def request_email
       result = lib.request_email(self)
       result['return']
     end
 
+    # Returns the list description
     def description
       result = lib.description(self)
       result['return']
     end
 
+    # Sets the list description to a new value
+    def description=(desc)
+      result = lib.set_description(self, desc)
+      result['result'].to_sym
+    end
+
+    # Returns the list's subject prefix
+    def subject_prefix
+      result = lib.subject_prefix(self)
+      result['return']
+    end
+
+    # Sets the list's subject prefix to a new value. Remember to leave a space
+    # at the end (assuming you want one, and you probably do).
+    def subject_prefix=(sp)
+      result = lib.set_subject_prefix(self, sp)
+      result['result'].to_sym
+    end
+
     private
 
     def add_member_using(method, email, name)

data/lib/mailmanager/listproxy.py

@@ -1,16 +1,16 @@
 try:
-  import json
+    import json
 except ImportError:
-  import simplejson as json
+    import simplejson as json
 from email.Utils import parseaddr
 try:
-  from collections import Callable
+    from collections import Callable
 except ImportError:
-  def iscallable(attr):
-    return callable(attr)
+    def iscallable(attr):
+        return callable(attr)
 else:
-  def iscallable(attr):
-    return isinstance(attr, Callable)
+    def iscallable(attr):
+        return isinstance(attr, Callable)
 from Mailman import MailList
 from Mailman import Errors
 
@@ -29,34 +29,44 @@ def userdesc_for(member):
     userdesc.fullname, userdesc.address = parseaddr(member)
     return userdesc
 
-def unwindattrs(obj, attrs, *args):
-    if not attrs.count('.'):
-        attr = getattr(obj, attrs)
+def unwindattrs(obj, attrname, *args):
+    if not attrname.count('.'):
+        attr = getattr(obj, attrname)
         if iscallable(attr):
             return attr(*args)
         else:
-            return attr
+            if len(args) > 0:
+                # must be a setter
+                setattr(obj, attrname, args[0])
+            else:
+                # must be a getter
+                return attr
     else:
-        attr, nextattrs = attrs.split('.', 1)
+        attr, nextattrname = attrname.split('.', 1)
         nextobj = getattr(obj, attr)
-        return unwindattrs(nextobj, nextattrs, *args)
+        return unwindattrs(nextobj, nextattrname, *args)
 
 needs_userdesc = dict(AddMember=True, ApprovedAddMember=True)
 needs_save = dict(AddMember=True, ApprovedAddMember=True,
                   DeleteMember=True, ApprovedDeleteMember=True,
                   moderator_append=True, moderator_remove=True)
+needs_save_with_arg = dict(description=True, subject_prefix=True)
 
 def command(mlist, cmd, *args):
     result = {}
     try:
-        if needs_save.get(cmd.replace('.','_'), False):
-            mlist.Lock()
+        if (needs_save.get(cmd.replace('.','_'), False) or
+            (needs_save_with_arg.get(cmd.replace('.','_'), False) and
+            len(args) > 0)):
+                mlist.Lock()
         if needs_userdesc.get(cmd, False):
             result['return'] = unwindattrs(mlist, cmd, userdesc_for(args[0]))
         else:
             result['return'] = unwindattrs(mlist, cmd, *args)
-        if needs_save.get(cmd.replace('.','_'), False):
-            mlist.Save()
+        if (needs_save.get(cmd.replace('.','_'), False) or
+            (needs_save_with_arg.get(cmd.replace('.','_'), False) and
+            len(args) > 0)):
+                mlist.Save()
     except TypeError, err:
         error_msg = '%s' % err
         print json.dumps({'error': error_msg})

data/lib/mailmanager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
 end

data/mailmanager.gemspec

@@ -26,4 +26,5 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~>2.4.0')
   s.add_development_dependency('ZenTest', '~>4.4.2')
   s.add_development_dependency('ruby-debug19')
+  s.add_development_dependency('ci_reporter')
 end

data/spec/lib/mailmanager/lib_spec.rb

@@ -184,6 +184,12 @@ EOF
         test_lib_attr(:description, "this is a mailing list")
       end
     end
+
+    describe "#subject_prefix" do
+      it "should ask Mailman for the list's subject prefix" do
+        test_lib_attr(:subject_prefix, "[Foo] ")
+      end
+    end
   end
 
   def test_lib_getter(lib_method, return_value, *args)

data/tasks/hudson.rake

@@ -0,0 +1,15 @@
+if ENV['RUBY_ENV'] == 'test'
+
+  namespace :hudson do
+    task :spec => ["hudson:setup:rspec", 'rake:spec']
+
+    namespace :setup do
+      task :pre_ci do
+        ENV["CI_REPORTS"] = 'results/rspec/'
+        gem 'ci_reporter'
+        require 'ci/reporter/rake/rspec'
+      end
+      task :rspec => [:pre_ci, "ci:setup:rspec"]
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - Wes Morgan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-01-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ci_reporter
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Ruby wrapper library for GNU Mailman's admin functions
 email: MorganW@dnc.org
 executables: []
@@ -118,6 +131,7 @@ files:
 - spec/lib/mailmanager/list_spec.rb
 - spec/lib/mailmanager_spec.rb
 - spec/spec_helper.rb
+- tasks/hudson.rake
 has_rdoc: true
 homepage: http://github.com/dnclabs/mailmanager
 licenses: []