smailr 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c91fc6367c4e52731a3886cd5ceff54e5caeeea9440786cea0c2bcbfae0ee2
-  data.tar.gz: 1ba046fc982b493c56984ef00dd20f93f5408e953da0233f409b083b5d49fdac
+  metadata.gz: ec2eb186ac1f81e1be4bb80e199288cb2d63661bfbfa4a07190b4cefd59c5f44
+  data.tar.gz: 2740f99b5401c4163a09793ac62cfc5cff8e8aa7c0a3aaa2686c57d79fe58be3
 SHA512:
-  metadata.gz: a2a9a72c55cadb9698132895d064c6c4b5fd334601e06c91604dfc8727be4ef57d8ab9002f9ec67d870d99548f0619feed4903cdc18efed2a77a4623510218db
-  data.tar.gz: a4a11e80ebf8e318f8b836946c872e38416d204312965deb289c4d621bdc50aafffda8c4ddf3cf7e274115fbd139bd5242c3e86b09eda8107c659abb0099ffc2
+  metadata.gz: 6974dbf722f0f0c508c9b012a622b63a74b400c4bced9b778e40fae5805efa6b93b87b9230fb1057037f6b83b535f6047a80b99ddf47e1ce57624369335aa547
+  data.tar.gz: 052e8c354fdc58689d24430f69fa67b59c5e331f862e834b8e65a0ebc4c49cc7a684e5bfd258aa9be4e3a120c83c93ae9e964f0ca79993500928782bd4e50f95

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

@@ -107,7 +107,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 +124,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.4'
 end

metadata

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