capistrano-webhook 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38b5d46d2f0466186885538d311f50f3677aba57
-  data.tar.gz: e6eb51648254b187272654c24f9be1e546751aca
+  metadata.gz: 84592ca61d11ed81135da72ac01748f60a10b2c5
+  data.tar.gz: 384c183a5f7cbbef9a6987302247e85eaa996840
 SHA512:
-  metadata.gz: d1ba3afbda8b71e0762c9165c9edd126b65a852128a8401291a199434e86a8fa0f0bd79d1031dbc4c96ba9f8f7be5bfdc09ba9a1d9497607fe6f311704d8f0d8
-  data.tar.gz: 92a4bda8eed793e26aae7a0d154be76b658295efb74cc3bbc4d8def5275ccb5ddfd12af5b939346df1f53b1c9a6b6a17adc3ac6977a44830e61ee7b95ea196e9
+  metadata.gz: 7469ad20dc746e3362c21f021195607035f97352f780df62f5c34f05d8d553c80f80d39c4db4e35c2f7a998b7ba3238f4abe2179894d11bb6d22b6ac3b5a9b26
+  data.tar.gz: cf856439cb715740bc13aa005fb4a50dfc80624e0cacdafc71d2f2e1d9ebd65288fae75359fbea806be57554f1e68c0864adac01035c4ce6c3e5908006b4924d

data/README.md

@@ -2,21 +2,29 @@
 
 Simple webhooks for Capistrano deployments.
 
-*Currently only supporting Capistrano 2.*
+Supports both Capistrano 2 and 3!
 
 ## Installation
 
 Add this line to your application's Gemfile under the 'development' group:
 
-    gem 'capistrano-webhook', require: false
+    gem 'capistrano-webhook'
 
 ## Usage
 
 In your application's `deploy.rb` file, set a Capistrano variable called `webhooks` to a hash containing a set of callbacks you wish to run during your deployment. The hash keys should be event names (see supported events below) and they should map to arrays representing webhook arguments to send to Faraday. The first item in each webhook should be a valid Farday HTTP method (`:get`, `:post`, etc will map to `Faraday.get`, and `Faraday.post` respectively). All other arguments will be sent in to the Faraday method as arguments with as a splat.
 
+In your `Capfile`:
+
 ```
 require 'capistrano/webhook'
-set(:webhooks) do
+```
+
+In your `deploy.rb`:
+
+For Cap 2:
+```
+set :webhooks, do
   {
     after_deploy: [
       [:get, "https://ci.example.com", { sha: fetch(:current_revision), app: fetch(:application), env: fetch(:stage) }]
@@ -25,15 +33,25 @@ set(:webhooks) do
 end
 ```
 
+
+For Cap 3:
+```
+set :webhooks, {
+  after_deploy: [
+    [:get, "https://ci.example.com", { sha: fetch(:current_revision), app: fetch(:application), env: fetch(:stage) }]
+  ]
+}
+```
+
 In this example, a `GET` request would be issued to `https://ci.example.com?sha=:current_revision&app=:application&env=:stage`
 
 #### Supported Capistrano Events
 
 ```
-:before_deploy             # runs before 'deploy'
-:before_deploy_migrations  # runs before 'deploy:migrations'
-:after_deploy              # runs after  'deploy'
-:after_deploy_migrations   # runs after  'deploy:migrations'
+:before_deploy             # runs before 'deploy'            (Cap 3: 'deploy:started')
+:before_deploy_migrations  # runs before 'deploy:migrations' (Cap 3: 'deploy:migrate')
+:after_deploy              # runs after  'deploy'            (Cap 3: 'deploy:finished')
+:after_deploy_migrations   # runs after  'deploy:migrations' (Cap 3: 'deploy:migrate')
 ```
 
 #### See also:
@@ -45,9 +63,9 @@ For `post`, `put`, and `patch` requests, see: https://github.com/lostisland/fara
 ## TODO
 
 * Deeper Faraday support (POST body, headers, etc)
-* Support for Cap 3
+* ~~Support for Cap 3~~
 * Logging enhancements
-* Support more events, maybe custom events
+* Support more (all?) events, maybe custom events
 
 ## Contributing
 

data/capistrano-webhook.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "faraday"
-  spec.add_dependency "capistrano", "~> 2.15.5"
+  spec.add_dependency "capistrano"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/capistrano/webhook.rb

@@ -1,38 +1,13 @@
-require "capistrano/webhook/version"
-require 'capistrano'
-require 'json'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
+
+require 'capistrano/version'
 require 'faraday'
+require 'json'
 
 module Capistrano
   module Webhook
-    def self.extended(configuration)
-      configuration.load do
-
-        before 'deploy',            'webhook:before_deploy'
-        before 'deploy:migrations', 'webhook:before_deploy_migrations'
-        after  'deploy',            'webhook:after_deploy'
-        after  'deploy:migrations', 'webhook:after_deploy_migrations'
-
-        namespace :webhook do
-          task :before_deploy do
-            do_webhooks_for_event :before_deploy
-          end
-          task :before_deploy_migrations do
-            do_webhooks_for_event :before_deploy_migrations
-          end
-          task :after_deploy do
-            do_webhooks_for_event :after_deploy
-          end
-          task :after_deploy_migrations do
-            do_webhooks_for_event :after_deploy_migrations
-          end
-        end
-
-      end
-    end
-
     def webhooks
-      @webhooks ||= fetch(:webhooks, {})
+      fetch :webhooks, {}
     end
 
     def do_webhooks_for_event(event)
@@ -61,6 +36,8 @@ module Capistrano
   end
 end
 
-if Capistrano::Configuration.instance
-  Capistrano::Configuration.instance.extend(Capistrano::Webhook)
-end
+if defined?(Capistrano::VERSION) && Gem::Version.new(Capistrano::VERSION).release >= Gem::Version.new('3.0.0')
+  load File.expand_path('../webhook/v3/tasks.rake', __FILE__)
+else
+  require 'capistrano/webhook/v2/tasks'
+end

data/lib/capistrano/webhook/v2/tasks.rb

@@ -0,0 +1,33 @@
+require 'capistrano'
+
+module Capistrano
+  module Webhook
+    def self.extended(configuration)
+      configuration.load do
+        namespace :webhook do
+          task :before_deploy do
+            do_webhooks_for_event :before_deploy
+          end
+          task :before_deploy_migrations do
+            do_webhooks_for_event :before_deploy_migrations
+          end
+          task :after_deploy do
+            do_webhooks_for_event :after_deploy
+          end
+          task :after_deploy_migrations do
+            do_webhooks_for_event :after_deploy_migrations
+          end
+        end
+
+        before 'deploy',            'webhook:before_deploy'
+        before 'deploy:migrations', 'webhook:before_deploy_migrations'
+        after  'deploy',            'webhook:after_deploy'
+        after  'deploy:migrations', 'webhook:after_deploy_migrations'
+      end
+    end
+  end
+end
+
+if Capistrano::Configuration.instance
+  Capistrano::Configuration.instance.extend(Capistrano::Webhook)
+end

data/lib/capistrano/webhook/v3/tasks.rake

@@ -0,0 +1,27 @@
+namespace :webhook do
+  task :before_deploy do
+    on roles(:db) do
+      Capistrano::Webhook.new.do_webhooks_for_event :before_deploy
+    end
+  end
+  task :before_deploy_migrations do
+    on roles(:db) do
+      Capistrano::Webhook.new.do_webhooks_for_event :before_deploy_migrations
+    end
+  end
+  task :after_deploy do
+    on roles(:db) do
+      Capistrano::Webhook.new.do_webhooks_for_event :after_deploy
+    end
+  end
+  task :after_deploy_migrations do
+    on roles(:db) do
+      Capistrano::Webhook.new.do_webhooks_for_event :after_deploy_migrations
+    end
+  end
+
+  before 'deploy:started',  'webhook:before_deploy'
+  before 'deploy:migrate',  'webhook:before_deploy_migrations'
+  after  'deploy:finished', 'webhook:after_deploy'
+  after  'deploy:migrate',  'webhook:after_deploy_migrations'
+end

data/lib/capistrano/webhook/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Webhook
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-webhook
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Hammond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -28,16 +28,16 @@ dependencies:
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,10 @@ files:
 - README.md
 - Rakefile
 - capistrano-webhook.gemspec
+- lib/capistrano-webhook.rb
 - lib/capistrano/webhook.rb
+- lib/capistrano/webhook/v2/tasks.rb
+- lib/capistrano/webhook/v3/tasks.rake
 - lib/capistrano/webhook/version.rb
 homepage: http://github.com/andrhamm
 licenses:
@@ -101,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple webhooks for Capistrano deployments.
 test_files: []
-has_rdoc: