rumble 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f03e3edbc9e2b37f248b11bec2941f6d4a261e81b5f16801ce70d3bb87211f20
-  data.tar.gz: b95d41c24c2be68d9adfa328ae3499226a767a798f9e14d0ac2bbd7beffa9e09
+  metadata.gz: 8e909a68082518ee20778ffba50461fdb99ce0a0e050c3663cd8a3a2eb02db2b
+  data.tar.gz: d3f2b07df66e4667aa433b911dcaec42a1276bfb019aa09b68008406b7c94f39
 SHA512:
-  metadata.gz: 0c5e549ea1f92e4160f5ca81942877bbd962488cfda61b7e9d9e49ea06375670c3e8f4b36c0ec46864af3f947fcd1de26008c36594c5a80db0491aaf518a1e03
-  data.tar.gz: 17118c0c04c50f6c7951a38c103d33e276621abd7f28506cac957a6138a38c5f7b34f73172368d395a90f0223f2f6b690fefc798b578ff295206e08a81f59b7e
+  metadata.gz: b79225adf5112676fe8c71528a2196a60b70d51367414bc9df7717adff4ab4650caa9f50e7318f8938c6e88ea90bcdcdcdb926b849c1ea66cf0fe4e0638053ad
+  data.tar.gz: 85d41d802f8b5014b1a943bf26c10c408f57f815a752574b36bd1f299e19e1b8a822c81d76a999eb7db9b58479c4cdb61e962c9079f04638627d17957123f934

data/.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3
 
+Layout/EndOfLine:
+  EnforcedStyle: lf
 Metrics/CyclomaticComplexity:
   Max: 20
 Metrics/MethodLength:
@@ -21,3 +23,5 @@ Style/MultilineTernaryOperator:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false

data/README.md

@@ -7,8 +7,7 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/orvfo2qgmd1d7a2i?svg=true)](https://ci.appveyor.com/project/yegor256/rumble)
 [![PDD status](http://www.0pdd.com/svg?name=yegor256/rumble)](http://www.0pdd.com/p?name=yegor256/rumble)
 [![Gem Version](https://badge.fury.io/rb/rumble.svg)](http://badge.fury.io/rb/rumble)
-[![Dependency Status](https://gemnasium.com/yegor256/rumble.svg)](https://gemnasium.com/yegor256/rumble)
-[![Code Climate](http://img.shields.io/codeclimate/github/yegor256/rumble.svg)](https://codeclimate.com/github/yegor256/rumble)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a3fee65d42a9cf6397ea/maintainability)](https://codeclimate.com/github/yegor256/rumble/maintainability)
 [![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/rumble.svg)](https://codecov.io/github/yegor256/rumble?branch=master)
 
 ## What this is for?

data/bin/rumble

@@ -26,6 +26,7 @@ require 'mail'
 require 'net/smtp/proxy'
 require_relative '../lib/rumble'
 require_relative '../lib/rumble/version'
+require_relative '../lib/rumble/cli'
 
 begin
   args = []
@@ -34,7 +35,8 @@ begin
     body = File.read(config)
     extra = body.split(/[\r\n]+/).map(&:strip)
     args += extra
-    puts "Found #{body.split(/\n/).length} lines in #{config}"
+    puts "Found #{body.split(/\n/).length} lines in #{config}:
+  #{extra.join("\n  ")}"
   else
     puts "Default config file #{config} not found"
   end
@@ -95,18 +97,24 @@ begin
       raise '--port is required' unless opts[:port]
       raise '--user is required' unless opts[:user]
       raise '--password is required' unless opts[:password]
+      from = Mail::Address.new(opts[:from])
       if opts[:proxy]
         scheme, host, port = opts[:proxy].strip.split(':')
         delivery_method Net::SMTP::Proxy::DeliveryMethod, {
+          domain: from.domain,
           address: opts[:host],
           port: opts[:port],
           proxy_address: "#{scheme}://#{host}",
           proxy_port: port.to_i,
+          authentication: 'plain',
           openssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
-          enable_starttls_auto: true
+          enable_starttls_auto: true,
+          user_name: opts[:user],
+          password: opts[:password]
         }
       else
         delivery_method :smtp, {
+          domain: from.domain,
           address: opts[:host],
           port: opts[:port],
           user_name: opts[:user],

data/lib/rumble.rb

@@ -20,105 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'mail'
-require 'uuidtools'
-require 'liquid'
-require 'csv'
-require 'redcarpet'
-require 'redcarpet/render_strip'
-require 'rainbow'
-require_relative 'rumble/version'
-
-# Rumble main script.
+# Rumble module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018-2019 Yegor Bugayenko
 # License:: MIT
 module Rumble
-  # Command line interface.
-  class CLI
-    def initialize(opts)
-      @opts = opts
-    end
-
-    def send
-      letter = Liquid::Template.parse(
-        File.read(File.expand_path(@opts[:letter]))
-      )
-      skip = @opts[:skip] ? File.readlines(@opts[:skip]).map(&:strip) : []
-      if @opts[:test]
-        rcpt = []
-        rcpt[@opts['col-first'].to_i] = 'John'
-        rcpt[@opts['col-last'].to_i] = 'Doe'
-        rcpt[@opts['col-email'].to_i] = @opts[:test]
-        emails = [rcpt]
-      else
-        raise '--csv is required' unless @opts[:csv]
-        emails = CSV.read(@opts[:csv])
-      end
-      total = 0
-      sent = []
-      ignore = !@opts[:resume].nil? && !@opts[:test]
-      from = @opts[:from].strip
-      puts "Sending #{emails.length} email(s) as #{from}"
-      domain = from.strip.gsub(/^.+@|>$/)
-      emails.each do |array|
-        email = array[@opts['col-email'].to_i]
-        unless email
-          puts "Email is #{Rainbow('absent').red} \
-at the column ##{@opts['col-email'].to_i}: #{array}"
-          next
-        end
-        email = email.strip.downcase
-        if sent.include?(email)
-          puts "#{Rainbow('Duplicate').red} at: #{array}"
-          next
-        end
-        sent.push(email)
-        first = (array[@opts['col-first'].to_i] || '').strip
-        last = (array[@opts['col-last'].to_i] || '').strip
-        first, last = first.split(' ', 2) if last.empty? && first.include?(' ')
-        name = "#{first.strip} #{last.strip}".strip
-        address = email
-        address = "#{name} <#{email}>" unless name.empty?
-        print "Sending to #{address}... "
-        markdown = letter.render(
-          'email' => email, 'first' => first, 'last' => last
-        )
-        html = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
-          .render(markdown)
-        text = Redcarpet::Markdown.new(Redcarpet::Render::StripDown)
-          .render(markdown)
-        if ignore
-          if @opts[:resume].downcase != email
-            puts "#{Rainbow('ignored').orange}, waiting for #{@opts[:resume]}"
-            next
-          end
-          ignore = false
-        end
-        if skip.include?(email)
-          puts Rainbow('skipped').red
-          next
-        end
-        subject = @opts[:subject]
-        mail = Mail.new do
-          from from
-          to address
-          subject subject
-          message_id "<#{UUIDTools::UUID.random_create}@#{domain}>"
-          text_part do
-            content_type 'text/plain; charset=UTF-8'
-            body text
-          end
-          html_part do
-            content_type 'text/html; charset=UTF-8'
-            body html
-          end
-        end
-        mail.deliver! unless @opts[:dry]
-        total += 1
-        puts "#{Rainbow('done').green} ##{total}"
-      end
-      puts "Processed #{sent.size} emails"
-    end
-  end
+  # Nothing
 end

data/lib/rumble/cli.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Yegor Bugayenko
+#
+# 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 NONINFINGEMENT. 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.
+
+require 'mail'
+require 'uuidtools'
+require 'liquid'
+require 'csv'
+require 'redcarpet'
+require 'redcarpet/render_strip'
+require 'rainbow'
+require_relative 'version'
+
+# Rumble main script.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018-2019 Yegor Bugayenko
+# License:: MIT
+class Rumble::CLI
+  # Make an instance.
+  def initialize(opts)
+    @opts = opts
+  end
+
+  # Send a letter, reading options from the opts.
+  def send
+    letter = Liquid::Template.parse(
+      File.read(File.expand_path(@opts[:letter]))
+    )
+    skip = @opts[:skip] ? File.readlines(@opts[:skip]).map(&:strip) : []
+    if @opts[:test]
+      rcpt = []
+      rcpt[@opts['col-first'].to_i] = 'John'
+      rcpt[@opts['col-last'].to_i] = 'Doe'
+      rcpt[@opts['col-email'].to_i] = @opts[:test]
+      emails = [rcpt]
+    else
+      raise '--csv is required' unless @opts[:csv]
+      emails = CSV.read(@opts[:csv])
+    end
+    total = 0
+    sent = []
+    ignore = !@opts[:resume].nil? && !@opts[:test]
+    from = @opts[:from].strip
+    puts "Sending #{emails.length} email(s) as #{from}"
+    domain = from.strip.gsub(/^.+@|>$/)
+    emails.each do |array|
+      email = array[@opts['col-email'].to_i]
+      unless email
+        puts "Email is #{Rainbow('absent').red} \
+at the column ##{@opts['col-email'].to_i}: #{array}"
+        next
+      end
+      email = email.strip.downcase
+      if sent.include?(email)
+        puts "#{Rainbow('Duplicate').red} at: #{array}"
+        next
+      end
+      sent.push(email)
+      first = (array[@opts['col-first'].to_i] || '').strip
+      last = (array[@opts['col-last'].to_i] || '').strip
+      first, last = first.split(' ', 2) if last.empty? && first.include?(' ')
+      name = "#{first.strip} #{last.strip}".strip
+      address = email
+      address = "#{name} <#{email}>" unless name.empty?
+      print "Sending to #{address}... "
+      markdown = letter.render(
+        'email' => email, 'first' => first, 'last' => last
+      )
+      html = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+        .render(markdown)
+      text = Redcarpet::Markdown.new(Redcarpet::Render::StripDown)
+        .render(markdown)
+      if ignore
+        if @opts[:resume].downcase != email
+          puts "#{Rainbow('ignored').orange}, waiting for #{@opts[:resume]}"
+          next
+        end
+        ignore = false
+      end
+      if skip.include?(email)
+        puts Rainbow('skipped').red
+        next
+      end
+      subject = @opts[:subject]
+      mail = Mail.new do
+        from from
+        to address
+        subject subject
+        message_id "<#{UUIDTools::UUID.random_create}@#{domain}>"
+        text_part do
+          content_type 'text/plain; charset=UTF-8'
+          body text
+        end
+        html_part do
+          content_type 'text/html; charset=UTF-8'
+          body html
+        end
+      end
+      mail.deliver! unless @opts[:dry]
+      total += 1
+      puts "#{Rainbow('done').green} ##{total}"
+    end
+    puts "Processed #{sent.size} emails"
+  end
+end

data/lib/rumble/version.rb

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

data/test/test_rumble.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'slop'
 require_relative '../lib/rumble'
+require_relative '../lib/rumble/cli'
 
 # Rumble main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumble
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -251,6 +251,7 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - lib/rumble.rb
+- lib/rumble/cli.rb
 - lib/rumble/version.rb
 - rumble.gemspec
 - test/test__helper.rb