peony 0.1.6 → 0.1.8

data/lib/peony/shell.rb

@@ -0,0 +1,46 @@
+module Peony
+  module Shell
+    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns,
+                               :print_table, :print_wrapped, :file_collision, :terminal_width, :padding,
+                               :padding_to, :padding_up, :padding_down]
+
+    # The following classes's code was copied from Thor, available under MIT-LICENSE
+    # Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al.
+    autoload :Basic, 'peony/shell/basic'
+    autoload :Color, 'peony/shell/color'
+    autoload :HTML,  'peony/shell/html'
+
+
+    # Holds the shell for the given Thor instance. If no shell is given,
+    # it gets a default shell from Thor::Base.shell.
+    def shell
+      @shell ||= if ENV['PEONY_SHELL'] && ENV['PEONY_SHELL'].size > 0
+        Peony::Shell.const_get(ENV['PEONY_SHELL']).new
+      elsif (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/) && !(ENV['ANSICON'])
+        Peony::Shell::Basic.new
+      else
+        Peony::Shell::Color.new
+      end
+    end
+
+    # Common methods that are delegated to the shell.
+    SHELL_DELEGATED_METHODS.each do |method|
+      module_eval <<-METHOD, __FILE__, __LINE__
+        def #{method}(*args, &block)
+          shell.#{method}(*args, &block)
+        end
+      METHOD
+    end
+
+    # Yields the given block with padding.
+    def with_padding
+      shell.padding_up
+      yield
+    ensure
+      shell.padding_down
+    end
+
+  end
+
+end
+

data/lib/peony/utils.rb

@@ -6,51 +6,12 @@ module Peony
         set $1.strip.to_sym, $2 if arg =~ /([^=]+)=(.+)/
       end
     end
-        
-    def sudo(cmd, &block)
-      run "sudo #{cmd}", &block
-    end
-    
-    def run(cmd)
-      sh cmd do|res, stat|
-        if block_given?
-          yield res, stat
-        else
-          puts stat.inspect unless res
-        end
-      end
-    end
-    
-    def mkdir_p(*dirs)
-      dirs.each do|dir|
-        if !FileTest.exists?(dir)
-          FileUtils.mkdir_p(dir)
-        end
-        fail "#{dir} must be a directory!" unless FileTest.directory?(dir)
-      end
-    end
 
-    # ### invoke
-    # Invokes another Rake task.
-    #
-    # Invokes the task given in `task`. Returns nothing.
-    #
-    #     invoke :'git:clone'
-    #     invoke :restart
-    #
-    # Options:
-    #   reenable (bool) - Execute the task even next time.
-    #
-    def invoke(task, options = {})
-      Rake.application.invoke_task task
-      Rake::Task[task].reenable if options[:reenable]
-    end
-    
     def template(from, to, override=false)
       template = find_templates(from).first
       raise "Can't find tempalte #{from} in directory #{search_paths}." unless template
       raise "File #{to} have already exists." if !override && File.exists?(to)
-      puts "copy #{template} to #{to}"
+      say "copy #{template} to #{to}", :green
       open(to, "w+") do|out|
         out.write(erb(template))
       end
@@ -70,61 +31,9 @@ module Peony
     # Returns the output string of the ERB template.
     def erb(file, b=binding)
       require 'erb'
-      ERB.new(File.read(file), nil, "-").result(b)
-    end
-
-    # ### report_time
-    # Report time elapsed in the block.
-    # Returns the output of the block.
-    #
-    #     report_time do
-    #       sleep 2
-    #       # do other things
-    #     end
-    #
-    #     # Output:
-    #     # Elapsed time: 2.00 seconds
-    def report_time(&blk)
-      time, output = measure &blk
-      print_str "Elapsed time: %.2f seconds" % [time]
-      output
-    end
-
-    # ### measure
-    # Measures the time (in seconds) a block takes.
-    # Returns a [time, output] tuple.
-    def measure(&blk)
-      t = Time.now
-      output = yield
-      [Time.now - t, output]
-    end
-
-    # ### error
-    # __Internal:__ Prints to stdout.
-    # Consider using `print_error` instead.
-    def error(str)
-      $stderr.write "#{str}\n"
+      ERB.new(File.read(file), nil, '-').result(b)
     end
 
-    # ### echo_cmd
-    # Converts a bash command to a command that echoes before execution.
-    # Used to show commands in verbose mode. This does nothing unless verbose mode is on.
-    #
-    # Returns a string of the compound bash command, typically in the format of
-    # `echo xx && xx`. However, if `verbose_mode?` is false, it returns the
-    # input string unharmed.
-    #
-    #     echo_cmd("ln -nfs releases/2 current")
-    #     #=> echo "$ ln -nfs releases/2 current" && ln -nfs releases/2 current
-    def echo_cmd(str)
-      if verbose_mode?
-        require 'shellwords'
-        "echo #{Shellwords.escape("$ " + str)} &&\n#{str}"
-      else
-        str
-      end
-    end
-    
     # ### set
     # Sets settings.
     # Sets given symbol `key` to value in `value`.
@@ -162,20 +71,33 @@ module Peony
     #     domain           #=> 'kickflip.me'
     def settings
       @settings ||= Settings.new
-    end    
-    
-    def search_paths
-      ["#{Dir.pwd}/templates", File.expand_path("../../templates", __dir__)]
-    end    
-    
+    end
+
+    def template_paths
+      ["#{Dir.pwd}/templates", File.expand_path('../../templates', __dir__)]
+    end
+
     def find_templates(name, file_only=true)
+      find_in_directories(template_paths, name, file_only)
+    end
+
+    def recipes_paths
+      ["#{Dir.pwd}/recipes", File.expand_path('../../recipes', __dir__)]
+    end
+
+    def find_recipes(name, file_only=true)
+      find_in_directories(recipes_paths, name, file_only)
+    end
+
+    def find_in_directories(paths, name, file_only)
       templates = []
-      search_paths.each do|path|
+      paths.each do|path|
         templates += Dir[File.expand_path(name, path)].reject{|filename| file_only && File.directory?(filename) }
       end
       templates
     end
 
+
     # ### method_missing
     # Hook to get settings.
     # See #settings for an explanation.

data/lib/peony/version.rb

@@ -1,3 +1,3 @@
 module Peony
-  VERSION = "0.1.6"
+  VERSION = '0.1.8'
 end

data/lib/peony.rb

@@ -1,13 +1,15 @@
-require "peony/version"
-require "peony/application"
+require 'peony/version'
+require 'peony/application'
 
 module Peony
   PREFIX = File.dirname(__FILE__)
   ROOT = File.expand_path('../../', __FILE__)
 
-  autoload :Utils, 'peony/utils'
-  autoload :Settings, 'peony/settings'
- 
+  autoload :Utils,      'peony/utils'
+  autoload :Shell,      'peony/shell'
+  autoload :Actions,    'peony/actions'
+  autoload :LineEditor, 'peony/line_editor'
+  autoload :Settings,   'peony/settings'
   
   Error = Class.new(Exception)
   

data/peony.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'peony/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "peony"
+  spec.name          = 'peony'
   spec.version       = Peony::VERSION
-  spec.authors       = ["James Zhan"]
-  spec.email         = ["zhiqiangzhan@gmail.com"]
+  spec.authors       = ['James Zhan']
+  spec.email         = ['zhiqiangzhan@gmail.com']
   spec.description   = %q{Local Script Management System Using Rake}
   spec.summary       = %q{Local Script Management System Using Rake.}
-  spec.homepage      = "https://github.com/jameszhan/peony"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/jameszhan/peony'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
   
-  spec.add_dependency "rake"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec"
+  spec.add_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rspec', '~> 2'
 end

data/recipes/db/mongo.rake

@@ -1,13 +1,13 @@
-set_default :mongod, "/usr/local/bin/mongod"
+set_default :mongod, '/usr/local/bin/mongod'
 
-set_default :mongo_master_name, "master"
-set_default :mongo_slave_name, "slave"
+set_default :mongo_master_name, 'master'
+set_default :mongo_slave_name,  'slave'
 
-set_default :mongo_master_dir, ->{"#{data_dir}/mongo/#{mongo_master_name}"}
-set_default :mongo_slave_dir, ->{"#{data_dir}/mongo/#{mongo_slave_name}"}
-set_default :mongo_etc_dir, ->{"#{etc_dir}/mongo"}
-set_default :mongo_log_dir, ->{"#{log_dir}/mongo"}
-set_default :mongo_run_dir, ->{"#{run_dir}/mongo"}
+set_default :mongo_master_dir,  ->{ "#{data_dir}/mongo/#{mongo_master_name}" }
+set_default :mongo_slave_dir,   ->{ "#{data_dir}/mongo/#{mongo_slave_name}" }
+set_default :mongo_etc_dir,   ->{ "#{etc_dir}/mongo" }
+set_default :mongo_log_dir,   ->{ "#{log_dir}/mongo" }
+set_default :mongo_run_dir,   ->{ "#{run_dir}/mongo" }
 
 
 set_default :mongo_fork , true
@@ -15,26 +15,26 @@ set_default :mongo_jsonp, true
 set_default :mongo_rest , true
 
 set_default :mongo_master_port, 27017
-set_default :mongo_slave_port, 27018
-set_default :mongo_slave_source, ->{"127.0.0.1:#{mongo_master_port}"}
+set_default :mongo_slave_port,  27018
+set_default :mongo_slave_source,  ->{ "127.0.0.1:#{mongo_master_port}" }
                                                        
-set_default :mongo_master_conf, ->{"#{mongo_etc_dir}/#{mongo_master_name}.conf"}
-set_default :mongo_slave_conf, ->{"#{mongo_etc_dir}/#{mongo_slave_name}.conf"}
+set_default :mongo_master_conf,   ->{ "#{mongo_etc_dir}/#{mongo_master_name}.conf" }
+set_default :mongo_slave_conf,    ->{ "#{mongo_etc_dir}/#{mongo_slave_name}.conf" }
 
-set_default :mongo_master_start, ->{"#{mongod} --config #{mongo_master_conf}"}
-set_default :mongo_slave_start, ->{"#{mongod} --config #{mongo_slave_conf}"}
-set_default :mongo_master_stop, ->{"kill -2 `cat #{mongo_run_dir}/#{mongo_master_name}.pid`"}
-set_default :mongo_slave_stop, ->{"kill -2 `cat #{mongo_run_dir}/#{mongo_slave_name}.pid`"}
+set_default :mongo_master_start,  ->{ "#{mongod} --config #{mongo_master_conf}" }
+set_default :mongo_slave_start,   ->{ "#{mongod} --config #{mongo_slave_conf}" }
+set_default :mongo_master_stop,   ->{ "kill -2 `cat #{mongo_run_dir}/#{mongo_master_name}.pid`" }
+set_default :mongo_slave_stop,    ->{ "kill -2 `cat #{mongo_run_dir}/#{mongo_slave_name}.pid`" }
 
 
 namespace :db do  
   namespace :mongo do
     
-    desc "Create the directory for mongodb, and copy mongo config file to etc directory."
+    desc 'Create the directory for mongodb, and copy mongo config file to etc directory.'
     task :init do
       mkdir_p(mongo_master_dir, mongo_slave_dir, mongo_etc_dir, mongo_log_dir, mongo_run_dir)
-      template("mongo/master.conf.erb", mongo_master_conf, true)
-      template("mongo/slave.conf.erb", mongo_slave_conf, true)
+      template('mongo/master.conf.erb', mongo_master_conf, true)
+      template('mongo/slave.conf.erb', mongo_slave_conf, true)
     end
     
     [:master, :slave].each do|ns|
@@ -48,12 +48,12 @@ namespace :db do
       end
     end
     
-    desc "Start the master mongodb instance"
-    task :start => "master:start" do
+    desc 'Start the master mongodb instance'
+    task :start => 'master:start' do
     end
     
-    desc "Stop the master mongodb instance"
-    task :stop => "master:stop" do
+    desc 'Stop the master mongodb instance'
+    task :stop => 'master:stop' do
     end
   end
 end

data/recipes/db/mysql.rake

@@ -1,34 +1,34 @@
-set_default :mysql_home, `brew --prefix mysql`.strip
-set_default :mysqld, "/usr/local/bin/mysqld_safe"
-set_default :mysqladmin, "/usr/local/bin/mysqladmin"
-set_default :mysql_install_db, "/usr/local/bin/mysql_install_db"
+set_default :mysql_home,        `brew --prefix mysql`.strip
+set_default :mysqld,            '/usr/local/bin/mysqld_safe'
+set_default :mysqladmin,        '/usr/local/bin/mysqladmin'
+set_default :mysql_install_db,  '/usr/local/bin/mysql_install_db'
 
-set_default :mysql_dir, ->{"#{data_dir}/mysql/#{mysql_port}"}
-set_default :mysql_log_dir, ->{"#{log_dir}/mysql/#{mysql_port}"}
-set_default :mysql_conf, ->{"#{etc_dir}/my.cnf"}
+set_default :mysql_dir,         ->{ "#{data_dir}/mysql/#{mysql_port}" }
+set_default :mysql_log_dir,     ->{ "#{log_dir}/mysql/#{mysql_port}" }
+set_default :mysql_conf,        ->{ "#{etc_dir}/my.cnf" }
 
-set_default :mysql_user, "root"
-set_default :mysql_password, "123456"
+set_default :mysql_user,        'root'
+set_default :mysql_password,    '123456'
 
-set_default :mysql_pid_file, ->{"#{run_dir}/mysql/#{mysql_port}.pid"}
-set_default :mysql_port, '3306'
-set_default :mysql_socket, "/tmp/mysql.sock"
-set_default :mysql_charset, 'UTF8'
+set_default :mysql_pid_file,    ->{ "#{run_dir}/mysql/#{mysql_port}.pid" }
+set_default :mysql_port,        '3306'
+set_default :mysql_socket,      '/tmp/mysql.sock'
+set_default :mysql_charset,     'UTF8'
 set_default :mysql_general_log, 'ON'
 set_default :mysql_slow_query_log, 'ON'
 
-set_default :mysql_start, ->{"#{mysqld}  --defaults-file=#{mysql_conf} --datadir=#{mysql_dir} --basedir=#{mysql_home} &"}
-set_default :mysql_stop, ->{"#{mysqladmin} --verbose --user=#{mysql_user} --password=#{mysql_password} shutdown"}
-set_default :mysql_status, ->{"#{mysqladmin} --verbose status variables"}
+set_default :mysql_start,       ->{ "#{mysqld}  --defaults-file=#{mysql_conf} --datadir=#{mysql_dir} --basedir=#{mysql_home} &" }
+set_default :mysql_stop,        ->{ "#{mysqladmin} --verbose --user=#{mysql_user} --password=#{mysql_password} shutdown" }
+set_default :mysql_status,      ->{ "#{mysqladmin} --verbose status variables" }
 
 namespace :db do
   
   namespace :mysql do
     
-    desc "Create mysql directorys, config file and run mysql_install_db"
+    desc 'Create mysql directorys, config file and run mysql_install_db'
     task :init do
       mkdir_p(mysql_dir, mysql_log_dir, "#{run_dir}/mysql/")
-      template("mysql/my.cnf.erb", mysql_conf, true)
+      template('mysql/my.cnf.erb', mysql_conf, true)
       run "#{mysql_install_db} --defaults-file=#{mysql_conf} --datadir=#{mysql_dir} --basedir=#{mysql_home}" if Dir["#{mysql_dir}/*"].empty?
     end
     
@@ -39,7 +39,7 @@ namespace :db do
       end
     end
     
-    desc "Set mysql root user password."
+    desc 'Set mysql root user password.'
     task :set_root_pass do
       run "mysqladmin --no-defaults --port=#{mysql_port} --user=root --protocol=tcp password '#{mysql_password}'"
     end

data/recipes/db/pg.rake

@@ -1,31 +1,31 @@
-set_default :pg_home, ->{`brew --prefix postgresql`.strip}
-set_default :pg_initdb, "/usr/local/bin/initdb"
-set_default :pg_ctl, "/usr/local/bin/pg_ctl"
+set_default :pg_home,     ->{ `brew --prefix postgresql`.strip }
+set_default :pg_initdb,   '/usr/local/bin/initdb'
+set_default :pg_ctl,      '/usr/local/bin/pg_ctl'
 
-set_default :pg_data_dir, ->{"#{data_dir}/pgsql"}
-set_default :pg_init, ->{"#{pg_initdb} -D #{pg_data_dir} --debug"}
-set_default :pg_start, ->{"#{pg_ctl} -D #{pg_data_dir} -l #{log_dir}/pgsql.log start"}
-set_default :pg_stop, ->{"#{pg_ctl} -D #{pg_data_dir} stop"}
-set_default :pg_reload, ->{"#{pg_ctl} -D #{pg_data_dir} reload"}
-set_default :pg_restart, ->{"#{pg_ctl} -D #{pg_data_dir} -l #{log_dir}/pgsql.log restart"}
+set_default :pg_data_dir,   ->{ "#{data_dir}/pgsql" }
+set_default :pg_init,       ->{ "#{pg_initdb} -D #{pg_data_dir} --debug" }
+set_default :pg_start,      ->{ "#{pg_ctl} -D #{pg_data_dir} -l #{log_dir}/pgsql.log start" }
+set_default :pg_stop,       ->{ "#{pg_ctl} -D #{pg_data_dir} stop" }
+set_default :pg_reload,     ->{ "#{pg_ctl} -D #{pg_data_dir} reload" }
+set_default :pg_restart,    ->{ "#{pg_ctl} -D #{pg_data_dir} -l #{log_dir}/pgsql.log restart" }
 
 set_default :pg_super_users, {
-  pgsql: "123456"
+  pgsql: '123456'
 }
 
 namespace :db do
   namespace :pg do
     
-    desc "Execute postgres initdb."
+    desc 'Execute postgres initdb.'
     task :init do
       if File.exists?("#{pg_data_dir}/postgresql.conf")
-        puts "Postgresql database has already initialized."
+        say 'Postgresql database has already initialized.', :magenta, true
       else
         run pg_init
       end
     end
     
-    desc "Set super users for postgresql."
+    desc 'Set super users for postgresql.'
     task :set_super_users do
       pg_super_users.each do|user, password|
         sqls = ["CREATE USER #{user} WITH PASSWORD '#{password}';", "ALTER USER #{user} WITH SUPERUSER;"]

data/recipes/db/redis.rake

@@ -1,29 +1,29 @@
-set_default :redis_conf, ->{"#{etc_dir}/redis.conf"}
-set_default :redis_dir, ->{"#{data_dir}/redis"}
-set_default :redis_pid, ->{"#{run_dir}/redis.pid"}
-set_default :redis_port, 6379
+set_default :redis_conf,      ->{ "#{etc_dir}/redis.conf" }
+set_default :redis_dir,       ->{ "#{data_dir}/redis" }
+set_default :redis_pid,       ->{ "#{run_dir}/redis.pid" }
+set_default :redis_port,      6379
 
-set_default :redis_start, ->{"redis-server #{redis_conf}"}
-set_default :redis_stop, ->{"redis-cli -p #{redis_port} shutdown"}
-set_default :redis_restart, ->{"kill -2 `#{redis_pid}` && #{redis_start}"}
+set_default :redis_start,     ->{ "redis-server #{redis_conf}" }
+set_default :redis_stop,      ->{ "redis-cli -p #{redis_port} shutdown" }
+set_default :redis_restart,   ->{ "kill -2 `#{redis_pid}` && #{redis_start}" }
 
-set_default :redis_daemonize, "yes"
-set_default :redis_timeout, 0
-set_default :redis_loglevel, "notice"
-set_default :redis_logfile, "stdout"
-set_default :redis_databases, 16
-set_default :rdbcompression, "yes"
-set_default :rdbchecksum, "yes"
-set_default :redis_dbfilename, "dump.rdb"
-set_default :redis_appendonly, "yes"
-set_default :redis_activerehashing, "yes"
+set_default :redis_daemonize,         'yes'
+set_default :redis_timeout,           0
+set_default :redis_loglevel,          'notice'
+set_default :redis_logfile,           'stdout'
+set_default :redis_databases,         16
+set_default :rdbcompression,          'yes'
+set_default :rdbchecksum,             'yes'
+set_default :redis_dbfilename,        'dump.rdb'
+set_default :redis_appendonly,        'yes'
+set_default :redis_activerehashing,   'yes'
 
 namespace :db do
   namespace :redis do
-    desc "Initialize redis directory and copy redis.conf to etc directory."
+    desc 'Initialize redis directory and copy redis.conf to etc directory.'
     task :init do
       mkdir_p(redis_dir)
-      template("redis.conf.erb", redis_conf)
+      template('redis.conf.erb', redis_conf)
     end
     
     [:start, :stop, :restart].each do|cmd|

data/recipes/elasticsearch.rake

@@ -1,22 +1,22 @@
-set_default :es_plugins_dir, "/usr/local/var/lib/elasticsearch/plugins"
-set_default :es_cluster_name, "default_cluster"
-set_default :es_data_dir, ->{"#{data_dir}/elasticsearch/"}
-set_default :es_network_host, "127.0.0.1"
-set_default :es_config, ->{"#{etc_dir}/elasticsearch/config.yml"}
+set_default :es_plugins_dir,  '/usr/local/var/lib/elasticsearch/plugins'
+set_default :es_cluster_name, 'default_cluster'
+set_default :es_data_dir,     ->{ "#{data_dir}/elasticsearch/" }
+set_default :es_network_host, '127.0.0.1'
+set_default :es_config,       ->{ "#{etc_dir}/elasticsearch/config.yml" }
 
 #-f can let elasticsearch running in the foreground
-set_default :elasticsearch_start, ->{"elasticsearch -D es.config=#{es_config} -p #{run_dir}/elasticsearch.pid"}
+set_default :elasticsearch_start, ->{ "elasticsearch -D es.config=#{es_config} -p #{run_dir}/elasticsearch.pid" }
 #set_default :elasticsearch_stop, ->{"elasticsearch -D es.config=#{es_config} -p #{run_dir}/elasticsearch.pid stop"}
-set_default :elasticsearch_stop, ->{"kill `cat #{run_dir}/elasticsearch.pid`"}
-set_default :elasticsearch_shutdown, ->{"curl -XPOST 'http://#{es_network_host}:9200/_shutdown'"}
+set_default :elasticsearch_stop,  ->{ "kill `cat #{run_dir}/elasticsearch.pid`" }
+set_default :elasticsearch_shutdown, ->{ "curl -XPOST 'http://#{es_network_host}:9200/_shutdown'" }
 
 namespace :elasticsearch do
   
   desc "Initialize elasticsearch directory and copy it's config files to etc path."
   task :init do  
     mkdir_p("#{etc_dir}/elasticsearch")
-    template("elasticsearch/config.yml.erb", es_config)
-    template("elasticsearch/logging.yml.erb", "#{etc_dir}/elasticsearch/logging.yml")
+    template('elasticsearch/config.yml.erb', es_config)
+    template('elasticsearch/logging.yml.erb', "#{etc_dir}/elasticsearch/logging.yml")
   end
   
   [:start, :stop, :shutdown].each do|cmd|

data/recipes/httpd.rake

@@ -1,32 +1,32 @@
-set_default :httpd, "/usr/sbin/httpd"
-set_default :httpd_server_root, "/usr"
-set_default :httpd_share_dir, "/usr/share/httpd"
+set_default :httpd,               '/usr/sbin/httpd'
+set_default :httpd_server_root,   '/usr'
+set_default :httpd_share_dir,     '/usr/share/httpd'
 
-set_default :httpd_etc_dir, ->{"#{etc_dir}/httpd"}
-set_default :httpd_conf, ->{"#{httpd_etc_dir}/httpd.conf"}
+set_default :httpd_etc_dir,       ->{ "#{etc_dir}/httpd" }
+set_default :httpd_conf,          ->{ "#{httpd_etc_dir}/httpd.conf" }
 
-set_default :httpd_log_dir, ->{"#{log_dir}/httpd"}
-set_default :webdav_dir, ->{"#{var_dir}/webdav"}
-set_default :auth_user_file, ->{"#{httpd_etc_dir}/user.passwd"}
-set_default :httpd_server_admin, "zhiqiangzhan@gmail.com"
-set_default :httpd_port, 8888
-set_default :httpd_server_name, ->{"localhost:#{httpd_port}"}
+set_default :httpd_log_dir,       ->{ "#{log_dir}/httpd" }
+set_default :webdav_dir,          ->{ "#{var_dir}/webdav" }
+set_default :auth_user_file,      ->{ "#{httpd_etc_dir}/user.passwd" }
+set_default :httpd_server_admin,  'zhiqiangzhan@gmail.com'
+set_default :httpd_port,          8888
+set_default :httpd_server_name,   ->{ "localhost:#{httpd_port}" }
 
-set_default :auth_user, "admin"
+set_default :auth_user,           'admin'
 
 namespace :httpd do 
-  desc "Initialize httpd config files."
+  desc 'Initialize httpd config files.'
   task :init do
     mkdir_p(httpd_etc_dir, "#{httpd_etc_dir}/extra", httpd_log_dir, webdav_dir)
     search_paths.each do|sp|
-      Dir["#{sp}/httpd/**/*.erb"].each do|fn|
+      Dir["#{sp}/httpd/conf/*.erb"].each do|fn|
         target = fn.sub("#{sp}/httpd", "#{httpd_etc_dir}").sub(/.erb$/, "")
         template(fn, target) unless File.exists?(target)
       end
     end
   end 
   
-  desc "Create AuthUserFile."
+  desc 'Create AuthUserFile.'
   task :auth_user_file do
     run "htpasswd -c #{auth_user_file} #{auth_user}"
   end

data/recipes/nginx/www.rake

@@ -4,11 +4,11 @@ set_default :www_paths, {}
 
 namespace :nginx do
   namespace :www do
-    desc "Create www config files."
+    desc 'Create www config files.'
     task :init do
-      template("nginx/www.conf.erb", "#{nginx_etc_dir}/www.conf", true)
-      template("nginx/sites-enabled/static.conf.erb", "#{nginx_etc_dir}/sites-enabled/static.http.conf", true) unless www_paths.empty?
-      template("nginx/sites-enabled/php.conf.erb", "#{nginx_etc_dir}/sites-enabled/php.http.conf", true)
+      template('nginx/www.conf.erb', "#{nginx_etc_dir}/www.conf", true)
+      template('nginx/sites-enabled/static.conf.erb', "#{nginx_etc_dir}/sites-enabled/static.http.conf", true) unless www_paths.empty?
+      template('nginx/sites-enabled/php.conf.erb', "#{nginx_etc_dir}/sites-enabled/php.http.conf", true)
     end
     
     [:start, :stop, :reload].each do|t|
@@ -18,7 +18,7 @@ namespace :nginx do
       end
     end
     
-    desc "Restart nginx www instance."
+    desc 'Restart nginx www instance.'
     task :restart do
       nginx_restart(:www)
     end

data/recipes/nginx.rake

@@ -1,17 +1,17 @@
-set_default :nginx, ->{"/usr/local/bin/nginx"}
-set_default :nginx_home,    ->{`brew --prefix nginx`.strip}
-set_default :nginx_etc_dir, ->{"#{etc_dir}/nginx"}
-set_default :nginx_run_dir, ->{"#{run_dir}/nginx"}
-set_default :nginx_prefix, ->{"#{log_dir}/nginx"}
+set_default :nginx,         ->{ '/usr/local/bin/nginx' }
+set_default :nginx_home,    ->{ `brew --prefix nginx`.strip }
+set_default :nginx_etc_dir, ->{ "#{etc_dir}/nginx" }
+set_default :nginx_run_dir, ->{ "#{run_dir}/nginx" }
+set_default :nginx_prefix,  ->{ "#{log_dir}/nginx" }
 
 set_default :worker_processes, 8
             
 set_default :upstreams, [
-  {name: :fastcgi_server, servers: ["127.0.0.1:6666"]}, 
-  {name: :catalina_server, servers: ["127.0.0.1:8080"]}
+  {name: :fastcgi_server, servers: ['127.0.0.1:6666']},
+  {name: :catalina_server, servers: ['127.0.0.1:8080']}
 ]
 
-set_default :server_name, "localhost"
+set_default :server_name, 'localhost'
 
 set_default :use_ssl, false
 set_default :ssl_certificate,	    ->{"#{etc_dir}/ssl/server.crt"}	  
@@ -32,7 +32,7 @@ end
 
 def nginx_restart(name)
   invoke "nginx:#{name}:stop"
-  puts "Start nginx......"
+  puts 'Start nginx......'
   sleep 5
   invoke "nginx:#{name}:start"
 end
@@ -40,7 +40,7 @@ end
 namespace :nginx do
   desc "Initialize nginx directory and create it's config files."
   task :init do
-    mkdir_p(nginx_etc_dir, nginx_run_dir, nginx_prefix)
+    mkdir_p(nginx_etc_dir, nginx_run_dir, nginx_prefix, nginx_log_dir)
     unless File.exists?("#{nginx_etc_dir}/conf")
       FileUtils.cp_r(find_templates("nginx/conf", false).first, nginx_etc_dir)
     end