rpush 2.1.0-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39bdc7bf081a339dd09353c0690a9e0cff7b67ac
-  data.tar.gz: 3dbee5a4f472b95d4ef419f21340a21b30d4a2f0
+  metadata.gz: 518f5cf260390bc60e3fc71463ec9f1f774ab77e
+  data.tar.gz: de2def70662a539c00b591cd5107da44d35b60fc
 SHA512:
-  metadata.gz: 60ccb8ff250b4bfab1da699cbd7f7433aa1ad9cf08087e1545bfc297835ba722a28aa2effeeea982a4823839e633609bf26415b4e549c5392f78e176c7b6ecd4
-  data.tar.gz: 3d7bb6dcfb36fa128b8d60975219598bce3656b05b70b9289a37135239a3a6fee3532700697cc76b8c0d3eddd02f7ea280a84a47ded27daa4c8af510dbb633e9
+  metadata.gz: d3105561c117ba12b9c63d9dfd423db9665eac81282b64792d404f5c49d4bf6a033c0b01c29d46a84915a86ca7dedae5219feffaebfc2dd9dc3672d7406ffa6e
+  data.tar.gz: 7a92076300c1eb790365b3c7049e403b0ea02deab720acf70c84b45e586a01582363ce49446c991e223ee3c4839250b66b2ef127a8f795878b3896d1a79aaefb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0 (Oct 7, 2014)
+  * Numerous command-line fixes, sorry folks!
+  * Add 'rpush push' command-line command for one-off use.
+
 ## 2.1.0 (Oct 4, 2014)
   * Bump APNs max payload size to 2048 for iOS 8.
   * Add 'category' for iOS 8.

data/README.md

@@ -167,11 +167,13 @@ See [Configuration](https://github.com/rpush/rpush/wiki/Configuration) for a lis
 
 ### Updating Rpush
 
-You should run `rails init` after upgrading Rpush to check for configuration and migration changes.
+You should run `rpush init` after upgrading Rpush to check for configuration and migration changes.
 
 ### Wiki
 
 ### General
+* [Using Redis](https://github.com/rpush/rpush/wiki/Using-Redis)
+* [Using ActiveRecord](https://github.com/rpush/rpush/wiki/Using-ActiveRecord)
 * [Configuration](https://github.com/rpush/rpush/wiki/Configuration)
 * [Moving from Rapns](https://github.com/rpush/rpush/wiki/Moving-from-Rapns-to-Rpush)
 * [Deploying to Heroku](https://github.com/rpush/rpush/wiki/Heroku)

data/lib/rpush/cli.rb

@@ -16,23 +16,16 @@ module Rpush
     end
 
     class_option :config, type: :string, aliases: '-c', default: default_config_path
-    class_option :rails_env, type: :string, aliases: '-e', default: 'development'
+    class_option 'rails-env', type: :string, aliases: '-e', default: 'development'
 
     option :foreground, type: :boolean, aliases: '-f', default: false
     option 'pid-file', type: :string, aliases: '-p'
     desc 'start', 'Start Rpush'
     def start
+      underscore_option_names
       check_ruby_version
+      configure_rpush
 
-      if detect_rails? && options[:rails_env]
-        STDOUT.write "* Booting Rails '#{options[:rails_env]}' environment... "
-        STDOUT.flush
-        ENV['RAILS_ENV'] = options[:rails_env]
-        load 'config/environment.rb'
-        puts green('✔')
-      end
-
-      load_config
       require 'rpush/daemon'
       Rpush::Daemon.start
     end
@@ -40,9 +33,10 @@ module Rpush
     desc 'stop', 'Stop Rpush'
     option 'pid-file', type: :string, aliases: '-p'
     def stop
+      underscore_option_names
       check_ruby_version
-      load_config
-      ensure_pid_file
+      configure_rpush
+      ensure_pid_file_set
 
       if File.exist?(Rpush.config.pid_file)
         pid = File.read(Rpush.config.pid_file).strip.to_i
@@ -67,8 +61,9 @@ module Rpush
     end
 
     desc 'init', 'Initialize Rpush into the current directory.'
-    option 'active-record', type: :boolean, desc: 'Install ActiveRecord migrations.'
+    option 'active-record', type: :boolean, desc: 'Install ActiveRecord migrations'
     def init
+      underscore_option_names
       check_ruby_version
       require 'rails/generators'
 
@@ -76,9 +71,9 @@ module Rpush
       $RPUSH_CONFIG_PATH = default_config_path # rubocop:disable Style/GlobalVars
       Rails::Generators.invoke('rpush_config')
 
-      install_migrations = options['active-record']
+      install_migrations = options['active_record']
 
-      unless options.key?('active-record')
+      unless options.key?('active_record')
         has_answer = false
         until has_answer
           STDOUT.write "\n* #{green('Install ActiveRecord migrations?')} [y/n]: "
@@ -90,7 +85,7 @@ module Rpush
         install_migrations = answer == 'y'
       end
 
-      Rails::Generators.invoke('rpush_migration') if install_migrations
+      Rails::Generators.invoke('rpush_migration', ['--force']) if install_migrations
 
       puts "\n* #{green('Next steps:')}"
       puts "  - Run 'db:migrate'." if install_migrations
@@ -99,24 +94,38 @@ module Rpush
       puts "  - Run 'rpush help' for commands and options."
     end
 
-    private
+    desc 'push', 'Deliver all pending notifications and then exit'
+    def push
+      underscore_option_names
+      check_ruby_version
+      configure_rpush
+      Rpush.config.foreground = true
 
-    def detect_rails?
-      self.class.detect_rails?
+      Rpush.push
     end
 
-    def default_config_path
-      self.class.default_config_path
+    private
+
+    def configure_rpush
+      load_rails_environment || load_standalone
     end
 
-    def ensure_pid_file
-      return  if Rpush.config.pid_file.blank?
+    def load_rails_environment
+      if detect_rails? && options['rails_env']
+        STDOUT.write "* Booting Rails '#{options[:rails_env]}' environment... "
+        STDOUT.flush
+        ENV['RAILS_ENV'] = options['rails_env']
+        load 'config/environment.rb'
+        Rpush.config.update(options)
+        puts green('✔')
 
-      STDERR.puts(red('ERROR: ') + 'config.pid_file is not set.')
-      exit 1
+        return true
+      end
+
+      false
     end
 
-    def load_config
+    def load_standalone
       if !File.exist?(options[:config])
         STDERR.puts(red('ERROR: ') + "#{options[:config]} does not exist. Please run 'rpush init' to generate it or specify the --config option.")
         exit 1
@@ -126,8 +135,40 @@ module Rpush
       end
     end
 
+    def detect_rails?
+      self.class.detect_rails?
+    end
+
+    def default_config_path
+      self.class.default_config_path
+    end
+
+    def ensure_pid_file_set
+      return unless Rpush.config.pid_file.blank?
+
+      STDERR.puts(red('ERROR: ') + 'config.pid_file is not set.')
+      exit 1
+    end
+
     def check_ruby_version
-      STDERR.puts(yellow('WARNING: ') + "You are using an old and unsupported version of Ruby.") if RUBY_VERSION <= '1.9.3'
+      STDERR.puts(yellow('WARNING: ') + "You are using an old and unsupported version of Ruby.") if RUBY_VERSION <= '1.9.3' && RUBY_ENGINE == 'ruby'
+    end
+
+    def underscore_option_names
+      # Underscore option names so that they map directly to Configuration options.
+      new_options = options.dup
+
+      options.each do |k, v|
+        new_k = k.to_s.tr('-', '_')
+
+        if k != new_k
+          new_options.delete(k)
+          new_options[new_k] = v
+        end
+      end
+
+      new_options.freeze
+      self.options = new_options
     end
   end
 end

data/lib/rpush/configuration.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Rpush
   def self.config
     @config ||= Rpush::Configuration.new

data/lib/rpush/push.rb

@@ -10,6 +10,7 @@ module Rpush
     Rpush::Daemon.initialize_store
     Rpush::Daemon::Synchronizer.sync
     Rpush::Daemon::Feeder.start
+    # TODO: Wait until there are no more notifications.
     Rpush::Daemon::AppRunner.stop
   end
 end

data/lib/rpush/version.rb

@@ -1,3 +1,3 @@
 module Rpush
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/tasks/test.rake

@@ -1,46 +1,62 @@
-namespace :test do
-  task :build_rails do
-    require 'fileutils'
-
-    def cmd(str, clean_env = true)
-      puts "* #{str}"
-      retval = clean_env ? Bundler.with_clean_env { `#{str}` } : `#{str}`
-      puts retval.strip
-      retval
-    end
+require 'fileutils'
+
+def cmd(str, clean_env = true)
+  puts "* #{str}"
+  retval = clean_env ? Bundler.with_clean_env { `#{str}` } : `#{str}`
+  puts retval.strip
+  retval
+end
 
-    rpush_root = Dir.pwd
-    path = '/tmp/rails_test'
-    cmd("rm -rf #{path}")
-    FileUtils.mkdir_p(path)
-    pwd = Dir.pwd
+task :build_rails do
+  rpush_root = Dir.pwd
+  path = '/tmp/rpush/rails_test'
+  cmd("rm -rf #{path}")
+  FileUtils.mkdir_p(path)
+  pwd = Dir.pwd
 
-    cmd("bundle exec rails --version", false)
-    cmd("bundle exec rails new #{path} --skip-bundle", false)
+  cmd("bundle exec rails --version", false)
+  cmd("bundle exec rails new #{path} --skip-bundle", false)
 
-    begin
-      Dir.chdir(path)
-      cmd('echo "gem \'rake\'" >> Gemfile')
-      cmd('echo "gem \'pg\'" >> Gemfile')
-      cmd("echo \"gem 'rpush', :path => '#{rpush_root}'\" >> Gemfile")
-      cmd('bundle install')
+  begin
+    Dir.chdir(path)
+    cmd('echo "gem \'rake\'" >> Gemfile')
+    cmd('echo "gem \'pg\'" >> Gemfile')
+    cmd("echo \"gem 'rpush', :path => '#{rpush_root}'\" >> Gemfile")
+    cmd('bundle install')
 
-      File.open('config/database.yml', 'w') do |fd|
-        fd.write(<<-YML)
+    File.open('config/database.yml', 'w') do |fd|
+      fd.write(<<-YML)
 development:
-  adapter: postgresql
-  database: rpush_rails_test
-  pool: 5
-  timeout: 5000
-        YML
-      end
-
-      cmd('bundle exec rails g rpush')
-      cmd('bundle exec rake db:migrate')
-    ensure
-      Dir.chdir(pwd)
+adapter: postgresql
+database: rpush_rails_test
+pool: 5
+timeout: 5000
+      YML
     end
+  ensure
+    Dir.chdir(pwd)
+  end
 
-    puts "Built into #{path}"
+  puts "Built into #{path}"
+end
+
+task :build_standalone do
+  rpush_root = Dir.pwd
+  path = '/tmp/rpush/standalone_test'
+  cmd("rm -rf #{path}")
+  FileUtils.mkdir_p(path)
+  pwd = Dir.pwd
+
+  begin
+    Dir.chdir(path)
+    cmd('echo "source \'https://rubygems.org\'" >> Gemfile')
+    cmd('echo "gem \'rake\'" >> Gemfile')
+    cmd('echo "gem \'rpush-redis\'" >> Gemfile')
+    cmd("echo \"gem 'rpush', :path => '#{rpush_root}'\" >> Gemfile")
+    cmd('bundle install')
+  ensure
+    Dir.chdir(pwd)
   end
+
+  puts "Built into #{path}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: java
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json