capistrano-isitdeployed 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 2471b60d8c1a097e0925f3d20ac2f5c5244b9a5d
-  data.tar.gz: 2fb69acafb514ac5643b4df3e64bd8666e4c8e29
 SHA512: 
-  metadata.gz: f0cc676f781843e51009cbdee245ab8e035e66c85ce4d5728b123bf9bd84261088c54178d214d77a85afd8dbc7ccabf54d759d873cc61b5118e7384c42bf057c
-  data.tar.gz: 4b321c1a11524ca9f0649603cc2f84eb0203f5ad3e3e78c247a9e4ac47ea3cdaf8e6a497e19aa2e061567eef82618e4d11914eb5de64a85a3d71f06cee2ea2f3
+  metadata.gz: 8228be5bb77d78ccd4cfe36ba02c2f74ebf6686c67fef258e41c4b193bdf00b623b4cf91be85473667d48be0403ea7d80210d2509e0cdbc8d4b9a42970493189
+  data.tar.gz: 5b340d8c407ac08fcd6459928e9ad9c3e3bb254ef0773f9007f83dfe6f573eec510f8ff71e248ea4289b6a97f23db3cd4aacfe15aa748ceb1b881394ad397eda
+SHA1: 
+  metadata.gz: cbff4dfd443b38406ea5e65bc6ab9c1c0977f26e
+  data.tar.gz: f6647ecdfcb4feef608aaaae17417a9aedb0f6d9

data/lib/capistrano/isitdeployed/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Isitdeployed
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/capistrano/isitdeployed.rb

@@ -11,12 +11,8 @@ module Capistrano
       return Time.now.utc.strftime("%Y%m%d%H%M%S")        
     end
 
-    def self.get_config
-      if File.exists?(CONFIG_DEST)
-        return YAML.load_file(CONFIG_DEST)
-      else 
-        logger.trace "IsItDeployed > WARNING: No configuration file found, please run cap 'isit:setup'"
-      end      
+    def self.load_user_config
+      return YAML.load_file(CONFIG_DEST)      
     end
 
     def self.load_into(configuration)
@@ -50,27 +46,32 @@ module Capistrano
 
           desc "Creates a new deploy using the API"
           task :deploy do
-            config  = Capistrano::Isitdeployed.get_config
-            started = Capistrano::Isitdeployed.timestamp
-            RestClient.post(ENDPOINT + "/p/#{config['project_id']}/d", { :status => 1, :platform => "#{stage}", :release => "#{release_name}", :started => started, :token => 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 #{ENDPOINT}/p/#{config['project_id']}"
-                set(:isitdeployed_did,     response.gsub(/\s+/, ""))
-                set(:isitdeployed_started, started)
-                set(:isitdeployed_created, 1)
-              when 401
-                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}"
-                set(:isitdeployed_created, 0)
-              end
-            }        
+            if File.exists?(CONFIG_DEST)
+              config  = Capistrano::Isitdeployed.load_user_config
+              started = Capistrano::Isitdeployed.timestamp
+              RestClient.post(ENDPOINT + "/p/#{config['project_id']}/d", { :status => 1, :platform => "#{stage}", :release => "#{release_name}", :started => started, :token => 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 #{ENDPOINT}/p/#{config['project_id']}"
+                  set(:isitdeployed_did,     response.gsub(/\s+/, ""))
+                  set(:isitdeployed_started, started)
+                  set(:isitdeployed_created, 1)
+                when 401
+                  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}"
+                  set(:isitdeployed_created, 0)
+                end
+              }
+            else 
+              logger.trace "IsItDeployed > WARNING: No configuration file found, please run cap 'isit:setup'"
+              set(:isitdeployed_created, 0)
+            end
           end
 
           namespace :status do
@@ -86,9 +87,9 @@ module Capistrano
           end
 
           desc "Updates deploy status using the API (succes or rollback)"
-            config  = Capistrano::Isitdeployed.get_config
             task :update do
             if isitdeployed_created === 1
+              config    = Capistrano::Isitdeployed.load_user_config
               stopped   = Capistrano::Isitdeployed.timestamp
               duration  = stopped.to_i - isitdeployed_started.to_i
               RestClient.put(ENDPOINT + "/p/#{config['project_id']}/d/#{isitdeployed_did}", { :status => isitdeployed_status, :stopped => stopped, :duration => duration, :token => config['api_secret'] }.to_json, :content_type => :json, :accept => :json, :timeout => 5, :open_timeout => 5){ |response, request, result| response
@@ -105,7 +106,6 @@ module Capistrano
               }                      
             end
           end
-
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-isitdeployed
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Thomas VIAL