fezzik 0.4.2 → 0.5.0

data/README.md

@@ -7,7 +7,7 @@ and gets out of your way.
 
 ## Install
 
-    sudo gem install fezzik
+    gem install fezzik
 
 ## Setup
 
@@ -96,6 +96,12 @@ The command.rb recipe gives you a prompt that lets you execute shell code on eac
     run command (or "quit"): tail www/myapp/log.txt -n 1
     [2011-07-01 00:01:23] GET / 200
 
+You can also run a single command:
+
+    $ fez prod command_execute\['ls'\]
+
+(You'll probably need to escape the `[]` in your shell as well.)
+
 ### Rollback
 
     fez get rollback

data/TODO.md

@@ -5,7 +5,6 @@
 * clear old releases
 * better way to update recipes/core with gem updates
 * figure out how to include/share common recipes
-* per-server or per-group configurations
 
 ## Bugs
 * symlink task links to a nonexistant directory when run in isolation

data/bin/fezify

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby
 require "colorize"
+require "fileutils"
 
 files = {
-  "config/deploy.rb" => <<-EOF,
+  "config/deploy.rb" => <<-'EOF',
 # This is the configuration file for fezzik.
 # Define variables here as you would for Vlad the Deployer.
 # A full list of variables can be found here:
 #     http://hitsquad.rubyforge.org/vlad/doco/variables_txt.html
 
 set :app, "app"
-set :deploy_to, "/opt/#\{app\}"
-set :release_path, "#\{deploy_to\}/releases/#\{Time.now.strftime("%Y%m%d%H%M")\}"
+set :deploy_to, "/opt/#{app}"
+set :release_path, "#{deploy_to}/releases/#{Time.now.strftime("%Y%m%d%H%M")}"
 set :local_path, Dir.pwd
 set :user, "root"
 
-
 # Each destination is a set of machines and configurations to deploy to.
 # You can deploy to a destination from the command line with:
 #     fez to_dev deploy
@@ -24,20 +24,27 @@ set :user, "root"
 # You can set environment variables that will be loaded at runtime on the server
 # like this:
 #     env :rack_env, "production"
+# or
+#     env :error_monitoring, "true", ["prod12.com"]
+# The second form specifies an environment variable particular to a server or list of servers (as a subset of
+# the :domain list).
+#
 # This will also generate a file on the server named config/environment.rb, which you can include
 # in your code to load these variables as Ruby constants. You can create your own config/environment.rb
 # file to use for development, and it will be overwritten at runtime.
 
 destination :dev do
-  set :domain, "#\{user\}@dev.example.com"
+  set :domain, "#{user}@dev.example.com"
 end
 
 destination :prod do
-  set :domain, "#\{user\}@prod.example.com"
+  set :domain, "#{user}@prod.example.com"
 end
   EOF
 
-  "config/recipes/core.rb" => <<-EOF,
+  "config/recipes/core.rb" => <<-'EOF',
+require "fileutils"
+
 # This file contains core tasks that are used to deploy your application to the
 # destination servers. This is a decent initial setup, but is completely configurable.
 
@@ -49,58 +56,65 @@ namespace :fezzik do
   # and it will be overwritten by this task when the code deploys.
   desc "saves variables set by 'env' in deploy.rb into config/environment.sh and config/environment.rb"
   task :save_environment do
-    system("mkdir -p /tmp/#\{app\}/config")
-    File.open("/tmp/#\{app\}/config/environment.rb", "w") do |file|
-      @environment.each do |key, value|
-        file.puts "#\{key.to_s.upcase\}=\\"#\{value\}\\""
+    @per_server_environments.each do |server, environment|
+      root_config_dir = "/tmp/#{app}/#{server}_config"
+      FileUtils.mkdir_p root_config_dir
+      File.open(File.join(root_config_dir, "environment.rb"), "w") do |file|
+        environment.each do |key, value|
+          quote = value.is_a?(Numeric) ? '' : '"'
+          file.puts "#{key.to_s.upcase} = #{quote}#{value}#{quote}"
+        end
       end
-    end
-    File.open("/tmp/#\{app\}/config/environment.sh", "w") do |file|
-      @environment.each do |key, value|
-        file.puts "export #\{key.to_s.upcase\}=\\"#\{value\}\\""
+      File.open(File.join(root_config_dir, "environment.sh"), "w") do |file|
+        environment.each { |key, value| file.puts %[export #{key.to_s.upcase}="#{value}"] }
       end
     end
   end
 
   desc "stages the project for deployment in /tmp"
   task :stage do
-    puts "staging project in /tmp/#\{app\}"
-    system("rm -fr /tmp/#\{app\}")
-    system("cp -r #\{local_path\} /tmp/#\{app\}")
+    puts "staging project in /tmp/#{app}"
+    FileUtils.rm_rf "/tmp/#{app}"
+    FileUtils.mkdir_p "/tmp/#{app}/staged"
+    FileUtils.cp_r "#{local_path}/.", "/tmp/#{app}/staged"
     Rake::Task["fezzik:save_environment"].invoke
   end
 
   desc "performs any necessary setup on the destination servers prior to deployment"
   remote_task :setup do
     puts "setting up servers"
-    run "mkdir -p #\{deploy_to\}/releases"
+    run "mkdir -p #{deploy_to}/releases"
   end
 
   desc "rsyncs the project from its stages location to each destination server"
   remote_task :push => [:stage, :setup] do
-    puts "pushing to #\{target_host\}:#\{release_path\}"
+    puts "pushing to #{target_host}:#{release_path}"
     # Copy on top of previous release to optimize rsync
-    rsync "-q", "--copy-dest=#\{current_path\}", "/tmp/#\{app\}/", "#\{target_host\}:#\{release_path\}"
+    rsync "-q", "--copy-dest=#{current_path}", "/tmp/#{app}/staged/", "#{target_host}:#{release_path}"
+    # Copy over the appropriate configs for the target
+    ["environment.rb", "environment.sh"].each do |config_file|
+      rsync "-q", "/tmp/#{app}/#{target_host}_config/#{config_file}",
+            "#{target_host}:#{release_path}/config/#{config_file}"
+    end
   end
 
   desc "symlinks the latest deployment to /deploy_path/project/current"
   remote_task :symlink do
-    puts "symlinking current to #\{release_path\}"
-    run "cd #\{deploy_to\} && ln -fns #\{release_path\} current"
+    puts "symlinking current to #{release_path}"
+    run "cd #{deploy_to} && ln -fns #{release_path} current"
   end
 
   desc "runs the executable in project/bin"
   remote_task :start do
-    puts "starting from #\{capture_output \{ run \"readlink #\{current_path\}\" \}\}"
-    run "cd #\{current_path\} && source config/environment.sh" +
-        " && ./bin/run_app.sh"
+    puts "starting from #{capture_output { run "readlink #{current_path}" }}"
+    run "cd #{current_path} && source config/environment.sh && ./bin/run_app.sh"
   end
 
   desc "kills the application by searching for the specified process name"
   remote_task :stop do
     puts "stopping app"
     # Replace YOUR_APP_NAME with whatever is run from your bin/run_app.sh file.
-    # run "(kill -9 `ps aux | grep 'YOUR_APP_NAME' | grep -v grep | awk '\{print $2\}'` || true)"
+    # run "(kill -9 `ps aux | grep 'YOUR_APP_NAME' | grep -v grep | awk '{print $2}'` || true)"
   end
 
   desc "restarts the application"
@@ -114,19 +128,19 @@ namespace :fezzik do
     Rake::Task["fezzik:push"].invoke
     Rake::Task["fezzik:symlink"].invoke
     Rake::Task["fezzik:restart"].invoke
-    puts "#\{app\} deployed!"
+    puts "#{app} deployed!"
   end
 end
   EOF
 
-  "bin/run_app.sh" => <<-EOF
+  "bin/run_app.sh" => <<-'EOF'
 #!/bin/sh
 # This file will be called to start your application.
   EOF
 }
 
-system("mkdir -p config/recipes")
-system("mkdir -p bin")
+FileUtils.mkdir_p "config/recipes"
+FileUtils.mkdir_p "bin"
 
 files.each do |filename, content|
   if File.exists?(filename) && ARGV[0] != "-f"
@@ -134,9 +148,7 @@ files.each do |filename, content|
   else
     puts "    [new]  #{filename} created".green
     File.open(filename, "w") { |file| file.write(content) }
-    if filename == "bin/run_app.sh"
-      system("chmod a+x bin/run_app.sh")
-    end
+    system("chmod a+x bin/run_app.sh") if filename == "bin/run_app.sh"
   end
 end
 

data/fezzik.gemspec

@@ -1,6 +1,10 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "fezzik/version"
+
 Gem::Specification.new do |s|
   s.name = "fezzik"
-  s.version = "0.4.2"
+  s.version = Fezzik::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">=0") if s.respond_to? :required_rubygems_version=
   s.specification_version = 2 if s.respond_to? :specification_version=

data/lib/fezzik.rb

@@ -3,7 +3,7 @@ require "stringio"
 namespace :fezzik do
   task :run do
     destination = ARGV[0]
-    destination = $1 if destination.match(/to_(.+)/)
+    destination = $1 if destination.match(/^to_(.+)/)
     destination, @domain_override = destination.split(":", 2)
     @domain_override = @domain_override.split(",") if @domain_override
     tasks = ARGV[1..-1]
@@ -29,9 +29,9 @@ namespace :fezzik do
     @destination = args[:destination].to_sym
     @environment = {}
     require "./config/deploy.rb"
-    servers = domain
-    servers = domain.join(", ") if domain.is_a?(Array)
-    puts "configuring for #{servers}"
+    @servers = domain.is_a?(Array) ? domain : domain.split(",").map(&:strip)
+    compute_environment_per_server
+    puts "configuring for #{@servers.join(", ")}"
   end
 
   def destination(target, &block)
@@ -44,8 +44,27 @@ namespace :fezzik do
     end
   end
 
-  def env(key, value)
-    @environment[key] = value
+  # If servers is given, then this environment variable will only apply to that server (or array of servers)
+  # (these should match names given in :domain). If servers is not given, then this environment variable
+  # applies to all servers.
+  def env(key, value, servers = nil)
+    servers = Array(servers) if servers
+    @environment[[key, servers]] = value
+  end
+
+  def compute_environment_per_server
+    @per_server_environments = Hash.new { |h, k| h[k] = {} }
+    @environment.each do |k, value|
+      key, servers = k
+      if servers
+        # Allow the user to provide "user@host.com" or "host.com" when identifying servers for per-server
+        # environment variables.
+        applicable_servers = @servers.select { |s1| servers.any? { |s2| s1 == s2 || s1.end_with?(s2) } }
+      else
+        applicable_servers = @servers
+      end
+      applicable_servers.each { |s| @per_server_environments[s][key] = value }
+    end
   end
 
   def capture_output(&block)

metadata

@@ -1,120 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fezzik
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Daniel MacDougall
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-18 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152418940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-remote_task
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152418940
+- !ruby/object:Gem::Dependency
+  name: rake-remote_task
+  requirement: &2152414560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: colorize
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152414560
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: &2152413800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 5
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2152413800
 description: A light deployment system that gets out of your way
 email: dmacdougall@gmail.com
-executables: 
+executables:
 - fez
 - fezify
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - TODO.md
 - fezzik.gemspec
 - lib/fezzik.rb
 - bin/fez
 - bin/fezify
-has_rdoc: true
 homepage: http://github.com/dmacdougall/fezzik
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fezzik
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 2
 summary: A light deployment system that gets out of your way
 test_files: []
-