ruby-managesieve 0.2.0 → 0.3.0

data/bin/sievectl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 #--
-# Copyright (c) 2004, 2005 Andre Nathan <andre@digirati.com.br>
+# Copyright (c) 2004-2006 Andre Nathan <andre@digirati.com.br>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -51,41 +51,51 @@
 #    capabilities, list, show, activate, deactivate, add, addactive, delete
 #  
 #  Short forms for some actions are also accepted:
-#    caps (capabilities), act (activate), deact (deactivate), addact (addactive),
-#    del (delete)
+#    caps (capabilities), act (activate), deact (deactivate),
+#    addact (addactive), del (delete)
 #  
 #    Examples:
 #      List server capabilities:
-#        sievectl caps
+#        sievectl myaccount caps
 #  
 #      List available scripts:
-#        sievectl list
+#        sievectl myaccount list
 #  
 #      Show contents of a script:
-#        sievectl show scriptname
+#        sievectl myaccount show scriptname
 #  
 #      Add a script:
-#        sievectl add scriptname script.txt
+#        sievectl myaccount add scriptname script.txt
 #        or
-#        sievectl add scriptname < script.txt
+#        sievectl myaccount add scriptname < script.txt
 #        or
-#        cat script.txt | sievectl add scriptname
+#        cat script.txt | sievectl myaccount add scriptname
 #  
 #      Delete a script:
-#        sievectl del scriptname
+#        sievectl myaccount del scriptname
 #
 #--
-# $Id: sievectl,v 1.15 2005/01/21 14:45:30 andre Exp $
+# $Id: sievectl,v 1.27 2006/08/30 18:06:21 andre Exp $
 #++
 #
 
 begin
   require 'rubygems'
 rescue LoadError
-  nil
 end
-
 require 'managesieve'
+
+$has_termios = true
+begin
+  require_gem 'termios'
+rescue LoadError
+  begin
+    require 'termios'
+  rescue LoadError
+    $has_termios = false
+  end
+end
+
 require 'yaml'
 
 class ManageSieve # :nodoc:
@@ -111,16 +121,20 @@ class ManageSieve # :nodoc:
   end
 end
 
-class TemplateError # :nodoc:
+class TemplateError < Exception # :nodoc:
 end
 
 class ConfigFile < File # :nodoc:
   def ConfigFile.open(name)
     begin
-      file = super(name)
-      conf = YAML::load(file)
-      file.close
-      return conf
+      conf = nil
+      super(name) do |file|
+        conf = YAML::load(file)
+      end
+      conf.each_key do |acct|
+        conf[acct].each_key { |k| conf[acct][k] = conf[acct][k].to_s }
+      end
+      conf
     rescue Errno::ENOENT
       ConfigFile::create_template(name)
       exit 0
@@ -136,7 +150,7 @@ class ConfigFile < File # :nodoc:
     __EOF__
 
     begin
-      file = File::open(name, 'w+')
+      file = File.new(name, 'w', 0600)
       file.puts <<-__EOF__
 accountname:
   host:     servername
@@ -197,8 +211,12 @@ class SieveCtl
   def add(script, file=nil, active=false)
     action = "add#{active ? 'active' : ''}"
     raise ArgumentError, "`#{action}' requires a script name" unless script
-    data = file ? File.open(file).readlines : STDIN.readlines
-    @manage_sieve.put_script(script, data.to_s)
+    data = file ? File.open(file).readlines.to_s : STDIN.readlines.to_s
+    unless @manage_sieve.have_space?(script, data.length)
+      raise SieveCommandError, "not enough space for script `#{script}' " +
+                               "(#{data.length} bytes)"
+    end
+    @manage_sieve.put_script(script, data)
     activate script if active
   end
 
@@ -209,9 +227,9 @@ class SieveCtl
   end
 end
 
-def usage(quit=true) # :nodoc: #
-  prog = File::basename $0
-  STDERR.puts <<-__EOF__
+def usage(quit=true, out=STDERR) # :nodoc: #
+  prog = File.basename $0
+  out.puts <<-__EOF__
 Usage: #{prog} <account> <action> [script name]
 Action is one of:
   capabilities, list, show, activate, deactivate, add, addactive, delete
@@ -223,7 +241,7 @@ end
 
 def help # :nodoc:
   prog = File::basename $0
-  usage(false)
+  usage(false, STDOUT)
   puts <<-__EOF__
 
 Short forms for some actions are also accepted:
@@ -232,23 +250,23 @@ Short forms for some actions are also accepted:
 
 Examples:
   List server capabilities:
-    #{prog} caps
+    #{prog} myaccount caps
 
   List available scripts:
-    #{prog} list
+    #{prog} myaccount list
 
   Show contents of a script:
-    #{prog} show scriptname
+    #{prog} myaccount show scriptname
 
   Add a script:
-    #{prog} add scriptname script.txt
+    #{prog} myaccount add scriptname script.txt
     or
-    #{prog} add scriptname < script.txt
+    #{prog} myaccount add scriptname < script.txt
     or
-    cat script.txt | #{prog} add scriptname
+    cat script.txt | #{prog} myaccount add scriptname
 
   Delete a script:
-    #{prog} del scriptname
+    #{prog} myaccount del scriptname
   __EOF__
   exit 0
 end
@@ -283,14 +301,36 @@ end
 
 info = conf[account]
 
-sievectl = SieveCtl.new(
-  :host     => info['host'],
-  :port     => info['port'],
-  :user     => info['user'],
-  :euser    => info['euser'],
-  :password => info['password'],
-  :auth     => info['auth']
-)
+if $has_termios and info['password'].nil?
+  oldt = Termios.tcgetattr(STDIN)
+  newt = oldt.dup
+  newt.lflag &= ~Termios::ECHO
+  Termios.tcsetattr(STDIN, Termios::TCSANOW, newt)
+  print 'Password: '
+  info['password'] = STDIN.gets
+  Termios.tcsetattr(STDIN, Termios::TCSANOW, oldt)
+end
+
+if info['password'].nil?
+  STDERR.puts "* Password not given."
+  exit 1
+end
+
+info['password'].chomp!
+
+begin
+  sievectl = SieveCtl.new(
+    :host     => info['host'],
+    :port     => info['port'] || 2000,
+    :user     => info['user'],
+    :euser    => info['euser'] || info['user'],
+    :password => info['password'],
+    :auth     => info['auth']
+  )
+rescue SieveNetworkError => e
+  STDERR.puts "* #{e}"
+  exit 1
+end
 
 begin
   case action
@@ -313,6 +353,6 @@ begin
   else
     usage
   end
-rescue SieveCommandError => e
-  STDERR.puts "* #{e}"
+rescue ArgumentError, SieveCommandError => e
+  STDERR.puts "* sievectl: #{e}"
 end

data/lib/managesieve.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 #--
-# Copyright (c) 2004, 2005 Andre Nathan <andre@digirati.com.br>
+# Copyright (c) 2004-2006 Andre Nathan <andre@digirati.com.br>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -25,7 +25,7 @@
 # See the ManageSieve class for documentation and examples.
 #
 #--
-# $Id: managesieve.rb,v 1.10 2005/01/17 11:25:56 andre Exp $
+# $Id: managesieve.rb,v 1.13 2006/08/30 14:23:58 andre Exp $
 #++
 #
 
@@ -45,6 +45,7 @@ end
 
 class SieveAuthError < Exception; end
 class SieveCommandError < Exception; end
+class SieveNetworkError < Exception; end
 class SieveResponseError < Exception; end
 
 #
@@ -249,7 +250,11 @@ class ManageSieve
 
   private
   def get_line # :nodoc:
-    return @socket.readline.chomp
+    begin
+      return @socket.readline.chomp
+    rescue EOFError => e
+      raise SieveNetworkError, "Network error: #{e}"
+    end
   end
 
   private
@@ -270,7 +275,7 @@ class ManageSieve
       data = get_line
 
       # server ok
-      m = /^OK$/.match(data)
+      m = /^OK(.*)?$/.match(data)
       yield :ok, m.captures.values_at(0, 3) and next if m
 
       # server error

metadata

@@ -1,39 +1,46 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-managesieve
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-01-21
+  version: 0.3.0
+date: 2006-08-30 00:00:00 -03:00
 summary: A Ruby library for the MANAGESIEVE protocol
 require_paths: 
-  - lib
-author: Andre Nathan
+- lib
 email: andre@digirati.com.br
 homepage: http://managesieve.rubyforge.org
 rubyforge_project: ruby-managesieve
-description: "ruby-managesieve is a pure-ruby implementation of the MANAGESIEVE protocol,
-  allowing remote management of Sieve scripts from ruby."
+description: ruby-managesieve is a pure-ruby implementation of the MANAGESIEVE protocol, allowing remote management of Sieve scripts from ruby.
 autorequire: managesieve
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
+- Andre Nathan
 files: 
-  - lib/managesieve.rb
+- lib/managesieve.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: 
-  - sievectl
+- sievectl
 extensions: []
+
 requirements: 
-  - A network connection and a MANAGESIEVE server.
-dependencies: []
+- A network connection and a MANAGESIEVE server.
+dependencies: []
+