post_office 0.3.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 001b4221494a9b862799ff8504e1afef46aa13a7
+  data.tar.gz: 1316fcae06e020835a7f80f27d3c5ecccdfcc09d
+SHA512:
+  metadata.gz: 46f635e7b67e0914b8123a93ecc45b982ab60bbd806794f87d736559638597f394b7febe9c999db0b5aec6b40c2bdfd621348f138e868206fe1946efe0b760f7
+  data.tar.gz: db714f92ba8a29083f349442824781ca75691441986dd280645dc10dc99ff1325bd64ab4f6a99660ef74a4e3240d9993ac07550d26927830821cfc1c86db8e66

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2011-2013 LICO Innovations
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,13 +1,6 @@
 PostOffice mock SMTP/POP3 server
 ================================
 
-https://github.com/bluerail/post_office
-
-By Rene van Lieshout <rene@bluerail.nl>
-
-Description
------------
-
 PostOffice is a mock SMTP/POP3 server to accept mails sent from your Rails application when it's running in development. The messages can be retrieved using a standard POP3 client, such as mail.app. Just connect to localhost with any username and password.
 
 Note: Received messages are **not** sent to their final recipient and will remain available until deleted or when the process is quit.
@@ -31,6 +24,13 @@ Usage
 
 This starts the service and listens on the specified ports (or 25 for SMTP and 110 for POP3 by default). Configure your POP3 client with any username and password.
 
+Config
+------
+
+Post Office will try to find a configuration file (post_office/config.json) in the user dir ($HOME), and then in /etc. It will load the first one it finds.
+
+The arguments passed on the command line will always override the ones specified in the config file. 
+
 Daemon
 ------
 
@@ -72,8 +72,26 @@ The Startup Item is stored in */Library/StartupItems/PostOffice*
 Planned features
 ----------------
 
-* Ability to use custom ports for SMTP and POP
-* Growl notifications
 * Store mail in tempfiles instead of in-memory array
 
 Contributions are welcome! Feel free to fork and send a pull request through Github.
+
+## Changelog
+
+### 1.0.0 (Aug 11, 2016)
+
+* [(tijn)](https://github.com/tijn) [load a config file and move default options (to become more DRY)](https://github.com/bluerail/post_office/pull/5)
+* [(gamecreature)](https://github.com/gamecreature) [NOOP smtp command support](https://github.com/bluerail/post_office/pull/4)
+* [(martijn)](https://github.com/martijn) Shorten timestamp in logs
+
+### 0.3.3 (Sep 13, 2011)
+
+* [(sgeorgi)](https://github.com/sgeorgi) [Specifying SMTP and POP3 ports on the command line](https://github.com/bluerail/post_office/pull/2)
+
+### 0.3.2 (Sep 13, 2011)
+
+Broken build
+
+### 0.3.1 (Aug 16, 2011)
+
+* First 'official' release

data/VERSION

@@ -1 +1 @@
-0.3.3
+1.0.0

data/bin/post_office

@@ -6,39 +6,41 @@ require 'logger'
 require 'thread'
 require 'smtp_server.rb'
 require 'pop_server.rb'
+require 'config_file.rb'
+
+options = ConfigFile.detect.read
 
 #
 # Parse command line arguments
 #
-options = {}
- 
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: #{__FILE__} [options]"
 
-  options[:verbose] = false
+  options[:verbose] ||= false
   opts.on( '-v', '--verbose', 'Output more information' ) do
     options[:verbose] = true
   end
 
-  options[:logfile] = nil
+  options[:logfile] ||= nil
   opts.on( '-l', '--logfile FILE', 'Write log to FILE. Outputs to STDOUT (or /var/log/post_office.log when daemonized) by default.' ) do |file|
     options[:logfile] = file
   end
 
-  options[:smtp_port] = nil
+  options[:smtp_port] ||= 25
   opts.on( '-s', '--smtp PORT', 'Specify SMTP port to use' ) do |port|
     options[:smtp_port] = port
   end
 
-  options[:pop3_port] = nil
+  options[:pop3_port] ||= 110
   opts.on( '-p', '--pop3 PORT', 'Specify POP3 port to use' ) do |port|
     options[:pop3_port] = port
   end
-  
+
   options[:startup_item] = nil
   opts.on('--install-osx-startup-item', 'Installs Post Office as OS X Startup Item') do
     options[:startup_item] = :install
   end
+
   opts.on('--remove-osx-startup-item', 'Removes Post Office as OS X Startup Item') do
     options[:startup_item] = :remove
   end
@@ -68,16 +70,17 @@ end
 #
 $log = Logger.new(options[:logfile] || STDOUT)
 $log.level = options[:verbose] ? Logger::DEBUG : Logger::INFO
+$log.datetime_format = "%H:%M:%S"
 
 begin
-  smtp_server = Thread.new{ SMTPServer.new(options[:smtp_port] || 25) }
-  pop_server  = Thread.new{ POPServer.new(options[:pop3_port] || 110) }
+  smtp_server = Thread.new{ SMTPServer.new(options[:smtp_port]) }
+  pop_server  = Thread.new{ POPServer.new(options[:pop3_port]) }
 
   smtp_server.join
   pop_server.join
 rescue Interrupt
   $log.info "Interrupt..."
 rescue Errno::EACCES
-  $log.error "I need root access to open ports #{options[:smtp_port] || 25} and / or #{options[:pop3_port] || 110}. Please sudo #{__FILE__}"
+  $log.error "I need root access to open ports #{options[:smtp_port]} and / or #{options[:pop3_port]}. Please sudo #{__FILE__}"
 end
 

data/lib/config_file.rb

@@ -0,0 +1,24 @@
+require 'json'
+
+class ConfigFile
+  USER_CONFIG_DIR = ENV.fetch('XDG_CONFIG_HOME', ENV['HOME'] + '/.config')
+  SYSTEM_CONFIG_DIR = '/etc'
+  CONFIG_DIRS = [USER_CONFIG_DIR, SYSTEM_CONFIG_DIR]
+  attr_reader :filename
+
+  def initialize(filename)
+    @filename = filename
+  end
+
+  def self.detect
+    filename =
+      CONFIG_DIRS.map { |dir| "#{dir}/post_office/config.json" }
+                 .detect { |file| File.exist? file }
+    new(filename)
+  end
+
+  def read
+    return {} if @filename.nil?
+    JSON.parse(File.read(@filename), symbolize_names: true)
+  end
+end

data/lib/smtp_server.rb

@@ -22,6 +22,7 @@ class SMTPServer < GenericServer
     case command
       when 'DATA' then data(client)
       when 'HELO', 'EHLO' then respond(client, 250)
+      when 'NOOP' then respond(client, 250)
       when 'MAIL' then mail_from(client, full_data)
       when 'QUIT' then quit(client)
       when 'RCPT' then rcpt_to(client, full_data)

data/post_office.gemspec

@@ -4,51 +4,39 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{post_office}
-  s.version = "0.3.3"
+  s.name = "post_office"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rene van Lieshout"]
-  s.date = %q{2011-09-13}
-  s.description = %q{A mock SMTP/POP3 server to aid in the development of applications with mail functionality.}
-  s.email = %q{rene@bluerail.nl}
+  s.date = "2016-08-11"
+  s.description = "A mock SMTP/POP3 server to aid in the development of applications with mail functionality."
+  s.email = "rene@bluerail.nl"
   s.executables = ["post_office", "post_officed"]
   s.extra_rdoc_files = [
+    "LICENSE",
     "README.md"
   ]
   s.files = [
+    "LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
     "bin/post_office",
     "bin/post_officed",
+    "lib/config_file.rb",
     "lib/generic_server.rb",
     "lib/pop_server.rb",
     "lib/smtp_server.rb",
     "lib/startup_item.rb",
     "lib/store.rb",
-    "pkg/post_office-0.1.0.gem",
-    "pkg/post_office-0.2.0.gem",
-    "pkg/post_office-0.2.1.gem",
-    "pkg/post_office-0.3.0.gem",
-    "pkg/post_office-0.3.1.gem",
-    "pkg/post_office-0.3.2.gem",
     "post_office.gemspec",
     "startup_item/PostOffice/PostOffice",
     "startup_item/PostOffice/StartupParameters.plist"
   ]
-  s.homepage = %q{http://github.com/bluerail/post_office}
+  s.homepage = "http://github.com/bluerail/post_office"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
-  s.summary = %q{PostOffice mock SMTP/POP3 server}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.rubygems_version = "2.0.14.1"
+  s.summary = "PostOffice mock SMTP/POP3 server"
 end
 

metadata

@@ -1,86 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: post_office
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Rene van Lieshout
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-13 00:00:00 +02:00
-default_executable: 
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies: []
-
-description: A mock SMTP/POP3 server to aid in the development of applications with mail functionality.
+description: A mock SMTP/POP3 server to aid in the development of applications with
+  mail functionality.
 email: rene@bluerail.nl
-executables: 
+executables:
 - post_office
 - post_officed
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- LICENSE
 - README.md
-files: 
+files:
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
 - bin/post_office
 - bin/post_officed
+- lib/config_file.rb
 - lib/generic_server.rb
 - lib/pop_server.rb
 - lib/smtp_server.rb
 - lib/startup_item.rb
 - lib/store.rb
-- pkg/post_office-0.1.0.gem
-- pkg/post_office-0.2.0.gem
-- pkg/post_office-0.2.1.gem
-- pkg/post_office-0.3.0.gem
-- pkg/post_office-0.3.1.gem
-- pkg/post_office-0.3.2.gem
 - post_office.gemspec
 - startup_item/PostOffice/PostOffice
 - startup_item/PostOffice/StartupParameters.plist
-has_rdoc: true
 homepage: http://github.com/bluerail/post_office
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 2.0.14.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PostOffice mock SMTP/POP3 server
 test_files: []
-