smailr 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 711ed3fbc0dd02795b873d6b8c5dae375ee2db772765d607550040b1946357f2
-  data.tar.gz: bdd43490822316051212b776a8834eb6ae41348d3df98fbe887d152126ab9f3e
+  metadata.gz: ec2eb186ac1f81e1be4bb80e199288cb2d63661bfbfa4a07190b4cefd59c5f44
+  data.tar.gz: 2740f99b5401c4163a09793ac62cfc5cff8e8aa7c0a3aaa2686c57d79fe58be3
 SHA512:
-  metadata.gz: 79c3f97dea293a130fdfa8ba385c8609700b3d91b0d3268f9e7bca211bb207cf21f643d4df0b64ac93ebaa8f274e23de4156773d0a47e1ae4ed7748142d78791
-  data.tar.gz: dbbacb1c5f7940d1bed41b22ba809faa5628698924e77f68ee4336e8550010cab560f863c87b2ed6dda56195ad2a6f4391067003f98c788b3cb9b8e84c6a3e78
+  metadata.gz: 6974dbf722f0f0c508c9b012a622b63a74b400c4bced9b778e40fae5805efa6b93b87b9230fb1057037f6b83b535f6047a80b99ddf47e1ce57624369335aa547
+  data.tar.gz: 052e8c354fdc58689d24430f69fa67b59c5e331f862e834b8e65a0ebc4c49cc7a684e5bfd258aa9be4e3a120c83c93ae9e964f0ca79993500928782bd4e50f95

data/bin/smailr

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
-#$: << File.expand_path('../../lib', __FILE__)
-#
-#require 'pathname'
-#ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-#  Pathname.new(__FILE__).realpath)
-#
-#require 'rubygems'
-#require 'bundler/setup'
+
+require 'smailr/version'
+
+if ARGV == ['version'] || ARGV.include?('--version')
+  puts "smailr #{Smailr::VERSION}"
+  exit 0
+end
 
 require 'smailr'
 require 'smailr/cli'

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.2'
+  VERSION = '0.8.4'
 end

data/lib/smailr.rb

@@ -67,13 +67,16 @@ module Smailr
 
   def self.initialize!
     load_config
+    database = db_connect
+
+    Smailr.send(:remove_const, :DB) if Smailr.const_defined?(:DB, false)
+    Smailr.const_set(:DB, database)
+    Sequel::Model.db = database
 
     unless defined?(Smailr::Model)
       require 'smailr/model'
     end
 
-    Smailr.send(:remove_const, :DB) if Smailr.const_defined?(:DB, false)
-    Smailr.const_set(:DB, db_connect)
     Smailr::DB.sql_log_level = :debug
   end
 

metadata

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