trikle-mail 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc1f6ac3d5593c2b07c79554fd73ac007913e2b8e257d044611328eca81d1c5
-  data.tar.gz: 779eb9f435e07e043f91d5eff45d2092a16076049157dbbbfaa1ee785b99cf5b
+  metadata.gz: 5fab487bbbcc70e117b9884b48d1b006b605b4c1403562563b3c6dc3cae68d96
+  data.tar.gz: f3540074f297409efce8c7e80a61a485d11f187683f51f3df5e8739b32760e1e
 SHA512:
-  metadata.gz: 7b9635c1c57938ea53c143458d48587234855f6b3910b1877c3f99b9bbedef48403748289338c38c2344b27e1915eec6806a8a3dd269225be85661d62fcc8eaa
-  data.tar.gz: baee1a420a5bcc5cd1ca280b3caee0aae9a0af0f98ff7d8423f49a7f90ab3e0c32cb639773decd0c3021a28edbf66ebbb21ef5d2c196741608099be655c2568e
+  metadata.gz: 8e11e92874661ec21e1da315cf4558972a541a7a6ea2143041d941879ce4e867760bfc16b18ebcfd2aa6d18a99522e6e48c8dca6cff12175f0ba1deef2e3314c
+  data.tar.gz: 24eec0f470a08d21c079f01c0ea1df8032be712d4c380c0e49f04eac7e97775ab5222a109f5756dd1dc6b8990bce8209535be83afd176f3fda288c890249070d

data/bin/trikle-mail

@@ -19,26 +19,43 @@ class TrikleMail
     c.description = 'Send a message to each email in the csv using the template'
     c.option '--host STRING', String, 'The host of the mail server e.g. <mail.gmail.com>'
     c.option '--port INTEGER', Integer, 'Port number of the mail server e.g. 587'
+    c.option '--domain STRING', String, 'Domain that emails are comming from'
     c.option '--username STRING', String, 'Username to authenticate with mail server'
     c.option '--password STRING', String, 'Password to authenticate with mail server'
     c.option '--from STRING', String, 'The email address to send the email from'
+    c.option '--bcc STRING', String, 'The email address to bcc each message to'
+    c.option '--subject STRING', String, 'The subject line of the message'
     c.option '--template STRING', String, 'The template to use to send the message'
+    c.option '--attachment STTRING', String, 'The relative file path to your attachement'
     c.option '--html', 'toggle using html to format email, defaults to no'
-    c.option '--subject STRING', String, 'The subject line of the message'
     c.option '--hours INTEGER', Integer, 'The number of hours over which to send the emails'
     c.option '--minutes INTEGER', Integer, 'The number of minutes over which to send the emails'
+    c.option '--oauth2-token', String, 'Authenticates your request with an Oauth 2.0 token instead of a password'
 
     c.action do |args, options|
-      recipients = CSV.new(args[0], headers: true).map(&:to_h)
-      sent_file_name = ['sent', options.template.split('.').first].join('_')
-      sent = CSV.new(sent_file_name, headers: true).map { |r| r[:email] }
+      recipients = CSV.new(File.new(args[0]), headers: true, header_converters: :symbol).map(&:to_h)
+      sent_file_name = "./#{['sent', options.template.split('.').first].join('_')}.csv"
+      sent =
+        if File.exists?(sent_file_name)
+          CSV.new(File.new(sent_file_name), headers: true, header_converters: :symbol).map { |r| r[:email] }
+        else
+          []
+        end
 
       mail_options = Triklemailer::Options.new(
         template: File.read(options.template),
         template_name: options.template,
         is_html: options.template.end_with?('html'),
         from: options.from,
-        subject: options.subject
+        bcc: options.bcc,
+        subject: options.subject,
+        port: options.port,
+        host: options.host,
+        username: options.username,
+        password: options.password,
+        oauth2_token: options.oauth2_token,
+        domain: options.domain,
+        attachment: options.attachment
       )
 
       Triklemailer.send_mail(mail_options, recipients, sent)

data/lib/triklemailer.rb

@@ -2,8 +2,13 @@ require 'mail'
 require 'csv'
 
 module Triklemailer
-  VERSION = '0.0.6'
-  Options = Struct.new(:template, :template_name, :is_html, :from, :subject, keyword_init: true)
+  VERSION = '0.1.0'
+  Options = Struct.new(
+    :template, :template_name, :is_html, :from, :subject,
+    :host, :port, :username, :password, :bcc, :domain,
+    :attachment, :oauth2_token,
+    keyword_init: true
+  )
 
   # It should take:
   # * A list of emails and data
@@ -43,6 +48,7 @@ module Triklemailer
         to recipient.fetch(:to, recipient.fetch(:email) {
           raise "Some rows are missing either a 'to' or 'email' column."
         })
+        bcc options.bcc if options.bcc
         subject recipient.fetch(:subject, options.subject)
 
         if options.is_html
@@ -55,17 +61,22 @@ module Triklemailer
             body cleaned_template % recipient
           end
         end
+
+        add_file(File.expand_path(options.attachment)) if options.attachment
       end
 
       if block_given?
         yield(mail, recipient)
       else
+        oauth2_token = recipient.fetch(:oauth2_token, options.oauth2_token)
+        password = recrecipient.fetch(:password, options.password)
+
         mail.delivery_method :smtp, {
           address: recipient.fetch(:host, options.host),
           port: recipient.fetch(:port, options.port),
           user_name: recipient.fetch(:username, options.username),
-          password: recipient.fetch(:password, options.password),
-          authentication: :login,
+          password: oauth2_token || password,
+          authentication: oauth2_token ? :xoauth2 : :login,
           enable_starttls_auto: true
         }
       end
@@ -78,18 +89,21 @@ module Triklemailer
           options.template_name)
       rescue => e
         puts "Failed to send email to #{recipient[:email]}."
+        puts e.class
+        puts e
+        puts e.backtrace
         next
       end
     end
   end
 
-  def log_sent(email, template)
-    log_file_name = ['sent', template.split('.').first].join('_')
+  def self.log_sent(email, template)
+    log_file_name = "./#{['sent', template.split('.').first].join('_')}.csv"
 
     CSV.open(
-      "./#{log_file_name}.csv",
+      log_file_name,
       'a',
-      write_headers: true,
+      write_headers: !File.exists?(log_file_name),
       headers: ['email', 'sent_at']
     ) do |csv|
       csv << [email, Time.now]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trikle-mail
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Jasper Lyons
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: mail_xoauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Send bulk email in a trickle over mandrill
 email: jasper.lyons@gmail.com
 executables:
@@ -93,7 +121,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Send a trickle of mail
 test_files: []