pushover 0.99.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384098813f10cc5c417e2e4f833ba8b7e7e58397
-  data.tar.gz: 30885b1bda002d1e5a95ae34ab5c67328e4f5b95
+  metadata.gz: fba81cc748d32d1fcb33b9033b31884f69b75446
+  data.tar.gz: cb9b81b74147841ed98a4e99ab6c56f1ae2a994c
 SHA512:
-  metadata.gz: 584baf258b9ef963b9f818203fbc9c3a507feb0fb5c7a214b2aa01627853fcddee08264048cf156116343641e74202f1916a6444251a83ba8fd635f1ecee50ea
-  data.tar.gz: ce345127bb007692d1faab0973c35f0f4d752145ff1b62a74f39888fefbab7ec19bde59e48ed53124dc22a8965a4c96fc394162ae633b4d8f9b6db19c3d7160c
+  metadata.gz: 006c0109d54e20428d8042694a00cd9a24eb79103b922eea16e571c85e72d614d6a8ba08f7defbef26ddf700f282ea20a6c19d95256797ad65e5070ffe0df2e0
+  data.tar.gz: 93c9d2647e1136b4ebd8ca3d88afc2433e949199e21e265de32da249e91a78cec3a39cb7dae75718d9ca27d0fa310f16a3234642febc901acba8f26a6888cb9e

data/.travis.yml

@@ -3,9 +3,12 @@ bundler_args: --without development
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - rbx-19mode
 
 branches:
   only:
     - master
     - development
+
+script: bundle exec rspec -b spec

data/Gemfile

@@ -3,27 +3,32 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "pry"
-  gem "pry-debugger"
-  gem "redcarpet"
-  gem "guard"
-  gem "guard-bundler"
-  gem "guard-rspec"
-  gem "guard-yard"
-  gem "guard-shell"
-  gem 'libnotify',  :require => false
-  gem 'growl',      :require => false
-  gem 'rb-inotify', :require => false
-  gem 'rb-fsevent', :require => false
-  gem 'rb-fchange', :require => false
+  gem "pry",           :require => false
+  gem "guard",         :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-rspec",   :require => false
+  gem "guard-yard",    :require => false
+  gem "guard-shell",   :require => false
+  gem 'libnotify',     :require => false
+  gem 'growl',         :require => false
+  gem 'rb-inotify',    :require => false
+  gem 'rb-fsevent',    :require => false
+  gem 'rb-fchange',    :require => false
 end
 
 group :test do
-  gem "rspec"
-  gem "rake"
-  gem "webmock"
-  gem "childprocess"
-  gem 'simplecov', :require => false
-  gem 'simplecov-rcov', :require => false
+  gem "rspec", "~> 2.13.0"
+  gem "rspec-core", "~> 2.13.0"
+  gem "rspec-expectations", "~> 2.13.0"
+  gem "rspec-mocks", "~> 2.13.0"
+  gem "rake", "~> 10.1.0"
+  gem "webmock", "~> 1.13.0"
 end
 
+group :extended_testing do
+  gem "childprocess", "~> 0.3.9"
+  gem 'simplecov', "~> 0.7.1", :require => false
+  gem 'simplecov-rcov', "~> 0.2.3", :require => false
+end
+
+

data/Guardfile

@@ -1,4 +1,8 @@
 #!/usr/bin/ruby
+# Must be an array
+test_cmd = [
+  "bundle exec pushover a message"
+]
 
 guard :bundler do
 	watch 'Gemfile'
@@ -7,7 +11,7 @@ end
 
 guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |m| "spec spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^bin/(.+)\.rb$})         { |m| "spec/bin/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')      { "spec" }
 end
@@ -15,3 +19,15 @@ end
 # guard :yard do
 #   watch(%r{^lib/(.+)\.rb$})
 # end
+
+# guard :shell do
+#   watch /.*/ do |m|
+#     puts "Time: #{Time.now}, file saved: #{m}"
+#     test_cmd.each do |cmd|
+
+#       puts "=" * 80
+#       puts "cmd: #{cmd}"
+#       puts `#{cmd}`
+#     end
+#   end
+# end

data/README.md

@@ -9,15 +9,15 @@ This gem provides a CLI and an API interface to http://pushover.net.
 
 To install:
 
-		$ gem install pushover
+		% gem install pushover
 
 To use inside of an application, add this to the your gemfile:
 
-		$ gem 'pushover'
+		% gem 'pushover'
 
 and run bundle to make it available:
 
-		$ bundle
+		% bundle
 
 ## Usage
 
@@ -46,11 +46,11 @@ Pushover.notification(message: 'message', title: 'title')
 
 To get help do, try ```--(h)elp```
 
-		$ pushover -h
+		% pushover -h
 
 To send a message.
 
-		$ pushover -u user_token -a app_key message is the rest of the cli.
+		% pushover -u user_token -a app_key message is the rest of the cli.
 
 #### Optional parameters
 
@@ -60,52 +60,62 @@ Most optional parameters have a shorter form you can use.  If that's the case, t
 
 The file to use for stored settings (including credentials).
 
-		$ pushover --(c)onfig_file /tmp/config_file
+		% pushover --(c)onfig_file /tmp/config_file
 
 
 #### Title
 
 The title of the message, if not supplied it will end up being the app name.
 
-		$ pushover --(t)itle "A title"
+		% pushover --(t)itle "A title"
 
-		$ pushover --(t)itle "A title"
+		% pushover --(t)itle "A title"
 
 #### Priority
 
 Priority of the message, either (low,normal,high) or (-1,0,1).  For the string you only need the first letter.
 
-		$ pushover --(p)riority high
+		% pushover --(p)riority high
 
-		$ pushover --(p)riority h
+		% pushover --(p)riority h
 
-		$ pushover --(p)riority -1
+		% pushover --(p)riority -1
+
+#### Emergency Notifications
+
+Currently retry/expire is supported, currently these are in seconds.  Callback url's are not.
+
+		% pushover --emergency_retry 60
+
+		% pushover --emergency_expire 3600
+
+It won't pre-check values sent to the api, so you will need to tune for the current min/max values or check api documentation.
 
 #### Device
 
 Specific device to send the message too, must be registered at pushover.net
 
-		$ pushover --(d)evice "Device name"
+		% pushover --(d)evice "Device name"
 
 #### URL
 
 Supplementary URL that can be passed with the message.
 
-		$ pushover --url "http://www.github.com/erniebrodeur/pushover"
+		% pushover --url "http://www.github.com/erniebrodeur/pushover"
 
 ##### URL Title
 
 The display string of the supplementary URL.
 
-		$ pushover --url "http://www.git.com/erniebrodeur/pushover" --url_title "This repo."
+		% pushover --url "http://www.git.com/erniebrodeur/pushover" --url_title "This repo."
 
 #### Time
 
 Time is tricky, I just pass the string off to the stdlib ```Time.parse```.  Therefore, if it fails I can't do much about it.  Though, it shouldn't fail, it seems to take just a ton of stuff.  You can always handle this yourself and just pass in an epoch (string or fixnum).
 
-    $ pushover --time 1331249662
+		% pushover --time 1331249662
 
-    $ pushover --time "6:30"
+		% pushover --time "6:30"
 
 ##### String examples
 
@@ -119,30 +129,56 @@ As far as I can tell, you can toss a ton of different things and get an output.
 * 14:30
 * Aug 21
 
+##### Sounds
+
+Get the available list of sounds:
+
+		% pushover --sound_list
+
+Play a specific sound with a message:
+
+		% pushover --sound Magic
+		% pushover --sound per
+
+* You only need to supply an unambiguous partial string.
+* It is not case sensitive.
+
 #### Saving
 
 You can also save and use stored information.  The username/application are titles.  They can be anything you want to reference them.
 
 ##### User
 
-		$ pushover -u user_token --save-user email@somewhere.net
+		% pushover -u user_token --save-user email@somewhere.net
 
 ##### Application
 
-		$ pushover -a app_key --save-app myApp
+		% pushover -a app_key --save-app myApp
 
 Delete done in the api, not lifted to the cli.
 
 Now, you can use these to send messages instead of having to remember the key:
 
-		$ pushover -a myApp -u email@somewhere.net Hello from somewhere!
+		% pushover -a myApp -u email@somewhere.net Hello from somewhere!
 
 If you don't supply the application or user name, it will use the first one in the save file.
 
-		$ pushover so now I can just send an app.
+		% pushover so now I can just send an app.
 
 Anytime you supply tokens directly to the cli, it will ignore any saved information and try them.  This allows you to use it as a once-off tool while keeping credentials stored.
 
+## TODO
+
+### 1.0 tree
+
+* Callback urls.
+* Receipt testing.
+
+### 2.0 tree
+
+* Rebuild the CLI so it works more like a git/bundle command.
+* More argument/string magic.
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,7 +1,7 @@
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-require "bundler/gem_tasks"

data/bin/pushover

@@ -7,7 +7,7 @@ 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[: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("-p", "--priority [PRIORITY]", "Set the priority of the notification from (low,normal,high,emergency) (optional).") { |o| Options[:priority] = o}
 Options.on("-d", "--device [DEVICE]", "Specify the device to send the notifcation to. (optional).") { |o| Options[:device] = o}
 Options.on("-c", "--config_file [FILE]", "Set the target config file.") {|o| Options[:config_file] = o}
 Options.on("--url [URL]", "Supplementary URL") { |o| Options[:url] = o }
@@ -15,6 +15,12 @@ Options.on("--url_title [TITLE]", "Supplementary URL title.") { |o| Options[:url
 Options.on("--time [TIME]", "Set the messages time.") {|o| Options[:timestamp] = o}
 Options.on("--save-app NAME", "Saves the application to the config file under NAME.") { |o| Options[:save_app] = [Options[:appkey], o]}
 Options.on("--save-user NAME", "Saves the user to the config file under NAME.") { |o| Options[:save_user] = [Options[:user], o]}
+Options.on("--sound [SOUND]", "Specify the sound to use.  Can be a partial string as long as it is unambiguous enough.") { |o| Options[:sound] = o}
+Options.on("--sound_list", "Display the current list of available sounds.  Requires an app token.") { |o| Options[:sound_list] = true}
+Options.on("--emergency_retry [TIME]", "The time in seconds between retries.") { |o| Options[:retry] = o}
+Options.on("--emergency_expire [TIME]", "How long the emergency notification will hang around.") { |o| Options[:expire] = o}
+Options.on("--emergency_callback_url [URL]", "A callback url to use when the notification is acknowledged.") { |o| Options[:callback] = o}
+Options.on("--receipts", "List the receipts cached and if they have been acknowledged or not.") {|o| Options[:receipts] = true}
 
 Options.parse!
 bail = false
@@ -37,16 +43,7 @@ if Options[:save_user]
 	bail = true
 end
 
-if ARGV.empty?
-	puts "You must supply a message."
-	bail = true
-end
-
-message = ARGV.join(" ")
-if !message
-	puts "Must supply a message to be sent."
-	bail = true
-end
+exit if bail # We don't care if we have a message, we should exit here.
 
 if !App.current_app?
 	puts "Couldn't find an app via the cli or save file."
@@ -54,31 +51,100 @@ if !App.current_app?
 end
 
 if !User.current_user?
-	puts User.current_user?
 	puts "Couldn't find a user via the cli or save file."
 	bail = true
 end
 
+if Options[:sound_list]
+	puts "Current Sound List:"
+	if Pushover.sounds
+		Pushover.sounds.each { |k,v| puts "  #{v}" }
+	else
+		puts "Error retrieving sound list, are you connected to the internet?  are your credentials correct?"
+		exit
+	end
+	bail = true
+end
+
+if Options[:receipts]
+	puts 'Updating receipts'
+	Pushover::Priority.update_receipts
+	Pushover::Priority::Receipts.each do |k,v|
+		if v["acknowledged"] != 0
+			print "Receipt #{k} was acknowledged at #{Time.at v["acknowledged_at"]}, "
+		else
+			print "Receipt #{k} has not been acknowledged yet, "
+		end
+
+		if v["expired"] == 0
+			puts "and will expire at: #{Time.at v["expires_at"]}."
+		else
+			puts "and expired at: #{Time.at v["expires_at"]}."
+		end
+	end
+	exit
+end
+
+if Options[:sound]
+	sounds = Pushover.sounds
+	if !sounds
+		puts "Error retrieving sound list, are you connected to the internet?  are your credentials correct?"
+		exit
+	end
+	match = sounds.select { |k,v| v.downcase.start_with? Options[:sound].downcase}
+	if !match || match.count == 0
+		puts "No such sound: #{Options[:sound]}."
+		bail = true
+	elsif match.count > 1
+		print "Sound is ambiguous, possible matches: "
+		match.each {|k,v| print "#{v} "}
+		print "\n"
+		bail = true
+	else
+		Options[:sound] = match.first[0]
+	end
+end
+
+if Options[:priority]
+	# Is this an emergency, did we include everything we need?
+	if Priority.is_emergency?(Options[:priority])
+		Options[:retry] = 30 if !Options[:retry]
+		Options[:expire] = 86400 if !Options[:expire]
+	end
+end
+
 exit if bail
 
-# I do both just as an example, you can configure it this way and have it
-# pre-configured:
-Pushover.configure do |c|
-	c.user 			= User.current_user
-	c.token	 		= App.current_app
+message = ARGV.join(" ")
+if !message
+	puts "Must supply a message to be sent."
+	bail = true
 end
 
-# Or in real time, which will also overwrite the .configure block.
+exit if bail
+
 options = Options[].select { |k,v| v}
+options[:token] = Pushover::App.current_app
+options[:user] = Pushover::User.current_user
 options.delete :config_file
 options.merge! message:message
-response = Pushover.notification options
 
-if response.code == "200"
+response = Pushover.notification options
+if response.code == 500
+	puts "Something is broken at pushover.net and it is returning 500's (server errors).  Here is the response body."
+	puts response.body
+	exit
+end
+j = Yajl.load response.body
+
+if response.code == 200
+	if Priority.is_emergency?(Options[:priority])
+		j = Yajl.load response.body
+		Pushover::Priority.process_receipt j["receipt"]
+		puts "emergency notification receipt: #{j["receipt"]}"
+	end
 	puts "Message sent successfully!"
 else
-	j = Yajl.load response.body
 	puts "ErrorCode (#{response.code}): #{j['errors'].first}."
 end
 
-

data/lib/pushover.rb

@@ -1,17 +1,25 @@
-require "net/https"
+require 'httparty'
 require "yajl"
 require 'time'
 require 'bini'
 require 'bini/config'
 require 'bini/optparser'
+require 'open-uri'
+require 'pushover/mixins.rb'
+
+module Pushover
+  autoload :VERSION,  "pushover/version"
+  autoload :App,      "pushover/app"
+  autoload :User,     "pushover/user"
+  autoload :Priority, "pushover/priority"
+end
 
-require "pushover/version"
-require "pushover/app"
-require "pushover/user"
 # The primary pushover namespace.
 module Pushover
+  # Unfuckingbelievable.  My code, and I still can't get it to work as expected.
+  Bini.long_name = 'pushover'
   # lets save our config to it's own dir, just because.
-  Bini::Config.file = "#{Dir.home}/.config/pushover/credentials.yaml"
+  Bini::Config.options[:file] = "#{Dir.home}/.config/pushover/credentials.yaml"
   Bini::Config.load
 
   extend self
@@ -26,14 +34,14 @@ module Pushover
   attr_accessor :title
   # [optional,String] device to recieve the message.
   attr_accessor :device
+  attr_reader   :priority
   attr_accessor :url
   attr_accessor :url_title
+  attr_accessor :emergency_retry
+  attr_accessor :emergency_expire
+  attr_accessor :emergency_callback
   # [optional,String, Fixnum] time a time stamp im one of three forms (epoch, strfmt, rails)
   attr_reader   :timestamp
-  attr_reader   :priority
-  def priority=(level)
-    @priority = priority_magic level
-  end
 
   # Stdlib time, seems to take a shitload of options.
   # rfc822: Tue, 14 Nov 2000 14:55:07 -0500
@@ -54,15 +62,22 @@ module Pushover
   # @return [String] the response from pushover.net, in json.
   def notification(tokens={})
     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, {'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
-    res.start {|http| http.request(req) }
+    tokens[:priority]  = Pushover::Priority.parse tokens[:priority] if tokens[:priority]
+
+    response = HTTParty.post('https://api.pushover.net/1/messages.json', body:tokens)
+    response
+  end
+
+  # Return a [Hash] of sounds.
+  def sounds
+    cache_file = "#{Bini.cache_dir}/sounds.json"
+    sounds = {}
+
+    cache_sounds if File.exists?(cache_file) && File.stat(cache_file).mtime < Time.at(Time.now.day - 1)
+
+    return nil if !cache_sounds
+    sounds = Yajl.load open(cache_file).read
+    sounds["sounds"]
   end
 
   # Adds a rails style configure method
@@ -93,9 +108,14 @@ module Pushover
 
   # A [Array] of keys available in Pushover.
   def keys
-    keys ||= [:token, :user, :message, :title, :priority, :device, :timestamp, :url, :url_title]
+    Pushover.instance_methods.select do |m|
+      m =~ /=$/
+    end.map do |m|
+      m[0..-2]
+    end
   end
 
+
   private
 
   def timestamp_magic(time_string)
@@ -111,18 +131,17 @@ module Pushover
     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
+  def cache_sounds
+    cache_file = "#{Bini.cache_dir}/sounds.json"
+
+    response = HTTParty.get('https://api.pushover.net/1/sounds.json', query:{token:Pushover::App.current_app})
+
+    return nil if response.code != 200
+    FileUtils.mkdir_p Bini.cache_dir
+    f = open(cache_file, 'w')
+    f.write response.body
+    f.flush
+    f.close
+    return true
   end
 end
-

data/lib/pushover/app.rb

@@ -34,7 +34,7 @@ module Pushover
 		# @return [Boolean] return the results of the save attempt.
 		def add(name, api_key)
 			App.new name, api_key
-			Bini::Config.save!
+			Bini::Config.save
 		end
 
 		def remove(name)
@@ -45,11 +45,8 @@ module Pushover
 			# did something get supplied on the cli? try to find it.
 			if Bini::Options[:apikey]
 				@current_app = find Bini::Options[:apikey]
-			end
-
-			# no?  do we have anything we can return?
-			if !@current_app
-				@current_app = find Bini::Config[:applications].first[0] if Bini::Config[:applications]
+			else
+				@current_app = find Bini::Config[:applications].values.first if Bini::Config[:applications]
 			end
 			@current_app
 		end

data/lib/pushover/mixins.rb

@@ -0,0 +1,7 @@
+class Hash
+  def first
+    self.each do |k,v|
+    	return {k => v}
+    end
+  end
+end

data/lib/pushover/priority.rb

@@ -0,0 +1,63 @@
+module Pushover
+  module Priority
+    extend self
+
+    # A sash for our receipts.
+    Receipts = Bini::Sash.new options:{
+      file:"#{Bini.cache_dir}/receipts.yaml", auto_load:true, auto_save:true
+    }
+    LEVELS = {
+      low:-1,
+      normal:0,
+      high:1,
+      emergency:2
+    }
+
+    def priority=(level)
+      @priority = parse level
+    end
+
+    def parse(level)
+      return level if level.class == Fixnum
+      if level.class == String
+        LEVELS.each { |k,v| return v if k.to_s.start_with? level.downcase }
+      end
+
+      return 0
+    end
+
+    # Pull one from cache, or fetch one if not available.
+    def find_receipt(prefix)
+      results = Receipts.select { |k,v| k =~ /^#{prefix}/ }
+      return nil if results.empty?
+      return results.first
+    end
+
+    def update_receipts
+      updates = Receipts.select {|k,v| v["acknowledged"] == 0 && v["expired"] == 0}
+      updates.keys.each do |key|
+        process_receipt key
+      end
+    end
+
+    def process_receipt(receipt)
+      r = fetch_receipt(receipt)
+
+      return nil if !r
+      Receipts[receipt] = r.to_h
+
+      return Receipts[receipt]
+    end
+
+    def is_emergency?(priority)
+      return true if priority && Pushover::Priority.parse(priority) == LEVELS[:emergency]
+      return false
+    end
+
+    private
+    def fetch_receipt(receipt)
+      HTTParty.get("https://api.pushover.net/1/receipts/#{receipt}.json",
+        body:{token:Pushover::App.current_app})
+    end
+  end
+end

data/lib/pushover/user.rb

@@ -35,7 +35,7 @@ module Pushover
 		# @return [Boolean] return the results of the save attempt.
 		def add(name, token)
 			User.new name, token
-			Bini::Config.save!
+			Bini::Config.save
 		end
 
 		def remove(name)
@@ -47,12 +47,10 @@ module Pushover
 			# did something get supplied on the cli? try to find it.
 			if Bini::Options[:token]
 				@current_user = find Bini::Options[:token]
+			elsif !@current_user
+				@current_user = find Bini::Config[:users].values.first if Bini::Config[:users]
 			end
 
-			# no?  do we have anything we can return?
-			if !@current_user
-				@current_user = find Bini::Config[:users].first[0] if Bini::Config[:users]
-			end
 			@current_user
 		end
 

data/lib/pushover/version.rb

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

data/pushover.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.has_rdoc = 'yard'
 
   # dependencies.
-  gem.add_runtime_dependency 'yajl-ruby'
-  gem.add_runtime_dependency 'bini', '~> 0.6.0'
+  gem.add_runtime_dependency 'yajl-ruby', "= 1.1.0"
+  gem.add_runtime_dependency 'httparty', "= 0.11.0"
+  gem.add_runtime_dependency 'bini', "= 0.7.0"
 end

data/spec/bin/pushover_spec.rb

@@ -28,7 +28,6 @@ if ENV["TEST_CLI"] =~ /^t/
         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
@@ -54,5 +53,45 @@ if ENV["TEST_CLI"] =~ /^t/
         open(FAKE_CRED_FILE).read.should include 'default'
       end
     end
+    describe "sounds" do
+      it "will list sounds" do
+        p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} --sound_list", 3, 3
+        p.run!
+        p.stdout.should include "Current Sound"
+        p.stdout.should include "Pushover (default)"
+        p.stdout.should include "None (silent)"
+      end
+      it "will play a sound (based on partial string)" do
+        p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} a message --sound none", 3, 3
+        p.run!
+        p.stdout.should include "success"
+      end
+      it "will fail if the sound is unavailble" do
+        p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} a message --sound slkdjg", 3, 3
+        p.run!
+        p.stdout.should include "No such sound"
+      end
+    end
+    describe "emergency notifications" do
+      it "will respond to emergency parameters" do
+        p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} an emergency message retry test --priority em --emergency_retry 180", 3, 3
+        p.run!
+        p.stdout.should include "success"
+
+        p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} an emergency message expires test --priority em --emergency_expire 7200", 3, 3
+        p.run!
+        p.stdout.should include "success"
+      end
+
+      it "will print the receipt" do
+        p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} an emergency message --priority em", 3, 3
+        p.run!
+        p.stdout.should include "receipt"
+      end
+
+      it "will accept a callback url"
+    end
   end
 end
+
+

data/spec/lib/pushover/app_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe "application" do
 	before(:each) do
-		Bini::Config.file = "tmp/test.save"
 		Bini::Config.clear
 		Bini::Options.clear
 		App.current_app = nil

data/spec/lib/pushover/user_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe "user" do
 	before(:each) do
-		Bini::Config.file = "tmp/test.save"
 		Bini::Config.clear
 		Bini::Options.clear
 		User.current_user = nil

data/spec/lib/{pushover/pushover_spec.rb → pushover_spec.rb}

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe "Pushover" do
+  before :all do
+    Bini.cache_dir = "tmp/cache_dir"
+    Bini.data_dir = "tmp/data_dir"
+    Bini.config_dir = "tmp/config_dir"
+  end
   before :each do
     App.current_app = nil
     User.current_user = nil
@@ -85,6 +90,18 @@ describe "Pushover" do
         WebMock.should have_requested(:post, /api.pushover.net/).with { |req| req.body.include? 'timestamp=1' }
       end
     end
+
+    describe "Sounds" do
+      it "will cache the sounds locally for at least a day" do
+        setup_webmocks
+        cache_file = "#{Bini.cache_dir}/sounds.json"
+        FileUtils.rm(cache_file) if File.exist?(cache_file)
+        Pushover.sounds.keys.should include("pushover")
+        stat = File.stat(cache_file)
+        Pushover.sounds.keys.should include("none")
+        stat.mtime.to_i.should eq File.stat(cache_file).mtime.to_i
+      end
+    end
+
   end
 end
-

data/spec/spec_helper.rb

@@ -15,6 +15,9 @@ require 'webmock/rspec'
 require 'pushover'
 
 include Pushover
+Bini.long_name = 'pushover'
+Bini::Config.options[:file] = "tmp/test.save"
+Bini::Config.load
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
@@ -28,11 +31,17 @@ def setup_webmocks
   good_result = '{"status":1}'
   bad_token = '{"token":"invalid","errors":["application token is invalid"],"status":0}'
   bad_user = '{"user":"invalid","errors":["user identifier is invalid"],"status":0}'
+  sounds = '{"sounds":{"pushover":"Pushover (default)","bike":"Bike","bugle":"Bugle","cashregister":"Cash Register","classical":"Classical","cosmic":"Cosmic","falling":"Falling","gamelan":"Gamelan","incoming":"Incoming","intermission":"Intermission","magic":"Magic","mechanical":"Mechanical","pianobar":"Piano Bar","siren":"Siren","spacealarm":"Space Alarm","tugboat":"Tug Boat","alien":"Alien Alarm (long)","climb":"Climb (long)","persistent":"Persistent (long)","echo":"Pushover Echo (long)","updown":"Up Down (long)","none":"None (silent)"},"status":1,"request":"14ef413f6a3bf74efee3e140efe63df9"}'
 
-  stub_http_request(:post, "https://api.pushover.net/1/messages.json").to_return(:status => 200,
-  :headers => {}, :body => good_result).with(:body => hash_including({token:'good_token', user:'good_user'}))
-  stub_http_request(:post, "https://api.pushover.net/1/messages.json").to_return(:status => 200,
-  :headers => {}, :body => bad_token).with(:body => hash_including({token:'bad_token', user:'good_user'}))
-  stub_http_request(:post, "https://api.pushover.net/1/messages.json").to_return(:status => 200,
-  :headers => {}, :body => bad_user).with(:body => hash_including({token:'good_token', user:'bad_user'}))
+  stub_request(:post, "https://api.pushover.net/1/messages.json").
+    with(body:hash_including(token:'good_token', user:'good_user')).
+    to_return(body:good_result, code:200)
+  stub_request(:post, "https://api.pushover.net/1/messages.json").
+    with(body:hash_including(token:'bad_token')).
+    to_return(body:bad_token, code:400)
+  stub_request(:post, "https://api.pushover.net/1/messages.json").
+    with(body:hash_including(user:'bad_user')).
+    to_return(body:bad_user, code:400)
+  stub_request(:get, /https:\/\/api.pushover.net\/1\/sounds.json.*/).
+    to_return(body:sounds, code:200)
 end

data/whatsnew.md

@@ -1,3 +1,9 @@
+## Unreleased
+  * Sounds.
+  * Emergency notifications.
+  * Will properly trap 500 (server errors) being returned from the server.
+  * Dropped the local sash in favor of the bini copy.
+
 ## 0.99.2:
   * Version constraint (thanks @freeatnet) on bini, I stupidily upgraded one without the other.
 

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pushover
 version: !ruby/object:Gem::Version
-  version: 0.99.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: bini
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 description: Api (and CLI) to interface with pushover.net
 email:
 - ebrodeur@ujami.net
@@ -58,14 +72,16 @@ files:
 - bin/pushover
 - lib/pushover.rb
 - lib/pushover/app.rb
+- lib/pushover/mixins.rb
+- lib/pushover/priority.rb
 - lib/pushover/user.rb
 - 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
+- spec/lib/pushover_spec.rb
 - spec/spec_helper.rb
 - whatsnew.md
 homepage: https://github.com/erniebrodeur/pushover
@@ -94,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: This gem provides both an API and CLI interface to pushover.net.
@@ -102,7 +118,7 @@ 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
+- spec/lib/pushover_spec.rb
 - spec/spec_helper.rb
 has_rdoc: yard