pushover 0.1.2 → 0.2.0

data/README.md

@@ -22,23 +22,14 @@ and run bundle to make it available:
 
 Progmatic usage:
 
-    require 'pushover'
-
-    Pushover.notification('message', 'title', user:'USER_TOKEN', token:'APP_TOKEN')
+```ruby
+require 'pushover'
 
+Pushover.notification('your_token', 'app_token', 'message', 'title')
+```
 
 Title is currently optional, it doesn't do more then this yet.
 
-Optional #configuration method:
-
-		Pushover.configure do |config|
-		  config.user='USER_TOKEN'
-		  config.token='APP_TOKEN'
-		end
-
-		Pushover.notification('message', 'title')
-
-
 CLI usage:
 
 		$ pushover -a apitoken -t token -m 'message goes in here' -t 'title is optional.'

data/bin/pushover

@@ -5,9 +5,39 @@ require 'pushover'
 include Pushover
 Options.parse!
 
-response = Pushover.notification Options[:token], Options[:appkey], Options[:message]
-if response.code == 200
-	puts "Message sent successfully!"
-else
-	puts "#{response.code}: #{response.body}"
+if Options[:save_app]
+	puts "Saving application #{Options[:save_app][0]} to #{Options[:save_app][1]}."
+	Pushover::App.add Options[:save_app][0], Options[:save_app][1]
+	exit
 end
+
+if Options[:save_user]
+	puts "Saving user #{Options[:save_user][0]} to #{Options[:save_user][1]}."
+	Pushover::User.add Options[:save_user][0], Options[:save_user][1]
+	exit
+end
+
+puts "Try pushover -h for help." if Options.empty? && ARGV.empty?
+
+if ARGV
+	if !Options[:appkey]
+			puts "Must supply the api_key or keyname via --(a)pp"
+			exit
+	end
+
+	if !Options[:user]
+		puts "Must supply the username or token via --(u)ser."
+		exit
+	end
+
+	api_key = Pushover::App.find Options[:appkey]
+	user = Pushover::User.find Options[:user]
+
+	response = Pushover.notification user, api_key, ARGV.join(" ")
+	if response.code == 200
+		puts "Message sent successfully!"
+	else
+		puts "#{response.code}: #{response.body}"
+	end
+end
+

data/lib/pushover.rb

@@ -1,57 +1,21 @@
 require "net/https"
+require "yajl"
 
 require "pushover/version"
+require "pushover/app"
+require "pushover/user"
 require "pushover/config"
 require "pushover/optparser"
 
 module Pushover
-
-	def params
-		Pushover.parameters
-	end
-
-	extend self
-
-	attr_accessor :token, :user
-
 	# push a message to across pushover, must supply all variables.
-	def notification(message, title = nil, tokens={})
+	def self.notification(token, application, message, title = nil)
 		url = URI.parse("https://api.pushover.net/1/messages")
 		req = Net::HTTP::Post.new(url.path)
-		req.set_form_data((params.merge(tokens.merge({:message => message, :title => title}))))
+		req.set_form_data({:token => token, :user => application, :message => message, :title => title})
 		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) }
 	end
-
-	# Adds a rails style configure method
-	def configure
-    yield self
-    parameters
-  end
-
-  # List available parameters and values in those params
-  def parameters
-    @values = {}
-    keys.each { |k| @values.merge! k => get_var("@#{k}") }
-    @values
-  end
-
-  # Returns true or false if all parameters are set.
-  def parameters?
-    parameters.values.all?
-  end
-
-  def keys
-    keys ||= [:token, :user]
-  end
-
-  private
-
-  # Helper to clean up recursive method in #parameters
-  def get_var(var)
-    self.instance_variable_get(var)
-  end
-
 end

data/lib/pushover/app.rb

@@ -0,0 +1,37 @@
+module Pushover
+	module App
+		class App
+			attr_accessor :name
+			attr_accessor :api_key
+
+			def initialize(api_key, name)
+				@name = name
+				@api_key = api_key
+				Pushover::Config[:applications] = {} if !Pushover::Config[:applications]
+				if name
+					Pushover::Config[:applications][name] = api_key
+				else
+					Pushover::Config[:applications][api_key] = api_key
+				end
+			end
+
+		end
+
+		# Find the apikey in the applications, or pass on the word to try direct access.
+		# @param [String] word the search token, can be an apikey or appname.
+		# @return [String] return the apikey (if it can find one) or the word itself.
+		def self.find(word)
+			return Config[:applications][word] if Config[:applications] && Config[:applications].include?(word)
+			word
+		end
+
+		# Add an application to the config file and save it.
+		# @param [String] api_key is the api_key to be used.
+		# @param [String] name is the short name that can be referenced later.
+		# @return [Boolean] return the results of the save attempt.
+		def self.add(api_key, name)
+			App.new api_key, name
+			Pushover::Config.save!
+		end
+	end
+end

data/lib/pushover/config.rb

@@ -29,7 +29,7 @@ module Pushover
     end
 
     def load
-      if File.exist? self.file
+      if File.exist?(self.file) && File.stat(self.file).size > 0
         h = Yajl.load open(file, 'r').read
         h.each { |k,v| self[k.to_sym] = v}
       end

data/lib/pushover/optparser.rb

@@ -7,10 +7,11 @@ module Pushover
       @options = {}
 
       on("-V", "--version", "Print version") { |version| @options[:version] = true}
-      on("-t", "--token TOKEN", "Set your identity token.") { |o| @options[:token] = o}
-      on("-a", "--app-key APPKEY", "Set the receiving application key.") { |o| @options[:appkey] = o}
-      on("-m", "--message MESSAGE", "The message to be sent.") { |o| @options[:message] = o}
+      on("-u", "--user USER", "Which user, can be a saved name or token.") { |o| @options[:user] = o}
+      on("-a", "--app APPKEY", "Which app to notify, can be a saved name or apikey.") { |o| @options[:appkey] = o}
       on("-T", "--title [TITLE]", "Set the title of the notification (optional).") { |o| @options[:title] = o}
+      on("--save-app NAME", "Saves the application to the config file under NAME.") { |o| @options[:save_app] = [@options[:appkey], o]}
+      on("--save-user NAME", "Saves the user to the config file under NAME.") { |o| @options[:save_user] = [@options[:user], o]}
     end
 
     # This will build an on/off option with a default value set to false.
@@ -33,7 +34,7 @@ module Pushover
       # we need to mash in our config array.  To do this we want to make config
       # options that don't overwrite cli options.
       Config.each do |k,v|
-        @options[k] = v if !@options[k]
+        @options[k] = v if !@options[k] && ["applications", "users"].include?(k)
       end
     end
 
@@ -46,6 +47,10 @@ module Pushover
     def []=(k,v)
       @options[k] = v
     end
+
+    def empty?
+      @options.empty?
+    end
   end
 
   Options = OptionParser.new

data/lib/pushover/user.rb

@@ -0,0 +1,33 @@
+module Pushover
+	module User
+		class User
+			attr_accessor :name
+			attr_accessor :token
+
+			def initialize(token, name)
+				@name = name
+				@token = token
+				Pushover::Config[:users] = {} if !Pushover::Config[:users]
+				Pushover::Config[:users][name] = token
+			end
+
+		end
+
+		# Find the apikey in the applications, or pass on the word to try direct access.
+		# @param [String] word the search token, can be an apikey or appname.
+		# @return [String] return the apikey (if it can find one) or the word itself.
+		def self.find(word)
+			return Config[:users][word] if Config[:users] && Config[:users].include?(word)
+			word
+		end
+
+		# Add an application to the config file and save it.
+		# @param [String] token is the token to be used.
+		# @param [String] name is the short name that can be referenced later.
+		# @return [Boolean] return the results of the save attempt.
+		def self.add(token, name)
+			User.new token, name
+			Pushover::Config.save!
+		end
+	end
+end

data/lib/pushover/version.rb

@@ -1,3 +1,3 @@
 module Pushover
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/pushover.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Pushover::VERSION
   gem.add_development_dependency('pry')
+  gem.add_runtime_dependency('yajl-ruby')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushover
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: App (and CLI) to interface with pushover.net
 email:
 - ebrodeur@ujami.net
@@ -42,8 +58,10 @@ files:
 - Rakefile
 - bin/pushover
 - lib/pushover.rb
+- lib/pushover/app.rb
 - lib/pushover/config.rb
 - lib/pushover/optparser.rb
+- lib/pushover/user.rb
 - lib/pushover/version.rb
 - pushover.gemspec
 homepage: ''