necktie 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.0.2
+* Added services.reload and improved read time for services.running?
+* Example now uses more file tasks for conditional updates.
+* Command line option --env becomes --environment.
+* Fix to cap necktie task, and using --trace by default.
+* Updated examples based on tasks we're using in production.
+
 1.0.1 (2009-10-16)
 * Improvements to RDoc.
 * Necktie module helps with documentation and usage.

data/README.rdoc

@@ -147,6 +147,9 @@ the default task instead of setting ROLES each time. In your Necktie file add:
 You may also want to take advantage of different environments, customizing your
 setup differently between production, staging, etc.
 
+Check the example directory for ideas on how to split large configurations into
+smaller files and tasks.
+
 Note: As with Rake, command line arguments are either options (see necktie -H),
 task names (executed in order), or name=value pairs that set environment
 variables (e.g. RAILS_ENV=production).
@@ -210,3 +213,5 @@ http://rush.heroku.com http://github.com/adamwiggins/rush
 Includes Session, created by Ara T. Howard and released under the Ruby License
 http://raa.ruby-lang.org/project/session
 http://www.codeforpeople.com/lib/ruby/session
+
+Developed for managing EC2 instances for http://apartly.com 

data/example/tasks/app.rb

@@ -20,30 +20,30 @@ task :memcached do
   end
 end
 
-task :unicorn=>[:rubygems, "#{@deploy_to}/current"] do
-  # Install init.d script to manage Unicorn, before we can start it.
+file "/etc/init.d/unicorn"=>"etc/init.d/unicorn" do
   cp "etc/init.d/unicorn", "/etc/init.d/"
+  update "/etc/init.d/unicorn", /^ENV=.*$/, "ENV=#{Necktie.env}"
   chmod 0755, "/etc/init.d/unicorn"
-  services.start "unicorn"
+  services.restart "unicorn"
 end
+task :unicorn=>[:rubygems, "#{@deploy_to}/current", "/etc/initd.unicorn"]
 
-task :nginx=>:unicorn do
+file "/etc/nginx/sites-available/unicorn.conf"=>"etc/nginx/unicorn.conf" do
   # We only care about one Nginx configuration, so enable it and disable all others.
-  unless services.running?("nginx")
-    rm_rf Dir["/etc/nginx/sites-enabled/*"]
-    cp "etc/nginx/unicorn.conf", "/etc/nginx/sites-available/"
-    ln_sf "/etc/nginx/sites-available/unicorn.conf", "/etc/nginx/sites-enabled/"
-    services.start "nginx"
-  end
+  rm_rf Dir["/etc/nginx/sites-enabled/*"]
+  cp "etc/nginx/unicorn.conf", "/etc/nginx/sites-available/"
+  ln_sf "/etc/nginx/sites-available/unicorn.conf", "/etc/nginx/sites-enabled/"
+  sh "service nginx reload"
 end
+task :nginx=>[:unicorn, "/etc/nginx/sites-available/unicorn.conf"
 
-task :email do
+task :postfix do
   # Have postfix send emails on behalf of our host, and start it. 
-  unless services.running?("postfix")
+  unless read("/etc/postfix/main.cf")[@hostname]
     update "/etc/postfix/main.cf", /^myhostname\s*=.*$/, "myhostname = #{@hostname}"
     write "/etc/mailname", @hostname
-    services.start "postfix"
+    services.restart "postfix"
   end
 end
 
-task :app=>[:environment, :memcached, :nginx, :email]
+task :app=>[:environment, :memcached, :unicorn, :nginx, :postfix]

data/example/tasks/current.rb

@@ -1,16 +1,11 @@
 user, group = "nginx", "nginx"
-
 shared_path = "#{@deploy_to}/shared"
 cached_copy = "#{shared_path}/cached-copy"
 releases_path = "#{@deploy_to}/releases"
-release = Time.now.utc.strftime("%Y%m%d%H%M%S")
-release_path = "#{releases_path}/#{release}"
 current_path = "#{@deploy_to}/current"
 
 file @deploy_to do
   mkdir_p @deploy_to
-  chown user, group, @deploy_to
-  chmod 0770, @deploy_to
 end
 
 file shared_path=>@deploy_to do
@@ -19,31 +14,41 @@ file shared_path=>@deploy_to do
   chmod_R 0770, shared_path
 end
 
+file cached_copy=>shared_path do
+  sh "git clone #{@git_url} #{cached_copy}"
+  chown_R user, group, cached_copy
+end
+
 file releases_path=>@deploy_to do
   mkdir_p releases_path
   chown user, group, releases_path
   chmod 0770, releases_path
 end
 
-file cached_copy=>shared_path do
-  sh "git clone #{@git_url} #{cached_copy}"
-  chown_R user, group, cached_copy
-end
+task :release=>[releases_path, cached_copy] do
+  sha = bash("git --git-dir=#{cached_copy}/.git rev-parse --verify HEAD")
+  latest = Dir["#{releases_path}/*/REVISION"].find { |f| File.read(f)[sha] }
+  if latest
+    @release_path = File.dirname(latest)
+  else
+    @release_path = "#{releases_path}/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}"
+    cp_r cached_copy, @release_path
+    write "#{@release_path}/REVISION", sha
+
+    rm_rf ["#{@release_path}/log", "#{@release_path}/public/system", "#{@release_path}/tmp/pids"]
+    mkdir_p ["#{@release_path}/public", "#{@release_path}/tmp", "#{@release_path}/tmp/cache",
+             "#{@release_path}/tmp/sockets", "#{@release_path}/tmp/sessions"]
+    ln_s "#{shared_path}/log", "#{@release_path}/log"
+    ln_s "#{shared_path}/system", "#{@release_path}/public/system"
+    ln_s "#{shared_path}/pids", "#{@release_path}/tmp/pids"
 
-file release_path=>[releases_path, cached_copy] do
-  cp_r cached_copy, release_path
-  revision = bash("git --git-dir=#{cached_copy}/.git rev-parse --verify HEAD")
-  write "#{release_path}/REVISION", revision
-  touch release_path
-  sh "chmod -R g+w #{release_path}"
-  rm_rf ["#{release_path}/log", "#{release_path}/public/system", "#{release_path}/tmp/pids"]
-  mkdir_p ["#{release_path}/public", "#{release_path}/tmp"]
-  ln_s "#{shared_path}/log", "#{release_path}/log"
-  ln_s "#{shared_path}/system", "#{release_path}/public/system"
-  ln_s "#{shared_path}/pids", "#{release_path}/tmp/pids"
+    chown_R user, group, @release_path
+    sh "chmod -R g+w #{@release_path}"
+  end
 end
 
-file current_path=>[release_path, shared_path] do
+file current_path=>[:release, shared_path] do
   rm_f current_path
-  ln_s release_path, current_path
+  ln_s @release_path, current_path
+  chown user, group, current_path
 end

data/example/tasks/db.rb

@@ -1,6 +1,6 @@
-task "/etc/cron/snapshot" do
+file "/etc/cron.hourly/snapshot"=>"etc/cron/snapshot" do
   cp "etc/cron/snapshot", "/etc/cron.hourly/"
-  chmod 0755, "/etc/cron/snapshot"
+  chmod 0755, "/etc/cron.hourly/snapshot"
 end
 
 task "/vol" do

data/lib/necktie/application.rb

@@ -35,7 +35,7 @@ module Necktie
 
     def necktie_options
       [
-        ['--env', '-e NAME', "Sets the environment (defaults to 'production').",
+        ['--environment', '-e NAME', "Sets the environment (defaults to 'production').",
           lambda { |value|
             options.env = value
           }

data/lib/necktie/capistrano.rb

@@ -8,6 +8,6 @@ Capistrano::Configuration.instance.load do
     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")} #{task.join(" ")}"
+    sudo "necktie --source #{necktie_url} --update --environment #{fetch(:rails_env, "production")} #{tasks.join(" ")} --trace"
   end
 end

data/lib/necktie/services.rb

@@ -5,9 +5,8 @@ module Necktie
     #   service <name> start
     def start(name)
       puts " ** Starting service #{name}"
-      system "update-rc.d #{name} defaults" and
-        system "service #{name} start" or
-        fail "failed to start #{name}"
+      sh "update-rc.d #{name} defaults"
+      sh "service #{name} start"
     end
 
     # Enables service to run after boot.
@@ -20,29 +19,34 @@ module Necktie
     #   update_rc.d <name> remove
     def stop(name)
       puts " ** Stopping service #{name}"
-      system "service #{name} stop" and
-      system "update-rc.d -f #{name} remove" or
-        fail "failed to stop #{name}"
+      sh "service #{name} stop"
+      sh "update-rc.d -f #{name} remove"
     end
 
     # Disables service from running after boot.
     def disable(name)
-      system "update-rc.d -f #{name} remove" or fail "cannot disable #{name}"
+      sh "update-rc.d -f #{name} remove"
     end
 
     # Restart service. Same as:
     #   service <name> restart
     def restart(name)
       puts " ** Restarting service #{name}"
-      system "service #{name} restart" or fail "failed to restart #{name}"
+      sh "service #{name} restart"
+    end
+
+    # Reload configuration. Same as:
+    #   service <name> reload
+    def reload(name)
+      sh "service #{name} reload"
     end
 
     # Checks if service is running. Returns true or false based on the outcome
     # of service <name> status, and nil if service doesn't have a status command.
     # (Note: Not all services report their running state, or do so reliably)
     def running?(name)
-      status = File.read("|service --status-all 2>&1")[/^ \[ (.) \]  #{Regexp.escape name}$/,1]
-      status == "+" ? true : status == "-" ? false : nil
+      status = File.read("|service #{name} status 2>&1")
+      status[/is running/] ? true : status[/is not running/] ? false : status.empty? ? false : nil;
     end
   end
 end

data/necktie.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |spec|
   spec.name           = "necktie"
-  spec.version        = "1.0.1"
+  spec.version        = "1.0.2"
   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.files          = Dir["{bin,lib,vendor,example}/**/*", "*.{gemspec,rdoc}"]
+  spec.files          = Dir["{bin,lib,vendor,example}/**/*", "CHANGELOG", "README.rdoc", "necktie.gemspec"]
   spec.executable     = "necktie"
 
   spec.has_rdoc         = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: necktie
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -07:00
+date: 2009-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -245,9 +245,9 @@ files:
 - example/tasks/app.rb
 - example/tasks/current.rb
 - example/tasks/db.rb
-- necktie.gemspec
-- README.rdoc
 - CHANGELOG
+- README.rdoc
+- necktie.gemspec
 has_rdoc: true
 homepage: http://github.com/assaf/necktie
 licenses: []