rsm 0.1.11 → 0.1.12

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.1.12 / March 29, 2012
+
+  * Fixed Nginx configuration generator: generates environment-aware paths
+  * Unicorn and Thin configuration files put to `shared` folder when _capistrano_ option not `false`
+
 # 0.1.11 / October 31, 2011
 
   * Added support for host/port or server

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/tasks/install/nginx.rb

@@ -1,7 +1,7 @@
 module Rsm
   module Install
     class Nginx < Rsm::Base
-      attr_reader :domain, :rewrite_www, :auth_basic, :auth_basic_realm, :auth_basic_user_file, :upstream_name
+      attr_reader :environment, :domain, :rewrite_www, :auth_basic, :auth_basic_realm, :auth_basic_user_file, :upstream_name
 
       class_option :nginx_root, :default => "/etc/nginx", :aliases => "-n", :desc => "Nginx configuration root"
       class_option :domain, :aliases => "-d", :desc => "Server's domain"
@@ -23,6 +23,7 @@ module Rsm
       end
 
       def nginx_server_config
+        @environment = options[:environment]
         @domain = options[:domain]
         unless @domain
           @domain = `hostname -f`.strip
@@ -47,4 +48,4 @@ module Rsm
 
     end
   end
-end
+end

data/lib/tasks/install/rails.rb

@@ -36,17 +36,22 @@ module Rsm
         @socket = options[:socket]
         @host = options[:host]
         @port = options[:port]
+        @config_dir = if options[:capistrano]
+                "../shared"
+              else
+                "config"
+              end
       end
 
       def unicorn_config
-        template "unicorn.rb.erb", "config/unicorn.rb"
+        template "unicorn.rb.erb", "#@config_dir/unicorn.rb"
       end
       remove_task :unicorn_config
 
       def thin_config
         env = options[:environment]
         inside "." do
-          cmd = "thin config -C config/thin.#{env}.yml -s #{options[:worker_processes]} -e #{env} -l log/thin.#{env}.log -P tmp/pids/thin.#{env}.pid"
+          cmd = "thin config -C #@config_dir/thin.#{env}.yml -s #{options[:worker_processes]} -e #{env} -l log/thin.#{env}.log -P tmp/pids/thin.#{env}.pid"
           if socket
             cmd << " -S tmp/sockets/thin.#{env}.sock"
           else

data/rsm.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.author = 'Oleksandr Ulianytskyi'
   s.license = 'BSD'
   s.version = Rsm::VERSION
-  s.date = File.mtime(File.expand_path('VERSION',  File.dirname(__FILE__)))
   s.extra_rdoc_files = ['README.md', 'CHANGES.md', 'VERSION']
   s.rdoc_options << '--main' << 'README.md' << '--line-numbers'
 
@@ -25,4 +24,4 @@ Gem::Specification.new do |s|
   s.requirements << 'A Git installed'
   s.requirements << 'A Nginx installed'
   s.add_dependency 'thor', '~> 0.14.6'
-end
+end

data/templates/rsm/install/nginx/nginx-server.conf.erb

@@ -1,11 +1,12 @@
 upstream <%= upstream_name %> {
 <%- if socket_per_worker -%>
   <%- (0...worker_processes).each do |n| -%>
-  server unix:<%= application_root %>/tmp/sockets/<%= server %>.<%= n %>.sock fail_timeout=0; # socket path must be same with last one in #{application_root}/config/unicorn.rb
+  # socket path must be same with last one in #{application_root}/config/unicorn.rb
+  server unix:<%= application_root %>/tmp/sockets/<%= server %>.<%= environment %>.<%= n %>.sock fail_timeout=0;
   <%- end -%>
 <%- else -%>
-  server unix:<%= application_root %>/tmp/sockets/<%= server %>.sock fail_timeout=0; # socket path must be same with last one in #{application_root}/config/unicorn.rb
-<%- end -%>
+  # socket path must be same with last one in #{application_root}/config/unicorn.rb
+  server unix:<%= application_root %>/tmp/sockets/<%= server %>.<%= environment %>.sock fail_timeout=0; <%- end -%>
 }
 
 server {

metadata

@@ -1,40 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rsm
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.12
   prerelease: 
-  version: 0.1.11
 platform: ruby
-authors: 
+authors:
 - Oleksandr Ulianytskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-31 00:00:00 +02:00
-default_executable: rsm
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &9004320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *9004320
 description: Thor tasks for rapid deployment new rails apps on server
 email: a.ulyanitsky@gmail.com
-executables: 
+executables:
 - rsm
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGES.md
 - VERSION
-files: 
+files:
 - .gitignore
 - .yardopts
 - CHANGES.md
@@ -61,37 +58,35 @@ files:
 - rsm.gemspec
 - templates/rsm/install/nginx/nginx-server.conf.erb
 - templates/rsm/install/rails/unicorn.rb.erb
-has_rdoc: true
 homepage: https://github.com/asux/rsm
-licenses: 
+licenses:
 - BSD
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - A coreutils installed
 - A Git installed
 - A Nginx installed
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Rails server manager
 test_files: []
-