rda 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,6 @@
+0.0.2 (Wed, Jan 25, 2012)
+
+* Fixed rvmrc template errors
+* Idented sites-enabled inclusion
+* Set default passenger user and group
+* Added setup_load_paths.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rda (0.0.1)
+    rda (0.0.2)
       confstruct
       rails (~> 3.1.3)
       thor

data/README.textile

@@ -22,7 +22,7 @@ Or simply add rda to the Gemfile
 
 h3. Configuration
 
-For configuring rda, you should create an initialize for rda:
+For configuring rda, you need to create an initializer for rda:
 
 <pre>
 <code>
@@ -88,6 +88,7 @@ Next it will set Nginx to include the configs under sites-enabled. It means that
 
 h3. Discard Nginx settings
 
+<pre>
 <code>
 rake rda:nginx:discard # Or
 
@@ -95,6 +96,7 @@ sudo rake rda:nginx:discard # Or
 
 rvmsudo rake rda:nginx:discard # Using RVM
 </code>
+</pre>
 
 This task will clean up all the things created or configured by rda:nginx:setup.
 
@@ -102,7 +104,7 @@ h3. Restart application
 
 <code> rake rda:app:restart</code>
 
-This task touches tmp/restart.txt to restart your rails application, For detail, please visit http://modrails.com/documentation/Users%20guide%20Nginx.html#_redeploying_restarting_the_ruby_on_rails_application
+This task touches tmp/restart.txt to restart your rails application, For detail, please visit "http://bit.ly/ztKA07":http://bit.ly/ztKA07
 
 h3. Release your rails application(not yet)
 

data/lib/rda/nginx.rb

@@ -12,7 +12,9 @@ module Rda
     def setup
       return unless installed?
 
+      create_setup_load_paths
       mkdir_for_sites
+      set_passenger_user_and_group
       include_sites_enabled
 
       template("templates/nginx", "#{conf_path}/sites-available/#{hostname}")
@@ -26,10 +28,11 @@ module Rda
       return unless installed?
 
       %W(enabled available).each do |n|
-        remove_file("#{conf_path}/sites-#{n}/#{hostname}")
+        remove_file "#{conf_path}/sites-#{n}/#{hostname}"
       end
 
       gsub_file("/etc/hosts", "#{hostname}  127.0.0.1", '')
+      remove_file "#{::Rails.root}/config/setup_load_paths.rb"
     end
 
     private
@@ -83,6 +86,10 @@ module Rda
       index >= 0 && index < available_paths.size ? available_paths[index] : exit
     end
 
+    def create_setup_load_paths
+      copy_file "templates/setup_load_paths.rb", "#{::Rails.root}/config/setup_load_paths.rb"
+    end
+
     def mkdir_for_sites
       %W(available enabled).each do |n|
         dir = conf_path + "/sites-#{n}"
@@ -90,11 +97,20 @@ module Rda
       end
     end
 
+    def set_passenger_user_and_group
+      conf = conf_path + '/nginx.conf'
+      gsub_file conf, /http {/, <<-PASSENGER
+http {
+    passenger_default_user root;
+    passenger_default_group root;
+      PASSENGER
+    end
+
     def include_sites_enabled
       conf = conf_path + '/nginx.conf'
       gsub_file conf, /http {/, <<-INCLUDE_SITES_ENABLED
 http {
-  include #{conf_path}/sites-enabled/*;
+    include #{conf_path}/sites-enabled/*;
       INCLUDE_SITES_ENABLED
     end
   end

data/lib/rda/templates/rvmrc

@@ -1,5 +1,5 @@
 if [[ -s "<%= gemset_env %>" ]]; then
-  . "<%= gemset_env %>
+  . "<%= gemset_env %>"
 else
-  rvm use <%= gemset_name %> --create
+  rvm --create use "<%= gemset_name %>"
 fi

data/lib/rda/templates/setup_load_paths.rb

@@ -0,0 +1,28 @@
+if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
+  begin
+    rvm_path     = File.dirname(File.dirname(ENV['MY_RUBY_HOME']))
+    rvm_lib_path = File.join(rvm_path, 'lib')
+    $LOAD_PATH.unshift rvm_lib_path
+    require 'rvm'
+    RVM.use_from_path! File.dirname(File.dirname(__FILE__))
+  rescue LoadError
+    # RVM is unavailable at this point.
+    raise "RVM ruby lib is currently unavailable."
+  end
+end
+
+# Pick the lines for your version of Bundler
+# If you're not using Bundler at all, remove all of them
+
+# Require Bundler 1.0 
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', File.dirname(__FILE__))
+require 'bundler/setup'
+
+# Require Bundler 0/9
+# if File.exist?(".bundle/environment.rb")
+#   require '.bundle/environment'
+# else
+#   require 'rubygems'
+#   require 'bundler'
+#   Bundler.setup
+# end

data/lib/rda/version.rb

@@ -1,3 +1,3 @@
 module Rda
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/rda/nginx_spec.rb

@@ -67,16 +67,27 @@ Found more than one config directory of Nginx, please choose one to setup:
       end
 
       it 'sets Nginx properly' do
+        # loads RVM
+        subject.should_receive(:copy_file).with("templates/setup_load_paths.rb", "#{::Rails.root}/config/setup_load_paths.rb")
+
         # creates sites-available and sites-enabled
         %W(available enabled).each do |n|
           path = "#{dummy_path}/sites-#{n}"
           subject.should_receive(:empty_directory).with(path)
         end
 
+        # sets default passenger user and group
+        subject.should_receive(:gsub_file).with("#{dummy_path}/nginx.conf", /http {/, <<-PASSENGER
+http {
+    passenger_default_user root;
+    passenger_default_group root;
+          PASSENGER
+        )
+
         # sets Nginx to include sites-enabled
         subject.should_receive(:gsub_file).with("#{dummy_path}/nginx.conf", /http {/, <<-INCLUSION
 http {
-  include #{dummy_path}/sites-enabled/*;
+    include #{dummy_path}/sites-enabled/*;
           INCLUSION
         )
 
@@ -117,6 +128,7 @@ http {
       %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("#{::Rails.root}/config/setup_load_paths.rb")
 
       subject.discard
     end

data/spec/lib/rda/rvm_spec.rb

@@ -28,9 +28,9 @@ describe Rda::Rvm do
         it "configs RVM properly" do
           contents = <<-RVMRC
 if [[ -s "#{ENV['rvm_path']}/environments/ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}@dummy" ]]; then
-  . "#{ENV['rvm_path']}/environments/ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}@dummy
+  . "#{ENV['rvm_path']}/environments/ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}@dummy"
 else
-  rvm use ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}@dummy --create
+  rvm --create use "ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}@dummy"
 fi
           RVMRC
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rda
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70359970346280 !ruby/object:Gem::Requirement
+  requirement: &70189996170600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70359970346280
+  version_requirements: *70189996170600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70359970345600 !ruby/object:Gem::Requirement
+  requirement: &70189996169780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359970345600
+  version_requirements: *70189996169780
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &70359970344560 !ruby/object:Gem::Requirement
+  requirement: &70189996169060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359970344560
+  version_requirements: *70189996169060
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70359970343580 !ruby/object:Gem::Requirement
+  requirement: &70189996168260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359970343580
+  version_requirements: *70189996168260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359970326360 !ruby/object:Gem::Requirement
+  requirement: &70189996167300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359970326360
+  version_requirements: *70189996167300
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70359970324740 !ruby/object:Gem::Requirement
+  requirement: &70189996166320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359970324740
+  version_requirements: *70189996166320
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70359970323680 !ruby/object:Gem::Requirement
+  requirement: &70189996165520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359970323680
+  version_requirements: *70189996165520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70359970322740 !ruby/object:Gem::Requirement
+  requirement: &70189996127620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359970322740
+  version_requirements: *70189996127620
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70359970321460 !ruby/object:Gem::Requirement
+  requirement: &70189996126560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359970321460
+  version_requirements: *70189996126560
 description: Rda(Rails Development Assist) is combined with lots of useful rake tasks
   which can help you to setup your development enviroments and tools more quickly.
 email:
@@ -120,6 +120,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -134,6 +135,7 @@ files:
 - lib/rda/rvm.rb
 - lib/rda/templates/nginx
 - lib/rda/templates/rvmrc
+- lib/rda/templates/setup_load_paths.rb
 - lib/rda/version.rb
 - lib/tasks/rda_tasks.rake
 - rda.gemspec
@@ -190,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2929130629606210235
+      hash: -2455843952260711673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2929130629606210235
+      hash: -2455843952260711673
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10