capistrano-calendar 0.1.0 → 0.1.1

data/README.md

@@ -25,6 +25,9 @@ Capistrano recipe should be used in some :after hooks (e.g. after deploy). Recip
 
 ## Calendar configuration
 
+* *:calendar_verbose (nil) - if true display calendar data actions
+* *:calendar_logfile (/tmp/capistrano-calendar-PID.log) - calendar log
+* *:calendar_foreground (nil) -  don't daemonize calendar process if true
 * *:calendar_service* (:google) - calendar service to use e.g. ':google'
 * **:calendar_username** (nil) - calendar service username e.g 'vasya.pupkin@gmail.com'
 * **:calendar_password** (nil) - calendar service password e.g 'qwery123456'
@@ -46,7 +49,7 @@ Bold means required options. Value in brackets means default value.
 Calendar event creation will be executed by default on the one of application servers (specified in :app roles)
 You can change this behavior via *calendar_runner* option. Examples:
 
-    set(:calendar_runner, { :roles => :calendar_notifier, :once => true )
+    set(:calendar_runner, { :roles => :calendar_notifier, :once => true })
     # or
     set(:calendar_runner, { :hosts => 'notification.example.com' })
 
@@ -58,21 +61,21 @@ Be sure to pass `:once => true` option if you use *:roles* !
     set :calendar_username, 'vasya.pupkin@my.company.com'
     set :calendar_password, '123456'
 
-    set :calendar_name      { stage }
-    set :calendar_summary   { "" }
+    set(:calendar_name)      { stage }
+    set(:calendar_summary)   { "" }
     set :calendar_timezone, 'UTC'
-    set :calendar_color,    { stage == 'production' ? '#ff000' : '#00ff00' }
+    set(:calendar_color),    { stage == 'production' ? '#ff000' : '#00ff00' }
 
-    set :calendar_event_summary { "Bla" }
-    set :calendar_event_time { Time.now }
+    set(:calendar_event_summary) { "Bla" }
+    set(:calendar_event_time) { Time.now }
 
     after 'deploy' do
-      set :calendar_event_title "[Deployed] #{application} #{branch}: #{real_revision}"
+      set :calendar_event_title, "[Deployed] #{application} #{branch}: #{real_revision}"
       top.calendar.create_event
     end
 
     after 'deploy:rollback' do
-      set :calendar_event_title "[Rollback] #{application} #{branch}: #{real_revision}"
+      set :calendar_event_title, "[Rollback] #{application} #{branch}: #{real_revision}"
       top.calendar.create_event
     end
 
@@ -80,12 +83,12 @@ Be sure to pass `:once => true` option if you use *:roles* !
     # Extra configurations if you are using capistrano-patch:
     #
     after 'patch:apply' do
-      set :calendar_event_title "[Pathed] #{application} #{branch}: #{patch_strategy.revision_to}"
+      set :calendar_event_title, "[Pathed] #{application} #{branch}: #{patch_strategy.revision_to}"
       calendar_client.create_event
     end
 
     after 'patch:revert' do
-      set :calendar_event_title "[Patch rollback] #{application} #{branch}: #{patch_strategy.revision_from}"
+      set :calendar_event_title, "[Patch rollback] #{application} #{branch}: #{patch_strategy.revision_from}"
       top.calendar.create_event
     end
 

data/lib/capistrano/calendar/configuration.rb

@@ -7,6 +7,10 @@ module Capistrano
 
       def self.collect(hash)
         [
+          :calendar_verbose,
+          :calendar_logfile,
+          :calendar_foreground,
+
           :calendar_service,
           :calendar_username,
           :calendar_password,
@@ -21,7 +25,7 @@ module Capistrano
           :calendar_event_summary,
           :calendar_event_location,
           :calendar_event_time,
-          :calendar_event_status
+          :calendar_event_status,
         ].inject({}) { |result, key|
           result[key] = hash[key] if hash.exists?(key)
           result

data/lib/capistrano/calendar/runner.rb

@@ -40,8 +40,12 @@ module Capistrano
           @configuration.is_a?(Hash) or abort("Bad configuration given")
 
           @client = Capistrano::Calendar::Client.new(@configuration)
-      
-          daemonize { create_event }
+
+          if @configuration[:calendar_foreground]
+            create_event
+          else
+            daemonize { create_event }
+          end
         else
           abort parser.help
         end
@@ -51,11 +55,18 @@ module Capistrano
       protected
 
       def create_event
+        verbose("Creating event with configuration: #{@configuration.inspect}")
+
         client.authenticate
-        client.create_event
+        event = client.create_event
+
+        verbose("Created event: #{event.inspect}")
+        event
       end
 
       def daemonize
+        logfile = @configuration[:calendar_logfile] || "/tmp/capistrano-calendar-#{Process.pid}.log"
+
         Process.fork do
           # Detach the child process from the parent's session.
           Process.setsid
@@ -76,13 +87,18 @@ module Capistrano
           # to be sure that any output from the daemon will
           # not appear in any terminals.
           $stdin.reopen("/dev/null")
-          $stdout.reopen("/tmp/capistrano-calendar.stdout")
-          $stderr.reopen("/tmp/capistrano-calendar.stderr")
+          $stdout.reopen(logfile, "a")
+          $stderr.reopen(logfile, "a")
 
           yield
         end
+
+        puts "Logging to: #{logfile}"
       end
 
+      def verbose(message)
+        puts(message) if @configuration[:calendar_verbose]
+      end
     end
   end
 end

data/lib/capistrano/calendar/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Calendar
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-calendar
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Andriy Yanko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano