crushserver 0.3.2 → 0.3.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 PJ Kelly, pj@boomdesigngroup.com
+Copyright (c) 2008 PJ Kelly, pj@crushlovely.com
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

data/Rakefile

@@ -10,5 +10,5 @@ begin
     gemspec.add_dependency "tinder", ">= 1.4.0"
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :build: 
 :minor: 3
-:patch: 2
+:patch: 3

data/crushserver.gemspec

@@ -1,39 +1,36 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{crushserver}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["PJ Kelly", "Mason Browne"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2011-04-26}
   s.description = %q{A collection of capistrano tasks frequently used at Crush + Lovely.}
   s.email = %q{pj@crushlovely.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README"
+    "README"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "VERSION.yml",
-     "crushserver.gemspec",
-     "lib/crushserver/recipes.rb"
+    "LICENSE",
+    "README",
+    "Rakefile",
+    "VERSION",
+    "VERSION.yml",
+    "crushserver.gemspec",
+    "lib/crushserver/recipes.rb"
   ]
   s.homepage = %q{http://github.com/crushlovely/crushserver}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.0}
   s.summary = %q{A collection of capistrano tasks frequently used at Crush + Lovely.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/crushserver/recipes.rb

@@ -1,10 +1,4 @@
-begin
-  require 'fileutils'
-rescue
-end
-
 require 'tinder'
-
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :sync do
     desc "Sync both database and attachments to local machine.  Requires awesome-backup plugin."
@@ -72,37 +66,50 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    # desc "Send a message to the campfire chat room about the deploy start"
-    # task :snitch_begin do
-    #   set :snitch_message, "BEGIN DEPLOY [#{stage.to_s.upcase}]: #{ENV['USER']}, #{branch}/#{real_revision[0, 7]} to #{deploy_to}"
-    #   snitch
-    # end
-
     desc "Send a message to the campfire chat room about the deploy end"
     task :snitch_end do
       # set :snitch_message, "END DEPLOY [#{stage.to_s.upcase}]: #{ENV['USER']}, #{branch}/#{real_revision[0, 7]} to #{deploy_to}"
       set :snitch_message, "#{application.upcase} was deployed to #{stage.to_s.upcase} by #{ENV['USER'].upcase} (#{branch}/#{real_revision[0, 7]})"
       snitch
     end
+  end
 
-    # desc "Send a message to the campfire chat roob about the rollback"
-    # task :snitch_rollback do
-    #   set :snitch_message, "ROLLBACK [#{stage.to_s.upcase}]: #{ENV['USER']}, #{latest_revision[0, 7]} to #{previous_revision[0, 7]} on #{deploy_to}"
-    #   snitch
-    # end
+  desc "Show currently deployed revision on server."
+  task :revisions, :roles => :app do
+    begin
+      current, previous, latest = current_revision[0,7], previous_revision[0,7], real_revision[0,7]
+      puts "\n" << "-"*63
+      puts "===== Master Revision: \033[1;33m#{latest}\033[0m\n\n"
+      puts "===== [ \033[1;36m#{application} - #{stage}\033[0m ]"
+      puts "=== Deployed Revision: \033[1;32m#{current}\033[0m"
+      puts "=== Previous Revision: \033[1;32m#{previous}\033[0m\n\n"
+
+      # If deployed and master are the same, show the difference between the last 2 deployments.
+      base_label, new_label, base_rev, new_rev = latest != current ? \
+           ["deployed", "master", current, latest] : \
+           ["previous", "deployed", previous, current]
+
+      # Show difference between master and deployed revisions.
+      if (diff = `git log #{base_rev}..#{new_rev} --oneline`) != ""
+        # Colorize refs
+        diff.gsub!(/^([a-f0-9]+) /, "\033[1;32m\\1\033[0m - ")
+        diff = "    " << diff.gsub("\n", "\n    ") << "\n"
+        # Indent commit messages nicely, max 80 chars per line, line has to end with space.
+        diff = diff.split("\n").map{|l|l.scan(/.{1,120}/).join("\n"<<" "*14).gsub(/([^ ]*)\n {14}/m,"\n"<<" "*14<<"\\1")}.join("\n")
+        puts "=== Difference between #{base_label} revision and #{new_label} revision:\n\n"
+        puts diff
+      end
+    rescue
+        puts "=== Revisions Task Failed!"
+    end
   end
 
   #############################################################
   # Hooks
   #############################################################
 
-  # before :deploy do
-  #   campfire.snitch_begin unless ENV['QUIET'].to_i > 0
-  # end
-
   after :deploy do
     campfire.snitch_end unless ENV['QUIET'].to_i > 0
+    revisions
   end
-
-  # before 'deploy:rollback', 'campfire:snitch_rollback'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crushserver
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - PJ Kelly
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -07:00
+date: 2011-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -43,7 +45,6 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
-- .gitignore
 - LICENSE
 - README
 - Rakefile
@@ -56,8 +57,8 @@ homepage: http://github.com/crushlovely/crushserver
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -65,6 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -73,13 +75,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.0
 signing_key: 
 specification_version: 3
 summary: A collection of capistrano tasks frequently used at Crush + Lovely.

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-pkg