capistrano-isitdeployed 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: d1e80dc7f4fbe2d68fe7e757435d40ffc1be3edf
-  data.tar.gz: 375bfa6616de5284e778a5508b1133661bfc74b2
+  metadata.gz: 2471b60d8c1a097e0925f3d20ac2f5c5244b9a5d
+  data.tar.gz: 2fb69acafb514ac5643b4df3e64bd8666e4c8e29
 SHA512: 
-  metadata.gz: 6b7c301a01d64b3e86c66f33e4f5478145064cd44c0c8fc7b0982330f1c19e2705d5b4a41301b6ddf5977b0c68e76a312ce9c46007d4eb73d72ca35cd5d61ad9
-  data.tar.gz: 21058ceb15e9777c116d0204e187ff0739a40eed22f5a17585c7bf7a037aecbb0fd7e160089cadb99996b91cf246f17d56d804c7e3b3f14fbd91c6894c614951
+  metadata.gz: f0cc676f781843e51009cbdee245ab8e035e66c85ce4d5728b123bf9bd84261088c54178d214d77a85afd8dbc7ccabf54d759d873cc61b5118e7384c42bf057c
+  data.tar.gz: 4b321c1a11524ca9f0649603cc2f84eb0203f5ad3e3e78c247a9e4ac47ea3cdaf8e6a497e19aa2e061567eef82618e4d11914eb5de64a85a3d71f06cee2ea2f3

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

@@ -1,10 +1,2 @@
-#
-# isitdeploye.yml configuration file
-# 
-
-# required configuration
 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.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/capistrano/isitdeployed.rb

@@ -7,12 +7,18 @@ require 'rest_client'
 module Capistrano
   module Isitdeployed
 
-    CONFIG = YAML.load_file(Capistrano::Isitdeployed::CONFIG_DEST)
-
     def self.timestamp
       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      
+    end
+
     def self.load_into(configuration)
       configuration.load do
   
@@ -28,12 +34,12 @@ module Capistrano
 
           desc "Creates a configuration file"
           task :setup do
-            if File.exists?('config/isitdeployed.yml')
+            if File.exists?(CONFIG_DEST)
               logger.trace "WARNING: A configuration file already exists. Remove it before running setup again."
             else 
               path      = File.dirname(File.expand_path(__FILE__))
-              source    = path + '/isitdeployed/' + Capistrano::Isitdeployed::CONFIG_SRC
-              dest      = Capistrano::Isitdeployed::CONFIG_DEST
+              source    = path + '/isitdeployed/' + CONFIG_SRC
+              dest      = CONFIG_DEST
               FileUtils.cp source, dest
               logger.trace "IsItDeployed > #"
               logger.trace "IsItDeployed > # A configuration file '#{dest}' has been created."
@@ -44,17 +50,13 @@ module Capistrano
 
           desc "Creates a new deploy using the API"
           task :deploy do
-            if File.exists?('config/isitdeployed.yml')
-            else 
-              logger.trace "IsItDeployed > WARNING: No configuration file found, please run cap 'isit:setup'"
-            end
+            config  = Capistrano::Isitdeployed.get_config
             started = Capistrano::Isitdeployed.timestamp
-            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
+            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 #{Capistrano::Isitdeployed::ENDPOINT}/p/#{Capistrano::Isitdeployed::CONFIG['project_id']}"
-                logger.trace "IsItDeployed > #{response.gsub(/\s+/, "")}"
+                logger.trace "IsItDeployed > URL is #{ENDPOINT}/p/#{config['project_id']}"
                 set(:isitdeployed_did,     response.gsub(/\s+/, ""))
                 set(:isitdeployed_started, started)
                 set(:isitdeployed_created, 1)
@@ -84,11 +86,12 @@ module Capistrano
           end
 
           desc "Updates deploy status using the API (succes or rollback)"
-          task :update do
+            config  = Capistrano::Isitdeployed.get_config
+            task :update do
             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['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
+              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
                 case response.code
                 when 204
                   logger.trace "IsItDeployed > Deploy ##{isitdeployed_did} has been updated for #{application} to #{stage}."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-isitdeployed
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Thomas VIAL
@@ -10,8 +10,17 @@ bindir: bin
 cert_chain: []
 
 date: 2013-04-02 00:00:00 Z
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.7
+  type: :runtime
+  version_requirements: *id001
 description: This is a pre-alpha build for test purpose.
 email: 
 - rubygems@ifusio.com
@@ -43,13 +52,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id001 
+  - &id002 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id001
+  - *id002
 requirements: []
 
 rubyforge_project: