capistrano-isitdeployed 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 3553474a256853809eebe7aa7aa06ea5e07352bd
-  data.tar.gz: 697a5e20c409a10c9a86aae82c4b6c77cd947fe6
+  metadata.gz: d1e80dc7f4fbe2d68fe7e757435d40ffc1be3edf
+  data.tar.gz: 375bfa6616de5284e778a5508b1133661bfc74b2
 SHA512: 
-  metadata.gz: f23411e27b9466f56ec0b802fc610e84f34317c6731fe8d661fd996a83126fd86e69531fe308953f6848f27b79120b1f8bebf14392ee0b28e400315dcc976257
-  data.tar.gz: 832ea7ccb6667af11fcbcb2d4251a6ba7c65420f7d74d079a1a098179bc5b7c52206d3bea14be0651121a44727f872bad67ab57ed1a03b46fb3dcb00ea678d94
+  metadata.gz: 6b7c301a01d64b3e86c66f33e4f5478145064cd44c0c8fc7b0982330f1c19e2705d5b4a41301b6ddf5977b0c68e76a312ce9c46007d4eb73d72ca35cd5d61ad9
+  data.tar.gz: 21058ceb15e9777c116d0204e187ff0739a40eed22f5a17585c7bf7a037aecbb0fd7e160089cadb99996b91cf246f17d56d804c7e3b3f14fbd91c6894c614951

data/lib/capistrano/isitdeployed/config.rb

@@ -1,7 +1,9 @@
 module Capistrano
   module Isitdeployed
 
-    ENDPOINT    = 'http://staging.isitdeployed.com'
+    ENDPOINT    = 'http://www.isitdeployed.com'
+    # ENDPOINT    = 'http://staging.isitdeployed.com'
+    # ENDPOINT    = 'http://0.0.0.0:3000'
     CONFIG_SRC  = 'template/isitdeployed.yml'
     CONFIG_DEST = 'config/isitdeployed.yml'
 

data/lib/capistrano/isitdeployed/template/isitdeployed.yml

@@ -3,8 +3,8 @@
 # 
 
 # required configuration
-isitdeployed_pid:   x
-isitdeployed_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+project_id: x
+api_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 # optional parameters:
 # "isitdeployed_app", to override :application variable

data/lib/capistrano/isitdeployed/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Isitdeployed
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/capistrano/isitdeployed.rb

@@ -49,16 +49,20 @@ module Capistrano
               logger.trace "IsItDeployed > WARNING: No configuration file found, please run cap 'isit:setup'"
             end
             started = Capistrano::Isitdeployed.timestamp
-            RestClient.post(Capistrano::Isitdeployed::ENDPOINT + "/p/#{Capistrano::Isitdeployed::CONFIG['isitdeployed_pid']}/d", { :status => 1, :platform => "#{stage}", :release => "#{release_name}", :started => started, :token => Capistrano::Isitdeployed::CONFIG['isitdeployed_token'] }.to_json, :content_type => :json, :accept => :json, :timeout => 5, :open_timeout => 5){ |response, request, result| response
+            RestClient.post(Capistrano::Isitdeployed::ENDPOINT + "/p/#{Capistrano::Isitdeployed::CONFIG['project_id']}/d", { :status => 1, :platform => "#{stage}", :release => "#{release_name}", :started => started, :token => Capistrano::Isitdeployed::CONFIG['api_secret'] }.to_json, :content_type => :json, :accept => :json, :timeout => 5, :open_timeout => 5){ |response, request, result| response
               case response.code
               when 201
                 logger.trace "IsItDeployed > New deploy created for #{application} to #{stage} with version: #{release_name}"
-                logger.trace "IsItDeployed > URL is #{Capistrano::Isitdeployed::ENDPOINT}/p/#{Capistrano::Isitdeployed::CONFIG['isitdeployed_pid']}"
-                set(:isitdeployed_did,     response)
+                logger.trace "IsItDeployed > URL is #{Capistrano::Isitdeployed::ENDPOINT}/p/#{Capistrano::Isitdeployed::CONFIG['project_id']}"
+                logger.trace "IsItDeployed > #{response.gsub(/\s+/, "")}"
+                set(:isitdeployed_did,     response.gsub(/\s+/, ""))
                 set(:isitdeployed_started, started)
                 set(:isitdeployed_created, 1)
               when 401
-                logger.trace "IsItDeployed > ERROR: Invalid token. Check your 'isitdeployed.yml'"                
+                logger.trace "IsItDeployed > ERROR: Invalid 'api_secret'. Check your 'isitdeployed.yml'"                
+                set(:isitdeployed_created, 0)
+              when 404
+                logger.trace "IsItDeployed > ERROR: Invalid 'project_id'. Check your 'isitdeployed.yml'"                
                 set(:isitdeployed_created, 0)
               else
                 logger.trace "IsItDeployed > ERROR: Can't create deploy, server returned code #{response.code}"
@@ -84,12 +88,14 @@ module Capistrano
             if isitdeployed_created === 1
               stopped   = Capistrano::Isitdeployed.timestamp
               duration  = stopped.to_i - isitdeployed_started.to_i
-              RestClient.put(Capistrano::Isitdeployed::ENDPOINT + "/p/#{Capistrano::Isitdeployed::CONFIG['isitdeployed_pid']}/d/#{isitdeployed_did}", { :status => isitdeployed_status, :stopped => stopped, :duration => duration, :token => Capistrano::Isitdeployed::CONFIG['isitdeployed_token'] }.to_json, :content_type => :json, :accept => :json, :timeout => 5, :open_timeout => 5){ |response, request, result| response
+              RestClient.put(Capistrano::Isitdeployed::ENDPOINT + "/p/#{Capistrano::Isitdeployed::CONFIG['project_id']}/d/#{isitdeployed_did}", { :status => isitdeployed_status, :stopped => stopped, :duration => duration, :token => Capistrano::Isitdeployed::CONFIG['api_secret'] }.to_json, :content_type => :json, :accept => :json, :timeout => 5, :open_timeout => 5){ |response, request, result| response
                 case response.code
                 when 204
                   logger.trace "IsItDeployed > Deploy ##{isitdeployed_did} has been updated for #{application} to #{stage}."
                 when 401
-                  logger.trace "IsItDeployed > ERROR: Invalid token. Check your 'isitdeployed.yml'"                
+                  logger.trace "IsItDeployed > ERROR: Invalid 'api_secret'. Check your 'isitdeployed.yml'"                
+                when 404
+                  logger.trace "IsItDeployed > ERROR: Invalid 'project_id'. Check your 'isitdeployed.yml'"                
                 else
                   logger.trace "IsItDeployed > ERROR: Can't create deploy, server returned #{response.code}"
                 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-isitdeployed
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Thomas VIAL
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-27 00:00:00 Z
+date: 2013-04-02 00:00:00 Z
 dependencies: []
 
 description: This is a pre-alpha build for test purpose.