pushover 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82845fa7fc83d75b2de7531edd42cee14e97a36
-  data.tar.gz: c9a78c165ff694607281d4e7186ebd5983d3d222
+  metadata.gz: 0e2a717fd5728c512f6c58a9fef3f1e40a8b3103
+  data.tar.gz: 020060276a59e65b83fc5a363dcfe7013f5e534e
 SHA512:
-  metadata.gz: d101253f3fc643bf54208d7b20e2009523ab5047a273e019b31d3c8eb5a963e81ffd45cef49e3c23fd9736a3e3d6f7913388fdd7befb43598cf7829c2badc066
-  data.tar.gz: c53ffd5bdcbb514e2a9863b668dd36605d8220447f7b0e9a4fd25b9981e464b88bd12b2c4c3634daa105d670205257feccaa139703dfd1fa958c57b73300a9de
+  metadata.gz: fd7f18dfbd1b3584b5ef27c45a6f011c02f9465cdcda9258ee343bffe465c79b57c3bccefa0a405a8989cbbd53410193111c9ae79bf5a06aaad01e7554d0e70d
+  data.tar.gz: 6941590b5140b4c38bd173e21d090b7c3f026ed8a8dd023668cf83aaf30af9e37bb9121fdbdc2e357c785800bb8b5f4f88353964419d50be4c4f04911a24c7dd

data/bin/pushover

@@ -27,7 +27,7 @@ bail = false
 
 # Order is important.
 if Options[:config_file]
-	Bini::Config.file = Options[:config_file]
+	Bini::Config.options[:file] = Options[:config_file]
 	puts "Selected config file: #{Options[:config_file]}"
 end
 
@@ -126,6 +126,7 @@ 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
 

data/lib/pushover/app.rb

@@ -43,8 +43,8 @@ module Pushover
 		# Return the current app selected, or the first one saved.
 		def current_app
 			# did something get supplied on the cli? try to find it.
-			if Bini::Options[:apikey]
-				@current_app = find Bini::Options[:apikey]
+			if Bini::Options[:token]
+				@current_app = find Bini::Options[:token]
 			else
 				@current_app = find Bini::Config[:applications].values.first if Bini::Config[:applications]
 			end

data/lib/pushover/user.rb

@@ -45,8 +45,8 @@ module Pushover
 		# Return the current user selected, or the first one saved.
 		def current_user
 			# did something get supplied on the cli? try to find it.
-			if Bini::Options[:token]
-				@current_user = find Bini::Options[:token]
+			if Bini::Options[:user]
+				@current_user = Bini::Options[:user]
 			elsif !@current_user
 				@current_user = find Bini::Config[:users].values.first if Bini::Config[:users]
 			end

data/lib/pushover/version.rb

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

data/pushover.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |gem|
   gem.date          = Time.now.strftime('%Y-%m-%d')
   gem.version       = Pushover::VERSION
   gem.platform      = Gem::Platform::RUBY
+  gem.license       = "Beerware v42"
 
   # descriptions
   gem.description   = "Api (and CLI) to interface with pushover.net"

data/spec/bin/pushover_spec.rb

@@ -3,6 +3,7 @@
 # If you want to run these tests, add ENV["TEST_CLI"]
 # If you have a credentials file already, you might find it beeps you.
 
+# this should be a working cred file that can send messages for proper end to end testing.
 CRED_FILE = "#{Dir.home}/.config/pushover/credentials.yaml"
 FAKE_CRED_FILE = 'tmp/fake_credentials.yaml'
 CMD = 'bundle exec bin/pushover'
@@ -22,14 +23,22 @@ if ENV["TEST_CLI"] =~ /^t/
     end
 
     describe "send" do
-      if !File.exist? CRED_FILE
-        it "sends messages (no credentials file)"
-      else
-        it "sends messages" do
+      it "sends messages" do
           p = CLIProcess.new "#{CMD} --config_file #{CRED_FILE} a message", 3, 3
           p.run!
           p.stdout.should include("success"), "#{p.stderr}"
-        end
+      end
+
+      it "sends messages (no credentials file)" do
+          # for this trick, lets extract our creds from the cred file manually.
+          # store them locally,then pass them back as app/user arguments.
+          creds = YAML.load open(CRED_FILE).read
+
+          app =  creds[:applications].first.values.first
+          user = creds[:users].first.values.first
+          p = CLIProcess.new "#{CMD} -a #{app} -u #{user} a message", 3, 3
+          p.run!
+          p.stdout.should include("success"), "#{p.stderr}"
       end
 
       it "lets me know when a message fails" do

data/spec/lib/pushover/app_spec.rb

@@ -30,20 +30,20 @@ describe "application" do
 
 	describe "#current_app" do
 		it "will look on the cli first" do
-			Bini::Options[:apikey] = 'anapikey'
+			Bini::Options[:token] = '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
+			Bini::Options[:token] = 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'
+			Bini::Options[:token] = 'somethingsilly'
 			App.current_app.should eq 'somethingsilly'
 		end
 		it "Will return nil otherwise" do

data/spec/lib/pushover/user_spec.rb

@@ -30,20 +30,20 @@ describe "user" do
 
 	describe "#current_user" do
 		it "will look on the cli first" do
-			Bini::Options[:token] = 'atoken'
+			Bini::Options[:user] = '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
+			Bini::Options[:user] = 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'
+			Bini::Options[:user] = 'somethingsilly'
 			User.current_user?.should be_true
 		end
 		it "Will return nil otherwise" do

data/whatsnew.md

@@ -1,4 +1,13 @@
-## Unreleased
+## 1.0.2
+  * hotfixes
+  * #13 added license to the gemspec
+  * #15 fixed the configfile not being configurable on the cli (and testing now)
+  * #16 fix for the --user option reading the app key (and tests).
+
+## 1.0.1
+  * hot fix (merge from @cptobvious) for optional notification parameters.
+
+## 1.0.0
   * Sounds.
   * Emergency notifications.
   * Will properly trap 500 (server errors) being returned from the server.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushover
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -85,7 +85,8 @@ files:
 - spec/spec_helper.rb
 - whatsnew.md
 homepage: https://github.com/erniebrodeur/pushover
-licenses: []
+licenses:
+- Beerware v42
 metadata: {}
 post_install_message: 
 rdoc_options: