rda 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,8 +1,7 @@
-TODO
+**0.2.0 (Tue, Oct 9, 2012)**
 
-* Check the permission when setup nginx
-* Specify passenger_default_user and passenger_default_group manually
-* Specify the hostname of the application
+* Support to specify the environment of the application
+* Support to specify the hostname of the application
 
 **0.0.6 (Mon, Jul 2, 2012)**
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rda (0.1.0)
+    rda (0.2.0)
       confstruct
       rails (>= 3.1)
       thor
@@ -39,7 +39,7 @@ GEM
     arel (3.0.2)
     builder (3.0.0)
     coderay (1.0.7)
-    confstruct (0.2.3)
+    confstruct (0.2.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.11)

data/README.md

@@ -80,7 +80,7 @@ This task removes the .rvmrc from your rails application.
 #### Setup Nginx
 
 ```bash
-rda nginx setup
+rda nginx setup --environment production --hostname www.example.com
 
 # Or
 rake rda:nginx:setup
@@ -101,7 +101,7 @@ 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:
 
 ```bash
-rvmsudo rda nginx setup
+rvmsudo rda nginx setup --environment production --hostname www.example.com
 
 # Or
 rvmsudo rake rda:nginx:setup
@@ -120,15 +120,15 @@ Finally, You need to start Nginx `/path/to/nginx/sbin/nginx` and then visit http
 #### Discard Nginx settings
 
 ```bash
-rda nginx discard # Or
+rda nginx discard --hostname www.example.com # Or
 
 rake rda:nginx:discard # Or
 
-sudo rda nginx discard # Or
+sudo rda nginx discard --hostname www.example.com # Or
 
 sudo rake rda:nginx:discard # Or
 
-rvmsudo rda nginx discard # Using RVM
+rvmsudo rda nginx discard --hostname www.example.com # Using RVM
 
 rvmsudo rake rda:nginx:discard # Using RVM
 ```

data/bin/rda

@@ -16,8 +16,10 @@ class RdaCommand < Thor
   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)
+    Rda::Nginx.new.send(action.to_sym, options)
   end
 
   desc 'app ACTION', 'Manage the lifecycle of the application. Available actions: restart.'

data/lib/rda/nginx.rb

@@ -7,9 +7,11 @@ module Rda
     end
 
     desc "setup", "Set up your rails application"
-    def setup
+    def setup(options = {})
       return unless installed?
 
+      @hostname, @environment = options["hostname"], options["environment"]
+
       create_setup_load_paths
       mkdir_for_sites
       set_passenger_user_and_group
@@ -24,9 +26,11 @@ module Rda
     end
 
     desc "discard", "Remove the settings of your rails application from nginx"
-    def discard
+    def discard(options = {})
       return unless installed?
 
+      @hostname = options["hostname"]
+
       %W(enabled available).each do |n|
         remove_file "#{conf_path}/sites-#{n}/#{hostname}"
       end
@@ -61,7 +65,7 @@ module Rda
     end
 
     def hostname
-      "#{Rda::Rails.app_name}.local"
+      @hostname || "#{Rda::Rails.app_name}.local"
     end
 
     def available_paths

data/lib/rda/templates/nginx

@@ -2,5 +2,5 @@ server {
   server_name <%= hostname %>;
   root <%= "#{::Rails.root}/public" %>;
   passenger_enabled on;
-  rails_env development;
+  rails_env <%= @environment || "development" %>;
 }

data/lib/rda/version.rb

@@ -1,3 +1,3 @@
 module Rda
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1257555642380015887
+      hash: 4004764091252748463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1257555642380015887
+      hash: 4004764091252748463
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24