trikle-mail 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc1f6ac3d5593c2b07c79554fd73ac007913e2b8e257d044611328eca81d1c5
-  data.tar.gz: 779eb9f435e07e043f91d5eff45d2092a16076049157dbbbfaa1ee785b99cf5b
+  metadata.gz: fcae7d44b75688c09359e79a19af8e9103b57d7f26956f342e766ce3e1677fae
+  data.tar.gz: c46a0e13c0e5dfb3630d2718f58280c8cccee86aef0f224b1d697332e55e0f4b
 SHA512:
-  metadata.gz: 7b9635c1c57938ea53c143458d48587234855f6b3910b1877c3f99b9bbedef48403748289338c38c2344b27e1915eec6806a8a3dd269225be85661d62fcc8eaa
-  data.tar.gz: baee1a420a5bcc5cd1ca280b3caee0aae9a0af0f98ff7d8423f49a7f90ab3e0c32cb639773decd0c3021a28edbf66ebbb21ef5d2c196741608099be655c2568e
+  metadata.gz: a897b41c9de4827986b7aac850e31d24aa2c3da34f69676264f71e03d182da271554bb70ff53c99b8ea3ea7791b408d0d07beb5bb9bf7a26ed419447a464bca0
+  data.tar.gz: 13055a1ef42990d12a0dffeaec428ff9e9edb8540bf5d1edd679acbe54a38422546c7eaef10648f901ee61ac852d0d7462b4e116b4547b76a30663da1495e755

data/bin/trikle-mail

@@ -29,16 +29,25 @@ class TrikleMail
     c.option '--minutes INTEGER', Integer, 'The number of minutes over which to send the emails'
 
     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
+        subject: options.subject,
+        port: options.port,
+        host: options.host,
+        username: options.username,
+        password: options.password
       )
 
       Triklemailer.send_mail(mail_options, recipients, sent)

data/lib/triklemailer.rb

@@ -2,8 +2,12 @@ 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.0.7'
+  Options = Struct.new(
+    :template, :template_name, :is_html, :from, :subject,
+    :host, :port, :username, :password,
+    keyword_init: true
+  )
 
   # It should take:
   # * A list of emails and data
@@ -78,18 +82,19 @@ module Triklemailer
           options.template_name)
       rescue => e
         puts "Failed to send email to #{recipient[:email]}."
+        puts e
         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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trikle-mail
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jasper Lyons
@@ -80,6 +80,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: