rumble 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 377181c0985605edbac92aaae9eb75ffabb3d4b5f6f774fbbd96d5e458af0f41
-  data.tar.gz: 8ecd2853a4fa114d0f770b83848acccfaaf6a7f0cf7daba64f90d07fa3ae834b
+  metadata.gz: 19aa6fb3581db4df5a235311c22d817e083b0987a31fe8c50ca4f5a60e7e2a91
+  data.tar.gz: 147d028433f2f2f66aca7783849ca5197b332d163ee998099772ce7316e26593
 SHA512:
-  metadata.gz: c7b29b4f45363921b2e459e867fa60c28c6403096255d05f02bb8bd5cc4666369c073cb5c17eb0bdd8826d6fcbf6710637d94a5b413ae0b422d4d5a4a6d27421
-  data.tar.gz: f6561ef5ea5524887dc3748539465bdb30070a7d024af083daa0fac121bf5791d0ded62211d9a8df3671e91ba0673051c00f45e620ea2eac76e04db474a0dbc2
+  metadata.gz: f699b9affdf67116c7c7231be7b0ede4535cf6c8496e1169acb504e3550f0256b9bd033002a82b2727aebcfc8530c5059df5b77562078b2fd041cbb1148185cb
+  data.tar.gz: 0c72dcff6b37cd7ab03bb9c657e330365327b1d6fab88f39834385ec5de103a22c8eb2e803a20f469df8b8c21ed3a94dea70fc22df7fa24926d7692e97716c7c

data/README.md

@@ -45,6 +45,8 @@ Yegor
 The list of emails must contain three columns separated by a comma: first
 name, last name, and email.
 
+If you want to send via HTTP/SMTP proxy, use `--proxy=host:port`.
+
 # How to contribute
 
 Read [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).

data/bin/rumble

@@ -23,6 +23,7 @@ STDOUT.sync = true
 
 require 'slop'
 require 'mail'
+require 'net/smtp/proxy'
 require_relative '../lib/rumble'
 require_relative '../lib/rumble/version'
 
@@ -61,6 +62,7 @@ begin
       o.string '--port', 'SMTP port number (25 by default)', default: 25
       o.string '--user', 'SMTP user name'
       o.string '--password', 'SMTP password'
+      o.string '--proxy', 'HTTP proxy, e.g. "192.168.0.1:8080"'
       o.string '--subject', 'Email subject', required: true
       o.string '--letter', 'File name with Liquid template', required: true
       o.string '--csv', 'CSV file with first name, last name, and email cols'
@@ -78,29 +80,45 @@ begin
   Encoding.default_external = Encoding::UTF_8
   Encoding.default_internal = Encoding::UTF_8
 
+  puts 'It is "dry" run, no emails will be actually sent!' if opts[:dry]
+
   Mail.defaults do
     case opts[:method].downcase.strip
     when 'sendmail'
+      puts "--host=#{opts[:host]} is not allowed w/sendmail" if opts[:host]
+      puts "--port=#{opts[:port]} is not allowed w/sendmail" if opts[:port]
+      puts "--user=#{opts[:user]} is not allowed w/sendmail" if opts[:user]
+      puts '--password is not allowed when using sendmail' if opts[:password]
       delivery_method :sendmail
     when 'smtp'
       raise '--host is required' unless opts[:host]
       raise '--port is required' unless opts[:port]
       raise '--user is required' unless opts[:user]
       raise '--password is required' unless opts[:password]
-      delivery_method :smtp, {
-        :address => opts[:host],
-        :port => opts[:port],
-        :user_name => opts[:user],
-        :password => opts[:password],
-        :enable_starttls_auto => true
-      }
+      if opts[:proxy]
+        host, port = opts[:proxy].strip.split(':')
+        delivery_method Net::SMTP::Proxy::DeliveryMethod, {
+          address: opts[:host],
+          port: opts[:port],
+          proxy_address: "http://#{host.strip}",
+          proxy_port: port,
+          openssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
+          domain: 'gmail.com'
+        }
+      else
+        delivery_method :smtp, {
+          :address => opts[:host],
+          :port => opts[:port],
+          :user_name => opts[:user],
+          :password => opts[:password],
+          :enable_starttls_auto => true
+        }
+      end
     else
       raise "Delivery method #{opts[:method]} is not supported"
     end
   end
-
   Rumble::CLI.new(opts).send
-
 rescue StandardError => ex
   puts "#{Rainbow('ERROR').red} (#{ex.class.name}): #{ex.message}"
   puts ex.backtrace

data/features/cli.feature

@@ -17,6 +17,6 @@ Feature: Command Line Processing
     How are you?
 
     """
-    When I run bin/rumble with "--test yegor256@gmail.com --host test --user test --password test --subject test --letter a.liquid --from me@example.com --dry --resume test@example.com"
+    When I run bin/rumble with "--test=yegor256@gmail.com --subject=test --letter=a.liquid --from=me@example.com --dry --resume=test@example.com"
     Then Stdout contains "Processed 1 email"
     And Exit code is zero

data/lib/rumble/version.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2018-2019 Yegor Bugayenko
 # License:: MIT
 module Rumble
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/rumble.gemspec

@@ -25,7 +25,6 @@ require 'English'
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require_relative 'lib/rumble/version'
-
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   if s.respond_to? :required_rubygems_version=
@@ -48,6 +47,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'liquid', '4.0.1'
   s.add_runtime_dependency 'mail', '2.7.1'
+  s.add_runtime_dependency 'net-smtp-proxy', '2.0.0'
   s.add_runtime_dependency 'rainbow', '3.0.0'
   s.add_runtime_dependency 'redcarpet', '3.4.0'
   s.add_runtime_dependency 'slop', '4.6.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumble
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.1
+- !ruby/object:Gem::Dependency
+  name: net-smtp-proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement