trikle-mail 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2d157ac21d41c5b4950c97d6fbce4d15c951fc1
-  data.tar.gz: dfe235800e9add4a2e42d87586c91f27af1b4343
+SHA256:
+  metadata.gz: 1bc1f6ac3d5593c2b07c79554fd73ac007913e2b8e257d044611328eca81d1c5
+  data.tar.gz: 779eb9f435e07e043f91d5eff45d2092a16076049157dbbbfaa1ee785b99cf5b
 SHA512:
-  metadata.gz: 01145d358fd1aca7133654e41773ac3be5547314fa46642ac725d6f059bdd30db4060cf324a16a3802700e40b0138032a2873c8c9b5cc2bcae8976bc00d6fa7b
-  data.tar.gz: 7d2e1a1b879315855b9ae375e94ed980adbf65b4c686cb173a5d3787075d0ca787e676c2ecc071553ce7977240f4474a323f2082ed9c9043bc24802e4f0f625d
+  metadata.gz: 7b9635c1c57938ea53c143458d48587234855f6b3910b1877c3f99b9bbedef48403748289338c38c2344b27e1915eec6806a8a3dd269225be85661d62fcc8eaa
+  data.tar.gz: baee1a420a5bcc5cd1ca280b3caee0aae9a0af0f98ff7d8423f49a7f90ab3e0c32cb639773decd0c3021a28edbf66ebbb21ef5d2c196741608099be655c2568e

data/bin/trikle-mail

@@ -3,18 +3,19 @@ require 'commander'
 require 'mandrill'
 require 'csv'
 require 'mail'
+require 'triklemailer'
 
 class TrikleMail
   extend Commander::Methods
 
   program :name, 'Trikle Mail'
-  program :version, '0.0.0'
-  program :description, 'Send your bulk email in a trikle over the mandril api'
+  program :version, Triklemailer::VERSION
+  program :description, 'Send your bulk email from the cli in a trikle'
 
-  default_command :run
+  default_command :smtp
 
   command :smtp do |c|
-    c.syntax = 'trikle-mail smtp csv_of_emails.csv [options]'
+    c.syntax = 'trikle-mail csv_of_emails.csv [options]'
     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'
@@ -28,122 +29,19 @@ class TrikleMail
     c.option '--minutes INTEGER', Integer, 'The number of minutes over which to send the emails'
 
     c.action do |args, options|
-      title_row, *data_rows = CSV.read(args[0])
-
-      data_hashes = data_rows.map do |row|
-        title_row.map.with_index do |title, index|
-          [title.downcase.to_sym, row[index]]
-        end.to_h
-      end
-
-      options.default({hours: 0, minutes: 0, html: false})
-
-      time_range = ((options.hours * 60 * 60) + (options.minutes * 60)) /
-        data_hashes.length.to_f
-
-      data_hashes.each do |hash|
-        template = File.read(hash.fetch(:template, options.template)).
-          gsub(/%(?!{)/, '%%') % hash
-        mail = Mail.new do
-          from hash.fetch(:from, options.from)
-          to hash.fetch(:to, hash.fetch(:email) { raise 'no email address found in to column!' })
-          subject hash.fetch(:subject, options.subject)
-
-          if options.html
-            html_part do
-              content_type 'text/html; charset=UTF-8'
-              body template
-            end
-          else
-            text_part do
-              body template
-            end
-          end
-        end
-
-        mail.delivery_method :smtp, {
-          address: hash.fetch(:host, options.host),
-          port: hash.fetch(:port, options.port),
-          user_name: hash.fetch(:username, options.username),
-          password: hash.fetch(:password, options.password),
-          authentication: :login,
-          enable_starttls_auto: true
-        }
-
-        puts mail.deliver!
-        random_wait_time = rand(0..time_range)
-        puts "waiting #{random_wait_time} seconds"
-        sleep(random_wait_time)
-      end
-    end
-  end
-
-  command :run do |c|
-    c.syntax = 'trikle-mail csv_of_emails.csv [options]'
-    c.description = 'Send a message to each email address in the csv'
-    c.option '--apikey STRING', String, 'The Mandrill API key'
-    c.option '--from_email STRING', String, 'The email address of the sender'
-    c.option '--from_name STRING', String, 'The name of the sender'
-    c.option '--subject STRING', String, 'The subject line of the message'
-    c.option '--template STRING', String, 'The template slug of the message template'
-    c.option '--subaccount STRING', String, 'The mandril subaccount for this batch of email'
-    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.action do |args, options|
-      api = Mandrill::API.new(options.apikey)  
-
-      title_row, *data_rows = CSV.read(args[0])
-
-      data_hashes = data_rows.map do |row|
-        title_row.map.with_index do |title, index|
-          [title.downcase, row[index]]
-        end.to_h
-      end
-
-      options.default({hours: 0, minutes: 0})
-      time_range = ((options.hours * 60 * 60) + (options.minutes * 60)) /
-        data_hashes.length.to_f
-
-      data_hashes.each do |hash|
-        response = api.messages.send_template(
-          hash['template'] || options.template,
-          [],
-          {
-            subaccount: hash['subaccount'] || options.subaccount,
-            subject: hash['subject'] || options.subject,
-            from_email: hash['from_email'] || options.from_email,
-            from_name: hash['from_name'] || options.from_name,
-            to: [{
-              email: hash['email'],
-              name: hash['name'],
-              type: 'to'
-            }],
-            merge_vars: [{
-              rcpt: hash['email'],
-              vars: hash.map { |key, value| { name: key, content: value } }
-            }]
-          }
-        )
-        TrikleMail.log(response)
-        random_wait_time = rand(0..time_range)
-        puts "waiting #{random_wait_time} seconds"
-        sleep(random_wait_time)
-      end
-    end
-  end
-
-  def self.log(json)
-    Array(json).each do |entry|
-      # write to log file
-      File.open('./log.json', 'a') { |f| f.write(JSON.dump(entry) + "\n") }
-      # write nicely to cli
-      puts [
-        entry['status'],
-        'email to',
-        entry['email'],
-        entry['reject_reason'] ? "becuase #{entry['reject_reason']}" : ''
-      ].join(' ')
+      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] }
+
+      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
+      )
+
+      Triklemailer.send_mail(mail_options, recipients, sent)
     end
   end
 end

data/lib/triklemailer.rb

@@ -0,0 +1,98 @@
+require 'mail'
+require 'csv'
+
+module Triklemailer
+  VERSION = '0.0.6'
+  Options = Struct.new(:template, :template_name, :is_html, :from, :subject, keyword_init: true)
+
+  # It should take:
+  # * A list of emails and data
+  # * SMTP account details
+  # * A template
+  # * SMTP Server details
+  # 
+  # and it should send an email to each email address from the csv using
+  # the template provided, filled in with the meta data provided for the
+  # email address. When each email is sent it should record that in a
+  # separate csv called sent_<template-name>.csv. Failures to send a
+  # messages should not be recorded. When sending emails it should check
+  # the sent_<template-name>.csv and if it exists, only send emails to 
+  # email address not included in the sent_<template-name>.csv file.
+  #
+  # Read provided csv
+  # Check for sent_ csv
+  # For each email, meta_data in provided csv
+  #   If email in sent_ csv
+  #     Next email
+  #
+  #   Read template file
+  #   Apply meta_data to template file
+  #   Send email with data from cli or meta data with template
+  #   If there was an error sending
+  #     Next email
+  #   Record email sent to template in sent_ csv
+  #
+  def self.send_mail(options, recipients, sent)
+    cleaned_template = options.template.gsub(/%(?!{)/, '%%')
+
+    recipients.
+      reject { |recipient| sent.include?(recipient[:email]) }.
+      each do |recipient|
+      mail = Mail.new do
+        from recipient.fetch(:from, options.from)
+        to recipient.fetch(:to, recipient.fetch(:email) {
+          raise "Some rows are missing either a 'to' or 'email' column."
+        })
+        subject recipient.fetch(:subject, options.subject)
+
+        if options.is_html
+          html_part do
+            content_type 'text/html; charset=UTF-8'
+            body cleaned_template % recipient
+          end
+        else
+          text_part do
+            body cleaned_template % recipient
+          end
+        end
+      end
+
+      if block_given?
+        yield(mail, recipient)
+      else
+        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,
+          enable_starttls_auto: true
+        }
+      end
+
+      begin
+        mail.deliver!
+        # might fail in here though...
+        log_sent(
+          recipient.fetch(:to, recipient[:email]),
+          options.template_name)
+      rescue => e
+        puts "Failed to send email to #{recipient[:email]}."
+        next
+      end
+    end
+  end
+
+  def log_sent(email, template)
+    log_file_name = ['sent', template.split('.').first].join('_')
+
+    CSV.open(
+      "./#{log_file_name}.csv",
+      'a',
+      write_headers: true,
+      headers: ['email', 'sent_at']
+    ) do |csv|
+      csv << [email, Time.now]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trikle-mail
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jasper Lyons
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Send bulk email in a trickle over mandrill
 email: jasper.lyons@gmail.com
 executables:
@@ -46,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/trikle-mail
+- lib/triklemailer.rb
 homepage: ''
 licenses:
 - MIT
@@ -65,10 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Send a trickle of mail
 test_files: []
-has_rdoc: