necktie 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,12 @@
+1.0.4 (2009-11-4)
+* When used with -U option and no other argument, necktie command updates the
+local repo but does not run any task.
+* Introduced -R option which you can use to checkout specific reference (tag,
+commit, tree).
+* cap necktie task broken up into separate stages, now runs deploy:web:disable
+before running necktie:upgrade.
+* Added syslog messages.
+
 1.0.3 (2009-11-2)
 * Added Necktie::Version.
 * Added gem clean to rubygems task (examples).

data/README.rdoc

@@ -44,6 +44,7 @@ or necktie.rb), with a list of tasks. For example:
     FileList["gems/*.gem"].each do |gem|
       install_gem gem
     end
+    sh "gem clean"
   end
 
   desc "Setup and start Nginx"

data/example/Necktie

@@ -10,3 +10,5 @@ task :environment do
   ps = Necktie.env == "staging" ? "\\e[0;34mSTAGE\\e[m \\w $ " : "\\e[0;31mLIVE\\e[m \\w $ " 
   append profile, "PS1=\"#{ps}\"\n" unless read(profile)["PS1=\"#{ps}\""]
 end
+
+task :default=>:app

data/lib/necktie/application.rb

@@ -1,4 +1,5 @@
 require "rake"
+require "syslog"
 
 module Necktie
   class Application < Rake::Application #:nodoc:
@@ -9,17 +10,17 @@ module Necktie
       @rakefiles = ["Necktie", "necktie", "Necktie.rb", "necktie.rb"]
       options.nosearch = true
       options.env = "production"
+      @syslog = Syslog.open("necktie")
     end
 
     def run
       standard_exception_handling do
         init "necktie"
-        puts "(#{options.env})"
         repo = File.expand_path("~/.necktie")
         if File.exist?(repo)
           Dir.chdir repo do
             puts "Pulling latest updates to #{repo} ..."
-            sh "git pull origin #{ENV["BRANCH"] || "master"}", :verbose=>false
+            sh "git pull origin master", :verbose=>false
           end if options.pull
         else
           options.git_url or fail "Need to set Git URL: use --source command line option"
@@ -27,8 +28,14 @@ module Necktie
           sh "git clone #{options.git_url} #{repo.inspect}", :verbose=>false
         end
         Dir.chdir repo do
+          sh "git checkout #{options.ref}" if options.ref
+          @sha = `git rev-parse --verify HEAD --short`.strip
+          puts "(in #{Dir.pwd}, head is #{@sha}, environment is #{options.env})"
+          syslog :info, "environment is #{options.env}"
+
           load_rakefile
-          top_level
+          top_level unless options.pull && ARGV.empty?
+          syslog :info, "done"
         end
       end
     end
@@ -43,6 +50,9 @@ module Necktie
         ['--source', '-S GIT_URL', "Git URL to your Necktie repository",
           lambda { |value| options.git_url = value }
         ],
+        ['--ref', '-R REF', "Checkout specific reference (commit, tag, tree)",
+          lambda { |value| options.ref = value }
+        ],
         ['--update', '-U', "Update .necktie directory (git pull)",
           lambda { |value| options.pull = true }
         ],
@@ -131,10 +141,27 @@ module Necktie
       load_imports
     end
 
+    def syslog(level, message)
+      @syslog.send level, "[#{@sha}] #{message.strip.gsub(/%/, '%%')}" # syslog(3) freaks on % (printf)
+    end
+
   end
 
   # Returns the environment name (set using -e command line option).
   def self.env
     Rake.application.options.env
   end
+
+end
+
+
+class Rake::Task #:nodoc:
+  alias :execute_without_syslog :execute
+  def execute(args=nil)
+    application.syslog :info, "execute: #{name}"
+    execute_without_syslog args
+  rescue
+    application.syslog :err, "#{$!.backtrace.first}: #{$!.class}: #{$!}"
+    raise
+  end
 end

data/lib/necktie/capistrano.rb

@@ -1,13 +1,36 @@
+# cap necktie task
 Capistrano::Configuration.instance.load do
-  desc "Run necktie on all servers (you can use HOSTS or RAILS env vars)"
-  task :necktie do
-    fail "You need to set :necktie_url, <git_url>" unless necktie_url
-    spec = Gem::Specification.load(File.expand_path("../../necktie.gemspec", File.dirname(__FILE__)))
-    gem_spec = Gem::SourceIndex.from_installed_gems.find_name(spec.name, spec.version).last
-    gem_file = File.join(Gem.dir, "cache", gem_spec.file_name)
-    upload gem_file, File.basename(gem_file), :via=>:scp
-    sudo "gem install #{File.basename(gem_file)}"
-    tasks = ENV["ROLES"].to_s.split(",") # ROLES => task names
-    sudo "necktie --source #{necktie_url} --update --environment #{fetch(:rails_env, "production")} #{tasks.join(" ")} --trace"
+  namespace :necktie do
+    desc "[internal] Install necktie on remote server"
+    task :install do
+      spec = Gem::Specification.load(File.expand_path("../../necktie.gemspec", File.dirname(__FILE__)))
+      gem_spec = Gem::SourceIndex.from_installed_gems.find_name(spec.name, spec.version).last
+      gem_file = File.join(Gem.dir, "cache", gem_spec.file_name)
+      upload gem_file, File.basename(gem_file), :via=>:scp
+      sudo "gem install #{File.basename(gem_file)}"
+    end
+
+    desc "[internal] Pull updates from Git"
+    task :pull do
+      fail "You need to set :necktie_url, <git_url>" unless necktie_url
+      sudo "necktie --source #{necktie_url} --update"
+    end
+
+    desc "[internal] Run necktie upgrade"
+    task :upgrade do # run necktime
+      tasks = ENV["ROLES"].to_s.split(",") # ROLES => task names
+      sudo "necktie --environment #{fetch(:rails_env, "production")} #{tasks.join(" ")}"
+    end
+
+    desc "Run necktie on all servers (you can use HOSTS or RAILS env vars)"
+    task :default do
+      fail "You need to set :necktie_url, <git_url>" unless necktie_url
+      install
+      pull
+      upgrade
+    end
+
+    before "necktie:upgrade", "deploy:web:disable"
+    after  "necktie:upgrade", "deploy:web:enable"
   end
 end

data/lib/necktie.rb

@@ -17,7 +17,10 @@ end
 module Necktie
   # Version number.
   module Version
-    STRING = Gem::Specification.load(File.expand_path("../necktie.gemspec", File.dirname(__FILE__))).version.to_s.freeze
-    MAJOR, MINOR, PATCH = STRING.split(".").map { |i| i.to_i }
+    version = Gem::Specification.load(File.expand_path("../necktie.gemspec", File.dirname(__FILE__))).version.to_s.split(".").map { |i| i.to_i }
+    MAJOR = version[0]
+    MINOR = version[1]
+    PATCH = version[2]
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/necktie.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |spec|
   spec.name           = "necktie"
-  spec.version        = "1.0.3"
+  spec.version        = "1.0.4"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://github.com/assaf/necktie"
   spec.summary        = "Dress to impress"
-  spec.description    = "Configure your servers remotely using Ruby and Git"
+  spec.description    = "Configure your servers using Ruby and Git"
 
   spec.files          = Dir["{bin,lib,vendor,example}/**/*", "CHANGELOG", "README.rdoc", "necktie.gemspec"]
   spec.executable     = "necktie"
 
   spec.has_rdoc         = true
-  spec.extra_rdoc_files = 'README.rdoc', 'CHANGELOG'
-  spec.rdoc_options     = '--title', 'Necktie', '--main', 'README.rdoc',
-                          '--webcvs', 'http://github.com/assaf/necktie'
+  spec.extra_rdoc_files = "README.rdoc", "CHANGELOG"
+  spec.rdoc_options     = "--title", "Necktie #{spec.version}", "--main", "README.rdoc",
+                          "--webcvs", "http://github.com/assaf/#{spec.name}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: necktie
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: Configure your servers remotely using Ruby and Git
+description: Configure your servers using Ruby and Git
 email: assaf@labnotes.org
 executables: 
 - necktie
@@ -243,8 +243,8 @@ files:
 - example/gems/unicorn-0.93.3.gem
 - example/Necktie
 - example/tasks/app.rb
-- example/tasks/current.rb
 - example/tasks/db.rb
+- example/tasks/deploy.rb
 - CHANGELOG
 - README.rdoc
 - necktie.gemspec
@@ -255,7 +255,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Necktie
+- Necktie 1.0.4
 - --main
 - README.rdoc
 - --webcvs