simple_mailing_list 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876826ef49ceb87b9cde436ec1e710e201235c6b
-  data.tar.gz: 11146f4b0668fd4a82d52ddcbddab47c44d319c0
+  metadata.gz: c653b1c46ea895b9c414448e4c4a576cd60af6e6
+  data.tar.gz: 1174fdaaa98a4bb1e57fe53d0a78ad1f001abe21
 SHA512:
-  metadata.gz: 681ba3200cde48683fe55e9f08cff82593cbe5bf0e065608e1c5e35e76322c7a3254960a978a94d2df4ba75211cfd17d213a2fdd5b028ef3a763f853d9822df6
-  data.tar.gz: f5ba4251379ffa68c4ce0c41db8a2e95649aba52e38d6cc2f3511bbd5b38ddce393811e730211c0fd3637ec284b06cdfed59b1f0aeb4354383e00f9914846563
+  metadata.gz: eac07c9e59617874a48243cb1532127f45eb3e90b6c19b0042847f2e99218ae68015a913300f5ecff2b96a1a4313b8e7fda2104d9bd491e1f9f9b3aa22f5dd83
+  data.tar.gz: 2475714bc2e295e96a44e2fa07173d466f0c62d14a5e083a6100ee0f94b365c4c5411c4fffa6219f208a8e9c08bfebda79f98d3bd694ec147b9628525e05d39e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_mailing_list (0.1.0)
+    simple_mailing_list (0.1.1)
       activerecord
       daemons
       liquid

data/lib/simple_mailing_list/configfile.rb

@@ -1,87 +1,87 @@
-module SimpleMailingList
-  module System
-    DEFAULT_CONFIGFILE = "config.yaml"
-
-    private
-
-    def load_configfile(configfile)
-      return if @path
-
-      # basic
-      config = YAML.load(File.read(configfile, encoding: "utf-8"))
-      @path = Dir.getwd
-
-      # log
-      config["log"] ||= {}
-      file = config["log"]["filename"] ?
-        File.expand_path(Time.now.strftime(config["log"]["filename"]), @path) : STDOUT
-      @log = (config["log"]["rotation"].is_a? Integer) ?
-        Logger.new(file, config["log"]["rotation"], config["log"]["shift_size"] || 1048576) :
-        Logger.new(file, config["log"]["rotation"] || 0)
-      if config["log"]["level"]
-        @log.level = config["log"]["level"].is_a?(String) ?
-          %w[debug info warn error fatal].index(config["log"]["level"].downcase) :
-          config["log"]["level"]
-      end
-
-      # others
-      @lockfile                 = config["lockfile"]
-      @maillogs_dir             = File.expand_path(config["maillogs_dir"] || "maillogs", @path)
-      @maillogs_period          = config["maillogs_period"] || -1
-
-      @validity_time            = config["validity_time"] || 86400
-      @max_check_times          = config["max_check_times"] || 5
-
-      @sleep_time1              = config["sleep_time1"] || 0.1
-      @sleep_time2              = config["sleep_time2"] || 1.5
-      @permitted_users          = config["permitted_users"]
-      @registered_user_only     = !!config["registered_user_only"]
-      @use_address_camouflage   = !!config["use_address_camouflage"]
-      @enable_html_mail         = !!config["enable_html_mail"]
-
-      @receive_servers          = config["receive_servers"] || []
-      @deliver_server           = config["deliver_server"] ||
-        { "protocol" => "sendmail", "charset" => "utf-8", "options" => {} }
-      
-      @register = config["register"] || []
-      @register_confirm_subject = config["register_confirm_subject"] || ""
-      @register_confirm_body    = config["register_confirm_body"] || ""
-      @register_success_subject = config["register_success_subject"] || ""
-      @register_success_body    = config["register_success_body"] || ""
-
-      @delete                   = config["delete"] || []
-      @delete_confirm_subject   = config["delete_confirm_subject"] || ""
-      @delete_confirm_body      = config["delete_confirm_body"] || ""
-      @delete_success_subject   = config["delete_success_subject"] || ""
-      @delete_success_body      = config["delete_success_body"] || ""
-
-      @forward                  = config["forward"] || []
-      @reply_to_address         = config["reply_to_address"]
-
-      # database
-      if config["database_require"]
-        require config["database_require"]
-      else
-        case config["database"]["adapter"]
-        when "mysql2"
-          require "mysql2"
-        when "postgresql"
-          require "pg"
-        when "sqlite3"
-          require "sqlite3"
-        else
-          require config["database"]["adapter"]
-        end
-      end
-      ActiveRecord::Base.establish_connection(config["database"])
-
-      # mail server
-      @receive_servers = Array(config["receive_server"]) if config["receive_server"]
-      deliver_server = @deliver_server
-      Mail.defaults do
-          delivery_method(deliver_server["protocol"].to_sym,
-                          deliver_server["options"].symbolize_keys)
-      end
-    end
-  end
-end
+module SimpleMailingList
+  module System
+    DEFAULT_CONFIGFILE = "config.yaml"
+
+    private
+
+    def load_configfile(configfile)
+      return if @path
+
+      # basic
+      config = YAML.load(File.read(configfile, encoding: "utf-8"))
+      @path = Dir.getwd
+
+      # log
+      config["log"] ||= {}
+      file = config["log"]["filename"] ?
+        File.expand_path(Time.now.strftime(config["log"]["filename"]), @path) : STDOUT
+      @log = (config["log"]["rotation"].is_a? Integer) ?
+        Logger.new(file, config["log"]["rotation"], config["log"]["shift_size"] || 1048576) :
+        Logger.new(file, config["log"]["rotation"] || 0)
+      if config["log"]["level"]
+        @log.level = config["log"]["level"].is_a?(String) ?
+          %w[debug info warn error fatal].index(config["log"]["level"].downcase) :
+          config["log"]["level"]
+      end
+
+      # others
+      @lockfile                 = config["lockfile"]
+      @maillogs_dir             = File.expand_path(config["maillogs_dir"] || "maillogs", @path)
+      @maillogs_period          = config["maillogs_period"] || -1
+
+      @validity_time            = config["validity_time"] || 86400
+      @max_check_times          = config["max_check_times"] || 5
+
+      @sleep_time1              = config["sleep_time1"] || 0.1
+      @sleep_time2              = config["sleep_time2"] || 1.5
+      @permitted_users          = config["permitted_users"]
+      @registered_user_only     = !!config["registered_user_only"]
+      @use_address_camouflage   = !!config["use_address_camouflage"]
+      @enable_html_mail         = !!config["enable_html_mail"]
+
+      @receive_servers          = config["receive_servers"] || []
+      @deliver_server           = config["deliver_server"] ||
+        { "protocol" => "sendmail", "charset" => "utf-8", "options" => {} }
+      
+      @register = config["register"] || []
+      @register_confirm_subject = config["register_confirm_subject"] || ""
+      @register_confirm_body    = config["register_confirm_body"] || ""
+      @register_success_subject = config["register_success_subject"] || ""
+      @register_success_body    = config["register_success_body"] || ""
+
+      @delete                   = config["delete"] || []
+      @delete_confirm_subject   = config["delete_confirm_subject"] || ""
+      @delete_confirm_body      = config["delete_confirm_body"] || ""
+      @delete_success_subject   = config["delete_success_subject"] || ""
+      @delete_success_body      = config["delete_success_body"] || ""
+
+      @forward                  = config["forward"] || []
+      @reply_to_address         = config["reply_to_address"]
+
+      # database
+      if config["database_require"]
+        require config["database_require"]
+      else
+        case config["database"]["adapter"]
+        when "mysql2"
+          require "mysql2"
+        when "postgresql"
+          require "pg"
+        when "sqlite3"
+          require "sqlite3"
+        else
+          require config["database"]["adapter"]
+        end
+      end
+      ActiveRecord::Base.establish_connection(config["database"])
+
+      # mail server
+      @receive_servers = Array(config["receive_server"]) if config["receive_server"]
+      deliver_server = @deliver_server
+      Mail.defaults do
+          delivery_method(deliver_server["protocol"].to_sym,
+                          deliver_server["options"].symbolize_keys)
+      end
+    end
+  end
+end

data/lib/simple_mailing_list/lock.rb

@@ -1,22 +1,22 @@
-module SimpleMailingList
-  module System
-    private
-
-    def lock()
-      if @lockfile
-        open(File.expand_path(@lockfile, @path), "w") do |lockfile|
-          if lockfile.flock(File::LOCK_EX | File::LOCK_NB)
-            @log.debug("Lock successed.")
-            yield
-            lockfile.flock(File::LOCK_UN)
-            @log.debug("Unlocked.")
-          else
-            @log.debug("Lock failed.")
-          end
-        end
-      else
-        yield
-      end
-    end
-  end
-end
+module SimpleMailingList
+  module System
+    private
+
+    def lock()
+      if @lockfile
+        open(File.expand_path(@lockfile, @path), "w") do |lockfile|
+          if lockfile.flock(File::LOCK_EX | File::LOCK_NB)
+            @log.debug("Lock successed.")
+            yield
+            lockfile.flock(File::LOCK_UN)
+            @log.debug("Unlocked.")
+          else
+            @log.debug("Lock failed.")
+          end
+        end
+      else
+        yield
+      end
+    end
+  end
+end

data/lib/simple_mailing_list/version.rb

@@ -1,3 +1,3 @@
 module SimpleMailingList
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/simple_mailing_list.rb

@@ -108,13 +108,13 @@ module SimpleMailingList
       _delete_old_maillogs()
     end
 
-    desc "loop", "loop main_jobs."
+    desc "loop_main_jobs", "loop main_jobs."
     option :sleep_time,
       aliases: "-s",
       default: 10,
       type: :numeric,
       desc: "wait time on a loop."
-    def loop()
+    def loop_main_jobs()
       require "simple_mailing_list/main"
       require "simple_mailing_list/delete_old"
       load_configfile(options[:configfile])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_mailing_list
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - nodai2hITC