postfix_admin 0.1.4 → 0.2.0

data/lib/postfix_admin/version.rb

@@ -1,3 +1,3 @@
 module PostfixAdmin
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/postfix_admin.gemspec

@@ -1,24 +1,31 @@
 require File.expand_path('../lib/postfix_admin/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'thor', '~> 0.19.1'
-  gem.add_dependency 'data_mapper'
-  gem.add_dependency 'do_mysql', '>= 0.10.17'
-  gem.add_dependency 'dm-mysql-adapter'
-  gem.add_development_dependency 'rake', '~> 10.5.0'
-  gem.add_development_dependency 'rspec', '~> 3.4.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.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Hitoshi Kurokawa
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,50 +16,50 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        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.17
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.17
+        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:
@@ -72,43 +72,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Command Line Tools of PostfixAdmin
+        version: 3.9.0
+description: Command Line Tools for Postfix Admin
 email:
 - hitoshi@nextseed.jp
 executables:
@@ -117,31 +117,39 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - Thorfile
-- bin/postfix_admin
+- bin/console
+- docker-compose.yml
+- docker-entrypoint.sh
+- 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/doveadm_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: {}
@@ -160,17 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+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/doveadm_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: []

data/spec/base_spec.rb

@@ -1,253 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
-require 'postfix_admin/base'
-
-describe PostfixAdmin::Base do
-  before do
-    db_initialize
-    @base = PostfixAdmin::Base.new({'database' => 'sqlite::memory:'})
-  end
-
-  it "DEFAULT_CONFIG" do
-    PostfixAdmin::Base::DEFAULT_CONFIG.should == {
-        'database'  => 'mysql://postfix:password@localhost/postfix',
-        'aliases'   => 30,
-        'mailboxes' => 30,
-        'maxquota'  => 100,
-        'scheme'    => 'CRAM-MD5',
-    }
-  end
-
-  it "#address_split" do
-    @base.address_split('user@example.com').should == ['user', 'example.com']
-  end
-
-  it "#new without config" do
-    lambda { PostfixAdmin::Base.new }.should raise_error(ArgumentError)
-  end
-
-  it "#new without database config" do
-    lambda { PostfixAdmin::Base.new({}) }.should raise_error(ArgumentError)
-  end
-
-  it "Default configuration should be correct" do
-    @base.config[:aliases].should == 30
-    @base.config[:mailboxes].should == 30
-    @base.config[:maxquota].should == 100
-    @base.config[:mailbox_quota].should == 100 * KB_TO_MB
-    @base.config[:scheme].should == 'CRAM-MD5'
-  end
-
-  it "#domain_exist?" do
-    Domain.exist?('example.com').should be true
-  end
-
-  it "#alias_exist?" do
-    Alias.exist?('user@example.com').should be true
-    Alias.exist?('unknown@example.com').should be false
-  end
-
-  it "#mailbox_exist?" do
-    Mailbox.exist?('user@example.com').should be true
-    Mailbox.exist?('unknown@example.com').should be false
-  end
-
-  it "#admin_exist?" do
-    Admin.exist?('admin@example.com').should be true
-    Admin.exist?('unknown_admin@example.com').should be false
-  end
-
-  describe "#add_domain" do
-    it "can add a new domain" do
-      num_domains = Domain.count
-      @base.add_domain('example.net')
-      (Domain.count - num_domains).should be(1)
-    end
-
-    it "can not add exist domain" do
-      lambda{ @base.add_domain('example.com') }.should raise_error Error
-    end
-
-    it "can not add invalid domain" do
-      lambda{ @base.add_domain('localhost') }.should raise_error Error
-    end
-  end
-
-  describe "#add_account" do
-    it "can add a new account" do
-      num_mailboxes = Mailbox.count
-      num_aliases   = Alias.count
-      @base.add_account('new_user@example.com', 'password')
-      (Mailbox.count - num_mailboxes).should be(1)
-        (Alias.count - num_aliases).should be(1)
-    end
-
-    it "refuse empty password" do
-      lambda{ @base.add_account('new_user@example.com', '') }.should raise_error Error
-    end
-
-    it "refuse nil password" do
-      lambda{ @base.add_account('new_user@example.com', nil) }.should raise_error Error
-    end
-
-    it "can not add account which hsas invalid address" do
-      lambda{ @base.add_account('invalid.example.com', 'password') }.should raise_error Error
-    end
-
-    it "can not add account for unknown domain" do
-      lambda{ @base.add_account('user@unknown.example.com', 'password') }.should raise_error Error
-    end
-
-    it "can not add account which has same address as exist mailbox" do
-      lambda{ @base.add_account('user@example.com', 'password') }.should raise_error Error
-    end
-
-    it "can not add account which has same address as exist alias" do
-      lambda{ @base.add_account('alias@example.com', 'password') }.should raise_error Error
-    end
-  end
-
-  describe "#add_admin" do
-    it "can add an new admin" do
-      num_admins = Admin.count
-      @base.add_admin('admin@example.net', 'password')
-      Admin.exist?('admin@example.net').should be true
-      (Admin.count - num_admins).should be(1)
-    end
-
-    it "refuse empty password" do
-      lambda{ @base.add_admin('admin@example.net', '') }.should raise_error Error
-    end
-
-    it "refuse nil password" do
-      lambda{ @base.add_admin('admin@example.net', nil) }.should raise_error Error
-    end
-
-    it "can not add exist admin" do
-      lambda{ @base.add_admin('admin@example.com', 'password') }.should raise_error Error
-    end
-  end
-
-  describe "#add_admin_domain" do
-    it "#add_admin_domain" do
-      @base.add_admin_domain('admin@example.com', 'example.org')
-      Admin.find('admin@example.com').has_domain?('example.org').should be true
-    end
-
-    it "can not add unknown domain for an admin" do
-      lambda{ @base.add_admin_domain('admin@example.com', 'unknown.example.com') }.should raise_error Error
-    end
-
-    it "can not add domain for unknown admin" do
-      lambda{ @base.add_admin_domain('unknown_admin@example.com', 'example.net') }.should raise_error Error
-    end
-
-    it "can not add a domain which the admin has already privileges for" do
-      lambda{ @base.add_admin_domain('admin@example.com', 'example.com') }.should raise_error Error
-    end
-  end
-
-  describe "#delete_admin_domain" do
-    it "#delete_admin_domain" do
-      lambda{ @base.delete_admin_domain('admin@example.com', 'example.com') }.should_not raise_error
-      Admin.find('admin@example.com').has_domain?('example.com').should be false
-    end
-
-    it "can not delete not administrated domain" do
-      lambda{ @base.delete_admin_domain('admin@example.com', 'example.org') }.should raise_error Error
-    end
-
-    it "raise error when unknown admin" do
-      lambda{ @base.delete_admin_domain('unknown_admin@example.com', 'example.com') }.should raise_error Error
-    end
-
-    it "raise error when unknown domain" do
-      lambda{ @base.delete_admin_domain('admin@example.com', 'unknown.example.com') }.should raise_error Error
-    end
- end
-
-  describe "#add_alias" do
-    it "can add a new alias" do
-      num_aliases   = Alias.count
-      lambda { @base.add_alias('new_alias@example.com', 'goto@example.jp') }.should_not raise_error
-      (Alias.count - num_aliases).should be(1)
-      Alias.exist?('new_alias@example.com').should be true
-    end
-
-    it "can not add an alias which has a same name as a mailbox" do
-      lambda { @base.add_alias('user@example.com', 'goto@example.jp') }.should raise_error Error
-    end
-
-    it "can not add an alias which has a sama name as other alias" do
-      @base.add_alias('new_alias@example.com', 'goto@example.jp')
-      lambda { @base.add_alias('new_alias@example.com', 'goto@example.jp') }.should raise_error Error
-    end
-
-    it "can not add an alias of unknown domain" do
-      lambda { @base.add_alias('new_alias@unknown.example.com', 'goto@example.jp') }.should raise_error Error
-    end
-  end
-
-  describe "#delete_alias" do
-    it "can delete an alias" do
-      lambda{ @base.delete_alias('alias@example.com') }.should_not raise_error
-      Alias.exist?('alias@example.com').should be false
-    end
-
-    it "can not delete mailbox" do
-      lambda{ @base.delete_alias('user@example.com') }.should raise_error Error
-    end
-
-    it "can not delete unknown alias" do
-      lambda{ @base.delete_alias('unknown@example.com') }.should raise_error Error
-    end
-  end
-
-  describe "#delete_domain" do
-    before do
-      @base.add_account('user2@example.com', 'password')
-      @base.add_account('user3@example.com', 'password')
-
-      @base.add_alias('alias2@example.com', 'goto2@example.jp')
-      @base.add_alias('alias3@example.com', 'goto3@example.jp')
-    end
-
-    it "can delete a domain" do
-      lambda{ @base.delete_domain('example.com') }.should_not raise_error
-
-      Domain.exist?('example.com').should be false
-      Admin.exist?('admin@example.com').should be false
-
-      Alias.all(:domain_name => 'example.com').count.should be(0)
-      Mailbox.all(:domain_name => 'example.com').count.should be(0)
-
-      DomainAdmin.all(:username => 'admin@example.com', :domain_name => 'example.com').count.should be(0)
-    end
-
-    it "can not delete unknown domain" do
-      lambda{ @base.delete_domain('unknown.example.com') }.should raise_error Error
-    end
-  end
-
-  describe "#delete_admin" do
-    it "can delete an admin" do
-      lambda{ @base.delete_admin('admin@example.com') }.should_not raise_error
-      Admin.exist?('admin@example.com').should be false
-    end
-
-    it "can not delete unknown admin" do
-      lambda{ @base.delete_admin('unknown_admin@example.com') }.should raise_error Error
-    end
-  end
-
-  describe "#delete_account" do
-    it "can delete an account" do
-      lambda{ @base.delete_account('user@example.com') }.should_not raise_error
-      Mailbox.exist?('user@example.com').should be false
-      Alias.exist?('user@example.com').should be false
-    end
-
-    it "can not delete unknown account" do
-      lambda{ @base.delete_account('unknown@example.com') }.should raise_error Error
-    end
-  end
-end