pushover 1.0.4 → 2.0.0

data/spec/spec_helper.rb

@@ -1,47 +1,22 @@
-if ENV["COVERAGE"] == 'true'
-  require 'simplecov'
-  require 'simplecov-rcov'
+require 'excon'
+require 'pry'
+require 'simplecov'
+require 'simplecov-console'
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::RcovFormatter
-  ]
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
-end
-
-require 'webmock/rspec'
-require 'pushover'
+Excon.defaults[:mock] = true
 
-include Pushover
-Bini.long_name = 'pushover'
-Bini::Config.options[:file] = "tmp/test.save"
-Bini::Config.load
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter
+]
 
 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
-  config.order = 'random'
+  config.run_all_when_everything_filtered = true
+  config.example_status_persistence_file_path = "tmp/examples.txt"
 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}'
-  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_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)
+SimpleCov.start do
+  add_filter "/spec/"
 end
+
+require 'pushover'

metadata

@@ -1,57 +1,253 @@
 --- !ruby/object:Gem::Specification
 name: pushover
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: creatable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bini
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Api (and CLI) to interface with pushover.net
 email:
 - ebrodeur@ujami.net
@@ -59,11 +255,12 @@ executables:
 - pushover
 extensions: []
 extra_rdoc_files:
+- CODE_OF_CONDUCT.md
 - README.md
-- whatsnew.md
 files:
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -71,22 +268,23 @@ files:
 - Rakefile
 - bin/pushover
 - lib/pushover.rb
-- lib/pushover/app.rb
-- lib/pushover/mixins.rb
-- lib/pushover/priority.rb
-- lib/pushover/user.rb
+- lib/pushover/api.rb
+- lib/pushover/message.rb
+- lib/pushover/receipt.rb
+- lib/pushover/request.rb
+- lib/pushover/response.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/user_spec.rb
+- spec/lib/pushover/api_spec.rb
+- spec/lib/pushover/message_spec.rb
+- spec/lib/pushover/receipt_spec.rb
+- spec/lib/pushover/request_spec.rb
+- spec/lib/pushover/response_spec.rb
 - spec/lib/pushover_spec.rb
 - spec/spec_helper.rb
-- whatsnew.md
 homepage: https://github.com/erniebrodeur/pushover
 licenses:
-- Beerware v42
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -111,15 +309,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: This gem provides both an API and CLI interface to pushover.net.
+summary: This spec 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/user_spec.rb
+- spec/lib/pushover/api_spec.rb
+- spec/lib/pushover/message_spec.rb
+- spec/lib/pushover/receipt_spec.rb
+- spec/lib/pushover/request_spec.rb
+- spec/lib/pushover/response_spec.rb
 - spec/lib/pushover_spec.rb
 - spec/spec_helper.rb
-has_rdoc: yard

data/.travis.yml

@@ -1,15 +0,0 @@
-bundler_args: --without development
-
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx-2.1
-
-branches:
-  only:
-    - master
-    - development
-
-script: bundle exec rspec -b spec

data/lib/pushover/app.rb

@@ -1,64 +0,0 @@
-module Pushover
-	# Stores a application definition in the config file.
-	module App
-		# an instance of an application.
-		# @!attribute name
-		# 	@return [String] the name of the application.
-		# @!attribute api_key
-		#   @return [String] the api_key of the application.
-		class App
-			attr_accessor :name
-			attr_accessor :api_key
-
-			def initialize(name, api_key)
-				@name = name
-				@api_key = api_key
-				Bini::Config[:applications] = {} if !Bini::Config[:applications]
-				Bini::Config[:applications][name] = api_key
-			end
-		end
-
-		extend self
-
-		# 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 find(word)
-			return Bini::Config[:applications][word] if Bini::Config[:applications] && Bini::Config[:applications][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 add(name, api_key)
-			App.new name, api_key
-			Bini::Config.save
-		end
-
-		def remove(name)
-			Bini::Config[:applications].delete name if Bini::Config[:applications]
-		end
-		# 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[:token]
-				@current_app = find Bini::Options[:token]
-			else
-				@current_app = find Bini::Config[:applications].values.first 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 nil
-		end
-	end
-end