rsm 0.1.1 → 0.1.3

data/CHANGES.md

@@ -1,3 +1,12 @@
+# 0.1.3 / September 04, 2011
+
+  * Using socket_per_worker in nginx upstream server config
+
+# 0.1.2 / September 04, 2011
+
+  * Added support of Thin server: generate config, start/stop/restart
+  * Fixed domain from hostname
+
 # 0.1.1 / September 04, 2011
 
   * Added `rsm:bundle:install` and `rsm:bundle:update` tasks

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/rsm/base.rb

@@ -5,11 +5,19 @@ module Rsm
     include Thor::Actions
     include Actions
 
+    SERVERS = [:unicorn, :thin]
+
+    attr_reader :server, :worker_processes, :socket_per_worker
+
     argument :name
 
     class_option :apps_root, :default => "/var/www", :aliases => "-r", :desc => "Rails apps root"
     class_option :capistrano, :default => false, :aliases => "-c", :desc => "Application's Capistrano stage"
 
+    class_option :server, :aliases => "-s", :default => :unicorn, :desc => "What server we will use"
+    class_option :worker_processes, :type => :numeric, :default => 2, :aliases => "-w", :desc => "Worker processes of server we will use"
+    class_option :environment, :aliases => "-e", :default => "production"
+
     class_option :verbose, :default => false, :aliases => "-V", :desc => "Verbose output"
 
     def self.template_path
@@ -23,5 +31,15 @@ module Rsm
     def set_destination_root
       self.destination_root = application_root.to_s
     end
+
+    def set_server
+      @server = options[:server].to_sym
+      raise "Unknown server #{options[:server].inspect}. Available is #{SERVERS}" unless SERVERS.include?(server)
+      @socket_per_worker = (server == :thin)
+    end
+
+    def set_worker_processes
+      @worker_processes = options[:worker_processes]
+    end
   end
 end

data/lib/tasks/install/nginx.rb

@@ -5,7 +5,7 @@ module Rsm
 
       class_option :nginx_root, :default => "/etc/nginx", :aliases => "-n", :desc => "Nginx configuration root"
       class_option :domain, :aliases => "-d", :desc => "Server's domain"
-      class_option :rewrite_www, :type => :boolean, :default => false, :desc => "Added www-subdomain rewriting"
+      class_option :rewrite_www, :type => :boolean, :default => false, :desc => "Use www-subdomain rewriting"
 
       class_option :auth_basic, :type => :boolean, :default => false, :aliases => "-a", :desc => "Use auth_basic"
       class_option :auth_basic_realm, :desc => "auth_basic realm or capitalized NAME unless set"
@@ -22,9 +22,12 @@ module Rsm
         end
       end
 
-      def nginx_unicorn_config
+      def nginx_server_config
         @domain = options[:domain]
-        @domain = "#{application_name}.`hostname -f`" unless @domain
+        unless @domain
+          @domain = `hostname -f`.strip
+          @domain = "#{name}.#{@domain}"
+        end
 
         @rewrite_www = options[:rewrite_www]
 
@@ -33,7 +36,7 @@ module Rsm
         @auth_basic_realm = name.to_s.capitalize unless @auth_basic_realm
         @auth_basic_user_file = options[:auth_basic_user_file]
 
-        template "nginx-unicorn.conf.erb", "sites-available.d/#{name}.conf"
+        template "nginx-server.conf.erb", "sites-available.d/#{name}.conf"
       end
 
       def enable_nginx_site

data/lib/tasks/install/rails.rb

@@ -1,7 +1,6 @@
 module Rsm
   module Install
     class Rails < Rsm::Base
-      attr_reader :worker_processes
 
       class_option :user, :aliases => "-u", :default => "git", :desc => "Owners's user"
       class_option :group, :aliases => "-g", :default => "git", :desc => "Owners's group"
@@ -10,8 +9,6 @@ module Rsm
       class_option :tgz, :desc => "Install from TGZ (tar.gz)"
       class_option :tbz2, :desc => "Install from TBZ2 (tar.bz2)"
 
-      class_option :worker_processes, :type => :numeric, :default => 2, :aliases => "-w", :desc => "Worker processes for use in Unicorn"
-
       def download
         empty_directory "."
         inside application_root do
@@ -39,9 +36,21 @@ module Rsm
       end
 
       def unicorn_config
-        @worker_processes = options[:worker_processes]
         template "unicorn.rb.erb", "config/unicorn.rb"
       end
+      remove_task :unicorn_config
+
+      def thin_config
+        inside "." do
+          run_ruby_binary "thin config -C config/thin.yml -S tmp/sockets/thin.sock -s #{options[:worker_processes]} -e #{options[:environment]}"
+        end
+      end
+      remove_task :thin_config
+
+      def server_config
+        send("#{server}_config")
+      end
+
     end
   end
 end

data/lib/tasks/thin/restart.rb

@@ -0,0 +1,11 @@
+module Rsm
+  module Thin
+    class Restart < Rsm::Base
+
+      def thin_restart
+        run_ruby_binary "thin restart -C #{application_root}/config/thin.yml"
+      end
+
+    end
+  end
+end

data/lib/tasks/thin/start.rb

@@ -0,0 +1,11 @@
+module Rsm
+  module Thin
+    class Start < Rsm::Base
+
+      def thin_start
+        run_ruby_binary "thin start -C #{application_root}/config/thin.yml"
+      end
+
+    end
+  end
+end

data/lib/tasks/thin/stop.rb

@@ -0,0 +1,11 @@
+module Rsm
+  module Thin
+    class Stop < Rsm::Base
+
+      def thin_stop
+        run_ruby_binary "thin stop -C #{application_root}/config/thin.yml"
+      end
+
+    end
+  end
+end

data/lib/tasks/unicorn/start.rb

@@ -1,7 +1,6 @@
 module Rsm
   module Unicorn
     class Start < Rsm::Base
-      class_option :environment, :aliases => "-e", :default => "production"
 
       def unicorn_rails
         run_ruby_binary "unicorn_rails -D -E #{options[:environment]} -c #{application_root.join("config", "unicorn.rb")}"

data/templates/rsm/install/nginx/{nginx-unicorn.conf.erb → nginx-server.conf.erb}

@@ -1,10 +1,16 @@
 upstream <%= name %>_server {
-  server unix:<%= application_root %>/tmp/sockets/unicorn.sock fail_timeout=0; # socket path must be same with last one in #{application_root}/config/unicorn.rb
+<%- 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
+  <%- 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 -%>
 }
 
 server {
   listen <%= domain %>:80;
-  server_name <%= domain %><%= if rewrite_www then "www.#{domain}" end -%>;
+  server_name <%= domain -%><%= if rewrite_www then " www.#{domain}" end -%>;
 
   client_max_body_size 1G;
   keepalive_timeout 5;
@@ -16,17 +22,17 @@ server {
   error_log <%= application_root %>/log/error.log;
 
   location @<%= name %> {
-    <% if auth_basic -%>
+    <%- if auth_basic -%>
     auth_basic            "<%= auth_basic_realm %>";
     auth_basic_user_file  <%= auth_basic_user_file%>;
-    <% end -%>
+    <%- end -%>
 
-    <% if rewrite_www -%>
+    <%- if rewrite_www -%>
     if ($host ~* www\.(.*)) {
       set $host_without_www $1;
       rewrite ^(.*)$ http://$host_without_www$1 permanent; # $1 contains '/foo', not 'www.mydomain.com/foo'}
     }
-    <% end -%>
+    <%- end -%>
 
     if (!-f $request_filename) {
       proxy_pass http://<%= name %>_server;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &81380070 !ruby/object:Gem::Requirement
+  requirement: &72444900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *81380070
+  version_requirements: *72444900
 description: Thor tasks for rapid deployment new rails apps on server
 email: a.ulyanitsky@gmail.com
 executables:
@@ -48,10 +48,13 @@ files:
 - lib/tasks/bundle/update.rb
 - lib/tasks/install/nginx.rb
 - lib/tasks/install/rails.rb
+- lib/tasks/thin/restart.rb
+- lib/tasks/thin/start.rb
+- lib/tasks/thin/stop.rb
 - lib/tasks/unicorn/start.rb
 - lib/tasks/unicorn/stop.rb
 - rsm.gemspec
-- templates/rsm/install/nginx/nginx-unicorn.conf.erb
+- templates/rsm/install/nginx/nginx-server.conf.erb
 - templates/rsm/install/rails/unicorn.rb.erb
 homepage: https://github.com/asux/rsm
 licenses: