mailshears 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00eaa9dfa4eba0f52b9ab26ad79bbf4bd1730260d81278488dc7710834a0ec7
-  data.tar.gz: 1b823e702d0abf5fd5b6b73ecbc166f0ea5c5a75adaa0851133b7b0df80b62e2
+  metadata.gz: 94a42628c44b5e49c347bc2fd33d93f12c5bc54d91c7254438711cfaaffe8549
+  data.tar.gz: 964e3e04b2dc82f3f6e54e247a919da54a67a1516cf95b992106a6e782c548be
 SHA512:
-  metadata.gz: 9b8a0ed3e568320d72bc6990e23c8f02619e9a642d322cf8ac9329a2cad8359d3af4e1a0d132a9610622ea6c544c03d5df781c6f62dc2f8f6b24dbe55dbee8e1
-  data.tar.gz: 148d00fea24eff0a94da79869cd7e71ee1f1d27d49c1bfe433951b6c578ecf22c41e6e6eeaa7d8f90f45ac44d69e70f37f6f60283048066098266109594af7f2
+  metadata.gz: 330b88ad801a3541da15b2dc5a40c3cf9e6eb243280c221a0d8de849e6e32634f861bb9fd294e6a29572de170540f205b75558879ede1c06066559fe6c1eb72d
+  data.tar.gz: 0c0d9335003d9cabdd7a7d05ceea545a81de126cdf1e84b4f4e96b92744dea6c15b5fc0dfcad5df89ea293f72a570fd0cd72dfd4a07af9e04d5100cd32844480

data/doc/mailshears.example.conf.yml

@@ -4,7 +4,6 @@ plugins: [agendav, davical, dovecot, postfixadmin, roundcube]
 agendav_dbhost: localhost
 agendav_dbport: 5432
 agendav_dbopts:
-agendav_dbtty:
 agendav_dbuser: postgres
 agendav_dbpass:
 agendav_dbname: agendav
@@ -12,7 +11,6 @@ agendav_dbname: agendav
 davical_dbhost: localhost
 davical_dbport: 5432
 davical_dbopts:
-davical_dbtty:
 davical_dbuser: postgres
 davical_dbpass:
 davical_dbname: davical
@@ -22,7 +20,6 @@ dovecot_mail_root: /var/spool/mail/vhosts
 postfixadmin_dbhost: localhost
 postfixadmin_dbport: 5432
 postfixadmin_dbopts:
-postfixadmin_dbtty:
 postfixadmin_dbuser: postgres
 postfixadmin_dbpass:
 postfixadmin_dbname: postfixadmin
@@ -30,7 +27,6 @@ postfixadmin_dbname: postfixadmin
 roundcube_dbhost: localhost
 roundcube_dbport: 5432
 roundcube_dbopts:
-roundcube_dbtty:
 roundcube_dbuser: postgres
 roundcube_dbpass:
 roundcube_dbname: roundcube

data/doc/man1/mailshears.1

@@ -165,9 +165,6 @@ on. Their meanings should be self-explanatory.
 \fI<plugin>_dbopts\fR (default: empty)
 \#
 .IP \(bu
-\fI<plugin>_dbtty\fR (default: empty)
-\#
-.IP \(bu
 \fI<plugin>_dbuser\fR (default: 'postgres')
 \#
 .IP \(bu

data/lib/common/agendav_plugin.rb

@@ -18,7 +18,6 @@ module AgendavPlugin
       :host     => cfg.agendav_dbhost,
       :port     => cfg.agendav_dbport,
       :options  => cfg.agendav_dbopts,
-      :tty      => cfg.agendav_dbtty,
       :dbname   => cfg.agendav_dbname,
       :user     => cfg.agendav_dbuser,
       :password => cfg.agendav_dbpass }

data/lib/common/configuration.rb

@@ -79,7 +79,6 @@ class Configuration
     d['agendav_dbhost'] = 'localhost'
     d['agendav_dbport'] = 5432
     d['agendav_dbopts'] = ''
-    d['agendav_dbtty'] = ''
     d['agendav_dbuser'] = 'postgres'
     d['agendav_dbpass'] = ''
     d['agendav_dbname'] = 'agendav'
@@ -87,7 +86,6 @@ class Configuration
     d['davical_dbhost'] = 'localhost'
     d['davical_dbport'] = 5432
     d['davical_dbopts'] = ''
-    d['davical_dbtty'] = ''
     d['davical_dbuser'] = 'postgres'
     d['davical_dbpass'] = ''
     d['davical_dbname'] = 'davical'
@@ -97,7 +95,6 @@ class Configuration
     d['postfixadmin_dbhost'] = 'localhost'
     d['postfixadmin_dbport'] = 5432
     d['postfixadmin_dbopts'] = ''
-    d['postfixadmin_dbtty'] = ''
     d['postfixadmin_dbuser'] = 'postgres'
     d['postfixadmin_dbpass'] = ''
     d['postfixadmin_dbname'] = 'postfixadmin'
@@ -105,7 +102,6 @@ class Configuration
     d['roundcube_dbhost'] = 'localhost'
     d['roundcube_dbport'] = 5432
     d['roundcube_dbopts'] = ''
-    d['roundcube_dbtty'] = ''
     d['roundcube_dbuser'] = 'postgres'
     d['roundcube_dbpass'] = ''
     d['roundcube_dbname'] = 'roundcube'

data/lib/common/davical_plugin.rb

@@ -18,7 +18,6 @@ module DavicalPlugin
       :host     => cfg.davical_dbhost,
       :port     => cfg.davical_dbport,
       :options  => cfg.davical_dbopts,
-      :tty      => cfg.davical_dbtty,
       :dbname   => cfg.davical_dbname,
       :user     => cfg.davical_dbuser,
       :password => cfg.davical_dbpass }

data/lib/common/postfixadmin_plugin.rb

@@ -20,7 +20,6 @@ module PostfixadminPlugin
       :host     => cfg.postfixadmin_dbhost,
       :port     => cfg.postfixadmin_dbport,
       :options  => cfg.postfixadmin_dbopts,
-      :tty      => cfg.postfixadmin_dbtty,
       :dbname   => cfg.postfixadmin_dbname,
       :user     => cfg.postfixadmin_dbuser,
       :password => cfg.postfixadmin_dbpass }

data/lib/common/roundcube_plugin.rb

@@ -19,7 +19,6 @@ module RoundcubePlugin
       :host     => cfg.roundcube_dbhost,
       :port     => cfg.roundcube_dbport,
       :options  => cfg.roundcube_dbopts,
-      :tty      => cfg.roundcube_dbtty,
       :dbname   => cfg.roundcube_dbname,
       :user     => cfg.roundcube_dbuser,
       :password => cfg.roundcube_dbpass }

data/mailshears.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name              = 'mailshears'
-  s.version           = '0.0.4'
+  s.version           = '0.0.5'
   s.platform          = Gem::Platform::RUBY
   s.authors           = ['Michael Orlitzky']
   s.email             = ['michael@orlitzky.com']

data/test/mailshears.test.conf.yml

@@ -4,7 +4,6 @@ plugins: [agendav, davical, dovecot, postfixadmin, roundcube]
 agendav_dbhost: localhost
 agendav_dbport: 5432
 agendav_dbopts:
-agendav_dbtty:
 agendav_dbuser: postgres
 agendav_dbpass:
 agendav_dbname: agendav_test
@@ -12,7 +11,6 @@ agendav_dbname: agendav_test
 davical_dbhost: localhost
 davical_dbport: 5432
 davical_dbopts:
-davical_dbtty:
 davical_dbuser: postgres
 davical_dbpass:
 davical_dbname: davical_test
@@ -22,7 +20,6 @@ dovecot_mail_root: /tmp/mailshears-test
 postfixadmin_dbhost: localhost
 postfixadmin_dbport: 5432
 postfixadmin_dbopts:
-postfixadmin_dbtty:
 postfixadmin_dbuser: postgres
 postfixadmin_dbpass:
 postfixadmin_dbname: postfixadmin_test
@@ -30,7 +27,6 @@ postfixadmin_dbname: postfixadmin_test
 roundcube_dbhost: localhost
 roundcube_dbport: 5432
 roundcube_dbopts:
-roundcube_dbtty:
 roundcube_dbuser: postgres
 roundcube_dbpass:
 roundcube_dbname: roundcube_test

data/test/mailshears_test.rb

@@ -32,16 +32,15 @@ class MailshearsTest < MiniTest::Test
     # Connect to the database (specified in the test configuration) as
     # the superuser. Your local configuration is expected to be such
     # that this "just works."
-    db_host = 'localhost'
-    db_port = 5432
-    db_opts = nil
-    db_tty = nil
-    db_name = 'postgres'
-    db_user = 'postgres'
-    db_pass = nil
-
-    connection = PG::Connection.new(db_host, db_port, db_opts, db_tty,
-                                    db_name, db_user, db_pass)
+    db_hash = {
+      :host     => 'localhost',
+      :port     => 5432,
+      :options  => nil,
+      :dbname   => 'postgres',
+      :user     => 'postgres',
+      :password => nil
+    }
+    connection = PG::Connection.new(db_hash)
 
     return connection
   end
@@ -210,17 +209,16 @@ class MailshearsTest < MiniTest::Test
       query = "CREATE DATABASE #{plugin_dbname};"
       connection.sync_exec(query)
 
-      plugin_dbhost = cfg.send("#{plugin}_dbhost")
-      plugin_dbport = cfg.send("#{plugin}_dbport")
-      plugin_dbopts = cfg.send("#{plugin}_dbopts")
-      plugin_dbtty  = cfg.send("#{plugin}_dbtty")
-      plugin_dbuser = cfg.send("#{plugin}_dbuser")
-      plugin_dbpass = cfg.send("#{plugin}_dbpass")
+      plugin_dbhash = {
+        :host     => cfg.send("#{plugin}_dbhost"),
+        :port     => cfg.send("#{plugin}_dbport"),
+        :options  => cfg.send("#{plugin}_dbopts"),
+        :dbname   => plugin_dbname,
+        :user     => cfg.send("#{plugin}_dbuser"),
+        :password => cfg.send("#{plugin}_dbpass")
+      }
 
-      plugin_conn = PG::Connection.new(plugin_dbhost, plugin_dbport,
-                                       plugin_dbopts, plugin_dbtty,
-                                       plugin_dbname, plugin_dbuser,
-                                       plugin_dbpass)
+      plugin_conn = PG::Connection.new(plugin_dbhash)
 
       sql = File.open("test/sql/#{plugin}.sql").read()
       plugin_conn.sync_exec(sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailshears
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Michael Orlitzky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -110,7 +110,7 @@ homepage: http://michael.orlitzky.com/code/mailshears.xhtml
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Prune unused mail directories.
 test_files: []