pwush 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3273bf6a132f726c154ad5fa9141f2b83378cd665a7a22653beb55ebd5afd91
-  data.tar.gz: e5ef888ebfdb4bf8d1fd30bec420c4ffd36635a71f9cba8304d00c5f7680d5b1
+  metadata.gz: bdbe86415e1ff2cdeb0dfb7a9229551f010ec1382e5ee94e7d37101dad60efea
+  data.tar.gz: 8af01dfd83eada3351dd739d723df4a682ee8d864c1f2aeae2d6840ab67d2cca
 SHA512:
-  metadata.gz: f8f8a3fb2027788d4977dd417877cc09062878f376a428e1312257e4531599c71238e29a23722b487630031bc4114a5dbc9b557666ab331ad2da3715b96cd09a
-  data.tar.gz: 8226de0c179cf7d7247fcd624d5dd380215464f741aa2262b674e6969d4bf12404a8f248330c19ef71637dd71c1921efaa7ff0f37007e4e66a199dad8d722845
+  metadata.gz: c5c0c37a945410c1db532e0469298c3fe13a64c236d567a597669281cb464f5be1bf9338a6c9fae74c73aa993b5acdfd2f6dbe3ca0036099e00604a6e8add1bf
+  data.tar.gz: 81b060f70f6d9b979e12df327137082bfe7c300e15baed3818b028f21454060f88ab1ead4c43b0b4948f0382dc107a19ba54414803c3d4689f8999a5ef1782c5

data/.github/workflows/gem-push.yml

@@ -0,0 +1,43 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+
+    - 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/.github/workflows/ruby.yml

@@ -0,0 +1,49 @@
+# 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: Ruby
+
+on:
+  push:
+    branches: [ "main", "edge" ]
+  pull_request:
+    branches: [ "main", "edge" ]
+
+permissions:
+  contents: read
+  checks: write
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake
+    - name: SimpleCov+ Action
+      uses: joshmfrankel/simplecov-check-action@1.0.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
+
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [0.4.0](https://github.com/iarie/pwush/tree/HEAD)
+- Update Dry-Monads runtime dependecy to 1.4
+- Update Dry-Struct runtime dependecy to 1.4
+- Update the HTTP gem runtime dependecy to 5.1
+- Drop ruby 2.5 support
+
+## [0.3.0](https://github.com/iarie/pwush/tree/HEAD)
+- Update Dry-Struct runtime dependecy to 1.0
+- Drop ruby 2.3 support
+
 ## [0.2.0](https://github.com/iarie/pwush/tree/HEAD)
 
 **Added:**

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 

data/README.md

@@ -1,4 +1,3 @@
-[![CircleCI](https://circleci.com/gh/iarie/pwush/tree/master.svg?style=shield)](https://circleci.com/gh/iarie/pwush/tree/master)
 [![Gem Version](https://badge.fury.io/rb/pwush.svg)](https://badge.fury.io/rb/pwush)
 [![Maintainability](https://api.codeclimate.com/v1/badges/d1887381dee84e26e860/maintainability)](https://codeclimate.com/github/iarie/pwush/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/d1887381dee84e26e860/test_coverage)](https://codeclimate.com/github/iarie/pwush/test_coverage)
@@ -12,7 +11,7 @@ Pwush is a remote api toolkit for [Pushwoosh](https://www.pushwoosh.com/v1.0/ref
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'pwush', '~> 0.2.0'
+gem 'pwush', '~> 0.3.0'
 ```
 
 And then execute:

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'pwush'

data/lib/pwush/api/applications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
   module Api
     module Applications

data/lib/pwush/api/devices.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
   module Api
     module Devices

data/lib/pwush/api/messages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
   module Api
     module Messages

data/lib/pwush/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'http'
 
 require 'pwush/api/messages'
@@ -36,7 +38,7 @@ module Pwush
         "Pushwoosh #{verb.upcase} #{url} BODY #{request.body.to_json}"
       )
 
-      Http.timeout(@config.timeout).request(verb, url, json: request.body)
+      HTTP.timeout(@config.timeout).request(verb, url, json: request.body)
     end
 
     def build_request(payload = nil)

data/lib/pwush/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Pwush
@@ -5,14 +7,14 @@ module Pwush
   MissingAppToken = Class.new(StandardError)
 
   class Config
-    URL = 'https://cp.pushwoosh.com/json/1.3'.freeze
+    URL = 'https://cp.pushwoosh.com/json/1.3'
 
     def initialize(options = {})
       @url     = options[:url]     || URL
       @auth    = options[:auth]    || auth_missing
       @app     = options[:app]     || app_missing
       @timeout = options[:timeout] || { write: 2, connect: 5, read: 10 }
-      @logger  = options[:logger]  || Logger.new(STDOUT)
+      @logger  = options[:logger]  || Logger.new($stdout)
     end
 
     attr_accessor :auth, :url, :app, :timeout, :logger

data/lib/pwush/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
   class Message < Dry::Struct
     # transform_types do |type|

data/lib/pwush/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
   class Request
     attr_reader :body
@@ -9,7 +11,7 @@ module Pwush
       @body    = build_body(@payload)
     end
 
-    def to_json
+    def to_json(*_args)
       Oj.dump(body)
     end
 

data/lib/pwush/response/deffered.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
   module Response
     class Deffered
@@ -10,6 +12,7 @@ module Pwush
       def resolve
         return http_request_failure if raw_result.status != 200
         return api_request_failure if value_from_api.status_code != 200
+
         api_request_succesful
       end
 
@@ -45,9 +48,9 @@ module Pwush
 
       def value_from_api
         @_value_from_api ||= Value.new(
-          status_code:    parsed_result['status_code'],
+          status_code: parsed_result['status_code'],
           status_message: parsed_result['status_message'],
-          body:           parsed_result['response']
+          body: parsed_result['response']
         )
       end
     end

data/lib/pwush/response/value.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Pwush
   module Response
-    class Value < Dry::Struct::Value
+    class Value < Dry::Struct
       attribute :status_code, Types::Coercible::Integer
       attribute? :status_message, Types::Strict::String
       attribute? :body, (Types::Hash | Types::String).optional

data/lib/pwush/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/monads/result'
 
 require 'pwush/response/deffered'
@@ -9,7 +11,7 @@ module Pwush
 
     def self.wrap
       Deffered.new(yield).resolve
-    rescue Http::TimeoutError => e
+    rescue HTTP::TimeoutError => e
       Failure.new(e)
     end
   end

data/lib/pwush/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry-struct'
 
 module Pwush

data/lib/pwush/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pwush
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'
 end

data/lib/pwush.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pwush/config'
 
 require 'pwush/types'

data/pwush.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pwush/version'
@@ -20,18 +22,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency 'dry-monads', '~> 1.0'
-  spec.add_dependency 'dry-struct', '~> 1.0'
-  spec.add_dependency 'http', '~> 3.0'
-  spec.add_dependency 'oj', '~> 3'
+  spec.add_dependency 'dry-monads', '~> 1.4'
+  spec.add_dependency 'dry-struct', '~> 1.4'
+  spec.add_dependency 'http', '~> 5.1'
+  spec.add_dependency 'oj', '~> 3.13'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'pry-byebug', '~> 3.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
-  spec.add_development_dependency 'webmock', '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 2.2'
+  spec.add_development_dependency 'pry-byebug', '~> 3.9'
+  spec.add_development_dependency 'rake', '>= 13.0.6'
+  spec.add_development_dependency 'rspec', '~> 3.11'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'webmock', '~> 3.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwush
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yaroslav Litvinov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -16,154 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.18'
 description: Pushwoosh remote API ruby toolkit
 email:
 - beyondthemkad@gmail.com
@@ -173,7 +159,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -210,14 +197,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Pushwoosh remote API ruby toolkit

data/.circleci/config.yml

@@ -1,64 +0,0 @@
-version: 2.0
-defaults: &default_job
-  working_directory: ~/repo
-
-  docker:
-    - image: circleci/ruby:2.4-node-browsers
-
-  steps:
-    - checkout
-
-    # - type: cache-restore
-    #   name: Restore bundle cache
-    #   key: pwush-{{ checksum "Gemfile.lock" }}
-
-    - run:
-        name: install dependencies
-        command: |
-          bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-    # - type: cache-save
-    #   name: Store bundle cache
-    #   key: pwush-{{ checksum "Gemfile.lock" }}
-    #   paths:
-    #     - vendor/bundle
-
-    - run:
-        name: Download cc-test-reporter
-        command: |
-          mkdir -p tmp/
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
-          chmod +x ./tmp/cc-test-reporter
-
-    - run:
-        name: Run tests
-        command: |
-          bundle exec rake
-          ./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.json
-
-    - run:
-        name: Upload coverage results to Code Climate
-        command: |
-          ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.json -r ce337e25b76b0c3048abfdb2d5aa6d3e87cc8540d90f0029ef7416683814732e
-
-jobs:
-  ruby-2.4:
-    <<: *default_job
-    docker:
-      - image: circleci/ruby:2.4-node-browsers
-  ruby-2.5:
-    <<: *default_job
-    docker:
-      - image: circleci/ruby:2.5-node-browsers
-  ruby-2.6:
-    <<: *default_job
-    docker:
-      - image: circleci/ruby:2.6-node-browsers
-
-workflows:
-  version: 2
-  multiple-rubies:
-    jobs:
-      - ruby-2.4
-      - ruby-2.5
-      - ruby-2.6