postfix_admin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa77157060260499b49c44b35270deaf01ffde5
-  data.tar.gz: 00bc7f9dfb7e8b6b628b9dbe0b3660b6f6d52828
+  metadata.gz: 59fef8b37f476a21d64574f49a2175c75ea36e36
+  data.tar.gz: 402c21e2842ad6eab990ecfed2bd6ea98c3b4c4a
 SHA512:
-  metadata.gz: 3a82010397e072cfd3ab056a908b943ebc5f0aff711977944768e32fdf60ae7dd81651416a08e97fcd27114ed230ffacb9ebb3e1c4790719c1a3ecf801ef8bf2
-  data.tar.gz: 89bea8924bb55e225d4b286c28f10c97e5a8218481896fab6c6c8e2359171dc5391d334ad44bec814bc9214d76f1a50c7b459e2589194aaa0322a9a3f947b964
+  metadata.gz: 3e2312e795f876059fe65f7907bc19a2d45c9619e713756a19a3a363cd827bc26c4d31f9207b0c66d8965e70686d718d34ae4a75f4f9bac2297c4ef0aeaa00f8
+  data.tar.gz: eee17cbc79654a56a6fefd9eea01daf7340a62108c60c2b11000527ed6b704608f5546e3bc1ecd53527e3823f095b13fa9b20e182253ae703b65ef83030ff4d1

data/lib/postfix_admin/cli.rb

@@ -63,6 +63,7 @@ module PostfixAdmin
           puts "Mailboxes : %4d / %4s"    % [domain.mailboxes.count, max_str(domain.maxmailboxes)]
           puts "Aliases   : %4d / %4s"    % [domain.num_total_aliases, max_str(domain.maxaliases)]
           puts "Max Quota : %4d MB" % domain.maxquota
+          puts "Active    :  %3s" % domain.active_str
         else
           puts "Domains   : %4d" % Domain.all_without_special_domain.count
           puts "Admins    : %4d" % Admin.count
@@ -101,6 +102,8 @@ module PostfixAdmin
       report("Admin") do
         puts "Name     : %s" % admin.username
         puts "Password : %s" % admin.password
+        puts "Domains  : %s" % (admin.super_admin? ? "ALL" : admin.domains.count)
+        puts "Role     : %s" % (admin.super_admin? ? "Super admin" : "Admin")
         puts "Active   : %s" % admin.active_str
       end
     end
@@ -137,18 +140,6 @@ module PostfixAdmin
       puts_registered(domain_name, "a domain")
     end
 
-    def super_admin(user_name, disable)
-      admin_check(user_name)
-
-      if disable
-        Admin.find(user_name).super_admin = false
-        puts "Successfully disabled super admin flag of #{user_name}"
-      else
-        Admin.find(user_name).super_admin = true
-        puts "Successfully enabled super admin flag of #{user_name}"
-      end
-    end
-
     def change_admin_password(user_name, password)
       change_password(Admin, user_name, password)
     end
@@ -157,12 +148,24 @@ module PostfixAdmin
       change_password(Mailbox, user_name, password)
     end
 
+    def edit_admin(admin_name, options)
+      admin_check(admin_name)
+      admin = Admin.find(admin_name)
+      admin.super_admin = options[:super] unless options[:super].nil?
+      admin.active = options[:active] unless options[:active].nil?
+      admin.save or raise "Could not save Admin"
+
+      puts "Successfully updated #{admin_name}"
+      show_admin_details(admin_name)
+    end
+
     def edit_domain(domain_name, options)
       domain_check(domain_name)
       domain = Domain.find(domain_name)
       domain.maxaliases   = options[:aliases]   if options[:aliases]
       domain.maxmailboxes = options[:mailboxes] if options[:mailboxes]
       domain.maxquota     = options[:maxquota]  if options[:maxquota]
+      domain.active       = options[:active] unless options[:active].nil?
       domain.save or raise "Could not save Domain"
 
       puts "Successfully updated #{domain_name}"
@@ -277,6 +280,7 @@ module PostfixAdmin
       mailbox = Mailbox.find(address)
       mailbox.name = options[:name] if options[:name]
       mailbox.quota = options[:quota] * KB_TO_MB if options[:quota]
+      mailbox.active = options[:active] unless options[:active].nil?
       mailbox.save or raise "Could not save Mailbox"
 
       puts "Successfully updated #{address}"

data/lib/postfix_admin/runner.rb

@@ -30,12 +30,6 @@ module PostfixAdmin
       runner{ @cli.setup_domain(domain_name, password) }
     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]) }
-    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) }
@@ -55,6 +49,7 @@ module PostfixAdmin
     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
@@ -103,6 +98,7 @@ module PostfixAdmin
     desc "edit_account user@example.com", "Edit an account"
     method_option :quota, :type => :numeric, :aliases => "-q", :desc => "quota limitation"
     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
@@ -119,6 +115,20 @@ module PostfixAdmin
       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 :scheme, :type => :string, :aliases => "-s", :desc => "password scheme"

data/lib/postfix_admin/version.rb

@@ -1,3 +1,3 @@
 module PostfixAdmin
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/postfix_admin.gemspec

@@ -1,7 +1,7 @@
 require File.expand_path('../lib/postfix_admin/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'thor'
+  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'

data/spec/cli_spec.rb

@@ -103,22 +103,6 @@ describe PostfixAdmin::CLI do
     lambda { @cli.show_alias('unknown.example.com') }.should raise_error Error
   end
 
-  describe "#super_admin" do
-    it "enables super admin flag of an admin" do
-      lambda{ @cli.super_admin('admin@example.com', false) }.should_not raise_error
-      Admin.find('admin@example.com').super_admin?.should be true
-    end
-
-    it "disable super admin flag of an admin" do
-      lambda{ @cli.super_admin('all@example.com', true) }.should_not raise_error
-      Admin.find('all@example.com').super_admin?.should be false
-    end
-
-    it "can not user for unknown admin" do
-      lambda{ @cli.super_admin('unknown_admin@example.com', false) }.should raise_error Error
-    end
-  end
-
   it "#change_admin_password" do
     lambda { @cli.change_admin_password('admin@example.com', 'new_password') }.should_not raise_error
     Admin.find('admin@example.com').password.should == CRAM_MD5_NEW_PASS
@@ -229,18 +213,21 @@ describe PostfixAdmin::CLI do
 
   describe "#edit_domain" do
     it "can update domain limitations" do
-      lambda{ @cli.edit_domain('example.com', {:aliases => 40, :mailboxes => 40, :maxquota => 400}) }.should_not raise_error
+      lambda{ @cli.edit_domain('example.com', {aliases: 40, mailboxes: 40, maxquota: 400, active: false}) }.should_not raise_error
       domain = Domain.find('example.com')
       domain.maxaliases.should == 40
       domain.maxmailboxes.should == 40
       domain.maxquota.should == 400
+      expect(domain.active).to be false
     end
   end
 
   describe "#edit_account" do
     it "can update account" do
-      lambda { @cli.edit_account('user@example.com', {:quota => 50}) }.should_not raise_error
-      Mailbox.find('user@example.com').quota.should == 50 * KB_TO_MB
+      lambda { @cli.edit_account('user@example.com', {quota: 50, active: false}) }.should_not raise_error
+      mailbox = Mailbox.find('user@example.com')
+      mailbox.quota.should == 50 * KB_TO_MB
+      expect(mailbox.active).to be false
     end
 
     it "raise error when unknown account" do
@@ -248,6 +235,15 @@ describe PostfixAdmin::CLI do
     end
   end
 
+  describe "#edit_admin" do
+    it "can update admin" do
+      expect { @cli.edit_admin('admin@example.com', {super: true, active: false}) }.not_to raise_error
+      admin = Admin.find('admin@example.com')
+      expect(admin.super_admin?).to be true
+      expect(admin.active).to be false
+    end
+  end
+
   describe "#delete_domain" do
     it "can delete exist domain" do
       lambda { @cli.delete_domain('example.com') }.should_not raise_error

data/spec/runner_spec.rb

@@ -66,31 +66,17 @@ describe PostfixAdmin::Runner do
     capture(:stdout){ Runner.start(['delete_domain', 'example.net']) }.should =~ EX_DELETED
   end
 
-  describe "super_admin" do
-    it "can enable super admin flag of an admin" do
-      capture(:stdout){ Runner.start(['super', 'admin@example.com']) }.should =~ /Successfully enabled/
-    end
-
-    it "can disable super admin flag of an admin (--disable)" do
-      capture(:stdout){ Runner.start(['super', 'admin@example.com', '--disable']) }.should =~ /Successfully disabled/
-    end
-
-    it "can use -d option as --disable" do
-      capture(:stdout){ Runner.start(['super', 'admin@example.com', '-d']) }.should =~ /Successfully disabled/
-    end
-  end
-
   describe "admin_passwd" do
     it "can change password of an admin" do
       capture(:stdout){ Runner.start(['admin_passwd', 'admin@example.com', 'new_password']) }.should =~ /successfully changed/
     end
 
     it "can not use too short password (< 5)" do
-      capture(:stderr){ Runner.start(['admin_passwd', 'admin@example.com', '124']) }.should =~ /too short/
+      exit_capture{ Runner.start(['admin_passwd', 'admin@example.com', '124']) }.should =~ /too short/
     end
 
     it "can not use for unknown admin" do
-      capture(:stderr){ Runner.start(['admin_passwd', 'unknown@example.com', 'new_password']) }.should =~ /Could not find/
+      exit_capture{ Runner.start(['admin_passwd', 'unknown@example.com', 'new_password']) }.should =~ /Could not find/
     end
   end
 
@@ -101,11 +87,11 @@ describe PostfixAdmin::Runner do
     end
 
     it "can not use too short password (< 5)" do
-      capture(:stderr){ Runner.start(['account_passwd', 'user@example.com', '1234']) }.should =~ /too short/
+      exit_capture{ Runner.start(['account_passwd', 'user@example.com', '1234']) }.should =~ /too short/
     end
 
     it "can not use for unknown account" do
-      capture(:stderr){ Runner.start(['account_passwd', 'unknown@example.com', 'new_password']) }.should =~ /Could not find/
+      exit_capture{ Runner.start(['account_passwd', 'unknown@example.com', 'new_password']) }.should =~ /Could not find/
     end
   end
 
@@ -116,11 +102,11 @@ describe PostfixAdmin::Runner do
     end
 
     it "can not delete mailbox alias." do
-      capture(:stderr){ Runner.start(['delete_alias', 'user@example.com']) }.should =~ /Can not delete mailbox/
+      exit_capture{ Runner.start(['delete_alias', 'user@example.com']) }.should =~ /Can not delete mailbox/
     end
 
     it "can not add an alias for existed mailbox" do
-      capture(:stderr){ Runner.start(['add_alias', 'user@example.com', 'goto@example.jp']) }.should =~ /mailbox user@example.com is already registered!/
+      exit_capture{ Runner.start(['add_alias', 'user@example.com', 'goto@example.jp']) }.should =~ /mailbox user@example.com is already registered!/
     end
   end
 
@@ -135,7 +121,7 @@ describe PostfixAdmin::Runner do
 
     describe "scheme option" do
       it "--scheme does not show error" do
-        capture(:stderr){ Runner.start(@args + ['--scheme', 'CRAM-MD5']) }.should == ""
+        exit_capture{ Runner.start(@args + ['--scheme', 'CRAM-MD5']) }.should == ""
         Admin.find('admin@example.jp').password.should == CRAM_MD5_PASS
       end
 
@@ -144,7 +130,7 @@ describe PostfixAdmin::Runner do
       end
 
       it "-s does not show error" do
-        capture(:stderr){ Runner.start(@args + ['-s', 'CRAM-MD5']) }.should == ""
+        exit_capture{ Runner.start(@args + ['-s', 'CRAM-MD5']) }.should == ""
       end
 
       it "-s can resister admin" do
@@ -152,7 +138,7 @@ describe PostfixAdmin::Runner do
       end
 
       it "-s require argument" do
-        capture(:stderr){ Runner.start(@args + ['-s']) }.should =~ /Specify password scheme/
+        exit_capture{ Runner.start(@args + ['-s']) }.should =~ /Specify password scheme/
       end
     end
 
@@ -169,13 +155,36 @@ describe PostfixAdmin::Runner do
     end
   end
 
+  describe "edit_admin" do
+    it "when no options, shows usage" do
+      expect(capture(:stderr){ Runner.start(['edit_admin', 'admin@example.com']) }).to match /Use one or more options/
+    end
+
+    it "can update active status" do
+      output = capture(:stdout){ Runner.start(['edit_admin', 'admin@example.com', '--no-active']) }
+      expect(output).to match EX_UPDATED
+      expect(output).to match /Active.+NO/
+      expect(output).to match /Role.+Admin/
+    end
+
+    it "can update super admin status" do
+      output = capture(:stdout){ Runner.start(['edit_admin', 'admin@example.com', '--super']) }
+      expect(output).to match EX_UPDATED
+      expect(output).to match /Domains.+ALL/
+      expect(output).to match /Active.+YES/
+      expect(output).to match /Role.+Super admin/
+    end
+  end
+
   describe "edit_domain" do
     it "when no options, shows usage" do
-      capture(:stderr){ Runner.start(['edit_domain', 'example.com']) }.should =~ /Use one or more options/
+      exit_capture{ Runner.start(['edit_domain', 'example.com']) }.should =~ /Use one or more options/
     end
 
     it "can edit limitations of domain" do
-      capture(:stdout){ Runner.start(['edit_domain', 'example.com', '--aliases', '40', '--mailboxes', '40', '--maxquota', '400']) }.should =~ EX_UPDATED
+      output = capture(:stdout){ Runner.start(['edit_domain', 'example.com', '--aliases', '40', '--mailboxes', '40', '--maxquota', '400', '--no-active']) }
+      expect(output).to match EX_UPDATED
+      expect(output).to match /Active.+NO/
     end
 
     it "aliases options -a, -m, -q" do
@@ -183,7 +192,7 @@ describe PostfixAdmin::Runner do
     end
 
     it "can not use unknown domain" do
-      capture(:stderr){ Runner.start(['edit_domain', 'unknown.example.com', '--aliases', '40', '--mailboxes', '40', '--maxquota', '400'])}.should =~ /Could not find/
+      exit_capture{ Runner.start(['edit_domain', 'unknown.example.com', '--aliases', '40', '--mailboxes', '40', '--maxquota', '400'])}.should =~ /Could not find/
     end
   end
 
@@ -193,13 +202,14 @@ describe PostfixAdmin::Runner do
     end
 
     it "when no options, shows usage" do
-      capture(:stderr){ Runner.start(@args) }.should =~ /Use one or more options/
+      exit_capture{ Runner.start(@args) }.should =~ /Use one or more options/
     end
 
     it "can edit quota limitation" do
-      output = capture(:stdout){ Runner.start(@args + ['--quota', '50'])}
-      output.should =~ EX_UPDATED
-      output.should =~ /Quota/
+      output = capture(:stdout){ Runner.start(@args + ['--quota', '50', '--no-active'])}
+      expect(output).to match EX_UPDATED
+      expect(output).to match /Quota/
+      expect(output).to match /Active.+NO/
     end
 
     it "can use alias -q option" do
@@ -207,7 +217,7 @@ describe PostfixAdmin::Runner do
     end
 
     it "-q option require an argment" do
-      capture(:stderr){ Runner.start(@args + ['-q'])}.should_not == ""
+      exit_capture{ Runner.start(@args + ['-q'])}.should_not == ""
     end
 
     it "can update name using --name option" do
@@ -226,7 +236,7 @@ describe PostfixAdmin::Runner do
     end
 
     it "-n option require an argument" do
-      capture(:stderr){ Runner.start(@args + ['-n'])}.should_not == ""
+      exit_capture{ Runner.start(@args + ['-n'])}.should_not == ""
     end
   end
 
@@ -265,15 +275,15 @@ describe PostfixAdmin::Runner do
 
     describe "name option" do
       it "--name options does not raise error" do
-        capture(:stderr){ Runner.start(@args + ['--name', @name]) }.should == ""
+        exit_capture{ Runner.start(@args + ['--name', @name]) }.should == ""
       end
 
       it "-n options does not raise error" do
-        capture(:stderr){ Runner.start(@args + ['-n', @name]) }.should == ""
+        exit_capture{ Runner.start(@args + ['-n', @name]) }.should == ""
       end
 
       it "require an argument" do
-        capture(:stderr){ Runner.start(@args + ['-n']) }.should_not == ""
+        exit_capture{ Runner.start(@args + ['-n']) }.should_not == ""
       end
 
       it "can change full name" do
@@ -282,14 +292,14 @@ describe PostfixAdmin::Runner do
       end
 
       it "can use Japanese" do
-        capture(:stderr){ Runner.start(@args + ['-n', '黒川　仁']) }.should == ""
+        exit_capture{ Runner.start(@args + ['-n', '黒川　仁']) }.should == ""
         Mailbox.find(@user).name.should == '黒川　仁'
       end
     end
 
     describe "scheme" do
       it "--scheme require argument" do
-        capture(:stderr){ Runner.start(@args + ['--scheme']) }.should =~ /Specify password scheme/
+        exit_capture{ Runner.start(@args + ['--scheme']) }.should =~ /Specify password scheme/
     end
 
       it "can use CRAM-MD5 using --scheme" do
@@ -323,7 +333,7 @@ describe PostfixAdmin::Runner do
 
   describe "dump" do
     it "does not raise error" do
-      capture(:stderr){ Runner.start(['dump']) }.should == ""
+      exit_capture{ Runner.start(['dump']) }.should == ""
     end
 
     it "all data" do

data/spec/spec_helper.rb

@@ -164,8 +164,13 @@ RSpec.configure do |config|
     begin
       stream = stream.to_s
       eval "$#{stream} = StringIO.new"
+      $stderr = StringIO.new if stream != "stderr"
       yield
       result = eval("$#{stream}").string
+    rescue SystemExit => e
+      message = $stderr.string
+      message += e.message
+      raise message
     ensure
       eval("$#{stream} = #{stream.upcase}")
     end
@@ -173,6 +178,17 @@ RSpec.configure do |config|
     result
   end
 
+  def exit_capture
+    begin
+      $stderr = StringIO.new
+      yield
+    rescue SystemExit => e
+    ensure
+      result = $stderr.string
+    end
+    result
+  end
+
   def source_root
     File.join(File.dirname(__FILE__), 'fixtures')
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: postfix_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Hitoshi Kurokawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-27 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: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: data_mapper
   requirement: !ruby/object:Gem::Requirement
@@ -174,3 +174,4 @@ test_files:
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/tmp/.gitkeep
+has_rdoc: