deprec-core 3.1.10 → 3.1.12

data/CHANGELOG

@@ -1,8 +1,9 @@
 deprec-core changelog
 =====================
 
-= 3.1.10  (Jul 29, 2011)
+= 3.1.12  (Jul 30, 2011)
 
+  * added pretty colors to terminal output
   * bugfix: use #{sudo} when setting owner
 
 = 3.1.9  (Jul 28, 2011)

data/lib/deprec-core.rb

@@ -5,7 +5,6 @@ if defined?(Capistrano)
   require "deprec-core/deprec"
   require "deprec-core/defaults"
   require "deprec-core/capistrano_extensions"
-  require "deprec-core/canonical"
 elsif defined?(rake)
   # pass
 end

data/lib/deprec-core/capistrano_extensions.rb

@@ -4,6 +4,22 @@ require 'fileutils'
 
 module Deprec2
 
+  # Pretty coloured output in terminal
+  #
+  # Embed in a String to clear all previous ANSI sequences.
+  CLEAR   = "\e[0m"
+  BOLD    = "\e[1m"
+  #
+  # # Colors
+  BLACK   = "\e[30m"
+  RED     = "\e[31m"
+  GREEN   = "\e[32m"
+  YELLOW  = "\e[33m"
+  BLUE    = "\e[34m"
+  MAGENTA = "\e[35m"
+  CYAN    = "\e[36m"
+  WHITE   = "\e[37m"
+
   # Run rake task on remote server(s)
   def rake_remote(task_name)
       run "cd #{current_path} && RAILS_ENV=#{rails_env} #{rake} #{task_name}"
@@ -70,7 +86,7 @@ module Deprec2
       end
     end
     rendered_template = template.result(binding)
-    puts "Using #{template_path}"
+    # puts "Using #{template_path}" # work out which template is being used
   
     if remote 
       # render to remote machine
@@ -85,20 +101,18 @@ module Deprec2
       path_dir = File.dirname(File.expand_path(full_path))
       if File.exists?(full_path)
         if IO.read(full_path) == rendered_template
-          puts "[skip] Identical file exists (#{full_path})."
+          puts "#{BLUE}    identical#{CLEAR}  #{full_path}"
           return false
         elsif overwrite?(full_path, rendered_template)
           File.delete(full_path)
         else
-          puts "[skip] Not overwriting #{full_path}"
+          puts "#{YELLOW}         skip#{CLEAR}  #{full_path}"
           return false
         end
       end
       FileUtils.mkdir_p "#{path_dir}" if ! File.directory?(path_dir)
-      # added line above to make windows compatible
-      # system "mkdir -p #{path_dir}" if ! File.directory?(path_dir) 
       File.open(File.expand_path(full_path), 'w'){|f| f.write rendered_template }
-      puts "[done] #{full_path} written"
+      puts "#{GREEN}       create#{CLEAR}  #{full_path}"
     else
       # render to string
       return rendered_template
@@ -114,11 +128,9 @@ module Deprec2
       end
     end
     
-    # XXX add :always and :never later - not sure how to set persistent value from here
-    # response = Capistrano::CLI.ui.ask "File exists. Overwrite? ([y]es, [n]o, [a]lways, n[e]ver)" do |q|
     puts
-    response = Capistrano::CLI.ui.ask "File exists (#{full_path}). 
-    Overwrite? ([y]es, [n]o, [d]iff)" do |q|
+    response = Capistrano::CLI.ui.ask "#{RED}     conflict#{CLEAR}  #{full_path} 
+   Overwrite?  ([y]es, [n]o, [d]iff)" do |q|
       q.default = 'n'
     end
     
@@ -225,14 +237,20 @@ module Deprec2
 
   # create directory if it doesn't already exist
   # set permissions and ownership
-  # XXX move mode, path and
   def mkdir(path, options={})
     run "test -d #{path} || #{sudo} mkdir -p #{path}"
-    run "chmod #{sprintf("%3o",options[:mode]||0755)} #{path}" if options[:mode]
-    # We only use sudo when setting owner and/or group
-    run "#{sudo} chown -R #{options[:owner]} #{path}" if options[:owner]
-    groupadd(options[:group]) if options[:group]
-    run "#{sudo} chgrp -R #{options[:group]} #{path}" if options[:group]
+    if options[:mode]
+      run "#{sudo} chmod #{sprintf("%3o",options[:mode]||0755)} #{path}" 
+    end
+    if options[:owner]
+      run "#{sudo} chown -R #{options[:owner]} #{path}" 
+    end
+    if options[:group]
+      groupadd(options[:group]) 
+    end
+    if options[:group]
+      run "#{sudo} chgrp -R #{options[:group]} #{path}" 
+    end
   end
   
   def create_src_dir

data/lib/deprec-core/defaults.rb

@@ -35,7 +35,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   # ssh_options[:forward_agent] = true
 
   # SCM
-  _cset :scm, "git"
+  set :scm, "git" # This is set to :svn by Capistrano deploy recipes
   _cset :user, "deploy" 
   _cset :deploy_via, :remote_cache
   _cset :branch, "master"
@@ -57,7 +57,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   # even when USER is set to someone else. Sorry windows!
   _cset :current_user, `whoami`.chomp
 
-  # Only used by vmbuilder_plugins
-  _cset :run_method, 'sudo'
+  # Used by vmbuilder_plugins and Capistrano's deploy tasks
+  _cset :run_method, :sudo
 
 end

data/lib/deprec-core/version.rb

@@ -1,5 +1,5 @@
 module Deprec
   module Core
-    VERSION = "3.1.10"
+    VERSION = "3.1.12"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: deprec-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.10
+  version: 3.1.12
 platform: ruby
 authors: 
 - Mike Bailey
@@ -62,7 +62,6 @@ files:
 - Rakefile
 - deprec-core.gemspec
 - lib/deprec-core.rb
-- lib/deprec-core/canonical.rb
 - lib/deprec-core/capistrano_extensions.rb
 - lib/deprec-core/defaults.rb
 - lib/deprec-core/deprec.rb
@@ -95,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: deprec-core
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: deprec-core provides extensions to Capistrano

data/lib/deprec-core/canonical.rb

@@ -1,108 +0,0 @@
-# Copyright 2006-2008 by Mike Bailey. All rights reserved.
-# canonical.rb
-#
-# Running deprec:web:stop will be the same as running deprec:apache:stop or 
-# deprec:nginx:stop depending what you have chosen.
-#
-# generic namespaces are linked up to chosen applications at runtime but these
-# stubs are so they'll be included in the output of "cap -T"
-#
-Capistrano::Configuration.instance(:must_exist).load do 
-
-  # deprec defines some generic recipes for common services
-  # including ruby interpreter, web, app and database servers
-  #
-  # They default to my current favourites which you can over ride
-  #  
-  # Service options
-  CHOICES_RUBY_VM   = [:mri, :ree]
-  CHOICES_WEBSERVER = [:apache, :none] # :nginx not recipes out of date
-  CHOICES_APPSERVER = [:passenger, :none] # any colour you like guys
-  CHOICES_DATABASE  = [:mysql, :postgresql, :sqlite, :none]
-  # 
-  # Service defaults
-  _cset :ruby_vm_type,    :mri
-  _cset :web_server_type, :apache
-  _cset :app_server_type, :passenger
-  _cset :db_server_type,  :mysql
-
-  # Connect deprec:db to deprec:mysql, deprec:web to deprec:apache, etc
-  on :load, 'deprec:connect_canonical_tasks'
-
-  namespace :deprec do
-    task :connect_canonical_tasks do
-      # link application specific recipes into canonical task names
-      # e.g. deprec:web:restart => deprec:nginx:restart 
-
-
-      namespaces_to_connect = { :web => :web_server_type,
-                                :app => :app_server_type,
-                                :db  => :db_server_type,
-                                :ruby => :ruby_vm_type
-                              }
-      namespaces_to_connect.each do |server, choice|
-        server_type = send(choice).to_sym
-        if server_type != :none && deprec.respond_to?(server_type)
-          namespaces[server] = deprec.send(server_type)
-        end
-      end
-    end
-  end
-  
-  %w(ruby).each do |package|
-    namespace "deprec:#{package}" do
-      
-      desc "Install #{package.capitalize}"
-      task :install do 
-      end
-      
-    end
-  end
-  
-  %w(web app db).each do |server|
-    namespace "deprec:#{server}" do
-      
-      desc "Install #{server.capitalize} server"
-      task :install, :roles => server do 
-      end
-      
-      desc "Generate config file(s) for #{server} server from template(s)"
-      task :config_gen do
-      end
-      
-      desc "Deploy configuration files(s) for #{server} server"
-      task :config, :roles => server do
-      end
-      
-      desc "Start #{server} server"
-      task :start, :roles => server do
-      end
-      
-      desc "Stop #{server} server"
-      task :stop, :roles => server do
-      end
-      
-      desc "Stop #{server} server"
-      task :restart, :roles => server do
-      end
-      
-      desc "Enable startup script for #{server} server"
-      task :activate, :roles => server do
-      end  
-      
-      desc "Disable startup script for #{server} server"
-      task :deactivate, :roles => server do
-      end
-      
-      desc "Backup data for #{server} server"
-      task :backup, :roles => server do
-      end
-      
-      desc "Restore data for #{server} server from backup"
-      task :restore, :roles => server do
-      end
-      
-    end
-  end
-  
-end