capistrano-rpush 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2512698119bd62e82bba9b27cb145550fd488b5
-  data.tar.gz: 8c57ad338e07c4cbb42dcd84aacab8ac38161d9c
+  metadata.gz: d04fd1717ead14deadc0785a44c576e7dd7ad1eb
+  data.tar.gz: 9d842e6e773a94c1b9930377bdd86fa6798cd5b8
 SHA512:
-  metadata.gz: 44d4f31f00454cf44b2388cd65ae54e263fad600830fec69183961ce09c9e7b954fbd15296ee3f4a225a1310ba0dcab0117acf69b4993c0fa1873881072e7c9e
-  data.tar.gz: 6b331ba06d76f38daceb265cc47f6750479679a3c8dac76b8695d56e39c510aff75452d6f08c63ccc7e9b45ad6ccad671dba63f0182f75fa0311794c1b52b09c
+  metadata.gz: 48a73bfbc2ea5edaa8a26fdba3b3c04831c4a59a572cf30cd131edf4b0ff3ee6ec499ab3ee652a66538696e5a3a7ec2c5568187adb6b1fa3dc45ed59500f271a
+  data.tar.gz: 6346b5858b88508adcc93b653016f7d7b537f2723e82c124cf1d4cd281e22d2cb31090c91c3adb465ce39769bf0c95dd6f5e59e3da85be9db8f4d8a556da9837

data/.rbenv-gemsets

@@ -0,0 +1 @@
+capistrano-rpush

data/.ruby-version

@@ -0,0 +1 @@
+2.4.2

data/README.md

@@ -2,13 +2,18 @@
 
 # Capistrano::Rpush
 
-[Capistrano::Rpush](https://github.com/juicyparts/capistrano-rpush) adds [Rpush](https://rubygems.org/gems/rpush) tasks to your Capistrano deployment.
+[Capistrano::Rpush](https://github.com/juicyparts/capistrano-rpush) adds [Rpush](https://rubygems.org/gems/rpush) tasks to your [Capistrano](https://rubygems.org/gems/capistrano) deployment.
+
+## Capistrano 3
+
+This gem was developed against version 3.9.1. It uses the experimental ```Capistrano::Plugin```.
 
 ## Rpush
 
-This gem was developed against version 2.7.0. Additionally it only provides tasks over a subset of available commands:
+This gem was developed against version 3.0.0. Additionally it only provides tasks over a subset of available commands:
 
     $ rpush --help
+
 ```
 Commands:
   rpush help [COMMAND]  # Describe available commands or one specific command
@@ -47,8 +52,15 @@ Or install it yourself as:
 ```ruby
   # In Rails.root/Capfile
 
+  require 'capistrano/rpush'
+  install_plugin Capistrano::Rpush
+```
+Or, to install the plugin without its hooks:
+```ruby
+  # In Rails.root/Capfile
 
   require 'capistrano/rpush'
+  install_plugin Capistrano::RPush, load_hooks: false
 ```
 
 Now you can use cap -T to list tasks:

data/capistrano-rpush.gemspec

@@ -4,30 +4,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'capistrano/rpush/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "capistrano-rpush"
-  spec.version       = Capistrano::Rpush::VERSION
-  spec.authors       = ["Mel Riffe"]
-  spec.email         = ["mel@juicyparts.com"]
+  spec.name          = 'capistrano-rpush'
+  spec.version       = Capistrano::RpushPlugin::VERSION
+  spec.authors       = ['Mel Riffe']
+  spec.email         = ['mel@juicyparts.com']
   spec.summary       = %q{Capistrano3 plugin with basic 'start', 'stop' commands for rpush.}
   spec.description   = %q{A set of Capistrano3 tasks to controll a deployed Rpush installation. The tasks include: restart, start, status, and stop.}
-  spec.homepage      = "http://juicyparts.com/capistrano-rpush"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://juicyparts.com/capistrano-rpush'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.post_install_message = "Thanks for installing!"
+  spec.post_install_message = 'Thanks for installing the Capistrano::Rpush plugin!'
   spec.metadata = {
-    "source_code"   => 'https://github.com/juicyparts/capistrano-rpush',
-    "issue_tracker" => "https://github.com/juicyparts/capistrano-rpush/issues",
+    'source_code'   => 'https://github.com/juicyparts/capistrano-rpush',
+    'issue_tracker' => 'https://github.com/juicyparts/capistrano-rpush/issues',
   }
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency 'capistrano', '~> 3.9', '>= 3.9.1'
+  spec.add_dependency 'rpush', '>= 2.7'
 
-  spec.add_dependency 'capistrano', '~> 3.0', '< 4.0'
-  spec.add_dependency 'rpush', '~> 2.7', '< 3.0'
+  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.6'
 end

data/lib/capistrano/rpush.rb

@@ -1 +1,28 @@
-load File.expand_path('../tasks/rpush.cap', __FILE__)
+require 'capistrano/plugin'
+require 'capistrano/rpush/common'
+
+class Capistrano::Rpush < Capistrano::Plugin
+  include Capistrano::RpushPlugin::Common
+
+  def define_tasks
+    eval_rakefile File.expand_path('../tasks/rpush.rake', __FILE__)
+  end
+
+  def set_defaults
+    set_if_empty :rpush_default_hooks, true
+    set_if_empty :rpush_role,          :app
+    set_if_empty :rpush_env,           -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+    set_if_empty :rpush_conf,          -> { File.join(current_path, 'config', 'initializers', 'rpush.rb') }
+    set_if_empty :rpush_log,           -> { File.join(shared_path, 'log', 'rpush.log') }
+    set_if_empty :rpush_pid,           -> { File.join(shared_path, 'tmp', 'pids', 'rpush.pid') }
+
+    append :rbenv_map_bins, 'rpush'
+    append :bundle_bins, 'rpush'
+  end
+
+  def register_hooks
+    after 'deploy:check',    'rpush:check'
+    after 'deploy:finished', 'rpush:restart'
+  end
+
+end

data/lib/capistrano/rpush/common.rb

@@ -0,0 +1,25 @@
+module Capistrano
+  module RpushPlugin
+    module Common
+
+      def rpush_switch_user role, &block
+        user = rpush_user role
+        if user == role.user
+          block.call
+        else
+          as user do
+            block.call
+          end
+        end
+      end
+
+      def rpush_user role
+        properties = role.properties
+        properties.fetch(:rpush_user) ||  # local property for rpush only
+        fetch(:rpush_user) ||
+        properties.fetch(:run_as) ||      # global property across multiple capistrano gems
+        role.user
+      end
+    end
+  end
+end

data/lib/capistrano/rpush/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
-  module Rpush
-    VERSION = "0.1.7"
+  module RpushPlugin
+    VERSION = "0.2.0"
   end
 end

data/lib/capistrano/tasks/rpush.rake

@@ -0,0 +1,73 @@
+git_plugin = self
+
+namespace :rpush do
+  desc 'Check if config file exists'
+  task :check do
+    on roles (fetch(:rpush_role)) do |role|
+      unless  test "[ -f #{fetch(:rpush_conf)} ]"
+        warn 'rpush.rb NOT FOUND!'
+        info 'Configure rpush for your project before attempting a deployment.'
+      end
+    end
+  end
+
+  desc 'Restart rpush'
+  task :restart do
+    on roles (fetch(:rpush_role)) do |role|
+      git_plugin.rpush_switch_user(role) do
+        if test "[ -f #{fetch(:rpush_pid)} ]"
+          invoke 'rpush:stop'
+        end
+        invoke 'rpush:start'
+      end
+    end
+  end
+
+  desc 'Start rpush'
+  task :start do
+    on roles (fetch(:rpush_role)) do |role|
+      git_plugin.rpush_switch_user(role) do
+        if test "[ -f #{fetch(:rpush_conf)} ]"
+          info "using conf file #{fetch(:rpush_conf)}"
+        else
+          invoke 'rpush:check'
+        end
+        within current_path do
+          with rack_env: fetch(:rpush_env) do
+            execute :rpush, "start -p #{fetch(:rpush_pid)} -c #{fetch(:rpush_conf)} -e #{fetch(:rpush_env)}"
+          end
+        end
+      end
+    end
+  end
+
+  desc 'Status rpush'
+  task :status do
+    on roles (fetch(:rpush_role)) do |role|
+      git_plugin.rpush_switch_user(role) do
+        if test "[ -f #{fetch(:rpush_conf)} ]"
+          within current_path do
+            with rack_env: fetch(:rpush_env) do
+              execute :rpush, "status -c #{fetch(:rpush_conf)} -e #{fetch(:rpush_env)}"
+            end
+          end
+        end
+      end
+    end
+  end
+
+  desc 'Stop rpush'
+  task :stop do
+    on roles (fetch(:rpush_role)) do |role|
+      git_plugin.rpush_switch_user(role) do
+        if test "[ -f #{fetch(:rpush_pid)} ]"
+          within current_path do
+            with rack_env: fetch(:rpush_env) do
+              execute :rpush, "stop -p #{fetch(:rpush_pid)} -c #{fetch(:rpush_conf)} -e #{fetch(:rpush_env)}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,97 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rpush
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Mel Riffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
+        version: '3.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.9.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rpush
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '2.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '12.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rpush
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '3.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
 description: 'A set of Capistrano3 tasks to controll a deployed Rpush installation.
   The tasks include: restart, start, status, and stop.'
 email:
@@ -101,7 +95,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rbenv-gemsets"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -111,15 +107,16 @@ files:
 - capistrano-rpush.gemspec
 - lib/capistrano-rpush.rb
 - lib/capistrano/rpush.rb
+- lib/capistrano/rpush/common.rb
 - lib/capistrano/rpush/version.rb
-- lib/capistrano/tasks/rpush.cap
+- lib/capistrano/tasks/rpush.rake
 homepage: http://juicyparts.com/capistrano-rpush
 licenses:
 - MIT
 metadata:
   source_code: https://github.com/juicyparts/capistrano-rpush
   issue_tracker: https://github.com/juicyparts/capistrano-rpush/issues
-post_install_message: Thanks for installing!
+post_install_message: Thanks for installing the Capistrano::Rpush plugin!
 rdoc_options: []
 require_paths:
 - lib
@@ -135,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Capistrano3 plugin with basic 'start', 'stop' commands for rpush.

data/lib/capistrano/tasks/rpush.cap

@@ -1,111 +0,0 @@
-namespace :load do
-  set :rpush_default_hooks, -> { true }
-  set :rpush_role,          :app
-  set :rpush_env,           -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
-  set :rpush_conf,          -> { File.join(shared_path, 'config', 'rpush.rb') }
-  set :rpush_log,           -> { File.join(shared_path, 'log', 'rpush.log') }
-  set :rpush_pid,           -> { File.join(shared_path, 'tmp', 'pids', 'rpush.pid') }
-end
-
-namespace :deploy do
-  before :starting, :check_rpush_hooks do
-    invoke 'rpush:add_default_hooks' if fetch(:rpush_default_hooks)
-  end
-end
-
-namespace :rpush do
-
-  task :add_default_hooks do
-    after 'deploy:check',    'rpush:check'
-    after 'deploy:finished', 'rpush:restart'
-  end
-
-  task :check do
-    on roles (fetch(:rpush_role)) do |role|
-      unless  test "[ -f #{fetch(:rpush_conf)} ]"
-        warn 'rpush.rb NOT FOUND!'
-        info 'Configure rpush for your project before attempting a deployment.'
-      end
-    end
-  end
-
-  desc 'Restart rpush'
-  task :restart do
-    on roles (fetch(:rpush_role)) do |role|
-      rpush_switch_user(role) do
-        if test "[ -f #{fetch(:rpush_pid)} ]"
-          invoke 'rpush:stop'
-        end
-        invoke 'rpush:start'
-      end
-    end
-  end
-
-  desc 'Start rpush'
-  task :start do
-    on roles (fetch(:rpush_role)) do |role|
-      rpush_switch_user(role) do
-        if test "[ -f #{fetch(:rpush_conf)} ]"
-          info "using conf file #{fetch(:rpush_conf)}"
-        else
-          invoke 'rpush:check'
-        end
-        within current_path do
-          with rack_env: fetch(:rpush_env) do
-            execute :bundle, :exec, "rpush start -p #{fetch(:rpush_pid)} -c #{fetch(:rpush_conf)} -e #{fetch(:rpush_env)}"
-          end
-        end
-      end
-    end
-  end
-
-  desc 'Status rpush'
-  task :status do
-    on roles (fetch(:rpush_role)) do |role|
-      rpush_switch_user(role) do
-        if test "[ -f #{fetch(:rpush_conf)} ]"
-          within current_path do
-            with rack_env: fetch(:rpush_env) do
-              execute :bundle, :exec, "rpush status -c #{fetch(:rpush_conf)} -e #{fetch(:rpush_env)}"
-            end
-          end
-        end
-      end
-    end
-  end
-
-  desc 'Stop rpush'
-  task :stop do
-    on roles (fetch(:rpush_role)) do |role|
-      rpush_switch_user(role) do
-        if test "[ -f #{fetch(:rpush_pid)} ]"
-          within current_path do
-            with rack_env: fetch(:rpush_env) do
-              execute :bundle, :exec, "rpush stop -p #{fetch(:rpush_pid)} -c #{fetch(:rpush_conf)} -e #{fetch(:rpush_env)}"
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def rpush_switch_user(role, &block)
-    user = rpush_user(role)
-    if user == role.user
-      block.call
-    else
-      as user do
-        block.call
-      end
-    end
-  end
-
-  def rpush_user(role)
-    properties = role.properties
-    properties.fetch(:rpush_user) ||  # local property for rpush only
-    fetch(:rpush_user) ||
-    properties.fetch(:run_as) ||      # global property across multiple capistrano gems
-    role.user
-  end
-
-end