smitty 0.0.5 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWE1ZDZmNGM5NmIwMWJlMjE4YjUyNDY1ODE2MzVhOTRlZTdkNGUxYQ==
-  data.tar.gz: !binary |-
-    NDIxOGZlNmNjNTRkNGEwMjA0NGFhOTMwODAzOWYwNTdlMjAwYzM3Yw==
+SHA1:
+  metadata.gz: 99a212ff5d842c723fc6c7065735ea067f36d3ce
+  data.tar.gz: 5b32ed4266e57f252b2d1216789802922fa5b30b
 SHA512:
-  metadata.gz: !binary |-
-    NTFlODBiYjUxYTRmZDU0Y2FhMzdlNzkxMGExYmVmZGExNGViMTU1N2JmZWNk
-    ODkxOWY0ODNhZDQwN2U1OWU4NzU0OGIzOTM4ZTk5ZDQwMzM1OTRjMTgyNzU2
-    M2VlNjA3YmNhOTI3MDMzYzFiMzI2MTBlMmZiN2NiODk4NTk2ZTA=
-  data.tar.gz: !binary |-
-    ZDI0M2UyY2Q4MTEzYzc4ODg1Y2RiMWZjZTliMDkxZWNlODNmM2Y4ZDQ4YzIy
-    MjE0ZWNjMjZiODRiM2YyNDBlOTRmMjk2YTYzNmYzZDE3MGQ2NjE1MzIwZDEx
-    Mzc3NWIzMzY5YWIxNGQzZDIyMDM4ZjNhNzJkYjY1MzM0OTk5OTY=
+  metadata.gz: 23ce6b70ed7750b1d2de87156f77fa527417b29b5a3f787312d23473d6a16b236a1867b0dbddc46eea2fd3c25a71b3bdb2ac580b0996eb23029b59f51fff9a16
+  data.tar.gz: a5b08ff840a51a341e6f6657659d040f0274bd6fcc4f4a0c3a4f0f8a755f7e4e9159f7e92cc6db9bad44c0fc89f180e63750f476aee6c6851c99935862ef9b98

data/README.md

@@ -10,6 +10,14 @@ For example, say you wanted to loop over a set of emails and names, inserting a
     
 Smitty would then loop over each email address in emails.txt, replacing {{name}} with the corresponding name from names.txt. As you can see, variable names in the subject is also supported.
 
+## Content-ID Embedded Images
+
+Smitty includes the ability to generate Content-ID values for attached images and embed the content within the handlebars HTML template in accordance with [RFC2557](http://tools.ietf.org/html/rfc2557#page-8). Smitty will generate a Multi-Part email message and search the handlebar HTML template for image references associated with the attached image name.
+
+    ./smitty from@someplace.io emails.txt 'Subject' -a someimage.jpg --cid tempalte.hbs
+
+Smitty will then search through the template and replace references to \<img src="cid:{{someimage.jpg}}"\> with the Content-ID value of the attached image.
+
 ## Installation
 
     $ gem install smitty
@@ -21,12 +29,12 @@ Or build and install it yourself as:
 
 ## Usage
 
-    Smitty 0.0.4
+    Smitty 1.0.0
 
     Usage:
-      ./smitty [options] <from_address> <to_file> <subject> <template>
-      ./smitty -h | --help
-      ./smitty -v | --version
+      smitty [options] <from_address> <to_file> <subject> <template>
+      smitty -h | --help
+      smitty -v | --version
 
     Required Arguments:
       from_address:                    Address to send mail from.
@@ -42,6 +50,7 @@ Or build and install it yourself as:
                                        template, and value may be a constant or a newline separated file.
                                        Value file and to_file must have the same amount of lines.
       -a files                         Attach comma separated list of files.
+      --cid                            Enable CID embedding of images for email attachments, default is false.
       --server SERVER                  SMTP Server, default is localhost.
       --port PORT                      SMTP Port, default is 25.
       --ssl                            Use SSL, default is false.
@@ -50,6 +59,7 @@ Or build and install it yourself as:
       --cc address                     Add a cc address.
       --bcc address                    Add a bcc address.
       --messageid FQDN                 Set a FQDN to use when generating the message-id for each message.
+      --sleep SEC                      Sets sleep delay, in seconds, per each recipent.
       --dry-run                        Output messages and don't send.
 
 ## Contributing

data/bin/smitty

@@ -23,9 +23,11 @@ end
 
 attachments = args['-a'].split(',') if args['-a']
 from_address = args['<from_address>']
+match_address = /[-0-9a-z.+_]+@[-0-9a-z.+_]+\.[a-z]{2,}/i.match(from_address).to_s
 subject = args['<subject>']
-message_id_fqdn = from_address.split('@')[1]
+message_id_fqdn = match_address.split('@')[1]
 message_id_fqdn = args['-messageid'] if args['-messageid']
+sleep = args['--sleep'] unless args['--sleep'].nil?
 
 # Read to_file into list of addresses
 begin
@@ -81,7 +83,15 @@ to_addresses.each do |to_address|
   end
   # Attach each file to the message
   begin
-    attachments.each { |file| mail.add_file(file) } unless attachments.nil?
+    attachments.each { |file| 
+      mail.add_file(file) 
+      if  args['--cid']
+        file.sub!(/.*?\/(\w+\.\w{3})$/, '\1')
+        image = mail.attachments[file]
+        template_copy.gsub!("{{#{file}}}", image.cid)
+        subject_copy.gsub!("{{#{file}}}", image.cid)
+      end 
+    } unless attachments.nil?
   rescue Exception => e
     Smitty.croak('Could not attach file', e.message)
   end
@@ -92,6 +102,10 @@ to_addresses.each do |to_address|
     begin
       mail.deliver!
       puts "Message sent"
+      if defined?(sleep) && !to_address.equal?(to_addresses.last)
+        puts "Sleeping for #{sleep} seconds"
+        sleep(sleep.to_i)
+      end
     rescue Exception => e
       puts "Error: #{e.message}"
     end

data/lib/smitty/smtp_connect.rb

@@ -6,10 +6,14 @@ module Smitty
       smtp_server = server.nil? ? 'localhost' : server
       smtp_port = port.nil? ? 25 : port.to_i
       smtp_conn = Net::SMTP.new(smtp_server, smtp_port)
-      smtp_conn.enable_tls() if ssl
+      smtp_conn.enable_starttls() if ssl
       if username
         Smitty.croak('No password provided') if password.nil?
-        smtp_conn.start(smtp_server, username, password, :plain)
+        if ssl
+          smtp_conn.start(smtp_server, username, password, :login)
+        else
+          smtp_conn.start(smtp_server, username, password, :plain)
+        end
       else
         smtp_conn.start()
       end

data/lib/smitty/usage.rb

@@ -21,6 +21,7 @@ Options:
                                    template, and value may be a constant or a newline separated file.
                                    Value file and to_file must have the same amount of lines.
   -a files                         Attach comma separated list of files.
+  --cid                            Enable CID embedding of images for email attachments, default is false.
   --server SERVER                  SMTP Server, default is localhost.
   --port PORT                      SMTP Port, default is 25.
   --ssl                            Use SSL, default is false.
@@ -29,7 +30,8 @@ Options:
   --cc address                     Add a cc address.
   --bcc address                    Add a bcc address.
   --messageid FQDN                 Set a FQDN to use when generating the message-id for each message.
+  --sleep SEC                      Sets sleep delay, in seconds, per each recipent.
   --dry-run                        Output messages and don't send.
 
 DOC
-end
+end

data/lib/smitty/variable_parser.rb

@@ -12,4 +12,4 @@ module Smitty
     end
     {replace_string: pairs[0], with: with_content }
   end
-end
+end

data/lib/smitty/version.rb

@@ -1,3 +1,3 @@
 module Smitty
-  VERSION = '0.0.5'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: smitty
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Tom Steele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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 mail with handlebars like templates
@@ -102,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Send mail with handlebars like templates