mail-relayer 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d61c76888e98c510ebc89367ae2308c81e9a0d86deb435cab7a002a25d84ec
-  data.tar.gz: e79c169436b9963319b16e4e8a19fc0d3814ec6c9ec143479f8ec8478bfcdf18
+  metadata.gz: a7000ec5bbfcc9779972081b7508bee5768abd044ccf812d39529f4745a26adb
+  data.tar.gz: deeca4cc2f1bb7248f0a936b93547e1f6f2bc1ea4c09138d485a03cec0dfde2c
 SHA512:
-  metadata.gz: 3a6bc66b94878889ff49562ecc255dbc1c228bd0a55a332a4810351d66c41033858ccc398e601e5185a10ca5b2b3d05a0c448294d819521f1e5566704c5eec1f
-  data.tar.gz: 48fe0a136889b42396f79205d3673adb8d0fb0064b8d09f85f8ffb2f0aea14137f153aa67c4193f457493a58b76d521b2a713a3d93b7a5a62fb0ab6881e79c71
+  metadata.gz: 1537b9b92e2a48cce91677b8b17355c96f8ed2ea83d858db462c32140fa3f7fff818b1077980192ea8e6c1c3e18467e2494af0a502efa56224d22ff17a9c5cba
+  data.tar.gz: 67f2dc3fb60869a1cbd3623b253ffddcba5f62b5ef4c4e8a3125b857d4db10229fd451aa397791b91112e22a7f2a2dab6c10542f3996636f336beb57c939a77f

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # CHANGELOG
 
+## v0.2.1 - Dec 20, 2019
+
+Re-release v0.2.0 as v0.2.1.
+
+## v0.2.0 - Dec 19, 2019
+
+Adds option parsing to `mail-relayer` executable.
+
 ## v0.1.0 - Dec 19, 2019
 
 Adds executable `mail-relayer` for CLI usage.
 
-## v0.0.1 - Dec 18, 2019
+## v0.0.1 - Dec 17, 2019
 
 Initial release.
 

data/README.md

@@ -2,6 +2,20 @@
 
 This project is an attempt to simplify relaying incoming emails, e.g. to ActionMailbox.
 
+## Usage
+
+1. `gem install mail-relayer`
+
+2. Then pipe the email content from `STDIN` to `mail-relayer` executable. You need to specify the target URL and password (HTTP Basic Auth) either via command line arguments or via environment variables.
+
+3. Profit
+
+### Configuration
+
+- target URL: `--url` or `MAIL_RELAYER_URL`
+- ingress username: `--ingress-username` or `MAIL_RELAYER_INGRESS_USERNAME` (optional, default: `mail_relayer`)
+- ingress password: `--ingress-password` or `MAIL_RELAYER_INGRESS_PASSWORD`
+
 ## Development
 
 1. Install ruby - see `.ruby-version`

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/bin/mail-relayer

@@ -2,19 +2,39 @@
 
 # frozen_string_literal: true
 
-require "mail-relayer"
+require "optparse"
 
-# postfix implementation
-url, password = ENV.values_at("URL", "INGRESS_PASSWORD")
+require "mail_relayer"
 
-unless url && password
-  print "4.3.5 URL and INGRESS_PASSWORD are required"
+options = {
+  url: ENV["MAIL_RELAYER_URL"],
+  username: ENV["MAIL_RELAYER_INGRESS_USERNAME"],
+  password: ENV["MAIL_RELAYER_INGRESS_PASSWORD"]
+}
+
+OptionParser.new do |opts|
+  opts.on("--url URL") do |url|
+    options[:url] = url
+  end
+  opts.on("--ingress-username INGRESS_USERNAME") do |user|
+    options[:username] = user
+  end
+  opts.on("--ingress-password INGRESS_PASSWORD") do |password|
+    options[:password] = password
+  end
+  opts.on("-v", "--version") do
+    puts "mail-relayer v#{Mail::Relayer::VERSION}"
+    exit 0
+  end
+end.parse!
+
+unless options[:url] && options[:password]
+  puts "4.3.5 URL and INGRESS_PASSWORD are required"
   exit 1
 end
 
-Mail::Relayer.new(url: url, password: password)
-  .relay(STDIN.read)
-  .tap do |result|
-    print "#{result.status_code} #{result.message}"
-    exit result.success?
-  end
+relayer = Mail::Relayer.new(**options.compact)
+result = relayer.relay(STDIN.read)
+
+puts "#{result.status_code} #{result.message}"
+exit result.success?

data/lib/mail/relayer.rb

@@ -6,7 +6,7 @@ require "uri"
 
 module Mail
   class Relayer
-    class Result < Struct.new(:status_code, :message)
+    class Result < Struct.new(:status_code, :message) # rubocop:disable Style/StructInheritance
       def success?
         !failure?
       end
@@ -32,7 +32,9 @@ module Mail
     attr_reader :uri, :username, :password
 
     def initialize(url:, username: "mail_relayer", password:)
-      @uri, @username, @password = URI(url), username, password
+      @uri = URI(url)
+      @username = username
+      @password = password
     end
 
     def relay(source)
@@ -48,7 +50,7 @@ module Mail
       Result.new "4.4.2", "Network error relaying to ingress: #{error.message}"
     rescue Timeout::Error
       Result.new "4.4.2", "Timed out relaying to ingress"
-    rescue => error
+    rescue => error # rubocop:disable Style/RescueStandardError
       Result.new "4.0.0", "Error relaying to ingress: #{error.message}"
     end
 
@@ -56,9 +58,9 @@ module Mail
 
     def post(source)
       client.post uri, source,
-        "Content-Type"  => CONTENT_TYPE,
-        "User-Agent"    => USER_AGENT,
-        "Authorization" => "Basic #{Base64.strict_encode64(username + ":" + password)}"
+        "Content-Type" => CONTENT_TYPE,
+        "User-Agent" => USER_AGENT,
+        "Authorization" => "Basic #{Base64.strict_encode64(username + ':' + password)}"
     end
 
     def client

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-relayer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Axel Gustav
@@ -14,16 +14,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -78,9 +78,9 @@ files:
 - README.md
 - VERSION
 - bin/mail-relayer
-- lib/mail-relayer.rb
 - lib/mail/relayer.rb
-homepage: https://rubygems.org/gems/mail-relayer
+- lib/mail_relayer.rb
+homepage: https://gitlab.com/axelthegerman/mail-relayer
 licenses:
 - MIT
 metadata: {}