html2mail 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c042d5df30576ad32780120959037e402b636c3
-  data.tar.gz: e9c6fe82de5a37eab3a81755498701acd7e11d2a
+  metadata.gz: 9bb5798551dddb8ccc6a7694dcaaa469a4c6b596
+  data.tar.gz: 2d98c196ae8c42eb2492f45dec4d3b755d9072a2
 SHA512:
-  metadata.gz: 120fc118d49be086e634ab265de5fbe2bd12cffcd387ad0658cc3258e5ac4c48650332913ea59d888f75898cdd9e8f40ca8581e8b46bde7b1f972ea3dd49e949
-  data.tar.gz: 1a4a16dfeeb330ba5d91a28cd2c0d2722a6c082fc91a5922262c77311ccf712536f8f95408f265aa91f24186e72dac3872eb1b08423fa88f2bafc642d6cfd1fb
+  metadata.gz: 23c3aa5fea6cf675fac779141b85d40e271cee6e13c7a92cad508f39291bf4d8c981c7303975438c8ef09a236dd06ab8c4b8eb0cb426b7905059f201d156f060
+  data.tar.gz: ead577fc1155dc7f5d45df472d518e3ec46c38a9603968961d4b37a1116865045c603dc5d640790f0c4efdd1d9b9905de05f3e279c78e5c4cca487c9adae2edd

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+/test/files/premailed/
+/test/files/*.eml
+/coverage

data/README.md

@@ -1,6 +1,6 @@
 # html2mail
 
-Generates html/eml stuff for your newsletters from generic html (with images in separate files).
+Console tool which generates html/eml stuff for your newsletters from html-files (support images in separate files)
 
 
 ## Examples
@@ -27,19 +27,26 @@ Save "premailed" HTML files (convert css to inline styles):
 
 Send test emails and use stored config for SMTP server:
 
-`html2mail send /path/to/newsletters/*.html --to your@domain.com --domain=example.com --user=user@example.com --password=princess1 --subj='Test mail'`
+`html2mail --smtp_address=mail.example.com --smtp_user_name=newsletter@example.com --smtp_password=princess1 send /path/to/newsletters/*.html --to your@domain.com --subj='Test mail'`
+
 
 Init SMTP config:
 
 > WARNING: Password stored as plain text in config file `.html2mail.yml` file in $HOME for Linux
 
-`html2mail --domain=example.com --user=user@example.com --password=princess1 initconfig`
+`html2mail --smtp_address=mail.example.com --smtp_user_name=newsletter@example.com --smtp_password=princess1 initconfig`
+
 
 Send test emails and use stored config for SMTP server:
 
 `html2mail send /path/to/newsletters/*.html --to your@domain.com`
 
 
+Send newsletter.html to all adresses from list.txt:
+
+`html2mail bulksend -l list.txt newsletter.html`
+
+
 ## Based on gems
 
  * ActionMailer

data/bin/html2mail

@@ -6,30 +6,22 @@ require 'gli'
 
 include GLI::App
 
-
 program_desc 'Convert html file with images to e-mail'
+version Html2mail::VERSION
 
-# flag [:t, :sendtest], default_value: true
-# flag [:f, :file], default_value: nil
-
-# pre do |global_options, command, options, args|
-#   # $todo_list = Hacer::Todolist.new(global_options[:tasklist])
-# end
-
-
-flag [:domain], default_value: nil
-flag [:user], default_value: nil
-flag [:password], default_value: nil
-switch [:starttls], default_value: true
+flag [:smtp_address], default_value: nil, desc: "SMTP server address"
+flag [:smtp_user_name], default_value: nil, desc: "SMTP server user name (email address)"
+flag [:smtp_password], default_value: nil, desc: "SMTP server user password"
+switch [:smtp_starttls], default_value: true, desc: "Enables SMTP/TLS (STARTTLS)"
 
 config_file '.html2mail.yml'
 
 pre do |global, command, options, args|
   Mailer2.delivery_method = :smtp
-  Mailer2.smtp_settings = {:address => global[:domain],
-                           :user_name => global[:user],
-                           :password => global[:password],
-                           :enable_starttls_auto => global[:starttls]}
+  Mailer2.smtp_settings = {:address => global[:smtp_address],
+                           :user_name => global[:smtp_user_name],
+                           :password => global[:smtp_password],
+                           :enable_starttls_auto => global[:smtp_starttls]}
 end
 
 desc 'Sent email from html to given adress'
@@ -39,7 +31,6 @@ command :send do |c|
   c.flag [:s, :subj], default_value: nil
 
   c.action do |global_options, options, args|
-    # STDERR.puts args
     args.each do |f|
       STDERR.puts "Start mail processing"
 
@@ -59,7 +50,6 @@ command :convert do |c|
   c.flag [:o, :output], default_value: nil
 
   c.action do |global_options, options, args|
-    # STDERR.puts "Processing: #{args}"
     args.each do |f|
       m = Mailer2.mail2 f, options[:to], options[:subj], global_options[:user]
 
@@ -74,7 +64,7 @@ command :convert do |c|
           out = File.join(File.dirname(f), File.basename(f, File.extname(f)) + '.eml')
         end
 
-        STDERR.puts "out: #{out}"
+        STDERR.puts "Out: #{out}"
         # raise "File already exists: #{out}" if File.exists?(out)
         File.open(out, 'w') { |fw| fw.write(html) }
       end
@@ -95,9 +85,6 @@ command :prepare do |c|
   c.action do |global_options, options, args|
     STDERR.puts "Processing: #{args.join(', ')}"
     args.each do |f|
-      # if f.end_with?(options[:premailer_suffix])
-      #   STDERR.puts "Skip already premailed html: #{File.basename(f)}"
-      # else
       html = Premailer.new(f, :warn_level => Premailer::Warnings::SAFE).to_inline_css.html_safe
 
       if options[:stdout]
@@ -108,17 +95,72 @@ command :prepare do |c|
         else
           premailed_dir = File.join(File.dirname(f), options[:premailer_dir])
           FileUtils.mkdir_p(premailed_dir)
-          out = File.join(premailed_dir, options[:premailer_prefix] + File.basename(f, File.extname(f)) + options[:premailer_suffix] +File.extname(f))
+          out = File.join(premailed_dir, options[:premailer_prefix] + File.basename(f, File.extname(f)) + options[:premailer_suffix] + File.extname(f))
         end
 
         STDERR.puts "#{File.basename(f)} --> #{File.join options[:premailer_dir], File.basename(out)}"
         # raise "File already exists: #{out}" if File.exists?(out)
         File.open(out, 'w') { |fw| fw.write(html) }
       end
-      # end
     end
     STDERR.puts "Done"
   end
 end
 
+
+desc 'Send html-letter(s) to recipients'
+arg 'files', multiple: true, desc: "HTML-files to process"
+command :bulksend do |c|
+  c.flag [:csv_email_column], default_value: 'email', type: String, desc: 'Colum name in csv with email addresses'
+  c.flag [:l, :list], default_value: nil, required: true, desc: "File with recipents (.txt - one email per line; .csv - with column named 'email')"
+  c.switch [:r, :shuffle], default_value: true, desc: "Send emails to recipients in random order"
+  c.flag [:t, :timeout], default_value: 1.0, type: Float, desc: "Wait given seconds between sending mails"
+  c.flag [:s, :subj], default_value: nil, desc: "Subject for mail. If blank then use <title> tag or html-file name"
+  # c.flag [:p, :pretend], default_value: nil, desc: "Run but do not make any real actions"
+
+  c.action do |global_options, options, args|
+    file_type = File.extname(options[:list]).gsub('.', '').strip.downcase
+
+    case file_type
+      when 'csv'
+        require 'csv'
+
+        rows = CSV.table(options[:list], skip_blanks: true)
+        total_count = rows.size
+        email_column = options[:csv_email_column].to_sym
+
+        STDERR.puts "Warning: shuffle option not yer implemented for CSV" if options[:shuffle]
+
+        rows.each_with_index do |row, index|
+          args.each do |f|
+            email = row[email_column]
+            Mailer2.mail2(f, email, options[:subj], global_options[:user]).deliver_now
+            STDERR.puts "(#{index+1}/#{total_count}) Email '#{File.basename(f)}' sent to #{email}"
+            sleep(options[:timeout]) if options[:timeout].present?
+          end
+        end
+      else
+        # STDERR.puts
+        lines = File.readlines(options[:list])
+        lines = lines.reject { |x| x.strip.blank? }
+        lines = lines.shuffle if options[:shuffle]
+        total_count = lines.size
+        lines.each_with_index do |line, index|
+          email = line.strip
+          if email.present?
+            args.each do |f|
+              Mailer2.mail2(f, email, options[:subj], global_options[:user]).deliver_now
+              # STDERR.print '.'
+              STDERR.puts "(#{index+1}/#{total_count}) Email '#{File.basename(f)}' sent to #{email}"
+
+              sleep(options[:timeout]) if options[:timeout].present?
+            end
+          end
+        end
+    end
+
+    STDERR.puts "Done"
+  end
+end
+
 exit run(ARGV)

data/html2mail.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["e.vakhromtsev@gmail.com"]
 
   spec.summary       = %q{html to mail converter}
-  spec.description   = %q{Generates html/eml stuff for your newsletters from generic html (with images in separate files)}
+  spec.description   = %q{Console tool which generates html/eml stuff for your newsletters from html-files (support images in separate files)}
   spec.homepage      = "https://github.com/zuf/html2mail"
   spec.license       = "MIT"
 
@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   # end
 
+  spec.required_ruby_version = '>= 1.9.1'
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
   spec.executables   = "html2mail" #spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -35,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.8"
+  spec.add_development_dependency "simplecov", "~> 0.11"
 end

data/lib/html2mail/mailer2.rb

@@ -3,38 +3,32 @@ require "action_mailer/base"
 require 'premailer'
 
 class Mailer2 < ActionMailer::Base
-
-  def prepare_html(html_file)
-    Premailer.new(html_file, :warn_level => Premailer::Warnings::SAFE).to_inline_css
-  end
-
   def mail2(html_file, email, subject, from=nil)
     premailer = Premailer.new(html_file, :warn_level => Premailer::Warnings::SAFE)
-    # STDOUT.puts premailer.to_inline_css
     doc = Nokogiri::HTML(premailer.to_inline_css)
-    # doc = File.open(html_file) { |f| Nokogiri::XML(f) }
 
     doc.css('img').each do |img|
       path = img['src']
-      STDERR.puts "Process img: #{path}"
-      attachments.inline[File.basename(path)] = File.read(File.expand_path(path, File.dirname(html_file)))
-      img['src'] = attachments.inline[File.basename(path)].url
+      filesystem_path = File.expand_path(path, File.dirname(html_file))
+      if File.readable?(filesystem_path)
+        STDERR.puts "Process img: #{path}"
+        attachments.inline[File.basename(path)] = File.read(filesystem_path)
+        img['src'] = attachments.inline[File.basename(path)].url
+      end
     end
 
     head_title = doc.css('head title')
-    subject ||= head_title.text  if head_title.present?
-    subject ||= File.basename(html_file)
+    subject ||= head_title.text if head_title.present?
+    subject ||= File.basename(html_file, File.extname(html_file))
 
     html = doc.to_s.html_safe
 
     from ||= email
 
-    m = mail from: from, to: email, subject: subject do |format|
+    mail from: from, to: email, subject: subject do |format|
       format.text { render plain: premailer.to_plain_text }
       format.html { render html: html }
     end
-
-    return m
   end
 end
 

data/lib/html2mail/version.rb

@@ -1,3 +1,3 @@
 module Html2mail
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2mail
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Egor Vakhromtsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -108,8 +108,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
-description: Generates html/eml stuff for your newsletters from generic html (with
-  images in separate files)
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+description: Console tool which generates html/eml stuff for your newsletters from
+  html-files (support images in separate files)
 email:
 - e.vakhromtsev@gmail.com
 executables:
@@ -142,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="