pushover 0.99.0 → 0.99.1

data/Gemfile

@@ -22,6 +22,7 @@ group :test do
   gem "rspec"
   gem "rake"
   gem "webmock"
+  gem "childprocess"
   gem 'simplecov', :require => false
   gem 'simplecov-rcov', :require => false
 end

data/README.md

@@ -1,5 +1,6 @@
 # Pushover
 **Master** [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/erniebrodeur/pushover) [![Build Status](https://travis-ci.org/erniebrodeur/pushover.png?branch=master)](https://travis-ci.org/erniebrodeur/pushover) [![Dependency Status](https://gemnasium.com/erniebrodeur/pushover.png)](https://gemnasium.com/erniebrodeur/pushover)
+
 **Development** [![Build Status](https://travis-ci.org/erniebrodeur/pushover.png?branch=development)](https://travis-ci.org/erniebrodeur/pushover)
 
 This gem provides a CLI and an API interface to http://pushover.net.

data/bin/pushover

@@ -5,7 +5,7 @@ require 'pushover'
 include Bini
 include Pushover
 Options.on("-u", "--user USER", "Which user, can be a saved name or token.") { |o| Options[:user] = o}
-Options.on("-a", "--app APPKEY", "Which app to notify, can be a saved name or apikey.") { |o| Options[:appkey] = o}
+Options.on("-a", "--app APPKEY", "Which app to notify, can be a saved name or apikey.") { |o| Options[:token] = o}
 Options.on("-t", "--title [TITLE]", "Set the title of the notification (optional).") { |o| Options[:title] = o}
 Options.on("-p", "--priority [PRIORITY]", "Set the priority of the notification from (low,normal,high) (optional).") { |o| Options[:priority] = o}
 Options.on("-d", "--device [DEVICE]", "Specify the device to send the notifcation to. (optional).") { |o| Options[:device] = o}
@@ -17,34 +17,32 @@ Options.on("--save-app NAME", "Saves the application to the config file under NA
 Options.on("--save-user NAME", "Saves the user to the config file under NAME.") { |o| Options[:save_user] = [Options[:user], o]}
 
 Options.parse!
+bail = false
 
 # Order is important.
 if Options[:config_file]
-	puts "Selecting config file: #{Options[:config_file]}"
-	Pushover::Config.save_file = Options[:config_file]
+	Bini::Config.file = Options[:config_file]
+	puts "Selected config file: #{Options[:config_file]}"
 end
 
 if Options[:save_app]
-	puts "Saving application #{Options[:save_app][0]} to #{Options[:save_app][1]}."
 	App.add Options[:save_app][1], Options[:save_app][0]
-	puts "Save successful."
-	exit
+	puts "Saved application #{Options[:save_app][0]} to #{Options[:save_app][1]}."
+	bail = true
 end
 
 if Options[:save_user]
-	puts "Saving user #{Options[:save_user][0]} to #{Options[:save_user][1]}."
 	User.add Options[:save_user][1], Options[:save_user][0]
-	puts "Save successful."
-	exit
+	puts "Saved user #{Options[:save_user][0]} to #{Options[:save_user][1]}."
+	bail = true
 end
 
 if ARGV.empty?
 	puts "You must supply a message."
-	exit
+	bail = true
 end
-bail = false
-message = ARGV.join(" ")
 
+message = ARGV.join(" ")
 if !message
 	puts "Must supply a message to be sent."
 	bail = true
@@ -60,6 +58,7 @@ if !User.current_user?
 	puts "Couldn't find a user via the cli or save file."
 	bail = true
 end
+
 exit if bail
 
 # I do both just as an example, you can configure it this way and have it
@@ -71,7 +70,7 @@ end
 
 # Or in real time, which will also overwrite the .configure block.
 options = Options[].select { |k,v| v}
-
+options.delete :config_file
 options.merge! message:message
 response = Pushover.notification options
 
@@ -81,3 +80,5 @@ else
 	j = Yajl.load response.body
 	puts "ErrorCode (#{response.code}): #{j['errors'].first}."
 end
+
+

data/lib/pushover.rb

@@ -32,17 +32,7 @@ module Pushover
   attr_reader   :timestamp
   attr_reader   :priority
   def priority=(level)
-    if level.class == String
-      if level =~ /^[lL]/
-        @priority = -1
-      elsif level =~ /^[hH]/
-        @priority = 1
-      else
-        @priority = 0
-      end
-    elsif level.class == Fixnum
-      @priority = level
-    end
+    @priority = priority_magic level
   end
 
   # Stdlib time, seems to take a shitload of options.
@@ -51,16 +41,7 @@ module Pushover
   # Time.parse 'Aug 13, 1979 6:30'
   # Time.parse '1979/08/13, 6:30:50 UTC'
   def timestamp=(time_string)
-    if time_string.class == String
-      begin
-        @timestamp = Time.parse(time_string).to_i
-      rescue ArgumentError
-        @timestamp = time_string.to_i
-      end
-    elsif
-      time_string.class == Fixnum
-      @timestamp = time_string
-    end
+    @timestamp = timestamp_magic time_string
   end
 
   # push a message to  pushover, must supply all variables.
@@ -72,10 +53,12 @@ module Pushover
   # @param [optional, String] user the user token.
   # @return [String] the response from pushover.net, in json.
   def notification(tokens={})
-    tokens.each {|k,v| send("#{k}=", tokens[k])}
+    tokens[:timestamp] = timestamp_magic tokens[:timestamp] if tokens[:timestamp]
+    tokens[:priority]  = priority_magic tokens[:priority] if tokens[:priority]
+
     url = URI.parse("https://api.pushover.net/1/messages.json")
-    req = Net::HTTP::Post.new(url.path)
-    req.set_form_data(params)
+    req = Net::HTTP::Post.new(url.path, {'User-Agent' => "Ruby pushover gem: #{Pushover::VERSION}"})
+    req.set_form_data(params.merge(tokens).select {|k,v| v != nil})
     res = Net::HTTP.new(url.host, url.port)
     res.use_ssl = true
     res.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -112,4 +95,34 @@ module Pushover
   def keys
     keys ||= [:token, :user, :message, :title, :priority, :device, :timestamp, :url, :url_title]
   end
+
+  private
+
+  def timestamp_magic(time_string)
+    if time_string.class == String
+      begin
+        return Time.parse(time_string).to_i
+      rescue ArgumentError
+        return time_string.to_i
+      end
+    elsif
+      time_string.class == Fixnum
+      return time_string
+    end
+  end
+
+  def priority_magic(level)
+    if level.class == String
+      if level =~ /^[lL]/
+        return -1
+      elsif level =~ /^[hH]/
+        return 1
+      else
+        return 0
+      end
+    elsif level.class == Fixnum
+      return level
+    end
+  end
 end
+

data/lib/pushover/version.rb

@@ -1,4 +1,4 @@
 module Pushover
 	# The current version of Pushover.
-  VERSION = "0.99.0"
+  VERSION = "0.99.1"
 end

data/spec/bin/pushover_spec.rb

@@ -1,4 +1,58 @@
-# describe "CLI Interface" do
+# Since this testing requires an actual account, and a working internet, we don't
+# run it as part of the standard suite.
+# If you want to run these tests, add ENV["TEST_CLI"]
+# If you have a credentials file already, you might find it beeps you.
 
-# end
+CRED_FILE = "#{Dir.home}/.config/pushover/credentials.yaml"
+FAKE_CRED_FILE = 'tmp/fake_credentials.yaml'
+CMD = 'bundle exec bin/pushover'
 
+require 'spec_helper.rb'
+require 'cli_spec_helper.rb'
+
+if ENV["TEST_CLI"] =~ /^t/
+  describe "CLI Interface" do
+    describe 'help' do
+      it 'has options' do
+        p = CLIProcess.new "#{CMD} --help"
+        p.run!
+        words = /user|app|title|priority|url|url_title|save-app|save-user|time|version/
+        p.stdout.should =~ words
+      end
+    end
+
+    describe "send" do
+      if !File.exist? CRED_FILE
+        it "sends messages (no credentials file)"
+      else
+        it "sends messages" do
+          p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} a message", 3, 3
+          p.run!
+          #binding.pry
+          p.stdout.should include("success"), "#{p.stderr}"
+        end
+      end
+
+      it "lets me know when a message fails" do
+        p = CLIProcess.new "#{CMD} --app fail --user now message goes here", 3, 3
+        p.run!
+        p.stdout.should include "ErrorCode"
+      end
+    end
+
+    describe "saving" do
+      it "saves app:key pairs" do
+        p = CLIProcess.new "#{CMD} --config_file #{FAKE_CRED_FILE} --save-app default --app default"
+        p.run!
+        p.stdout.should include 'Saved'
+        open(FAKE_CRED_FILE).read.should include 'default'
+      end
+      it "saves user:token pairs" do
+        p = CLIProcess.new "#{CMD} --config_file #{FAKE_CRED_FILE} --save-user default --user default"
+        p.run!
+        p.stdout.should include 'Saved'
+        open(FAKE_CRED_FILE).read.should include 'default'
+      end
+    end
+  end
+end

data/spec/cli_spec_helper.rb

@@ -0,0 +1,99 @@
+# Ripped without remorse from: https://github.com/cucumber/aruba/blob/master/lib/aruba/process.rb
+# slightly modified for my purposes.
+require 'childprocess'
+require 'tempfile'
+require 'shellwords'
+
+class CLIProcess
+  include Shellwords
+
+  def initialize(cmd, exit_timeout = 0, io_wait = 1)
+    @exit_timeout = exit_timeout
+    @io_wait = io_wait
+    @io_waited = false
+
+    @cmd = cmd
+    @process = nil
+    @exit_code = nil
+  end
+
+  def run!(&block)
+    @process = ChildProcess.build(*shellwords(@cmd))
+    @out = Tempfile.new("binary-out")
+    @err = Tempfile.new("binary-err")
+    @process.io.stdout = @out
+    @process.io.stderr = @err
+    @process.duplex = true
+    @exit_code = nil
+    begin
+      @process.start
+    rescue ChildProcess::LaunchError => e
+      raise LaunchError.new(e.message)
+    end
+    yield self if block_given?
+  end
+
+  def stdin
+    @process.io.stdin
+  end
+
+  def output(keep_ansi = false)
+    stdout(keep_ansi) + stderr(keep_ansi)
+  end
+
+  def stdout(keep_ansi = false)
+    wait_for_io do
+      @out.rewind
+      filter_ansi(@out.read, keep_ansi)
+    end
+  end
+
+  def stderr(keep_ansi = false)
+    wait_for_io do
+      @err.rewind
+      filter_ansi(@err.read, keep_ansi)
+    end
+  end
+
+  def read_stdout(keep_ansi = false)
+    wait_for_io do
+      @process.io.stdout.flush
+      content = filter_ansi(open(@out.path).read, keep_ansi)
+    end
+  end
+
+  def stop(reader, keep_ansi)
+    return @exit_code unless @process
+    unless @process.exited?
+      @process.poll_for_exit(@exit_timeout)
+    end
+    reader.stdout stdout(keep_ansi)
+    reader.stderr stderr(keep_ansi)
+    @exit_code = @process.exit_code
+    @process = nil
+    @exit_code
+  end
+
+  def terminate(keep_ansi = false)
+    if @process
+      stdout(keep_ansi = false) && stderr(keep_ansi) # flush output
+      @process.stop
+      stdout(keep_ansi) && stderr(keep_ansi) # flush output
+    end
+  end
+
+  private
+
+  def wait_for_io(&block)
+    if @process && !@io_waited
+      sleep @io_wait
+      @io_waited = true
+    end
+    yield
+  end
+
+  def filter_ansi(string, keep_ansi)
+    keep_ansi ? string : string.gsub(/\e\[\d+(?>(;\d+)*)m/, '')
+  end
+
+end

data/whatsnew.md

@@ -1,4 +1,11 @@
-## 0.99.0 (unreleased):
+## 0.99.1:
+  * Big one here, properly testing bin/pushover now.
+  * Fixed a bug in the bin/pushover so --config_file and --app work as expected.
+  * Empty params will no longer be sent to pushover.net
+  * Fixed Pushover#notification, no longer overwrites params with it's arguments.
+  * Added a user-agent to the POST's sent to pushover.net
+
+## 0.99.0:
   * Added url and a url_title.
   * Added time, we can take an epoch or string.  The string is run through stdlib Time#parse, so effectively takes rfc822, html, xml, and a bunch of random bits.
   * Added gemnasium to the readme.
@@ -9,7 +16,7 @@
 ## 0.5.1:
   * SimpleCov and 100% test coverage
   * Webmock based testing for Pushover##notification.
-  * Added intergration to http://travis-ci.org
+  * Added integration to http://travis-ci.org
 
 ## 0.5.0:
   * Switched the order of App and it's derivatives so that it's name, api_key to make it more human readable.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushover
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 0.99.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -67,6 +67,7 @@ files:
 - lib/pushover/version.rb
 - pushover.gemspec
 - spec/bin/pushover_spec.rb
+- spec/cli_spec_helper.rb
 - spec/lib/pushover/app_spec.rb
 - spec/lib/pushover/pushover_spec.rb
 - spec/lib/pushover/user_spec.rb
@@ -105,6 +106,7 @@ specification_version: 3
 summary: This gem provides both an API and CLI interface to pushover.net.
 test_files:
 - spec/bin/pushover_spec.rb
+- spec/cli_spec_helper.rb
 - spec/lib/pushover/app_spec.rb
 - spec/lib/pushover/pushover_spec.rb
 - spec/lib/pushover/user_spec.rb