rpush 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2bd0a00817c1d763652f59881b939ede6de72a70ef13f9ee761f4143170f4f
-  data.tar.gz: 65d645e9b67c459908648c34ceb965e9989831dbd5e61b3d110209e47eb8b1a1
+  metadata.gz: f974d91d6caa8c660383285d254a61dbb001fd7a4000540cc76b798f77b09d9f
+  data.tar.gz: 3d4fe2bfc3b354b6c25cc47a5a81f0f40e6a3a6b38ac9750fac1c117555e379f
 SHA512:
-  metadata.gz: 61d8c34cf01ee4057fc068a69fb1f79ad3b51e9ab22b0dada132b20560f66134edb228f0085a9d9be9b3a0c608973d185ccaa762ee9282740ec17b1913c255cd
-  data.tar.gz: 9738e9c124d22e3bc981c889b7b6eef59f7e85bf4fd19fb4a23c0b082004107bf178ffa2c9565aaa8cf69c978a98c010dbb4151f7879004c707f630211a06b26
+  metadata.gz: 6a4d532a9c05739a246454c0194552a84270a4f3dc864f7279cb3ca2671e1fe02bc624ecad001083aa5745c21fd428af04b8aa4833581def109e77a6a5df7207
+  data.tar.gz: 6b1311abb89a2d78e4aa447521815177a6cc7b546665b636685fe600c8219d35833ccc79fae892496b6488f3b444b886395700b09fdb3c76268ecd55e0878ab3

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## Unreleased
+## 4.1.1 (2019-05-13)
+
+### Added
+
+- Allow disabling of APNS feedback for specific Rpush apps [#491](https://github.com/rpush/rpush/pull/491) (by [@drn](https://github.com/drn)).
+
+### Changed
+
+- Switch from ANSI to Rainbow. ([#496](https://github.com/rpush/rpush/pull/496) by [@drn](https://github.com/drn))
 
 ## 4.1.0 (2019-04-17)
 

data/lib/generators/rpush_migration_generator.rb

@@ -51,6 +51,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
     add_rpush_migration('rpush_3_3_0_updates')
     add_rpush_migration('rpush_3_3_1_updates')
     add_rpush_migration('rpush_4_1_0_updates')
+    add_rpush_migration('rpush_4_1_1_updates')
   end
 
   protected

data/lib/generators/templates/rpush_4_1_1_updates.rb

@@ -0,0 +1,9 @@
+class Rpush411Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+  def self.up
+    add_column :rpush_apps, :feedback_enabled, :boolean, default: true
+  end
+
+  def self.down
+    remove_column :rpush_apps, :feedback_enabled
+  end
+end

data/lib/rpush/apns_feedback.rb

@@ -7,6 +7,7 @@ module Rpush
       # Redis stores every App type on the same namespace, hence the
       # additional filtering
       next unless app.service_name == 'apns'
+      next unless app.feedback_enabled
 
       receiver = Rpush::Daemon::Apns::FeedbackReceiver.new(app)
       receiver.check_for_feedback

data/lib/rpush/cli.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 require 'thor'
-require 'ansi/code'
+require 'rainbow'
 
 module Rpush
   class CLI < Thor
@@ -46,37 +46,29 @@ module Rpush
         end
       end
 
-      puts ANSI.green { '✔' }
+      puts Rainbow('✔').green
     end
 
     desc 'init', 'Initialize Rpush into the current directory'
     option 'active-record', type: :boolean, desc: 'Install ActiveRecord migrations'
     def init
       underscore_option_names
-      check_ruby_version
       require 'rails/generators'
 
-      puts "* " + ANSI.green { 'Installing config...' }
+      puts "* " + Rainbow('Installing config...').green
       $RPUSH_CONFIG_PATH = default_config_path # rubocop:disable Style/GlobalVars
       Rails::Generators.invoke('rpush_config')
 
       install_migrations = options['active_record']
 
       unless options.key?('active_record')
-        has_answer = false
-        until has_answer
-          STDOUT.write "\n* #{ANSI.green { 'Install ActiveRecord migrations?' }} [y/n]: "
-          STDOUT.flush
-          answer = STDIN.gets.chomp.downcase
-          has_answer = %w(y n).include?(answer)
-        end
-
+        answer = ask("\n* #{Rainbow('Install ActiveRecord migrations?').green}", limited_to: %w[y n])
         install_migrations = answer == 'y'
       end
 
       Rails::Generators.invoke('rpush_migration', ['--force']) if install_migrations
 
-      puts "\n* #{ANSI.green { 'Next steps:' }}"
+      puts "\n* #{Rainbow('Next steps:').green}"
       puts "  - Run 'bundle exec rake db:migrate'." if install_migrations
       puts "  - Review and update your configuration in #{default_config_path}."
       puts "  - Create your first app, see https://github.com/rpush/rpush for examples."
@@ -111,7 +103,6 @@ module Rpush
 
     def config_setup
       underscore_option_names
-      check_ruby_version
       configure_rpush
     end
 
@@ -126,7 +117,7 @@ module Rpush
         ENV['RAILS_ENV'] = options['rails_env']
         load 'config/environment.rb'
         Rpush.config.update(options)
-        puts ANSI.green { '✔' }
+        puts Rainbow('✔').green
 
         return true
       end
@@ -136,7 +127,7 @@ module Rpush
 
     def load_standalone
       if !File.exist?(options[:config])
-        STDERR.puts(ANSI.red { 'ERROR: ' } + "#{options[:config]} does not exist. Please run 'rpush init' to generate it or specify the --config option.")
+        STDERR.puts(Rainbow('ERROR: ').red + "#{options[:config]} does not exist. Please run 'rpush init' to generate it or specify the --config option.")
         exit 1
       else
         load options[:config]
@@ -152,10 +143,6 @@ module Rpush
       self.class.default_config_path
     end
 
-    def check_ruby_version
-      STDERR.puts(ANSI.yellow { 'WARNING: ' } + "You are using an old and unsupported version of Ruby.") if RUBY_VERSION < '2.3.0' && RUBY_ENGINE == 'ruby'
-    end
-
     def underscore_option_names
       # Underscore option names so that they map directly to Configuration options.
       new_options = options.dup
@@ -175,7 +162,7 @@ module Rpush
 
     def rpush_process_pid
       if Rpush.config.pid_file.blank?
-        STDERR.puts(ANSI.red { 'ERROR: ' } + 'config.pid_file is not set.')
+        STDERR.puts(Rainbow('ERROR: ').red + 'config.pid_file is not set.')
         exit 1
       end
 

data/lib/rpush/client/redis/app.rb

@@ -18,7 +18,8 @@ module Rpush
         attribute :apn_key_id, :string
         attribute :team_id, :string
         attribute :bundle_id, :string
- 
+        attribute :feedback_enabled, :boolean, default: true
+
         index :name
 
         validates :name, presence: true

data/lib/rpush/daemon.rb

@@ -109,7 +109,7 @@ module Rpush
         Feeder.stop
         AppRunner.stop
         delete_pid_file
-        puts ANSI.green { '✔' } if Rpush.config.foreground
+        puts Rainbow('✔').red if Rpush.config.foreground
       end
     end
 
@@ -168,7 +168,7 @@ module Rpush
       if Rpush::Daemon::AppRunner.app_ids.count == 0
         puts <<-EOS
 
-* #{ANSI.green { 'Is this your first time using Rpush?' }}
+* #{Rainbow('Is this your first time using Rpush?').green}
   You need to create an App before you can start using Rpush.
   Please refer to the documentation at https://github.com/rpush/rpush
 

data/lib/rpush/daemon/apns/feedback_receiver.rb

@@ -36,7 +36,7 @@ module Rpush
             Rpush::Daemon.store.release_connection
           end
 
-          puts ANSI.green { '✔' } if Rpush.config.foreground
+          puts Rainbow('✔').green if Rpush.config.foreground
         end
 
         def stop

data/lib/rpush/daemon/app_runner.rb

@@ -29,7 +29,7 @@ module Rpush
         Rpush.logger.info("[#{app.name}] Starting #{pluralize(app.connections, 'dispatcher')}... ", true)
         runner = @runners[app.id] = new(app)
         runner.start_dispatchers
-        puts ANSI.green { '✔' } if Rpush.config.foreground
+        puts Rainbow('✔').green if Rpush.config.foreground
         runner.start_loops
       rescue StandardError => e
         @runners.delete(app.id)

data/lib/rpush/version.rb

@@ -2,7 +2,7 @@ module Rpush
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

data/spec/support/active_record_setup.rb

@@ -40,6 +40,7 @@ require 'generators/templates/rpush_3_2_4_updates'
 require 'generators/templates/rpush_3_3_0_updates'
 require 'generators/templates/rpush_3_3_1_updates'
 require 'generators/templates/rpush_4_1_0_updates'
+require 'generators/templates/rpush_4_1_1_updates'
 
 migrations = [
   AddRpush,
@@ -55,7 +56,8 @@ migrations = [
   Rpush324Updates,
   Rpush330Updates,
   Rpush331Updates,
-  Rpush410Updates
+  Rpush410Updates,
+  Rpush411Updates
 ]
 
 unless ENV['TRAVIS']

data/spec/unit/apns_feedback_spec.rb

@@ -1,13 +1,15 @@
 require 'unit_spec_helper'
 
 describe Rpush, 'apns_feedback' do
-  let!(:apns_app) do
-    Rpush::Apns::App.create!(name: 'test', environment: 'production', certificate: TEST_CERT)
-  end
-
-  let!(:gcm_app) do
-    Rpush::Gcm::App.create!(name: 'MyApp', auth_key: 'abc123')
+  let!(:apns_app) { Rpush::Apns::App.create!(apns_app_params) }
+  let(:apns_app_params) do
+    {
+      name: 'test',
+      environment: 'production',
+      certificate: TEST_CERT
+    }
   end
+  let!(:gcm_app) { Rpush::Gcm::App.create!(name: 'MyApp', auth_key: 'abc123') }
 
   let(:receiver) { double(check_for_feedback: nil) }
 
@@ -25,4 +27,13 @@ describe Rpush, 'apns_feedback' do
     expect(receiver).to receive(:check_for_feedback)
     Rpush.apns_feedback
   end
+
+  context 'feedback disabled' do
+    let(:apns_app_params) { super().merge(feedback_enabled: false) }
+
+    it 'does not initialize feedback receiver' do
+      expect(Rpush::Daemon::Apns::FeedbackReceiver).not_to receive(:new)
+      Rpush.apns_feedback
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -282,6 +282,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -377,6 +391,7 @@ files:
 - lib/generators/templates/rpush_3_3_0_updates.rb
 - lib/generators/templates/rpush_3_3_1_updates.rb
 - lib/generators/templates/rpush_4_1_0_updates.rb
+- lib/generators/templates/rpush_4_1_1_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb