capistrano-php-fpm 1.0.1 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjA3NzQzOGU1NTQyZmM1MmRjOTAyYmIyZDk5MTY2MzRiZjM5MjNiMQ==
-  data.tar.gz: !binary |-
-    Y2IzMTdkYWIzYTdhOTFhODM0ZDRhMjlkYzQzMDZkMjQ5ZjQ2OTU1Nw==
+SHA256:
+  metadata.gz: 8a0bfedbe189e38adf5b99ac43f686adc7cb040bc22dac62d7b611fed72524d4
+  data.tar.gz: 69088649a04169fd529c3c9455daf0ba8ece3de451323a1ee03ce499da76f3e7
 SHA512:
-  metadata.gz: !binary |-
-    OTIwNDU1NzdmNmFjMTY2OGNmYTMwOWZiYWU0YTdkNTZhNjRlYjVhNDExM2Rm
-    ZTE4ZWRiMWMzMTk5NTk1NWI2NTFkYWNiNTI4ZjhmOTEwZDgwMjkxODNjOTlm
-    NDhjMTkyYzhmODczZjE5NGI4OTcwYmEzYmM1OGNjZjNhZjc2YTA=
-  data.tar.gz: !binary |-
-    ZTZiOTkxMzg0MjFkYTM0MDZkZDVjNWI0MTc4ZWQ2MWVkYTA3ZGZkYzc4NTU2
-    MGYxNmZiYTAwNmQ0ZmQyZjQ5YjcwMDRlYzc2NTJmMzcxMDUxZmYyZDA1NWRi
-    YzY2MTc5ZWRjMDYxNWI2YzY4MDlhMzY0NGY1ZmYzNWYzMzI0MjI=
+  metadata.gz: e2d6e81e961bf1c4891dddb5dbc0c3ffbc6d394dbd3a748a4d4d99aeb24752c50c4209a0cbb6e15bff1ac46650f6f271d6d6aab0a164eed6f15a643e2c502b0b
+  data.tar.gz: 27b5583d84dbd92a27010cfc3a082574af53870c84d43fdf9568b4637efd0d90634804ea10c6e67102dc986cc15acdd43fce14ee5c62ae9c497e87ae6fd905f6

data/.gitignore

@@ -1 +1,4 @@
-pkg
+.idea
+Gemfile.lock
+*.gem
+.DS_Store

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+### v2.0.0, 2018-01-27
+- Functional for sysv, upstart, and systemd environments

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in capistrano-php-fpm.gemspec
 gemspec

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2015 glooby
+Copyright (c) 2018 Capistrano Plugins
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,69 +1,80 @@
-# Capistrano::PhpFpm
+# Capistrano PHP-FPM
 
-[![Gem Version](https://badge.fury.io/rb/capistrano-php-fpm.svg)](https://badge.fury.io/rb/capistrano-php-fpm)
+Official Capistrano extension for PHP-FPM tasks.
+This replaces 1.0.0 of https://rubygems.org/gems/capistrano-fpm. *It differs greatly in configuration.*
 
-php-fpm support for Capistrano 3.x
-
-Makes it possible to reload/restart php-fpm during deploys
+### Environments Supported
+| systemd | sysv & upstart |
+|-------- | -------------- |
+| ```capistrano/php_fpm/systemd``` | ```capistrano/php_fpm/sysv_upstart``` |
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'capistrano', '~> 3.0.0'
+gem 'capistrano', '~> 3.2'
 gem 'capistrano-php-fpm'
 ```
 
-And then execute:
-
-    $ bundle
+## Usage
 
-Or install it yourself as:
+Require one of the above 'Environments Supported' in your `Capfile`:
 
-    $ gem install capistrano-php-fpm
+```ruby
+require 'capistrano/php_fpm/sysv_upstart'
+```
 
-## Usage
+`capistrano/php_fpm` comes with 5 tasks:
 
-Require in Capfile to use the default task:
+* php_fpm:reload
+* php_fpm:restart
+* php_fpm:stop
+* php_fpm:start
+* php_fpm:zap
 
-```ruby
-require 'capistrano/php-fpm'
+You can execute the task on command line:
+ 
+```bash
+cap production php_fpm:reload
 ```
 
-Configure in deploy.rb to execute one of the tasks:
+And configure it on your `deploy.rb` file:
 
 ```ruby
-after 'deploy:published', 'php_fpm:reload'
-after 'deploy:published', 'php_fpm:restart'
+namespace :deploy do
+  after :finishing, 'php_fpm:reload'
+  after :rollback, 'php_fpm:reload'
+end
 ```
 
-You can also run it in isolation: `cap production php_fpm:reload` or `cap production php_fpm:restart`
+### Configuration
 
-Configurable options:
+Configurable options shown here are also the defaults:
 
 ```ruby
-set :php_fpm_reload_roles, :all
-set :php_fpm_reload_command, '/etc/init.d/php-fpm reload'
-set :php_fpm_restart_roles, :all
-set :php_fpm_restart_command, '/etc/init.d/php-fpm reload'
+set :php_fpm_with_sudo, true
+set :php_fpm_roles, :web
+set :php_fpm_service_name, 'php-fpm' # Change this if you have non-standard naming for the php-fpm service
+set :systemctl_location, '/bin/systemctl' # May already exist if you use other plugins. Be sure to check your config/deploy/{env} file
 ```
 
-## Development
+### More Capistrano automation?
+
+Check out [capistrano-plugins](https://github.com/capistrano-plugins) github org.
+
+### Contributing and bug reports
+
+Contributions and improvements are very welcome.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `capistrano-php-fpm.gemspec`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+If something is not working for you, or you find a bug please report it.
 
-## Contributing
+### Thanks
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+* [Sullivan Senechal](https://github.com/Soullivaneuh) @ [NexyLan](https://www.nexylan.com) - Original creator of sysv & upstart code plugin this is heavily based on
+* [Emil Kilhage](https://github.com/kilhage) - For letting us use https://rubygems.org/gems/capistrano-php-fpm
 
-## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+### License
 
-[www.glooby.com](https://www.glooby.com)
-[www.glooby.se](https://www.glooby.se)
+[MIT](LICENSE.md)

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/capistrano-php-fpm.gemspec

@@ -1,33 +1,21 @@
-# coding: utf-8
+# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'capistrano/php_fpm/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = "capistrano-php-fpm"
-  spec.version       = '1.0.1'
-  spec.authors       = ["Emil Kilhage"]
-  spec.email         = ["emil.kilhage@glooby.com"]
+Gem::Specification.new do |gem|
+  gem.name          = 'capistrano-php-fpm'
+  gem.version       = Capistrano::PHP_FPM::VERSION
+  gem.summary       = 'Capistrano extension for PHP-FPM tasks'
+  gem.description   = 'Executes PHP-FPM service tasks like zap or restart from Capistrano'
+  gem.authors       = ['Sullivan Senechal, Nathan Pierce']
+  gem.email         = ['soullivaneuh@gmail.com','connarpierce@gmail.com']
+  gem.homepage      = 'https://github.com/capistrano-plugins/capistrano-php-fpm'
+  gem.license       = 'MIT'
 
-  spec.summary       = %q{php-fpm support for Capistrano 3.x}
-  spec.description   = %q{php-fpm support for Capistrano 3.x}
-  spec.homepage      = "https://github.com/glooby/capistrano-php-fpm"
-  spec.license       = "MIT"
+  gem.files         = `git ls-files`.split($/)
+  gem.require_paths = ['lib']
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'capistrano', '>= 3.0.0'
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  gem.add_dependency 'capistrano', '~> 3.2'
+  gem.add_development_dependency 'rake', '~> 10.1'
 end

data/lib/capistrano/php_fpm/php_fpm.rake

@@ -0,0 +1,8 @@
+namespace :load do
+  task :defaults do
+    set :php_fpm_with_sudo, true
+    set :php_fpm_roles, :web
+    set :php_fpm_service_name, 'php-fpm'
+    set :systemctl_location, '/bin/systemctl'
+  end
+end

data/lib/capistrano/php_fpm/systemd.rb

@@ -0,0 +1,2 @@
+load File.expand_path('../php_fpm.rake', __FILE__) # Load configuration options
+load File.expand_path('../tasks/systemd.rake', __FILE__)

data/lib/capistrano/php_fpm/sysv_upstart.rb

@@ -0,0 +1,2 @@
+load File.expand_path('../php-fpm.rake', __FILE__) # Load configuration options
+load File.expand_path('../tasks/sysv_upstart.rake', __FILE__)

data/lib/capistrano/php_fpm/tasks/systemd.rake

@@ -0,0 +1,38 @@
+namespace :'php_fpm' do
+  desc 'Reload php_fpm'
+  task :reload do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "reload #{fetch(:php_fpm_service_name)}.service") : execute(fetch(:systemctl_location), "reload #{fetch(:php_fpm_service_name)}.service")
+    end
+  end
+
+  desc 'Zap php_fpm'
+  task :zap do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "zap #{fetch(:php_fpm_service_name)}.service") : execute(fetch(:systemctl_location), "zap #{fetch(:php_fpm_service_name)}.service")
+    end
+  end
+
+  desc 'Stop php_fpm'
+  task :stop do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "stop #{fetch(:php_fpm_service_name)}.service") : execute(fetch(:systemctl_location), "stop #{fetch(:php_fpm_service_name)}.service")
+    end
+  end
+
+  desc 'Start php_fpm'
+  task :start do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "start #{fetch(:php_fpm_service_name)}.service") : execute(fetch(:systemctl_location), "start #{fetch(:php_fpm_service_name)}.service")
+    end
+  end
+
+  desc 'Restart php_fpm'
+  task :restart do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "restart #{fetch(:php_fpm_service_name)}.service") : execute(fetch(:systemctl_location), "restart #{fetch(:php_fpm_service_name)}.service")
+    end
+  end
+end
+
+

data/lib/capistrano/php_fpm/tasks/sysv_upstart.rake

@@ -0,0 +1,36 @@
+namespace :'php_fpm' do
+  desc 'Reload php_fpm'
+  task :reload do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:php_fpm_service_name)}", 'reload') : execute("/etc/init.d/#{fetch(:php_fpm_service_name)}", 'reload')
+    end
+  end
+
+  desc 'Zap php_fpm'
+  task :zap do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:php_fpm_service_name)}", 'zap') : execute("/etc/init.d/#{fetch(:php_fpm_service_name)}", 'zap')
+    end
+  end
+
+  desc 'Stop php_fpm'
+  task :stop do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:php_fpm_service_name)}", 'stop') : execute("/etc/init.d/#{fetch(:php_fpm_service_name)}", 'stop')
+    end
+  end
+
+  desc 'Start php_fpm'
+  task :start do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:php_fpm_service_name)}", 'start') : execute("/etc/init.d/#{fetch(:php_fpm_service_name)}", 'start')
+    end
+  end
+
+  desc 'Restart php_fpm'
+  task :restart do
+    on release_roles(fetch(:php_fpm_roles)) do
+      fetch(:php_fpm_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:php_fpm_service_name)}", 'restart') : execute("/etc/init.d/#{fetch(:php_fpm_service_name)}", 'restart')
+    end
+  end
+end

data/lib/capistrano/php_fpm/version.rb

@@ -0,0 +1,5 @@
+module Capistrano
+  module PHP_FPM
+    VERSION = '2.0.0'
+  end
+end

metadata

@@ -1,99 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-php-fpm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
-- Emil Kilhage
+- Sullivan Senechal, Nathan Pierce
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: php-fpm support for Capistrano 3.x
+        version: '10.1'
+description: Executes PHP-FPM service tasks like zap or restart from Capistrano
 email:
-- emil.kilhage@glooby.com
+- soullivaneuh@gmail.com
+- connarpierce@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- CODE_OF_CONDUCT.md
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - capistrano-php-fpm.gemspec
-- lib/capistrano/php-fpm.rb
-- lib/capistrano/tasks/php-fpm.rake
-- script/bootstrap
-- script/release
-homepage: https://github.com/glooby/capistrano-php-fpm
+- lib/capistrano/php_fpm/php_fpm.rake
+- lib/capistrano/php_fpm/systemd.rb
+- lib/capistrano/php_fpm/sysv_upstart.rb
+- lib/capistrano/php_fpm/tasks/systemd.rake
+- lib/capistrano/php_fpm/tasks/sysv_upstart.rake
+- lib/capistrano/php_fpm/version.rb
+homepage: https://github.com/capistrano-plugins/capistrano-php-fpm
 licenses:
 - MIT
-metadata:
-  allowed_push_host: https://rubygems.org
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: php-fpm support for Capistrano 3.x
+summary: Capistrano extension for PHP-FPM tasks
 test_files: []

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile.lock

@@ -1,34 +0,0 @@
-PATH
-  remote: .
-  specs:
-    capistrano-php-fpm (1.0.0)
-      capistrano (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    capistrano (3.4.0)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    colorize (0.7.7)
-    i18n (0.7.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
-    rake (10.4.2)
-    sshkit (1.7.1)
-      colorize (>= 0.7.0)
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.10)
-  capistrano-php-fpm!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.10.5

data/lib/capistrano/php-fpm.rb

@@ -1 +0,0 @@
-load File.expand_path('../tasks/php-fpm.rake', __FILE__)

data/lib/capistrano/tasks/php-fpm.rake

@@ -1,23 +0,0 @@
-namespace :php_fpm do
-  desc "Reloads php-fpm"
-  task :reload do
-    on roles fetch(:php_fpm_reload_roles) do
-      execute fetch(:php_fpm_reload_command)
-    end
-  end
-  desc "Restarts php-fpm"
-  task :restart do
-    on roles fetch(:php_fpm_restart_roles) do
-      execute fetch(:php_fpm_restart_command)
-    end
-  end
-end
-
-namespace :load do
-  task :defaults do
-    set :php_fpm_reload_roles, :all
-    set :php_fpm_reload_command, '/etc/init.d/php-fpm reload'
-    set :php_fpm_restart_roles, :all
-    set :php_fpm_restart_command, '/etc/init.d/php-fpm reload'
-  end
-end

data/script/bootstrap

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-bundle install

data/script/release

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rake release