smailr 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c91fc6367c4e52731a3886cd5ceff54e5caeeea9440786cea0c2bcbfae0ee2
-  data.tar.gz: 1ba046fc982b493c56984ef00dd20f93f5408e953da0233f409b083b5d49fdac
+  metadata.gz: 3da734e8d32a11dd96f3c2a3e820aa04cab4841e22bccab9488a4258f782f923
+  data.tar.gz: bbcc0c1719497142b3aea0a4ce3c70b257fb7c5787086b3458bb2088edb772af
 SHA512:
-  metadata.gz: a2a9a72c55cadb9698132895d064c6c4b5fd334601e06c91604dfc8727be4ef57d8ab9002f9ec67d870d99548f0619feed4903cdc18efed2a77a4623510218db
-  data.tar.gz: a4a11e80ebf8e318f8b836946c872e38416d204312965deb289c4d621bdc50aafffda8c4ddf3cf7e274115fbd139bd5242c3e86b09eda8107c659abb0099ffc2
+  metadata.gz: 072341ff8b4a7ca1691c61686e762d1c1b44e222d239b728fc3189dd5a5325a1714d923ef71e3ab46e08248b0b1b49e9f0615950708c66c8176f07e5e25b68ca
+  data.tar.gz: b56b46286fa30700bf5d4e434b7b3bfeca03330dfbef714c61e965a46df4d2d2ae7cec8779b06fd00aea10d592e370c27f43b47e4fe3253c2f07f00a286f600d

data/README.md

@@ -10,9 +10,10 @@ able to get everything up and running within a couple of minutes.
 
 Install Packages
 
-    # aptitude install exim4-daemon-heavy dovecot-imapd dovecot-pop3d
+    # apt install exim4-daemon-heavy dovecot-imapd dovecot-pop3d
 
-    # aptitude install rubygems libsqlite3-dev ruby-sqlite3
+    # apt install ruby-rubygems ruby-bcrypt ruby-sqlite3
+    # apt install ruby-rubygems ruby-bcrypt ruby-mysql2
 
 Install Smailr Gem package
 
@@ -54,7 +55,7 @@ But you can configure any other database as well. Eg. for MySQL use:
         database: smailr
         password: S3cr3t
 
-Just make sure the database driver is installed (for MySQL: aptitude install
+Just make sure the database driver is installed (for MySQL: apt install
 ruby-mysql2). Smailr uses the Sequel ORM, check out the following page for
 connection parameters: [sequel.jeremyevans.net/opening_databases_rdoc](http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html)
 
@@ -186,4 +187,3 @@ https://github.com/sts/smailr/issues
 ## WHO
 
 Stefan Schlesinger / sts@ono.at / @stsonoat / http://sts.ono.at
-

data/lib/smailr/alias.rb

@@ -2,10 +2,11 @@ module Smailr
   class Alias
     def self.add(source, destinations)
       srclocalpart, srcdomain = source.split('@')
+      domain = Model::Domain[:fqdn => srcdomain]
 
       # We don't want aliases for non-local domains, since the
       # exim router won't accept it.
-      if not Model::Domain[:fqdn => srcdomain].exists?
+      unless domain
         raise MissingDomain, "You are trying to add an alias for a non existing domain: #{source}"
       end
 
@@ -14,7 +15,7 @@ module Smailr
 
         Smailr::logger.warn("Adding alias: #{source} -> #{dst}")
 
-        Model::Alias.find_or_create(:domain       => Model::Domain[:fqdn => srcdomain],
+        Model::Alias.find_or_create(:domain       => domain,
                                     :localpart    => srclocalpart,
                                     :dstdomain    => dstdomain,
                                     :dstlocalpart => dstlocalpart)

data/lib/smailr/cli.rb

@@ -27,22 +27,24 @@ module Smailr
     # Returns a string containing the entered password if password and
     # confirmation match.
     def ask_password
-        min_password_length = Smailr.config["password_policy"]["length"]
+        min_password_length = Smailr.config["password_policy"]["length"].to_i
 
-        password = ask("Password: ") { |q| q.echo = "*" }
-        confirm  = ask("Confirm: ")  { |q| q.echo = "*" }
+        loop do
+          password = ask("Password: ") { |q| q.echo = "*" }
+          confirm  = ask("Confirm: ")  { |q| q.echo = "*" }
 
-        if password != confirm
+          if password != confirm
             say("Mismatch; try again.")
-            ask_password
-        end
+            next
+          end
 
-        if password.length < min_password_length.to_i
+          if password.length < min_password_length
             say("Too short; try again.")
-            ask_password
-        end
+            next
+          end
 
-        password
+          return password
+        end
     end
 
     # Initialize the Cli
@@ -107,7 +109,7 @@ module Smailr
           when /^[^@][A-Z0-9.-]+\.[A-Z]{2,6}$/i then
             domain = Smailr::Model::Domain[:fqdn => args[0]]
             unless domain
-              error "No such domain: #{args[0]}"
+              say_error "No such domain: #{args[0]}"
               exit 1
             end
 
@@ -124,7 +126,7 @@ module Smailr
               puts d[:fqdn]
             end
           else
-            error "You can either list a domains or a domains addresses."
+            say_error "You can either list a domains or a domains addresses."
             exit 1
           end
         end

data/lib/smailr/version.rb

@@ -1,3 +1,3 @@
 module Smailr
-  VERSION = '0.8.3'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smailr
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Stefan Schlesinger