capistrano-payload 0.3.0 → 0.4.0

data/README.md

@@ -1,4 +1,3 @@
-
 # Capistrano Payload
 
 Capistrano plugin that delivers JSON-encoded deployment information via POST to the URL of your choice.
@@ -23,12 +22,12 @@ To test if it works type:
     
 The best way to test out is to use http://www.postbin.org/.
 
-## Options
+## Configuration options
 
 - payload_url     — Primary URL where the data would be sent (required)
 - payload_format  — Payload format. Must be one of :json (default), :form, :yaml, :xml
 - payload_params  — Extra parameters to the request (api_key, etc.). *Note: extra parameters wont be added to the payload.*
-- payload_message — Ask for deployment comment. (default: true)
+- payload_prompt  — Ask for deployment comment. (default: true)
 
 ## Payload structure
 
@@ -39,21 +38,21 @@ Here is an example data:
     {
       "capistrano": {
         "version": "2.6.0",
-        "application": "APP_NAME",
+        "application": "foobar",
         "deployer": {
-          "user": "sosedoff",
-          "hostname": "localhost",
-        }
-        "timestamp": "2011-07-21 19:09:52 -0500",
-        "message": "Release 1.0.0", 
+          "user": "username",
+          "hostname": "localhost"
+        },
+        "timestamp": "2011-01-01 00:00:00 -0600",
         "source": {
           "branch": "master",
-          "revision": "b18ffa822c16c028765800d0c4d22bfd5e4f3bf9",
-          "repository": "git@github.com:repository.git"
+          "revision": "abcdef",
+          "repository": "git@github.com:username/repo.git"
         },
-        "action": "deploy"
+        "action": "deploy",
+        "message": "Comment"
       },
-      "payload_version": "0.2.0"
+      "payload_version": "0.4.0"
     }
 
 That's it. Ready to roll.

data/capistrano-payload.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'capistrano',     '~> 2.6'
   gem.add_runtime_dependency 'rest-client',    '~> 1.6'
   gem.add_runtime_dependency 'multi_json',     '~> 1.0'
-  gem.add_runtime_dependency 'builder',        '~> 3.0'
+  gem.add_runtime_dependency 'builder',        '~> 2.1'
 end

data/lib/capistrano-payload.rb

@@ -1,4 +1,5 @@
 require 'capistrano-payload/version'
+require 'capistrano-payload/errors'
 require 'capistrano-payload/request'
 require 'capistrano-payload/format'
 require 'capistrano-payload/payload'

data/lib/capistrano-payload/capistrano_integration.rb

@@ -10,7 +10,7 @@ module CapistranoPayload
           abort 'Payload URL required! set :payload_url'
         }
         
-        _cset(:payload_message) { true }
+        _cset(:payload_prompt)  { true }
         _cset(:payload_format)  { :json }
         _cset(:payload_params)  { Hash.new }
         
@@ -34,7 +34,7 @@ module CapistranoPayload
         namespace :payload do
           task :deploy, :roles => :app do
             logger.debug("Sending deployment notification to #{fetch(:payload_url)}")
-            message = payload_message == true ? Capistrano::CLI.ui.ask("Deployment message (none): ", nil) : ''
+            message = payload_prompt == true ? Capistrano::CLI.ui.ask("Deployment message (none): ", nil) : ''
             begin
               CapistranoPayload::Payload.new('deploy', message, payload_data, payload_format, payload_params).deliver(payload_url)
             rescue DeliveryError => err
@@ -46,7 +46,7 @@ module CapistranoPayload
           
           task :rollback, :roles => :app do
             logger.debug("Sending rollback notification to #{fetch(:payload_url)}")
-            message = payload_message == true ? Capistrano::CLI.ui.ask("Rollback message (none): ", nil) : ''
+            message = payload_prompt == true ? Capistrano::CLI.ui.ask("Rollback message (none): ", nil) : ''
             begin
               CapistranoPayload::Payload.new('rollback', message, payload_data, payload_format, payload_params).deliver(payload_url)
             rescue DeliveryError => err

data/lib/capistrano-payload/errors.rb

@@ -0,0 +1,4 @@
+module CapistranoPayload
+  class ConfigurationError < StandardError ; end
+  class DeliveryError      < StandardError ; end
+end

data/lib/capistrano-payload/payload.rb

@@ -1,7 +1,4 @@
 module CapistranoPayload
-  class ConfigurationError < StandardError ; end
-  class DeliveryError      < StandardError ; end
-  
   class Payload
     include CapistranoPayload::Format
     include CapistranoPayload::Request

data/lib/capistrano-payload/version.rb

@@ -1,3 +1,5 @@
 module CapistranoPayload
-  VERSION = "0.3.0".freeze unless defined? ::CapistranoPayload::VERSION
+  unless defined?(::CapistranoPayload::VERSION)
+    VERSION = "0.4.0".freeze
+  end
 end

data/spec/fixtures/payload.form

@@ -1 +1 @@
-payload[capistrano][version]=2.6.0&payload[capistrano][application]=foobar&payload[capistrano][deployer][user]=username&payload[capistrano][deployer][hostname]=localhost&payload[capistrano][timestamp]=2011-01-01%2000%3A00%3A00%20-0600&payload[capistrano][source][branch]=master&payload[capistrano][source][revision]=abcdef&payload[capistrano][source][repository]=git%40github.com%3Ausername%2Frepo.git&payload[capistrano][action]=deploy&payload[capistrano][message]=Comment&payload[payload_version]=0.3.0
+payload[capistrano][version]=2.6.0&payload[capistrano][application]=foobar&payload[capistrano][deployer][user]=username&payload[capistrano][deployer][hostname]=localhost&payload[capistrano][timestamp]=2011-01-01%2000%3A00%3A00%20-0600&payload[capistrano][source][branch]=master&payload[capistrano][source][revision]=abcdef&payload[capistrano][source][repository]=git%40github.com%3Ausername%2Frepo.git&payload[capistrano][action]=deploy&payload[capistrano][message]=Comment&payload[payload_version]=0.4.0

data/spec/fixtures/payload.json

@@ -15,5 +15,5 @@
         "action": "deploy",
         "message": "Comment"
     },
-    "payload_version": "0.3.0"
+    "payload_version": "0.4.0"
 }

data/spec/fixtures/payload.xml

@@ -16,5 +16,5 @@
       <repository>git@github.com:username/repo.git</repository>
     </source>
   </capistrano>
-  <payload_version>0.3.0</payload_version>
+  <payload_version>0.4.0</payload_version>
 </payload>

data/spec/fixtures/payload.yml

@@ -12,4 +12,4 @@
     :repository: git@github.com:username/repo.git
   :action: deploy
   :message: Comment
-:payload_version: 0.3.0
+:payload_version: 0.4.0

metadata

@@ -2,7 +2,7 @@
 name: capistrano-payload
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dan Sosedoff
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 -05:00
+date: 2011-08-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.0"
+        version: "2.1"
   type: :runtime
   version_requirements: *id007
 description: Capistrano plugin that delivers JSON payload to the specified URL
@@ -107,6 +107,7 @@ files:
 - capistrano-payload.gemspec
 - lib/capistrano-payload.rb
 - lib/capistrano-payload/capistrano_integration.rb
+- lib/capistrano-payload/errors.rb
 - lib/capistrano-payload/format.rb
 - lib/capistrano-payload/payload.rb
 - lib/capistrano-payload/request.rb