rda 0.3.3 → 0.4.0.pre

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - "1.9.3"
+  - "1.9.2"
+  - "1.8.7"

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+**0.4.0 (2012)**
+
+* Provide support to configure options of rda
+* Set up load paths of applications when setting up rvm
+* Introduce a new command `rda app deploy` to deploy applications to
+  nginx
+
 **0.3.3 (Fri, Nov 9, 2012)**
 
 * Added a rake task for running specs

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    rda (0.3.3)
+    rda (0.4.0.pre)
       activesupport (>= 3.1)
       confstruct (~> 0.2)
+      oj (~> 1.4.4)
       thor (~> 0.15)
 
 GEM
@@ -23,15 +24,17 @@ GEM
     guard-bundler (1.0.0)
       bundler (~> 1.0)
       guard (~> 1.1)
-    guard-rspec (1.1.0)
+    guard-rspec (2.1.1)
       guard (>= 1.1)
+      rspec (~> 2.11)
     i18n (0.6.1)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
     method_source (0.7.1)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
+    oj (1.4.4)
     pry (0.9.9.6)
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
@@ -42,14 +45,14 @@ GEM
     rb-fsevent (0.9.1)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.11.3)
     ruby_gntp (0.3.4)
     slop (2.4.4)
     thor (0.15.4)
@@ -61,7 +64,7 @@ DEPENDENCIES
   fivemat (~> 1.0)
   guard (~> 1.2)
   guard-bundler (~> 1.0)
-  guard-rspec (~> 1.1)
+  guard-rspec (~> 2.1)
   pry (~> 0.9.9)
   rake
   rda!

data/README.md

@@ -1,5 +1,9 @@
 ## Rda
 
+[![Build Status](https://secure.travis-ci.org/towerhe/rda.png?branch=develop)](http://travis-ci.org/towerhe/rda)
+[![Dependency Status](https://gemnasium.com/towerhe/rda.png)](https://gemnasium.com/towerhe/rda)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/towerhe/rda)
+
 ### Description
 
 Rda(Rails Development Assist) is combined with lots of useful commands which can help you to setup your development enviroments and tools more quickly.
@@ -24,20 +28,14 @@ Or simply add rda to the Gemfile
 gem 'rda'
 ```
 
-That's all.
+And then, you should run `rda init` under the root of your application.
 
 #### Configuration
 
-For configuring rda, you need to create an initializer for rda:
-
-```ruby
-# config/initializers/rda.rb
-if Rails.env == 'development'
-  Rda.configure do
-    nginx_conf_paths ['/etc/nginx', '/opt/nginx/conf', '/usr/local/nginx/conf']
-  end
-end
-```
+After you run `rda init` successfully. You will see a generated file
+named `.rda` under the root of your application and it contains options
+like:
+[rda.json](https://github.com/towerhe/rda/blob/develop/lib/rda/templates/rda.json)
 
 #### Set up RVM
 
@@ -48,13 +46,33 @@ rda rvm setup
 First of all, this command will check whether the RVM is installed. If RVM is installed, it will create a .rvmrc for the application with the content which looks like:
 
 ```bash
-if [[ -s '/path/to/rvm/environments/ruby-1.9.3-p194@app_name' ]]; then
-  . '/path/to/rvm/environments/ruby-1.9.3-p194@app_name'
+if [[ -s '/path/to/rvm/environments/ruby-1.9.3-p286@app_name' ]]; then
+  . '/path/to/rvm/environments/ruby-1.9.3-p286@app_name'
 else
-  rvm use ruby-1.9.3-p194@app_name --create
+  rvm use ruby-1.9.3-p286@app_name --create
 fi
 ```
 
+And then, it will create a config file to set up load paths of your
+applications.
+
+```ruby
+# config/setup_load_paths.rb
+if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
+  begin
+    require 'rvm'
+    RVM.use_from_path! File.dirname(File.dirname(__FILE__))
+  rescue LoadError
+    raise "RVM gem is currently unavailable."
+  end
+end
+
+# If you're not using Bundler at all, remove lines bellow
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile',
+                                         File.dirname(__FILE__))
+require 'bundler/setup'
+```
+
 After setting up RVM, you need to trust the rvmrc by:
 
 ```bash
@@ -71,53 +89,36 @@ If RVM is not installed, this command will do nothing but exit.
 rda rvm discard
 ```
 
-This command removes the .rvmrc from your rails application.
+This command removes the `.rvmrc` and `config/setup_load_paths.rb` from your rails application.
 
 #### Setup Nginx
 
 ```bash
-rda nginx setup --environment production --hostname www.example.com
+rda nginx setup
 ```
 
-First this command will try to find the config files of Nginx, which you have installed, from the following paths:
-
-* /etc/nginx
-* /usr/local/nginx/conf
-* /opt/nginx/conf
-
-You can change the default searching paths by:
-
-```ruby
-Rda.configure { nginx_conf_paths ['/path/to/nginx/conf'] }
-```
-
-Please make sure that you have the write permission of the directory you choosed, or you can run:
+Please make sure that you have the write permission to config your nginx, or you can run:
 
 ```bash
-rvmsudo rda nginx setup --environment production --hostname www.example.com
+rvmsudo rda nginx setup
 ```
 
-If there are more than one paths found, it will give you a choice to decide which one will be used. After choosing a proper path, it will try to create two directories sites-available and sites-enabled to save the configs of rails applications.
+It will try to create `sites-available` and `sites-enabled` to save the configs of rails applications.
 
 * sites-available saves the configs of the rails applications.
 * sites-enabled saves the link to the rails applications.
 
-Next it will set Nginx to include the configs under sites-enabled. It means that only the applications under sites-enabled will be loaded. And than it will create a config file for your application under sites-available and create a link to the config file under sites-enabled. After all, it will create a local hostname for your application in /etc/hosts.
-
+Next it will set Nginx to include the configs under `sites-enabled`. It means that only the applications configured under `sites-enabled` will be loaded.
 
-Finally, You need to start Nginx `/path/to/nginx/sbin/nginx` and then visit http://your_app_name.local.
+#### Deploy application
 
-#### Discard Nginx settings
+Now you should deploy your applications with a new command of rda.
 
 ```bash
-rda nginx discard --hostname www.example.com # Or
-
-sudo rda nginx discard --hostname www.example.com # Or
-
-rvmsudo rda nginx discard --hostname www.example.com # Using RVM
+rda app deploy
 ```
 
-This command will clean up all the things created or configured by `rda nginx setup`.
+It will create a config file for your application under `sites-available` and create a link to the config file under `sites-enabled`. After all, it will create a local hostname for your application in `/etc/hosts`.
 
 #### Restart application
 
@@ -125,7 +126,7 @@ This command will clean up all the things created or configured by `rda nginx se
 rda app restart
 ```
 
-This command touches tmp/restart.txt to restart your rails application, For detail, please visit [http://bit.ly/ztKA07](http://bit.ly/ztKA07)
+This command touches `tmp/restart.txt` to restart your rails application, For detail, please visit [http://bit.ly/ztKA07](http://bit.ly/ztKA07)
 
 #### Release your rails application
 

data/bin/rda

@@ -3,23 +3,4 @@
 
 require 'rda'
 
-class RdaCommand < Thor
-  desc 'rvm ACTION', 'Set up RVM. Available actions: setup, discard.'
-  def rvm(action)
-    Rda::Rvm.new.send(action.to_sym)
-  end
-
-  desc 'nginx ACTION', 'Manage settings of nginx. Available actions: setup, discard.'
-  method_option :environment, aliases: "-e", desc: "Set the environment of the application"
-  method_option :hostname, aliases: "-h", desc: "Set the hostname of the application"
-  def nginx(action)
-    Rda::Nginx.new.send(action.to_sym, options)
-  end
-
-  desc 'app ACTION', 'Manage the lifecycle of the application. Available actions: restart, release.'
-  def app(action)
-    Rda::App.new.send(action.to_sym)
-  end
-end
-
-RdaCommand.start
+Rda::Command.start

data/lib/rda/app.rb

@@ -1,11 +1,37 @@
 module Rda
   class App < Thor
-    desc 'Restart', 'Restart the application'
+    include Thor::Actions
+    include Helper
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    desc 'deploy', 'Deploy the application to nginx'
+    def deploy
+      conf_dir = Rda.config.nginx.conf_dir
+
+      unless Rda::Nginx.setup?
+        $stderr.puts 'ERROR: Nginx is not set up properly. Please run `rda nginx setup` first.'
+        return
+      end
+
+      domain = Rda.config.domain
+
+      template("templates/nginx", "#{conf_dir}/sites-available/#{domain}")
+      link_file("#{conf_dir}/sites-available/#{domain}", "#{conf_dir}/sites-enabled/#{domain}")
+
+      unless configured?('/etc/hosts', "127.0.0.1  #{domain}")
+        append_file "/etc/hosts", "127.0.0.1  #{domain}\n"
+      end
+    end
+
+    desc 'restart', 'Restart the application'
     def restart
       FileUtils.touch dir_of('tmp') + '/restart.txt'
     end
 
-    desc 'Release', 'Release the application'
+    desc 'release', 'Release the application'
     def release
       version_file = File.join(Rda::Rails.root, 'VERSION')
       version = File.exist?(version_file) ? File.read(version_file).strip : ""

data/lib/rda/command.rb

@@ -0,0 +1,38 @@
+%w(rails rvm nginx app).each do |f|
+  require File.join(File.dirname(__FILE__), f)
+end
+
+module Rda
+  class Command < Thor
+    include Thor::Actions
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    desc 'init', 'Create a default config for rda.'
+    def init
+      template('templates/rda.json', "#{Rda::Rails.root}/.rda")
+    end
+
+    desc 'rvm ACTION', 'Set up RVM. Available actions: setup, discard.'
+    def rvm(action)
+      Rda::Rvm.new.send(action.to_sym)
+    end
+
+    desc 'nginx ACTION', 'Manage settings of nginx. Available actions: setup, discard.'
+    def nginx(action)
+      Rda::Nginx.new.send(action.to_sym, options)
+    end
+
+    desc 'app ACTION', 'Manage the lifecycle of the application. Available actions: restart, release.'
+    def app(action)
+      Rda::App.new.send(action.to_sym)
+    end
+
+    private
+    def app_name
+      Rails.app_name
+    end
+  end
+end

data/lib/rda/helper.rb

@@ -0,0 +1,15 @@
+module Rda
+  module Helper
+    def configured?(fname, conf)
+      IO.readlines(fname).each do |l|
+        if l.strip.start_with?(conf)
+          $stderr.puts "INFO: #{conf} has already been set!"
+
+          return true
+        end
+      end
+
+      false
+    end
+  end
+end

data/lib/rda/nginx.rb

@@ -1,145 +1,54 @@
 module Rda
   class Nginx < Thor
     include Thor::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
+    include Helper
 
     desc "setup", "Set up your rails application"
     def setup(options = {})
       return unless installed?
 
-      @hostname, @environment = options["hostname"], options["environment"]
-
-      create_setup_load_paths
       mkdir_for_sites
-      set_passenger_user_and_group
       include_sites_enabled
-
-      template("templates/nginx", "#{conf_path}/sites-available/#{hostname}")
-      link_file("#{conf_path}/sites-available/#{hostname}", "#{conf_path}/sites-enabled/#{hostname}")
-
-      unless configured?('/etc/hosts', "127.0.0.1  #{hostname}")
-        append_file "/etc/hosts", "127.0.0.1  #{hostname}"
-      end
     end
 
-    desc "discard", "Remove the settings of your rails application from nginx"
-    def discard(options = {})
-      return unless installed?
-
-      @hostname = options["hostname"]
+    def self.setup?
+      conf_dir = Rda.config.nginx.conf_dir
 
-      %W(enabled available).each do |n|
-        remove_file "#{conf_path}/sites-#{n}/#{hostname}"
-      end
-
-      gsub_file("/etc/hosts", "127.0.0.1  #{hostname}", '')
-      remove_file "#{Rda::Rails.root}/config/setup_load_paths.rb"
+      File.directory?(File.join(conf_dir, 'sites-available')) &&
+        File.directory?(File.join(conf_dir, 'sites-enabled'))
     end
 
     private
     def installed?
-      File.directory?(conf_path) if conf_path
-    end
-
-    def conf_path
-      return @conf_path if @conf_path
-
-      if available_paths.empty?
-        prompt_not_found
-
-        return
-      end
-
-      @conf_path = available_paths.first
-      begin
-        @conf_path = ask_for_choosing_one if available_paths.size > 1
-      rescue SystemExit
-        $stderr.puts "ERROR: You need to choose a config directory of Nginx!"
-        return
-      end
-
-      @conf_path
-    end
-
-    def hostname
-      @hostname || "#{Rda::Rails.app_name}.local"
+      File.exists?(conf_path) if conf_path
     end
 
-    def available_paths
-      search_paths = Rda.config.nginx_conf_paths || []
-      @paths ||= search_paths.select { |p| File.directory? p if p } unless search_paths.empty?
+    def conf_dir
+      Rda.config.nginx.conf_dir
     end
 
-    def prompt_not_found
-      $stderr.puts "ERROR: Config directory of Nginx is not found in the following paths:\n\n"
-      Rda.config.nginx_conf_paths.each { |p| $stderr.puts "* #{p}" }
-      $stderr.puts "\n"
-    end
-
-    def ask_for_choosing_one
-      available_paths.each_with_index { |p, i| puts "#{i + 1}) #{p}" }
-      puts "\n"
-      chosen = ask "Found more than one config directory of Nginx, please choose one to setup:"
-
-      index = chosen.to_i - 1
-
-      index >= 0 && index < available_paths.size ? available_paths[index] : exit
-    end
+    def conf_path
+      if File.exists? File.join(conf_dir, 'nginx.conf')
+        return File.join(conf_dir, 'nginx.conf')
+      end
 
-    def create_setup_load_paths
-      copy_file "templates/setup_load_paths.rb", "#{Rda::Rails.root}/config/setup_load_paths.rb"
+      $stderr.puts "ERROR: Missing `nginx.conf` in `#{conf_dir}`."
     end
 
     def mkdir_for_sites
       %W(available enabled).each do |n|
-        dir = conf_path + "/sites-#{n}"
+        dir = conf_dir + "/sites-#{n}"
         empty_directory(dir) unless File.directory?(dir)
       end
     end
 
-    def set_passenger_user_and_group
-      conf = conf_path + '/nginx.conf'
-
-      unless configured?(conf, 'passenger_default_user')
-        gsub_file conf, /http \{/, <<-PASSENGER
-http {
-    passenger_default_user root;
-        PASSENGER
-      end
-
-      unless configured?(conf, 'passenger_default_group')
-        gsub_file conf, /http \{/, <<-PASSENGER
-http {
-    passenger_default_group root;
-        PASSENGER
-      end
-    end
-
     def include_sites_enabled
-      conf = conf_path + '/nginx.conf'
-      unless configured?(conf, "include #{conf_path}/sites-enabled/*;")
+      unless configured?(conf_path, "include #{conf_dir}/sites-enabled/*;")
         gsub_file conf, /http \{/, <<-INCLUDE_SITES_ENABLED
 http {
-    include #{conf_path}/sites-enabled/*;
+    include #{conf_dir}/sites-enabled/*;
         INCLUDE_SITES_ENABLED
       end
     end
-
-    def configured?(fname, conf)
-      File.open(fname) do |f|
-        f.readlines.each do |l|
-          if l.strip.start_with?(conf)
-            $stderr.puts "INFO: #{conf} has already been set!"
-
-            return true
-          end
-        end
-      end
-
-      false
-    end
   end
 end

data/lib/rda/rvm.rb

@@ -10,6 +10,7 @@ module Rda
     def setup
       if installed?
         template('templates/rvmrc', rvmrc_path)
+        create_setup_load_paths
       else
         $stderr.puts "ERROR: RVM is not found. Please make sure that RVM is installed."
       end
@@ -17,11 +18,8 @@ module Rda
 
     desc "discard", "Discard RVM settings for rails application"
     def discard
-      if File.exists?(rvmrc_path)
-        remove_file(rvmrc_path)
-      else
-        $stderr.puts "ERROR: #{rvmrc_path} not found."
-      end
+      remove_file(rvmrc_path)
+      remove_file(setup_load_paths_path)
     end
 
     private
@@ -44,5 +42,21 @@ module Rda
     def rvmrc_path
       "#{Rda::Rails.root}/.rvmrc"
     end
+
+    def setup_load_paths_path
+      "#{Rda::Rails.root}/config/setup_load_paths.rb"
+    end
+
+    def create_setup_load_paths
+      copy_file "templates/setup_load_paths.rb", "#{Rda::Rails.root}/config/setup_load_paths.rb"
+    end
+
+    def remove_file(file)
+      if File.exists?(file)
+        super(file)
+      else
+        $stderr.puts "ERROR: #{file} not found."
+      end
+    end
   end
 end

data/lib/rda/templates/nginx

@@ -1,6 +1,10 @@
 server {
-  server_name <%= hostname %>;
+  server_name <%= Rda.config.domain %>;
   root <%= "#{Rda::Rails.root}/public" %>;
+  rails_env <%= Rda.config.rails_env || "development" %>;
+
   passenger_enabled on;
-  rails_env <%= @environment || "development" %>;
+<% Rda.config.passenger.each do |k, v| %>
+  <%= "passenger_#{k} #{v};" %>
+<% end %>
 }

data/lib/rda/templates/rda.json

@@ -0,0 +1,102 @@
+// The configuration of rda should be a valid JSON hash
+{
+  /**
+   * This option allows you to specify the domain of the application
+   *
+   * @default YOUR_APP_NAME.local
+   * @required
+   */
+  "domain": "<%= app_name %>.local",
+
+  /**
+   * This option allows you to specify the default RAILS_ENV value
+   *
+   * @default "development"
+   * @required
+   */
+  "rails_env": "development",
+
+  /**
+   * Configuring Nginx
+   */
+  "nginx": {
+    /**
+     * This option allows you to specify the config directory of your nginx
+     * installation
+     *
+     * @default "/opt/nginx/conf"
+     * @required
+     */
+    "conf_dir": "/opt/nginx/conf"
+  },
+
+  /**
+   * Configuring Phusion Passenger
+   *
+   * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_configuring_phusion_passenger
+   */
+  "passenger": {
+    /**
+     * This option allows you to override that behavior and explicitly set
+     * a user to run the web application as, regardless of the ownership of
+     * environment.rb/config.ru.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_passenger_user_lt_username_gt
+     */
+    "user": "root",
+
+    /**
+     * This option allows you to override that behavior and explicitly set
+     * a group to run the web application as, regardless of the ownership of
+     * environment.rb/config.ru.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_passenger_group_lt_group_name_gt
+     */
+    "group": "root"
+
+    /**
+     * This option allows you to specify the Ruby interpreter to use.
+     *
+     * NOTE This option is supported by passenger 4.0 only.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_passenger_ruby_lt_filename_gt
+     * @optional
+     */
+    // "ruby": "path/to/ruby"
+
+    /** Resource control and optimization options **/
+    /**
+     * The maximum number of application processes that may
+     * simultanously exist. A larger number results in higher memory
+     * usage, but improved ability to handle concurrent HTTP clients.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#PassengerMaxPoolSize
+     * @optional
+     * @default 6
+     */
+    // "max_pool_size": 15
+
+    /**
+     * This specifies the minimum number of application processes that
+     * should exist for a given application. You should set this option
+     * to a non-zero value if you want to avoid potentially long startup
+     * times after a website has been idle for an extended period.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#PassengerMinInstances
+     * @optional
+     * @default 1
+     */
+    // "min_instances": 10
+
+    /**
+     * The maximum number of requests an application process will
+     * process. After serving that many requests, the application
+     * process will be shut down and Phusion Passenger will restart it.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#PassengerMaxRequests
+     * @optional
+     * @default 0
+     */
+    // "max_requests": 10000
+  }
+}

data/lib/rda/version.rb

@@ -1,3 +1,3 @@
 module Rda
-  VERSION = "0.3.3"
+  VERSION = "0.4.0.pre"
 end

data/lib/rda.rb

@@ -1,18 +1,21 @@
 require 'thor'
+require 'oj'
 require 'confstruct'
 require 'confstruct/configuration'
 require 'active_support/inflector'
 
-require 'rda/rails'
-require 'rda/rvm'
-require 'rda/nginx'
-require 'rda/app'
+require 'rda/helper'
+require 'rda/command'
 
 module Rda
   class << self
     def config
-      @config ||= Confstruct::Configuration.new do
-        nginx_conf_paths ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf']
+      begin
+        @config ||= Confstruct::Configuration.new(
+          Oj.load(File.open(File.join(Rda::Rails.root, '.rda')))
+        )
+      rescue Errno::ENOENT
+        $stderr.puts 'ERROR: Rda is not initialized, please run `rda init` first.'
       end
     end
 

data/rda.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 2.10'
   s.add_development_dependency 'guard', '~> 1.2'
   s.add_development_dependency 'guard-bundler', '~> 1.0'
-  s.add_development_dependency 'guard-rspec', '~> 1.1'
+  s.add_development_dependency 'guard-rspec', '~> 2.1'
   s.add_development_dependency 'fivemat', '~> 1.0'
   if RUBY_PLATFORM =~ /darwin/
     s.add_development_dependency 'ruby_gntp', '~> 0.3'
@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 3.1'
   s.add_dependency 'thor', '~> 0.15'
   s.add_dependency 'confstruct', '~> 0.2'
+  s.add_dependency 'oj', '~> 1.4.4'
 end

data/spec/dummy/.rda

@@ -0,0 +1,100 @@
+// The configuration of rda should be a valid JSON hash
+{
+  /**
+   * This option allows you to specify the domain of the application
+   *
+   * @default YOUR_APP_NAME.local
+   * @required
+   */
+  "domain": "dummy.local",
+
+  /**
+   * This option allows you to specify the default RAILS_ENV value
+   *
+   * @default "development"
+   * @required
+   */
+  "rails_env": "development",
+
+  /**
+   * Configuring Nginx
+   */
+  "nginx": {
+    /**
+     * This option allows you to specify the config directory of your nginx
+     * installation
+     *
+     * @default "/opt/nginx/conf"
+     * @required
+     */
+    "conf_dir": "/opt/nginx/conf"
+  },
+
+  /**
+   * Configuring Phusion Passenger
+   *
+   * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_configuring_phusion_passenger
+   */
+  "passenger": {
+    /**
+     * This option allows you to override that behavior and explicitly set
+     * a user to run the web application as, regardless of the ownership of
+     * environment.rb/config.ru.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_passenger_user_lt_username_gt
+     */
+    "user": "root",
+
+    /**
+     * This option allows you to override that behavior and explicitly set
+     * a group to run the web application as, regardless of the ownership of
+     * environment.rb/config.ru.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_passenger_group_lt_group_name_gt
+     */
+    "group": "root"
+
+    /**
+     * This option allows you to specify the Ruby interpreter to use.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#_passenger_ruby_lt_filename_gt
+     * @optional
+     */
+    // "ruby": "path/to/ruby"
+
+    /** Resource control and optimization options **/
+    /**
+     * The maximum number of application processes that may
+     * simultanously exist. A larger number results in higher memory
+     * usage, but improved ability to handle concurrent HTTP clients.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#PassengerMaxPoolSize
+     * @optional
+     * @default 6
+     */
+    // "max_pool_size": 15
+
+    /**
+     * This specifies the minimum number of application processes that
+     * should exist for a given application. You should set this option
+     * to a non-zero value if you want to avoid potentially long startup
+     * times after a website has been idle for an extended period.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#PassengerMinInstances
+     * @optional
+     * @default 1
+     */
+    // "min_instances": 10
+
+    /**
+     * The maximum number of requests an application process will
+     * process. After serving that many requests, the application
+     * process will be shut down and Phusion Passenger will restart it.
+     *
+     * @see http://www.modrails.com/documentation/Users%20guide%20Nginx%204.0.html#PassengerMaxRequests
+     * @optional
+     * @default 0
+     */
+    // "max_requests": 10000
+  }
+}

data/spec/fixtures/nginx.conf

@@ -1,2 +1,3 @@
 http {
+  passenger_default_user root;
 }

data/spec/lib/rda/app_spec.rb

@@ -3,7 +3,53 @@ require 'spec_helper'
 describe Rda::App do
   subject { Rda::App.new }
 
-  before(:all) { Dir.chdir(File.join(File.dirname(__FILE__), '../../dummy')) }
+  let(:app_dir) { File.join(File.dirname(__FILE__), '../../dummy') }
+  let(:nginx_conf_dir) { File.join(File.dirname(__FILE__), '../../tmp') }
+
+  before { Rda::Rails.should_receive(:root).any_number_of_times.and_return(app_dir) }
+
+  describe '#deploy' do
+    before do
+      Rda.stub_chain(:config, :domain).and_return('dummy.local')
+      Rda.stub_chain(:config, :rails_env).and_return('development')
+      Rda.stub_chain(:config, :nginx, :conf_dir).and_return(nginx_conf_dir)
+      Rda.stub_chain(:config, :passenger).and_return(:user => 'root', :group => 'root')
+    end
+
+    context 'when nginx is not set up' do
+      it 'prompts that nginx is not set up' do
+        capture(:stderr) do
+          subject.deploy
+        end.should == <<-PROMPT
+ERROR: Nginx is not set up properly. Please run `rda nginx setup` first.
+        PROMPT
+      end
+    end
+
+    context 'when nginx is set up properly' do
+      before do
+        `mkdir -p #{nginx_conf_dir}/sites-available`
+        `mkdir -p #{nginx_conf_dir}/sites-enabled`
+
+        subject.should_receive(:append_file).with('/etc/hosts', "127.0.0.1  dummy.local\n").any_number_of_times
+
+        subject.deploy
+      end
+
+      after do
+        `rm -fr #{nginx_conf_dir}/sites-available`
+        `rm -fr #{nginx_conf_dir}/sites-enabled`
+      end
+
+      it 'creates a virtual host config file in nginx' do
+        File.should be_exists(File.join(nginx_conf_dir, 'sites-available/dummy.local'))
+      end
+
+      it 'enables the created virtual host' do
+        File.should be_exists(File.join(nginx_conf_dir, 'sites-enabled/dummy.local'))
+      end
+    end
+  end
 
   describe '#restart' do
     it 'touches restart.txt' do

data/spec/lib/rda/command_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Rda::Command do
+  subject { Rda::Command.new }
+
+  describe '#init' do
+    let(:tmp_path) { File.join(File.dirname(__FILE__), '../../tmp') }
+
+    before do
+      Rda::Rails.should_receive(:app_name).any_number_of_times.and_return('dummy')
+      Rda::Rails.should_receive(:root).any_number_of_times.and_return(tmp_path)
+    end
+
+    after { `rm -f #{Rda::Rails.root}/.rda` }
+
+    it 'creates a file named .rda' do
+      subject.init
+
+      File.should be_exists("#{Rda::Rails.root}/.rda")
+    end
+  end
+end

data/spec/lib/rda/helper_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Rda::Helper do
+  class MyClass
+    include Rda::Helper
+  end
+
+  let(:obj) { MyClass.new }
+  let(:file) { File.join(File.dirname(__FILE__), '../../fixtures/nginx.conf') }
+
+  describe '#configured?' do
+    it 'returns true if the specified option is configured' do
+      obj.should be_configured file, "passenger_default_user root;"
+    end
+  end
+end

data/spec/lib/rda/nginx_spec.rb

@@ -3,82 +3,24 @@ require 'spec_helper'
 describe Rda::Nginx do
   subject { Rda::Nginx.new }
 
-  before do
-    Rda.configure { nginx_conf_paths ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf'] }
-
-    Dir.chdir(File.join(File.dirname(__FILE__), '../../dummy'))
-  end
+  let(:app_dir) { File.join(File.dirname(__FILE__), '../../dummy') }
 
   describe '#setup' do
-    context 'when nginx is not found' do
+    context 'when the config file of nginx is not found' do
       before do
-        File.should_receive(:directory?).with('/etc/nginx').and_return(false)
-        File.should_receive(:directory?).with('/usr/local/nginx/conf').and_return(false)
-        File.should_receive(:directory?).with('/opt/nginx/conf').and_return(false)
+        Rda::Rails.should_receive(:app_name).any_number_of_times.and_return('dummy')
+        Rda::Rails.should_receive(:root).any_number_of_times.and_return(app_dir)
+
+        File.should_receive(:exists?).with('/opt/nginx/conf/nginx.conf').and_return(false)
       end
 
-      it 'prompts nginx is not found' do
+      it 'prompts `nginx.conf` is not found' do
         capture(:stderr) do
           subject.setup
         end.should == <<-PROMPT
-ERROR: Config directory of Nginx is not found in the following paths:
-
-* /etc/nginx
-* /usr/local/nginx/conf
-* /opt/nginx/conf
-
+ERROR: Missing `nginx.conf` in `/opt/nginx/conf`.
         PROMPT
       end
     end
-
-    context 'when found more than one config directory of nginx' do
-      before do
-        File.should_receive(:directory?).with('/etc/nginx').and_return(true)
-        File.should_receive(:directory?).with('/usr/local/nginx/conf').and_return(true)
-        File.should_receive(:directory?).with('/opt/nginx/conf').and_return(false)
-      end
-
-      it 'asks to choose one path' do
-        choice = <<-CHOICE
-1) /etc/nginx
-2) /usr/local/nginx/conf
-
-Found more than one config directory of Nginx, please choose one to setup:
-        CHOICE
-
-        $stdin.should_receive(:gets).and_return('\n')
-
-        capture(:stdout) do
-          subject.setup
-        end.strip.should == choice.strip
-      end
-    end
-  end
-
-  describe '#discard' do
-    let(:dummy_path) { File.dirname(__FILE__) + "/../../tmp/nginx" }
-
-    before do
-      FileUtils.mkdir_p dummy_path unless File.directory?(dummy_path)
-      FileUtils.copy_file(File.dirname(__FILE__) + "/../../fixtures/nginx.conf", dummy_path + '/nginx.conf')
-      Rda.configure { nginx_conf_paths [File.dirname(__FILE__) + "/../../tmp/nginx"] }
-    end
-
-    after do
-      conf = Rda.config.nginx_conf_paths.first
-      FileUtils.rm_r conf if File.directory?(conf)
-
-      Rda.configure { nginx_conf_paths ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf'] }
-    end
-
-    it 'discards the settings' do
-      subject.should_receive(:gsub_file).with("/etc/hosts", "127.0.0.1  dummy.local", '')
-      %W(enabled available).each do |n|
-        subject.should_receive(:remove_file).with("#{dummy_path}/sites-#{n}/dummy.local")
-      end
-      subject.should_receive(:remove_file).with("#{Rda::Rails.root}/config/setup_load_paths.rb")
-
-      subject.discard
-    end
   end
 end

data/spec/lib/rda/rvm_spec.rb

@@ -17,6 +17,7 @@ describe Rda::Rvm do
 
       after(:all) do
         `rm -f #{Rda::Rails.root}/.rvmrc`
+        `rm -f #{Rda::Rails.root}/config/setup_load_paths.rb`
 
         ENV['rvm_path'] = @rvm_path
       end
@@ -25,6 +26,10 @@ describe Rda::Rvm do
         File.should be_exists("#{Rda::Rails.root}/.rvmrc")
       end
 
+      it 'sets up loading paths' do
+        File.should be_exists("#{Rda::Rails.root}/config/setup_load_paths.rb")
+      end
+
       describe 'checking the contents of .rvmrc' do
         before { @contents = File.read("#{Rda::Rails.root}/.rvmrc") }
 
@@ -41,7 +46,7 @@ fi
         end
       end
     end
-    
+
     context 'when RVM is not installed' do
       before do
         subject.should_receive(:installed?).and_return(false)
@@ -52,7 +57,10 @@ fi
       it 'does not create .rvmrc' do
         File.should_not be_exists("#{Rda::Rails.root}/.rvmrc")
       end
-    end
 
+      it 'does not create `setup_load_paths`' do
+        File.should_not be_exists("#{Rda::Rails.root}/config/setup_load_paths.rb")
+      end
+    end
   end
 end

data/spec/lib/rda_spec.rb

@@ -2,19 +2,30 @@ require 'spec_helper'
 
 describe Rda do
   describe '.config' do
+    let(:dummy_path) { File.join(File.dirname(__FILE__), '../dummy') }
+
+    before do
+      Rda::Rails.should_receive(:root).any_number_of_times.and_return(dummy_path)
+    end
+
     subject { Rda.config }
 
     it { should be_a(Confstruct::Configuration) }
+
+    its(:domain) { should == 'dummy.local' }
+    its(:rails_env) { should == 'development' }
+    specify { subject.nginx.conf_dir.should == '/opt/nginx/conf' }
+    specify { subject.passenger.user.should == 'root' }
+    specify { subject.passenger.group.should == 'root' }
   end
 
   describe '.configure' do
     it 'sets the config paths of nginx' do
       Rda.configure do
-        nginx_conf_paths ['/tmp/rda/nginx/conf']
+        rails_env 'production'
       end
 
-      Rda.config.nginx_conf_paths.should have(1).item
-      Rda.config.nginx_conf_paths.should include('/tmp/rda/nginx/conf')
+      Rda.config.rails_env.should == 'production'
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rda
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.4.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Tower He
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 description: Rda(Rails Development Assist) is combined with lots of useful commands
   which can help you to setup your development enviroments and tools more quickly.
 email:
@@ -182,6 +198,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -192,18 +209,24 @@ files:
 - bin/rda
 - lib/rda.rb
 - lib/rda/app.rb
+- lib/rda/command.rb
+- lib/rda/helper.rb
 - lib/rda/nginx.rb
 - lib/rda/rails.rb
 - lib/rda/rvm.rb
 - lib/rda/templates/nginx
+- lib/rda/templates/rda.json
 - lib/rda/templates/rvmrc
 - lib/rda/templates/setup_load_paths.rb
 - lib/rda/version.rb
 - rda.gemspec
 - rvmrc.example
+- spec/dummy/.rda
 - spec/dummy/config.ru
 - spec/fixtures/nginx.conf
 - spec/lib/rda/app_spec.rb
+- spec/lib/rda/command_spec.rb
+- spec/lib/rda/helper_spec.rb
 - spec/lib/rda/nginx_spec.rb
 - spec/lib/rda/rails_spec.rb
 - spec/lib/rda/rvm_spec.rb
@@ -223,16 +246,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3989471672367132046
+      hash: -4551379883523660910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3989471672367132046
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -240,9 +260,12 @@ signing_key:
 specification_version: 3
 summary: Rails Development Assist
 test_files:
+- spec/dummy/.rda
 - spec/dummy/config.ru
 - spec/fixtures/nginx.conf
 - spec/lib/rda/app_spec.rb
+- spec/lib/rda/command_spec.rb
+- spec/lib/rda/helper_spec.rb
 - spec/lib/rda/nginx_spec.rb
 - spec/lib/rda/rails_spec.rb
 - spec/lib/rda/rvm_spec.rb