blertr 0.2.2 → 0.2.3

data/bin/blertr

@@ -47,6 +47,11 @@ Commands:
                Example: blertr time email 5 minutes
                This would make blertr send an email only if
                the command executing took longer than 5 mins
+
+    set        Pass in the notifier name, a configuration key, and
+               a value. Blertr will add this key / value to the 
+               notifiers config file.
+               Example: blertr set mail to user@gmail.com
 EOS
   puts help_string
 end
@@ -132,6 +137,22 @@ def take_action action, parameters
     name = parameters.join(" ")
     puts "Excluding #{name} from Blertr alerts"
     Blertr::Blacklist.new.add(name)
+  when "set"
+    notifier_name = parameters.shift
+    if Blertr::Control::is_notifier? notifier_name
+      key = parameters.shift
+      value = parameters.shift
+      if key and value
+        puts "Setting #{notifier_name}'s #{key} to #{value}"
+        Blertr::Control::notifier_with_name(notifier_name).set_option(key,value)
+      else
+        puts "set command requires a key and a value to set it to"
+        puts "example blertr set email to user@gmail.com"
+      end
+    else
+      puts "Sorry, #{action} isn't a notifier."
+      puts "Use blertr status for a list of all notifiers"
+    end
   when "time"
     notifier_found = false
     notifiers = parameters.shift.split(",")

data/lib/blertr/mail_notifier.rb

@@ -10,18 +10,24 @@ module Blertr
 
     def alert message
       username = options[:username]
+      blert_user = "#{username}@gmail.com"
       password = options[:password]
       receiver = options[:to]
-      msg = create_message(message)
+      msg = create_message(message, receiver, blert_user)
       smtp = Net::SMTP.new 'smtp.gmail.com', 587
       smtp.enable_starttls
-      smtp.start('gmail.com', username, password, :login) do
-        smtp.send_message(msg, "#{username}@gmail.com", receiver)
+      smtp.start('smtp.gmail.com', blert_user, password, :plain) do
+        smtp.send_message(msg, blert_user, receiver)
       end
     end
 
-    def create_message message
-      msg = "Subject: #{message.command_short_name} is done!\n"
+    def create_message message, to, from
+      date = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+      msg = "Date: #{date}\n"
+      msg += "From: Blertr App <#{from}>\n"
+      msg += "To: #{to} <#{to}>\n"
+      msg += "Subject: #{message.command_short_name} is done!\n"
+      msg += "\n"
       msg += "#{message.command_short_name} has completed.\nCommand: #{message.command}\nTime: #{message.time_string}\n"
       msg
     end

data/lib/blertr/notifier.rb

@@ -19,8 +19,12 @@ module Blertr
     end
 
     def set_time new_time
+      set_option :time, new_time
+    end
+
+    def set_option key, value
       opts = options
-      opts[:time] = new_time
+      opts[key.to_sym] = value
       Options::save_options_for name, opts
     end
 

data/lib/blertr/version.rb

@@ -1,3 +1,3 @@
 module Blertr
-  VERSION = "0.2.2".freeze
+  VERSION = "0.2.3".freeze
 end

data/scripts/blertr

@@ -18,8 +18,8 @@
 
 export HOME="${HOME%%+(\/)}" # Remove trailing slashes if they exist on HOME
 
-if [[ -z "${blertr_path:-}" ]]
-then
+#if [[ -z "${blertr_path:-}" ]]
+#then
 
   if [[ -z "${blertr_prefix:-}" ]]
   then
@@ -50,7 +50,7 @@ then
   # the scripts/cli file
   export blertr_path="${blertr_path%%+(\/)}"
   export blertr_bin_path="${blertr_bin_path%%+(\/)}"
-fi
+#fi
 
 # load the bash files that add hooks for executing commands
 if [[ -n "${blertr_path}" && -d "$blertr_path" ]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blertr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-26 00:00:00.000000000Z
+date: 2011-07-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2735430 !ruby/object:Gem::Requirement
+  requirement: &868650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2735430
+  version_requirements: *868650
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2735110 !ruby/object:Gem::Requirement
+  requirement: &867670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2735110
+  version_requirements: *867670
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2734800 !ruby/object:Gem::Requirement
+  requirement: &867160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *2734800
+  version_requirements: *867160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2734520 !ruby/object:Gem::Requirement
+  requirement: &866270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *2734520
+  version_requirements: *866270
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &2734230 !ruby/object:Gem::Requirement
+  requirement: &865450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2734230
+  version_requirements: *865450
 description: Automatic alerts for when bash scripts and commands complete
 email: vvv@gmail.com
 executables: