postfix_admin 0.1.1 → 0.2.1

data/lib/postfix_admin/quota.rb

@@ -0,0 +1,6 @@
+module PostfixAdmin
+  class Quota < ApplicationRecord
+    self.table_name = :quota2
+    self.primary_key = :username
+  end
+end

data/lib/postfix_admin/runner.rb

@@ -1,54 +1,59 @@
 require 'thor'
 require 'postfix_admin'
 require 'postfix_admin/cli'
+require 'postfix_admin/doveadm'
 
 module PostfixAdmin
   class Runner < Thor
+    def self.exit_on_failure?
+      true
+    end
+
     def initialize(*args)
       super
       @cli = CLI.new
     end
 
     desc "summary [example.com]", "Summarize the usage of PostfixAdmin"
-    def summary(domain_name=nil)
-      runner{ @cli.show_summary(domain_name) }
+    def summary(domain_name = nil)
+      runner { @cli.show_summary(domain_name) }
     end
 
-    desc "show [example.com | user@example.com]", "Show domains or mailboxes"
-    def show(domain_name=nil)
-      runner{ @cli.show(domain_name) }
+    desc "schemes", "List all supported password schemes"
+    def schemes
+      runner { puts PostfixAdmin::Doveadm.schemes.join(' ') }
     end
 
-    desc "setup example.com password", "Setup a domain"
-    def setup(domain_name, password)
-      runner{ @cli.setup_domain(domain_name, password) }
+    desc "show [example.com | admin@example.com | user@example.com]", "Show domains or admins or mailboxes"
+    def show(name = nil)
+      runner { @cli.show(name) }
     end
 
-    desc "super_admin admin@example.com", "Enable super admin flag of an admin"
-    method_option :disable, :type => :boolean, :aliases => "-d", :desc => "Disable super admin flag"
-    def super_admin(user_name)
-      runner{ @cli.super_admin(user_name, options[:disable]) }
+    desc "setup example.com password", "Setup a domain"
+    def setup(domain_name, password)
+      runner { @cli.setup_domain(domain_name, password) }
     end
 
     desc "admin_passwd admin@example.com new_password", "Change password of admin"
     def admin_passwd(user_name, password)
-      runner{ @cli.change_admin_password(user_name, password) }
+      runner { @cli.change_admin_password(user_name, password) }
     end
 
     desc "account_passwd user@example.com new_password", "Change password of account"
     def account_passwd(user_name, password)
-      runner{ @cli.change_account_password(user_name, password) }
+      runner { @cli.change_account_password(user_name, password) }
     end
 
     desc "add_domain example.com", "Add a domain"
     def add_domain(domain_name)
-      runner{ @cli.add_domain(domain_name) }
+      runner { @cli.add_domain(domain_name) }
     end
 
     desc "edit_domain example.com", "Edit a domain limitation"
-    method_option :aliases,   :type => :numeric, :aliases => "-a", :desc => "Edit aliases limitation"
-    method_option :mailboxes, :type => :numeric, :aliases => "-m", :desc => "Edit mailboxes limitation"
-    method_option :maxquota,  :type => :numeric, :aliases => "-q", :desc => "Edit max quota limitation"
+    method_option :aliases,   type: :numeric, aliases: "-a", desc: "Edit aliases limitation"
+    method_option :mailboxes, type: :numeric, aliases: "-m", desc: "Edit mailboxes limitation"
+    method_option :maxquota,  type: :numeric, aliases: "-q", desc: "Edit max quota limitation"
+    method_option :active, type: :boolean, desc: "Update active status"
     def edit_domain(domain_name)
       runner do
         if options.size == 0
@@ -62,78 +67,145 @@ module PostfixAdmin
 
     desc "delete_domain example.com", "Delete a domain"
     def delete_domain(domain_name)
-      runner{ @cli.delete_domain(domain_name) }
+      runner { @cli.delete_domain(domain_name) }
     end
 
     desc "delete_admin admin@example.com", "Delete an admin"
     def delete_admin(user_name)
-      runner{ @cli.delete_admin(user_name) }
+      runner { @cli.delete_admin(user_name) }
     end
 
     desc "delete_account user@example.com", "Delete an account"
     def delete_account(address)
-      runner{ @cli.delete_account(address) }
+      runner { @cli.delete_account(address) }
     end
 
     desc "add_account user@example.com password", "Add an account"
+    method_option :scheme, type: :string, aliases: "-s", desc: "password scheme"
+    method_option :name,   type: :string, aliases: "-n", desc: "full name"
     def add_account(address, password)
-      runner{ @cli.add_account(address, password) }
+      runner do
+        if options[:scheme] == 'scheme'
+          warn "Specify password scheme"
+          help('add_account')
+        else
+          if options[:name] == 'name'
+            warn "Specify name"
+            help('add_account')
+          else
+            @cli.add_account(address, password, options[:scheme], options[:name])
+          end
+        end
+      end
     end
 
     desc "edit_account user@example.com", "Edit an account"
-    method_option :quota, :type => :numeric, :aliases => "-q", :desc => "Edit quota limitation"
+    method_option :goto,  type: :string,  aliases: "-g", desc: "mailboxes, addresses e-mails are delivered to"
+    method_option :quota, type: :numeric, aliases: "-q", desc: "quota limitation (MB)"
+    method_option :name,  type: :string,  aliases: "-n", desc: "full name"
+    method_option :active, type: :boolean, desc: "Update active status"
     def edit_account(address)
       runner do
         if options.size == 0
           warn "Use one or more options."
           help('edit_account')
         else
-          @cli.edit_account(address, options)
+          if options[:name] == 'name'
+            warn "Specify name"
+            help('edit_account')
+          else
+            @cli.edit_account(address, options)
+          end
+        end
+      end
+    end
+
+    desc "edit_admin admin@example.com", "Edit an admin user"
+    method_option :active, type: :boolean, desc: "Update active status"
+    method_option :super, type: :boolean, desc: "Update super admin status"
+    def edit_admin(user_name)
+      runner do
+        if options.size == 0
+          warn "Use one or more options."
+          help('edit_admin')
+        else
+          @cli.edit_admin(user_name, options)
         end
       end
     end
 
     desc "add_admin admin@example.com password", "Add an admin user"
-    method_option :super, :type => :boolean, :aliases => "-s", :desc => "register as a super admin"
+    method_option :super, type: :boolean, aliases: "-S", desc: "register as a super admin"
+    method_option :scheme, type: :string, aliases: "-s", desc: "password scheme"
     def add_admin(user_name, password)
-      runner{ @cli.add_admin(user_name, password, options[:super]) }
+      runner do
+        if options[:scheme] == 'scheme'
+          warn "Specify password scheme"
+          help('add_admin')
+        else
+          @cli.add_admin(user_name, password, options[:super], options[:scheme])
+        end
+      end
     end
 
     desc "add_admin_domain admin@example.com example.com", "Add admin_domain"
     def add_admin_domain(user_name, domain_name)
-      runner{ @cli.add_admin_domain(user_name, domain_name) }
+      runner { @cli.add_admin_domain(user_name, domain_name) }
     end
 
     desc "delete_admin_domain admin@example.com example.com", "Delete admin_domain"
     def delete_admin_domain(user_name, domain_name)
-      runner{ @cli.delete_admin_domain(user_name, domain_name) }
+      runner { @cli.delete_admin_domain(user_name, domain_name) }
     end
 
+    desc "edit_alias alias@example.com", "Edit an alias"
+    method_option :goto,  type: :string,  aliases: "-g",
+                  desc: "mailboxes, addresses e-mails are delivered to"
+    method_option :active, type: :boolean, desc: "Update active status"
+    def edit_alias(address)
+      runner do
+        if options.size == 0
+          warn "Use one or more options."
+          help('edit_alias')
+        else
+          @cli.edit_alias(address, options)
+        end
+      end
+    end
 
     desc "add_alias alias@example.com goto@example.net", "Add an alias"
     def add_alias(address, goto)
-      runner{ @cli.add_alias(address, goto) }
+      runner { @cli.add_alias(address, goto) }
     end
 
     desc "delete_alias alias@example.com", "Delete an alias"
     def delete_alias(address)
-      runner{ @cli.delete_alias(address) }
+      runner { @cli.delete_alias(address) }
+    end
+
+    desc "log", "Show action logs"
+    def log
+      runner { @cli.log }
+    end
+
+    desc "dump", "Dump all data"
+    def dump
+      runner { @cli.dump }
     end
 
     desc "version", "Show postfix_admin version"
     def version
       require 'postfix_admin/version'
-      runner{ say "postfix_admin #{VERSION}" }
+      runner { say "postfix_admin #{VERSION}" }
     end
 
     private
 
     def runner
-      begin
-        yield
-      rescue Error, ArgumentError => e
-        warn e.message
-      end
+      @cli.db_setup
+      yield
+    rescue StandardError => e
+      abort "Error: #{e.message}"
     end
   end
 end

data/lib/postfix_admin/version.rb

@@ -1,3 +1,3 @@
 module PostfixAdmin
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/postfix_admin.gemspec

@@ -1,23 +1,33 @@
 require File.expand_path('../lib/postfix_admin/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'thor'
-  gem.add_dependency 'data_mapper'
-  gem.add_dependency 'do_mysql', '>= 0.10.9'
-  gem.add_dependency 'dm-mysql-adapter'
-  gem.add_development_dependency 'rspec', '~> 2.11.0'
-  gem.add_development_dependency 'dm-sqlite-adapter'
-
+  gem.name          = "postfix_admin"
+  gem.version       = PostfixAdmin::VERSION
   gem.authors       = ["Hitoshi Kurokawa"]
   gem.email         = ["hitoshi@nextseed.jp"]
-  gem.description   = %q{Command Line Tools of PostfixAdmin}
+
   gem.summary       = gem.description
+  gem.description   = %q{Command Line Tools for Postfix Admin}
   gem.homepage      = "https://github.com/krhitoshi/postfix_admin"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.required_ruby_version = ">= 2.5.0"
+
+  gem.add_dependency 'thor', '~> 1.0.1'
+  gem.add_dependency 'activerecord', '~> 6.0.3'
+  gem.add_dependency 'mysql2', '>= 0.5.3'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rake', '~> 13.0.1'
+  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rspec', '~> 3.9.0'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  gem.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  gem.bindir        = "exe"
+  gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "postfix_admin"
+
   gem.require_paths = ["lib"]
-  gem.version       = PostfixAdmin::VERSION
 end

metadata

@@ -1,100 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: postfix_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Hitoshi Kurokawa
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: data_mapper
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
-  name: do_mysql
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: dm-mysql-adapter
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Command Line Tools of PostfixAdmin
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+description: Command Line Tools for Postfix Admin
 email:
 - hitoshi@nextseed.jp
 executables:
@@ -102,28 +116,48 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - Thorfile
-- bin/postfix_admin
+- bin/console
+- docker-admin/Dockerfile
+- docker-admin/config.local.php
+- docker-app-2.5/Dockerfile
+- docker-app/Dockerfile
+- docker-app/docker-entrypoint.sh
+- docker-app/my.cnf
+- docker-compose.yml
+- docker-db/postfix.v1841.sql
+- docker-db/postfix.v352.sql
+- docker-db/postfix.v740.sql
+- exe/postfix_admin
 - lib/postfix_admin.rb
+- lib/postfix_admin/admin.rb
+- lib/postfix_admin/alias.rb
+- lib/postfix_admin/application_record.rb
 - lib/postfix_admin/base.rb
 - lib/postfix_admin/cli.rb
+- lib/postfix_admin/concerns/.keep
+- lib/postfix_admin/concerns/dovecot_cram_md5_password.rb
+- lib/postfix_admin/concerns/existing_timestamp.rb
+- lib/postfix_admin/domain.rb
+- lib/postfix_admin/domain_admin.rb
+- lib/postfix_admin/doveadm.rb
 - lib/postfix_admin/error.rb
+- lib/postfix_admin/log.rb
+- lib/postfix_admin/mail_domain.rb
+- lib/postfix_admin/mailbox.rb
 - lib/postfix_admin/models.rb
+- lib/postfix_admin/quota.rb
 - lib/postfix_admin/runner.rb
 - lib/postfix_admin/version.rb
 - postfix_admin.gemspec
-- spec/base_spec.rb
-- spec/cli_spec.rb
-- spec/models_spec.rb
-- spec/postfix_admin.conf
-- spec/postfix_test.sql
-- spec/runner_spec.rb
-- spec/spec_helper.rb
-- spec/tmp/.gitkeep
 homepage: https://github.com/krhitoshi/postfix_admin
 licenses: []
 metadata: {}
@@ -133,26 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Command Line Tools of PostfixAdmin
-test_files:
-- spec/base_spec.rb
-- spec/cli_spec.rb
-- spec/models_spec.rb
-- spec/postfix_admin.conf
-- spec/postfix_test.sql
-- spec/runner_spec.rb
-- spec/spec_helper.rb
-- spec/tmp/.gitkeep
+summary: ''
+test_files: []