pushover 0.5.0 → 0.5.1

data/.travis.yml

@@ -0,0 +1,11 @@
+bundler_args: --without development
+
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - rbx-19mode
+
+branches:
+  only:
+    - master
+    - development

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-	gem "pry"
+  gem "pry"
   gem "pry-debugger"
   gem "redcarpet"
   gem "guard"
@@ -11,14 +11,18 @@ group :development do
   gem "guard-rspec"
   gem "guard-yard"
   gem "guard-shell"
-	gem 'libnotify', 	:require => false
-	gem 'growl', 			:require => false
-	gem 'rb-inotify', :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 "rspec"
+  gem "rake"
+  gem "webmock"
+  gem 'simplecov', :require => false
+  gem 'simplecov-rcov', :require => false
 end
+

data/Guardfile

@@ -1,6 +1,4 @@
 #!/usr/bin/ruby
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
 
 guard :bundler do
 	watch 'Gemfile'

data/README.md

@@ -2,6 +2,18 @@
 
 This gem provides a CLI and an API interface to http://pushover.net.
 
+#### Build Status
+<table border="0">
+  <tr>
+    <td>master</td>
+    <td><a href=http://travis-ci.org/erniebrodeur/pushover?branch=master><img src="https://secure.travis-ci.org/erniebrodeur/pushover.png?branch=master"/></h> </td>
+  </tr>
+  <tr>
+    <td>development</td>
+    <td><a href=http://travis-ci.org/erniebrodeur/pushover?branch=development><img src="https://secure.travis-ci.org/erniebrodeur/pushover.png?branch=development"/></h> </td>
+  </tr>
+</table>
+
 ## Installation
 
 To install:

data/lib/pushover.rb

@@ -54,9 +54,9 @@ module Pushover
 
   # List available parameters and values in those params
   def parameters
-    @values = {}
-    keys.each { |k| @values.merge! k => get_var("@#{k}") }
-    @values
+    h = {}
+    keys.each { |k| h[k.to_sym] = Pushover.instance_variable_get("@#{k}") }
+    return h
   end
   alias_method :params, :parameters
 
@@ -65,16 +65,16 @@ module Pushover
     parameters.values.all?
   end
 
+  # Clear all the currently set parameters
+  def clear
+    keys.each do |k|
+      Pushover.instance_variable_set("@#{k}", nil)
+    end
+  end
+
   # A [Array] of keys available in Pushover.
   def keys
     keys ||= [:token, :user, :message, :title, :priority, :device]
   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

@@ -14,11 +14,7 @@ module Pushover
 				@name = name
 				@api_key = api_key
 				Bini.config[:applications] = {} if !Bini.config[:applications]
-				if name
-					Bini.config[:applications][name] = api_key
-				else
-					Bini.config[:applications][api_key] = api_key
-				end
+				Bini.config[:applications][name] = api_key
 			end
 		end
 
@@ -28,7 +24,7 @@ module Pushover
 		# @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 find(word)
-			return Bini.config[:applications][word] if Bini.config[:applications][word]
+			return Bini.config[:applications][word] if Bini.config[:applications] && Bini.config[:applications][word]
 			word
 		end
 
@@ -46,23 +42,25 @@ module Pushover
 		end
 		# Return the current app selected, or the first one saved.
 		def current_app
-			return @current_app if @current_app
-
 			# did something get supplied on the cli? try to find it.
-			if Options[:appkey]
-				@current_app = find Options[:appkey]
+			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]
+				@current_app = find Bini.config[:applications].first[0] if Bini.config[:applications]
 			end
 			@current_app
 		end
 
+		def current_app=(app)
+			@current_app = app
+		end
+
 		# Will return true if we can find an application either via the cli or save file.
 		def current_app?
-			return true if current_app
+			return true if @current_app
 			return nil
 		end
 	end

data/lib/pushover/user.rb

@@ -25,7 +25,7 @@ module Pushover
 		# @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 find(word)
-			return Bini.config[:users][word] if Bini.config[:users][word]
+			return Bini.config[:users][word] if Bini.config[:users] && Bini.config[:users][word]
 			word
 		end
 
@@ -44,23 +44,26 @@ module Pushover
 
 		# Return the current user selected, or the first one saved.
 		def current_user
-			return @current_user if @current_user
-
 			# did something get supplied on the cli? try to find it.
-			if Options[:user]
-				@current_user = find Options[:user]
+			if Bini::Options[:token]
+				@current_user = find Bini::Options[:token]
 			end
 
 			# no?  do we have anything we can return?
 			if !@current_user
-				@current_user = find Bini.config[:users].first[0]
+				@current_user = find Bini.config[:users].first[0] if Bini.config[:users]
 			end
 			@current_user
 		end
 
+		# Set the current_user to whatever you want it to be.
+		def current_user=(user)
+			@current_user = user
+		end
+
 		# Will return true if it can find a user either via the cli or save file.
 		def current_user?
-			return true if current_user
+			return true if @current_user
 			return nil
 		end
 	end

data/lib/pushover/version.rb

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

data/spec/bin/pushover_spec.rb

@@ -1,42 +1,4 @@
 # describe "CLI Interface" do
-# 	# the save file to be used.
-# 	SaveFile = 'spec/test_config'
-# 	# the exact string to execute the test version of pushover.
-# 	Exec = "bundle exec bin/pushover"
-# 	ExecConfig = Exec + " -c #{SaveFile}"
-# 	describe "Can select the config file" do
-# 		it "short form (-c)" do
-# 			output = `#{ExecConfig}`
-# 			output.include? "Selecting config file: #{SaveFile}"
-# 		end
 
-# 		it "long form (--config_file)" do
-# 			output = `#{Exec} -c #{SaveFile}`
-# 			output.include? "Selecting config file: #{SaveFile}"
-# 		end
-# 	end
-# 	describe "Saving" do
-# 		it "Application." do
-# 			output = `#{ExecConfig} --app 'test_app_api_key' --save-app test_app`
-# 			output.include?("Save successful").should be_true
-# 		end
-# 		it "User." do
-# 			output = `#{ExecConfig} --user 'test_user_key' --save-app test_user`
-# 			output.include?("Save successful").should be_true
-# 		end
-# 	end
-# 	describe "Sending a message" do
-# 		it "With no saved info."
-# 		context "With saved information" do
-# 			it "With a saved user"
-# 			it "With a saved app"
-# 			it "With both"
-# 		end
-# 		describe "Title" do
-# 			it "can send with a title"
-# 			it "can send without a title"
-# 		end
-# 	end
-# 	it "provides the proper version number"
 # end
 

data/spec/lib/pushover/app_spec.rb

@@ -1,11 +1,10 @@
-require 'pushover'
-
-include Pushover
+require 'spec_helper'
 
 describe "application" do
 	before(:each) do
 		Bini.config.file = "tmp/test.save"
 		Bini.config.clear
+		App.current_app = nil
 	end
 
 	it "can add a application to the Config[:application] hash." do
@@ -15,12 +14,41 @@ describe "application" do
 
 	it "can remove a application from the hash." do
 		App.add "foo", "bar"
-    App.remove "foo"
-    Bini.config[:applications]["foo"].should be_nil
-  end
+		App.remove "foo"
+		Bini.config[:applications]["foo"].should be_nil
+	end
 
-	it "can find the apikey from the name" do
-		App.add "foo", "bar"
-		App.find("foo").should eq("bar")
+	describe "#find" do
+		it "can find the apikey from the name" do
+			App.add "foo", "bar"
+			App.find("foo").should eq("bar")
+		end
+		it "If it can't find the apikey, it will still try whatever was passed" do
+			App.find("tryme").should eq "tryme"
+		end
+	end
+
+	describe "#current_app" do
+		it "will look on the cli first" do
+			Bini::Options[:apikey] = 'anapikey'
+			App.current_app.should eq "anapikey"
+		end
+		it "will grab the first app in the config as a last resort" do
+			App.add "foo", "bar2"
+			Bini.config.save
+			Bini::Options[:apikey] = nil
+			App.current_app.should eq "bar2"
+		end
+	end
+
+	describe "#current_app?" do
+		it "Will return true if we have a current_app" do
+			Bini::Options[:apikey] = 'somethingsilly'
+			App.current_app.should eq 'somethingsilly'
+		end
+		it "Will return nil otherwise" do
+			App.current_app?.should be_nil
+		end
 	end
 end
+

data/spec/lib/pushover/pushover_spec.rb

@@ -1,5 +1,48 @@
-require 'pushover'
+require 'spec_helper'
 
 describe "Pushover" do
-	it "can send a notification"
+  before :each do
+    App.current_app = nil
+    User.current_user = nil
+    Pushover.clear
+  end
+
+  describe "#clear" do
+    it "will erase all the attributes in Pushover" do
+      Pushover.send("#{keys.first}=", "something")
+      Pushover.clear
+      parameters.each {|k,v| v.should be_nil}
+    end
+  end
+
+  describe "#parameters?" do
+    it 'will return true only if every key is set to something.' do
+      keys.each {|k| Pushover.send("#{k}=", 'ladeda')}
+      parameters?.should eq true
+    end
+    it 'will return false otherwise.' do
+      Pushover.send("#{keys.first}=", "something")
+      parameters?.should eq false
+    end
+  end
+
+  describe "#configure" do
+    Pushover.keys.each do |key|
+      it "#{key} can be configured via .configure" do
+        r = "acdfef"
+        Pushover.configure do |c|
+          c.instance_variable_set "@#{key}", r
+        end
+        Pushover.send(key).should eq r
+      end
+    end
+  end
+
+  describe "#notification" do
+    it "can send a notification" do
+      setup_webmocks
+      resp = Pushover.notification message:'a message', token:'good_token', user:'good_user'
+      resp.code.should eq "200"
+    end
+  end
 end

data/spec/lib/pushover/user_spec.rb

@@ -1,28 +1,53 @@
-require 'pushover'
-
-include Pushover
+require 'spec_helper'
 
 describe "user" do
 	before(:each) do
 		Bini.config.file = "tmp/test.save"
 		Bini.config.clear
+		User.current_user = nil
 	end
 
-	it "can add a user to the Config[:application] hash." do
+	it "can add a user to the Config[:users] hash." do
 		User.add "foo", "bar"
 		Bini.config[:users]["foo"].should eq("bar")
 	end
 
 	it "can remove a user from the hash." do
 		User.add "foo", "bar"
-    User.remove "foo"
-    Bini.config[:users]["foo"].should be_nil
-  end
+		User.remove "foo"
+		Bini.config[:users]["foo"].should be_nil
+	end
 
-	it "can find the token from the name" do
-		User.add "foo", "bar"
-		User.find("foo").should eq("bar")
+	describe "#find" do
+		it "can find the token from the name" do
+			User.add "foo", "bar"
+			User.find("foo").should eq("bar")
+		end
+		it "If it can't find the token, it will still try whatever was passed" do
+			User.find("tryme").should eq "tryme"
+		end
 	end
-end
 
+	describe "#current_user" do
+		it "will look on the cli first" do
+			Bini::Options[:token] = 'atoken'
+			User.current_user.should eq "atoken"
+		end
+		it "will grab the first user in the config as a last resort" do
+			User.add "foo", "bar2"
+			Bini.config.save
+			Bini::Options[:token] = nil
+			User.current_user.should eq "bar2"
+		end
+	end
 
+	describe "#current_user?" do
+		it "Will return true if we have a current_user" do
+			Bini::Options[:token] = 'somethingsilly'
+			User.current_user.should eq 'somethingsilly'
+		end
+		it "Will return nil otherwise" do
+			User.current_user?.should be_nil
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -1,17 +1,41 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+if ENV["COVERAGE"] == 'true'
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::RcovFormatter
+  ]
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
+require 'webmock/rspec'
+
+require 'pushover'
+
+include Pushover
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
   config.order = 'random'
 end
+
+def setup_webmocks
+  WebMock.reset!
+  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}'
+
+  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'}))
+end
+
+
+

data/whatsnew.md

@@ -1,3 +1,8 @@
+0.5.1:
+  * SimpleCov and 100% test coverage
+  * Webmock based testing for Pushover#notification.
+  * Added intergration 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.
    * Ditto for User.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushover
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -52,16 +52,15 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - whatsnew.md
-- dev_notes.md
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/pushover
-- dev_notes.md
 - lib/pushover.rb
 - lib/pushover/app.rb
 - lib/pushover/user.rb

data/dev_notes.md

@@ -1 +0,0 @@
-* the file spec/test_config is ignored intentionally, you can load your personal pushover details into this file for running specs successfully.