rbbt-util 5.33.11 → 5.33.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c26a161d8529f19d32ace8b5565042b4baa6fef3d69580f46aadc523e8cc51
-  data.tar.gz: 8ee1305d3a66a55273474da60e84cec3385391ad99c8c87e764fd72eaaf29285
+  metadata.gz: 729b93bb0b82b05a03eb9cdf99728b4793ecd002ab06a92c08dc899341d26810
+  data.tar.gz: 568b263ae5bbc16e18383bd0fc5fb42054d2954b674bb1df97f80280ade9e7b2
 SHA512:
-  metadata.gz: 6b9ddf9ff821584ef21f7c30be381965ea9a8cf1cce7e9913cc11c118fa1d31211fe321d72c5d8daabcb14aac5b20df45c527fefa1d142c7a08633c3818b79dd
-  data.tar.gz: c0ab742b23fe87fd7f52bfdfe75690a02566547a34a484912c74766cff70c83634434d5a67a9e665bfdffb28be143afdb20028356befe045e19b14bcc83a21ff
+  metadata.gz: 1c56e3f171523bb412b391899b93ba88d80038a2a201ed4573897c3039526fbf1f05d2a2bcb81b837d6cb9ad31672c7c5a67572d7baa3789c10f3fc3929db274
+  data.tar.gz: b178ecce6c10f7933bdafd3cf495e3a185d6f0005b5111ed6b86f79f70b9608d613c837d7141c6ca42bf4504d352f46102d2ac628bc19d6e9a2001dbcc081284

data/lib/rbbt/util/misc/communication.rb

@@ -0,0 +1,79 @@
+module Misc
+  PUSHBULLET_KEY=begin
+                   if ENV["PUSHBULLET_KEY"]
+                     ENV["PUSHBULLET_KEY"]
+                   else
+                     config_api = File.join(ENV['HOME'], 'config/apps/pushbullet/apikey')
+                     if File.exist? config_api
+                       File.read(config_api).strip
+                     else
+                       nil
+                     end
+                   end
+                 end
+
+  def self.notify(description, event='notification', key = nil)
+    if PUSHBULLET_KEY.nil? and key.nil?
+      Log.warn "Could not notify, no PUSHBULLET_KEY"
+      return
+    end
+
+    Thread.new do
+      application = 'rbbt'
+      event ||= 'notification'
+      key ||= PUSHBULLET_KEY
+      `curl -s --header "Authorization: Bearer #{key}" -X POST https://api.pushbullet.com/v2/pushes --header 'Content-Type: application/json' --data-binary '{"type": "note", "title": "#{event}", "body": "#{description}"}'`
+    end
+  end
+
+  def self.send_email_old(from, to, subject, message, options = {})
+    IndiferentHash.setup(options)
+    options = Misc.add_defaults options, :from_alias => nil, :to_alias => nil, :server => 'localhost', :port => 25, :user => nil, :pass => nil, :auth => :login
+
+    server, port, user, pass, from_alias, to_alias, auth = Misc.process_options options, :server, :port, :user, :pass, :from_alias, :to_alias, :auth
+
+    msg = <<-END_OF_MESSAGE
+From: #{from_alias} <#{from}>
+To: #{to_alias} <#{to}>
+Subject: #{subject}
+
+#{message}
+END_OF_MESSAGE
+
+    Net::SMTP.start(server, port, server, user, pass, auth) do |smtp|
+      smtp.send_message msg, from, to
+    end
+  end
+
+  def self.send_email(from, to, subject, message, options = {})
+    require 'mail'
+
+    IndiferentHash.setup(options)
+    options = Misc.add_defaults options, :from_alias => nil, :to_alias => nil, :server => 'localhost', :port => 25, :user => nil, :pass => nil, :auth => :login, :files => []
+
+    server, port, user, pass, from_alias, to_alias, auth, files = Misc.process_options options, :server, :port, :user, :pass, :from_alias, :to_alias, :auth, :files
+
+    files = [] if files.nil?
+    files = [files] unless Array === files
+
+    Mail.defaults do
+      delivery_method :smtp, address: server, port: port, user_name: user, password: pass
+    end
+
+    mail = Mail.deliver do 
+      from  "#{from_alias} <#{from}>"
+      to "#{to_alias} <#{to}>"
+      subject subject
+
+      text_part do 
+        body message
+      end
+
+      files.each do |file|
+        file = file.find if Path === file
+        file = file.path if Step === file
+      end
+    end
+  end
+
+end

data/lib/rbbt/util/misc/development.rb

@@ -385,32 +385,6 @@ def self.add_libdir(dir=nil)
     `ps -o rss -p #{pid || $$}`.strip.split.last.to_i
   end
 
-  PUSHBULLET_KEY=begin
-                   if ENV["PUSHBULLET_KEY"]
-                     ENV["PUSHBULLET_KEY"]
-                   else
-                     config_api = File.join(ENV['HOME'], 'config/apps/pushbullet/apikey')
-                     if File.exist? config_api
-                       File.read(config_api).strip
-                     else
-                       nil
-                     end
-                   end
-                 end
-
-  def self.notify(description, event='notification', key = nil)
-    if PUSHBULLET_KEY.nil? and key.nil?
-      Log.warn "Could not notify, no PUSHBULLET_KEY"
-      return
-    end
-
-    Thread.new do
-      application = 'rbbt'
-      event ||= 'notification'
-      key ||= PUSHBULLET_KEY
-      `curl -s --header "Authorization: Bearer #{key}" -X POST https://api.pushbullet.com/v2/pushes --header 'Content-Type: application/json' --data-binary '{"type": "note", "title": "#{event}", "body": "#{description}"}'`
-    end
-  end
 
   def self.unzip_in_dir(file, dir)
     raise "Target is not a directory: #{file}" if File.exist?(dir) and not File.directory?(dir)

data/lib/rbbt/util/misc/system.rb

@@ -16,25 +16,6 @@ module Misc
     end
   end
 
-  def self.send_email(from, to, subject, message, options = {})
-    IndiferentHash.setup(options)
-    options = Misc.add_defaults options, :from_alias => nil, :to_alias => nil, :server => 'localhost', :port => 25, :user => nil, :pass => nil, :auth => :login
-
-    server, port, user, pass, from_alias, to_alias, auth = Misc.process_options options, :server, :port, :user, :pass, :from_alias, :to_alias, :auth
-
-    msg = <<-END_OF_MESSAGE
-From: #{from_alias} <#{from}>
-To: #{to_alias} <#{to}>
-Subject: #{subject}
-
-#{message}
-END_OF_MESSAGE
-
-Net::SMTP.start(server, port, server, user, pass, auth) do |smtp|
-  smtp.send_message msg, from, to
-end
-  end
-
   def self.env_add(var, value, sep = ":", prepend = true)
     ENV[var] ||= ""
     return if ENV[var] =~ /(#{sep}|^)#{Regexp.quote value}(#{sep}|$)/

data/lib/rbbt/util/misc.rb

@@ -20,6 +20,7 @@ require 'rbbt/util/misc/options'
 require 'rbbt/util/misc/system'
 require 'rbbt/util/misc/objects'
 require 'rbbt/util/misc/manipulation'
+require 'rbbt/util/misc/communication'
 
 require 'to_regexp'
 

data/lib/rbbt/util/open.rb

@@ -678,7 +678,14 @@ module Open
       if Open.exists? notification_file
         key = Open.read(notification_file).strip
         key = nil if key.empty?
-        Misc.notify("Wrote " << file, nil, key)
+        if key.include?("@")
+          to = from = key
+          subject = "Wrote " << file
+          message = "Content attached"
+          Misc.send_email(from, to, subject, message, :files => [file])
+        else
+          Misc.notify("Wrote " << file, nil, key)
+        end
         Open.rm notification_file
       end
     rescue

data/test/rbbt/util/misc/test_communication.rb

@@ -0,0 +1,11 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../../..', 'test_helper.rb')
+require 'rbbt/util/misc/communication'
+
+class TestCommunication < Test::Unit::TestCase
+  def test_send_email
+    to = from = 'mvazque2@localhost'
+    subject = message = "Test"
+    iii Misc.send_email(to, from, subject, message)
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.33.11
+  version: 5.33.12
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -292,6 +292,7 @@ files:
 - lib/rbbt/util/misc.rb
 - lib/rbbt/util/misc/annotated_module.rb
 - lib/rbbt/util/misc/bgzf.rb
+- lib/rbbt/util/misc/communication.rb
 - lib/rbbt/util/misc/concurrent_stream.rb
 - lib/rbbt/util/misc/development.rb
 - lib/rbbt/util/misc/exceptions.rb
@@ -531,6 +532,7 @@ files:
 - test/rbbt/util/concurrency/test_threads.rb
 - test/rbbt/util/log/test_progress.rb
 - test/rbbt/util/misc/test_bgzf.rb
+- test/rbbt/util/misc/test_communication.rb
 - test/rbbt/util/misc/test_development.rb
 - test/rbbt/util/misc/test_format.rb
 - test/rbbt/util/misc/test_lock.rb
@@ -611,6 +613,7 @@ test_files:
 - test/rbbt/util/misc/test_omics.rb
 - test/rbbt/util/misc/test_pipes.rb
 - test/rbbt/util/misc/test_format.rb
+- test/rbbt/util/misc/test_communication.rb
 - test/rbbt/util/misc/test_lock.rb
 - test/rbbt/util/misc/test_multipart_payload.rb
 - test/rbbt/util/misc/test_bgzf.rb