pushybullet 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9f14cc25a605fa81f01e30057db0e23cb2408e2e0b55154e6a71f9c458786e
-  data.tar.gz: 6b576942ce2c85bd4116458f289aab1320c60481813aee46a957572946a712da
+  metadata.gz: 169778e7ef203599479b119c582ca0c6b4dc7ec6baf563d058ab47a9ca525c2f
+  data.tar.gz: a88193e8e7310d3b577858573a403355fd40d96582b9cc0d3780828c0486345e
 SHA512:
-  metadata.gz: a81f59b2e5fa62da009bab4b04008692dba2331b98813481f3688890b57a1dac0b7a566c5439302011b749cc9ad8fd8c31785ebd1dfc3da3ae0e704065f0777f
-  data.tar.gz: '083bdc8b7de67f786a88fd9c08babb3ccbcfa1637eea42b523d737227f95af21d6d9e3bf93d73dc7d5544b3ff7dae0da77093d6b4490387c7a122b0db18bf408'
+  metadata.gz: 5c3d586bd928430d8fe3a1d2f9eccf327cd0c9e970b81f50b986f23ad06e366ad9a4d3778484b3dd8267972aa9d9f70d9a11c33ed736de75699262c93a0efe93
+  data.tar.gz: f7ef362d45a01a9511edfa52e5a87d58daaa62c24f3c5a705eb726c596b9e47ebb9fbe0ce52fc1cc45d411f741171384dc64c07c5db0abf9974b27ef708530db

data/.github/workflows/build_and_test.yml

@@ -0,0 +1,30 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Build and test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    name: Build + Test
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6.6
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.github/workflows/push_gem.yml

@@ -0,0 +1,41 @@
+name: Push gem
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.6
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.rubocop.yml

@@ -11,4 +11,12 @@ inherit_from: .rubocop_todo.yml
 #
 # See https://docs.rubocop.org/rubocop/configuration
 AllCops:
-  NewCops: enable
+  NewCops: enable
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-11-17 17:08:45 UTC using RuboCop version 1.3.1.
+# on 2020-11-18 18:57:39 UTC using RuboCop version 1.3.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.2] - 2020-11-18
+### Added
+- Added PushRequest type
+
+### Fixed
+- Fixed bug where unhandled http errors were being suppressed
+
 ## [0.1.1] - 2020-11-18
 ### Added
 - Added changelog

data/Gemfile.lock

@@ -1,70 +1,70 @@
-PATH
-  remote: .
-  specs:
-    pushybullet (0.1.1)
-      faraday (~> 1.1.0)
-      faraday_middleware (~> 1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.1)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    faraday (1.1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    multipart-post (2.1.1)
-    parallel (1.20.0)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.3.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 1.1.1)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    simplecov (0.19.1)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.3)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  pushybullet!
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.3)
-  simplecov (~> 0.19)
-
-BUNDLED WITH
-   2.1.4
+PATH
+  remote: .
+  specs:
+    pushybullet (0.1.2)
+      faraday (~> 1.1.0)
+      faraday_middleware (~> 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    multipart-post (2.1.1)
+    parallel (1.20.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.3.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 1.1.1)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    simplecov (0.19.1)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  pushybullet!
+  rake (~> 12.0)
+  rspec (~> 3.0)
+  rubocop (~> 1.3)
+  simplecov (~> 0.19)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -2,10 +2,6 @@
 
 A ruby gem for pushbullet.
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/pushybullet`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -34,7 +30,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pushybullet. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/arcticfoxnv/pushybullet/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/arcticfoxnv/pushybullet-gem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/arcticfoxnv/pushybullet-gem/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -43,4 +39,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Pushybullet project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/arcticfoxnv/pushybullet/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Pushybullet project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/arcticfoxnv/pushybullet-gem/blob/master/CODE_OF_CONDUCT.md).

data/lib/pushybullet/client.rb

@@ -23,29 +23,29 @@ module Pushybullet
       devs
     end
 
-    def create_push(push)
-      payload = JSON.dump(push.to_hash)
+    def create_push(push_request)
+      payload = JSON.dump(push_request.to_hash)
       resp = conn.post('v2/pushes', payload, 'Content-Type' => 'application/json')
       Pushybullet::Types::Push.from_hash(resp.body)
     end
 
     def push_link(title, body, url, target)
-      push = Pushybullet::Types::Push.from_hash({
-                                                  type: :link,
-                                                  title: title,
-                                                  body: body,
-                                                  url: url
-                                                })
+      push = Pushybullet::Types::PushRequest.from_hash({
+                                                         type: :link,
+                                                         title: title,
+                                                         body: body,
+                                                         url: url
+                                                       })
       push.target = target
       create_push(push)
     end
 
     def push_note(title, body, target)
-      push = Pushybullet::Types::Push.from_hash({
-                                                  type: :note,
-                                                  title: title,
-                                                  body: body
-                                                })
+      push = Pushybullet::Types::PushRequest.from_hash({
+                                                         type: :note,
+                                                         title: title,
+                                                         body: body
+                                                       })
       push.target = target
       create_push(push)
     end

data/lib/pushybullet/concerns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pushybullet
   module Concerns
     module FromHash

data/lib/pushybullet/errors.rb

@@ -8,18 +8,27 @@ module Pushybullet
       protected
 
       def exc_msg_and_response(exc, response = nil)
-        headers = response[:headers]
+        headers = response_headers exc, response
 
         if headers['Content-Type'] =~ /\bjson$/
           err = JSON.parse(response[:body])
-          @type = err[:error][:type]
-          @message = err[:error][:message]
-          @cat = err[:error][:cat]
+          @type = err['error']['type']
+          @message = err['error']['message']
+          @cat = err['error']['cat']
         end
 
         super
       end
+
+      def response_headers(exc, response = nil)
+        if response.nil? && exc.respond_to?(:each_key)
+          exc[:headers]
+        else
+          response[:headers]
+        end
+      end
     end
+
     class Unauthorized < ClientError; end
     class Forbidden < ClientError; end
     class TooManyRequests < ClientError; end

data/lib/pushybullet/middleware/error.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pushybullet/errors'
+
 module Pushybullet
   module Middleware
     class Error < Faraday::Response::RaiseError
@@ -11,6 +13,8 @@ module Pushybullet
           raise Errors::Forbidden, response_values(env)
         when 429
           raise Errors::TooManyRequests, response_values(env)
+        else
+          super
         end
       end
     end

data/lib/pushybullet/types.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'types/device'
 require_relative 'types/push'
+require_relative 'types/push_request'
 require_relative 'types/push_target'
 
 module Pushybullet

data/lib/pushybullet/types/push.rb

@@ -6,7 +6,6 @@ module Pushybullet
   module Types
     class Push
       extend Pushybullet::Concerns::FromHash
-      include Pushybullet::Concerns::ToHash
 
       # strings
       attr_accessor :iden, :type, :guid, :direction,
@@ -26,10 +25,6 @@ module Pushybullet
 
       # ints
       attr_accessor :image_width, :image_height
-
-      def target=(target)
-        instance_variable_set("@#{target.key}", target.value) unless target.nil?
-      end
     end
   end
 end

data/lib/pushybullet/types/push_request.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'pushybullet/concerns'
+
+module Pushybullet
+  module Types
+    class PushRequest
+      include Pushybullet::Concerns::FromHash
+      include Pushybullet::Concerns::ToHash
+
+      # strings
+      attr_accessor :type, :title, :body, :url, :file_name, :file_type, :file_url,
+                    :source_device_iden, :device_iden, :client_iden, :channel_tag,
+                    :email, :guid
+
+      def target=(target)
+        instance_variable_set("@#{target.key}", target.value) unless target.nil?
+      end
+    end
+  end
+end

data/lib/pushybullet/types/push_target.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Pushybullet
   module Types
     class PushTarget
       ID_TYPES = {
-        device: 'device_iden',
-        email: 'email',
         channel: 'channel_tag',
-        client: 'client_iden'
+        client: 'client_iden',
+        device: 'device_iden',
+        email: 'email'
       }.freeze
 
       def initialize(type, id)

data/lib/pushybullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pushybullet
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushybullet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick King
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -45,6 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build_and_test.yml"
+- ".github/workflows/push_gem.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -67,6 +69,7 @@ files:
 - lib/pushybullet/types.rb
 - lib/pushybullet/types/device.rb
 - lib/pushybullet/types/push.rb
+- lib/pushybullet/types/push_request.rb
 - lib/pushybullet/types/push_target.rb
 - lib/pushybullet/version.rb
 - pushybullet.gemspec