smailr 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6effb269294c6ec1f81fc25e2e05ee1e3f4ae6d98eef3d44a0fa64e939d8a8bc
-  data.tar.gz: 8a2e12d33594449fdacf111a06a4813e65454b45141af4bd884de25edb5c3c06
+  metadata.gz: 711ed3fbc0dd02795b873d6b8c5dae375ee2db772765d607550040b1946357f2
+  data.tar.gz: bdd43490822316051212b776a8834eb6ae41348d3df98fbe887d152126ab9f3e
 SHA512:
-  metadata.gz: 13a0e5bb2fb7d5d3e0e92c87a774a44750015d6daf8feb579ed1391490893f866ce45ef38d692b8473fc41b024977b476c0fc02c84cf3183b23b33c6107341e8
-  data.tar.gz: 847ef00e13a7d0e5624ad2f5b3609fcdbb94a3170cda4245eb7c4cfc7e23d77460ff8d368f6b4372123af23309f0c867ad7e1ba960932b49b97461db8a78f54e
+  metadata.gz: 79c3f97dea293a130fdfa8ba385c8609700b3d91b0d3268f9e7bca211bb207cf21f643d4df0b64ac93ebaa8f274e23de4156773d0a47e1ae4ed7748142d78791
+  data.tar.gz: dbbacb1c5f7940d1bed41b22ba809faa5628698924e77f68ee4336e8550010cab560f863c87b2ed6dda56195ad2a6f4391067003f98c788b3cb9b8e84c6a3e78

data/bin/smailr

@@ -12,4 +12,11 @@ require 'smailr'
 require 'smailr/cli'
 require 'smailr/setup'
 
+begin
+  Smailr.initialize!
+rescue Smailr::ConfigurationError => e
+  warn "ERROR: #{e.message}"
+  exit 1
+end
+
 Smailr::Cli.new.run

data/lib/smailr/cli.rb

@@ -106,6 +106,11 @@ module Smailr
           case args[0]
           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]}"
+              exit 1
+            end
+
             domain.mailboxes.each do |mbox|
               puts "m: #{mbox.localpart}@#{args[0]}"
             end

data/lib/smailr/version.rb

@@ -1,3 +1,3 @@
 module Smailr
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/smailr.rb

@@ -20,27 +20,61 @@ module Smailr
 
   # Exception Classes
   class MissingDomain < StandardError ; end
+  class ConfigurationError < StandardError ; end
 
   class << self;
     attr_accessor :config
     attr_accessor :config_files
-    attr_accessor :load_config
     attr_accessor :contrib_directory
     attr_accessor :migrations_directory
+    attr_accessor :bundled_config_file
   end
 
   def self.load_config
     config = {}
-    config_files.each do |f|
-      if File.readable?(f)
-        config.merge!(YAML.load_file(f))
+    runtime_config_files = config_files.reject { |f| f == bundled_config_file }
+    readable_runtime_config_files = runtime_config_files.select { |f| File.file?(f) && File.readable?(f) }
+    unreadable_runtime_config_files = runtime_config_files.select { |f| File.exist?(f) && !File.readable?(f) }
+
+    if readable_runtime_config_files.empty?
+      if unreadable_runtime_config_files.any?
+        raise ConfigurationError, "Cannot read configuration file: #{unreadable_runtime_config_files.join(', ')}"
       end
+
+      raise ConfigurationError, "Cannot find configuration file. Checked: #{runtime_config_files.join(', ')}"
+    end
+
+    if bundled_config_file && File.readable?(bundled_config_file)
+      config.merge!(YAML.load_file(bundled_config_file) || {})
     end
+
+    readable_runtime_config_files.each do |f|
+      config.merge!(YAML.load_file(f) || {})
+    end
+
     self.config = config
   end
 
   def self.db_connect
+    unless self.config && self.config['database']
+      raise ConfigurationError, "Configuration file is missing database settings."
+    end
+
     Sequel.connect(self.config['database'])
+  rescue Sequel::DatabaseConnectionError => e
+    raise ConfigurationError, "Cannot open database connection: #{e.message}"
+  end
+
+  def self.initialize!
+    load_config
+
+    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
 
   def self.logger
@@ -65,8 +99,5 @@ end
 
 Smailr.contrib_directory    ||= File.expand_path('../../contrib', __FILE__)
 Smailr.migrations_directory ||= File.expand_path('../../migrations', __FILE__)
-Smailr.config_files         ||= [ File.expand_path('../../smailr.yml', __FILE__),  '/etc/smailr.yml']
-Smailr.load_config
-Smailr::DB = Smailr::db_connect
-require 'smailr/model'
-Smailr::DB.sql_log_level = :debug
+Smailr.bundled_config_file  ||= File.expand_path('../../smailr.yml', __FILE__)
+Smailr.config_files         ||= [ Smailr.bundled_config_file, '/etc/smailr.yml' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smailr
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Stefan Schlesinger
@@ -57,6 +57,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-smtp
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="