fezzik 0.6.0 → 0.6.1

data/README.md

@@ -183,6 +183,28 @@ task :print_destination
 end
 ```
 
+
+## DSL
+
+Fezzik comes with a DSL module that you can optionally include in the top level of your Rakefiles. It exposes
+the following functions:
+
+```
+destination
+env
+capture_output
+```
+
+This lets you write your configuration more tersely:
+
+```ruby
+include Fezzik::DSL
+
+destination :prod do
+  env :rack_env, "production"
+end
+```
+
 ## Tasks
 
 Fezzik has a number of useful tasks other than deploy.rake and environment.rake. These can also be downloaded

data/fezzik.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/dmacdougall/fezzik"
   s.rubyforge_project = "fezzik"
 
-  s.executables = %w(fez fezify)
+  s.executables = %w(fez)
   s.files = `git ls-files`.split("\n")
 
   s.add_dependency("rake", "~>0.8.7")

data/lib/fezzik.rb

@@ -3,8 +3,9 @@ require "thread"
 require "rake"
 require "rake/remote_task"
 require "colorize"
-require "fezzik/base.rb"
-require "fezzik/environment.rb"
-require "fezzik/io.rb"
-require "fezzik/util.rb"
-require "fezzik/version.rb"
+require "fezzik/base"
+require "fezzik/dsl"
+require "fezzik/environment"
+require "fezzik/io"
+require "fezzik/util"
+require "fezzik/version"

data/lib/fezzik/dsl.rb

@@ -0,0 +1,15 @@
+module Fezzik
+  module DSL
+    def destination(name, &block)
+      Fezzik.destination(name, &block)
+    end
+
+    def env(*args)
+      Fezzik.env(*args)
+    end
+
+    def capture_output(*args)
+      Fezzik::Util.capture_output(*args)
+    end
+  end
+end

data/lib/fezzik/version.rb

@@ -1,3 +1,3 @@
 module Fezzik
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fezzik
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-02-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152662480 !ruby/object:Gem::Requirement
+  requirement: &2156480180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152662480
+  version_requirements: *2156480180
 - !ruby/object:Gem::Dependency
   name: rake-remote_task
-  requirement: &2152662020 !ruby/object:Gem::Requirement
+  requirement: &2156479720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152662020
+  version_requirements: *2156479720
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2152661560 !ruby/object:Gem::Requirement
+  requirement: &2156479260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,12 +44,11 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152661560
+  version_requirements: *2156479260
 description: A light deployment system that gets out of your way
 email: dmacdougall@gmail.com
 executables:
 - fez
-- fezify
 extensions: []
 extra_rdoc_files: []
 files:
@@ -58,12 +57,11 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- TODO.md
 - bin/fez
-- bin/fezify
 - fezzik.gemspec
 - lib/fezzik.rb
 - lib/fezzik/base.rb
+- lib/fezzik/dsl.rb
 - lib/fezzik/environment.rb
 - lib/fezzik/io.rb
 - lib/fezzik/util.rb

data/TODO.md

@@ -1,14 +0,0 @@
-## Features
-* rollback
-* rolling restarts
-* parallel execution
-* clear old releases
-* better way to update recipes/core with gem updates
-* figure out how to include/share common recipes
-
-## Bugs
-* symlink task links to a nonexistant directory when run in isolation
-
-## Release Notes
-* copy previous deployment to destination before rsync (for faster rsync)
-* copy unsafe links with rsync (done with -L)

data/bin/fezify

@@ -1,156 +0,0 @@
-#!/usr/bin/env ruby
-require "colorize"
-require "fileutils"
-
-files = {
-  "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 :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
-#
-# :domain can be an array if you are deploying to multiple hosts.
-#
-# 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"
-end
-
-destination :prod do
-  set :domain, "#{user}@prod.example.com"
-end
-  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.
-
-namespace :fezzik do
-  # Any variables set in deploy.rb with "env" will be saved on the server in two files:
-  # config/environment.sh and config/environment.rb. The first is loaded into the shell
-  # environment before the run script is called, and the second is made available to
-  # be required into your code. You can use your own environment.rb file for development,
-  # 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
-    @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
-      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}"
-    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"
-  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}"
-    # Copy on top of previous release to optimize rsync
-    rsync "-q", "--copy-dest=#{current_path}", "/tmp/#{app}/staged/", "#{target_host}:#{release_path}"
-    # Copy over the appropriate configs for the target
-    server = target_host.gsub(/^.*@/, "")
-    ["environment.rb", "environment.sh"].each do |config_file|
-      rsync "-q", "/tmp/#{app}/#{server}_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"
-  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"
-  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)"
-  end
-
-  desc "restarts the application"
-  remote_task :restart do
-    Rake::Task["fezzik:stop"].invoke
-    Rake::Task["fezzik:start"].invoke
-  end
-
-  desc "full deployment pipeline"
-  task :deploy do
-    Rake::Task["fezzik:push"].invoke
-    Rake::Task["fezzik:symlink"].invoke
-    Rake::Task["fezzik:restart"].invoke
-    puts "#{app} deployed!"
-  end
-end
-  EOF
-
-  "bin/run_app.sh" => <<-'EOF'
-#!/bin/sh
-# This file will be called to start your application.
-  EOF
-}
-
-FileUtils.mkdir_p "config/recipes"
-FileUtils.mkdir_p "bin"
-
-files.each do |filename, content|
-  if File.exists?(filename) && ARGV[0] != "-f"
-    puts "    [skip] #{filename} already exists"
-  else
-    puts "    [new]  #{filename} created".green
-    File.open(filename, "w") { |file| file.write(content) }
-    system("chmod a+x bin/run_app.sh") if filename == "bin/run_app.sh"
-  end
-end
-
-puts "    [done]".green