rsm 0.1.beta1 → 0.1.beta2

data/CHANGES.md

@@ -1,3 +1,11 @@
+# 0.1.beta2 / August 31, 2011
+
+  * Some code moved to `Rsm::Install::Base`
+  * Nginx config template uses `application_root` variable
+  * Changed injection in nginx.conf
+  * Command `unicorn` accepts environment option
+  * Capistrano-aware `application_root`
+
 # 0.1.beta1 / August 30, 2011
 
   * Methods in `Rsm::Actions` use `name` attribute

data/VERSION

@@ -1 +1 @@
-0.1.beta1
+0.1.beta2

data/lib/rsm/base.rb

@@ -0,0 +1,32 @@
+require 'pathname'
+
+module Rsm
+  class Base < Thor::Group
+    include Thor::Actions
+    include Actions
+
+    argument :name
+
+    class_option :apps_root, :defualt => "/var/www", :aliases => "-r", :desc => "Rails apps root (default: /var/www)"
+    class_option :capistrano, :defualt => false, :aliases => "-c", :desc => "Application's Capistrano stage"
+
+    def self.source_root
+      File.expand_path('../../../templates', __FILE__)
+    end
+
+    def application_root
+      unless @application_root
+        @application_root = if options[:capistrano]
+          "#{options[:apps_root]}/#{name}/#{options[:capistrano]}/current"
+        else
+          "#{options[:apps_root]}/#{name}"
+        end
+        @application_root = Pathname.new(@application_root)
+        say "Application root: #{@application_root}"
+      end
+      @application_root
+    end
+    remove_task :application_root
+
+  end
+end

data/lib/rsm/install/nginx.rb

@@ -1,38 +1,30 @@
 module Rsm
   module Install
-    class Nginx < Thor::Group
-      include Thor::Actions
-
+    class Nginx < Rsm::Base
       attr_reader :domain
 
-      argument :name
-
       class_option :nginx_root, :default => "/etc/nginx", :aliases => "-n", :desc => "Nginx configuration root"
       class_option :domain, :aliases => "-d", :desc => "Server's domain"
 
-      def self.source_root
-        File.expand_path('../../../..', __FILE__)
-      end
-
       def set_destination_root
         self.destination_root = options[:nginx_root]
       end
 
-      def nginx_conf_include
-        include_str = "include sites-enabled.d/*.conf;\n\t"
-        unless File.read("#{options[:nginx_root]}/nginx.conf").include?(include_str)
-          inject_into_file "nginx.conf", include_str, :before => "server {"
+      def nginx_config_include_vhosts
+        include_str = "include sites-enabled.d/*.conf;"
+        unless File.read("#{destination_root}/nginx.conf").include?(include_str)
+          inject_into_file "nginx.conf", "#{include_str}\n", :after => "index index.html;\n"
         end
       end
 
-      def nginx_config
+      def nginx_unicorn_config
         @domain = options[:domain]
         @domain = `hostname` unless @domain
-        template "templates/nginx-vhost.conf.erb", "sites-available.d/#{name}.conf"
+        template "nginx-unicorn.conf.erb", "sites-available.d/#{name}.conf"
       end
 
       def enable_nginx_site
-        link_file "#{options[:nginx_root]}/sites-available.d/#{name}.conf", "sites-enabled.d/#{name}.conf"
+        link_file "#{destination_root}/sites-available.d/#{name}.conf", "sites-enabled.d/#{name}.conf"
       end
 
     end

data/lib/rsm/install/rails.rb

@@ -1,14 +1,7 @@
 module Rsm
   module Install
-    class Rails < Thor::Group
-      include Thor::Actions
-      include Actions
-
-      attr_reader :application_root, :worker_processes
-
-      argument :name
-
-      class_option :apps_root, :defualt => "/var/www", :aliases => "-r", :desc => "Rails apps root (default: /var/www)"
+    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"
@@ -19,17 +12,12 @@ module Rsm
 
       class_option :worker_processes, :type => :numeric, :default => 2, :aliases => "-w", :desc => "Worker processes for use in Unicorn"
 
-      def self.source_root
-        File.expand_path('../../../..', __FILE__)
-      end
-
       def set_destination_root
-        @application_root = "#{options[:apps_root]}/#{name}"
-        self.destination_root = @application_root
+        self.destination_root = application_root.to_s
       end
 
       def download
-        empty_directory application_root
+        empty_directory "."
         inside application_root do
           if options[:git]
             run "git clone #{options[:git]} ."
@@ -40,14 +28,13 @@ module Rsm
             fetch_temporary_archive(name, options[:tbz2], :bz2)
             unpack_compessed_archive(name, :bz2)
           else
-            say "No source URI specified. Use --git, --tgz or --tbz2 option with URI passed"
-            exit 1
+            say "No source URI specified - skip download"
           end
         end
       end
 
       def permissions
-        inside application_root do
+        inside "." do
           empty_directory "log"
           empty_directory "tmp"
           run "chown #{options[:user]}:#{options[:group]} -R ."
@@ -57,7 +44,7 @@ module Rsm
 
       def unicorn_config
         @worker_processes = options[:worker_processes]
-        template "templates/unicorn.rb.erb", "config/unicorn.rb"
+        template "unicorn.rb.erb", "config/unicorn.rb"
       end
     end
   end

data/lib/rsm/runner.rb

@@ -2,14 +2,9 @@ module Rsm
   class Runner < Thor
     include Thor::Actions
 
-    def self.source_root
-      File.expand_path("../..", __FILE__)
-    end
-
-    class_option :apps_root, :defualt => "/var/www", :aliases => "-r", :desc => "Rails apps root (default: /var/www)"
-
     register Rsm::Install::Nginx, "install:nginx", "install:nginx NAME", "Install Nginx config"
     register Rsm::Install::Rails, "install:rails", "install:rails NAME", "Install Rails application"
+    register Rsm::Unicorn, "unicorn", "unicorn NAME", "Run Unicorn server"
 
     desc "install NAME", "Install Nginx config and Rails application"
     def install(name)
@@ -17,16 +12,10 @@ module Rsm
       invoke "install:rails"
     end
 
-    desc "unicorn NAME", "Run Unicorn server"
-    def unicorn(name)
-      app_root = Pathname.new("#{options[:apps_root]}/#{name}")
-      rvmrc = app_root.join(".rvmrc")
-      if rvmrc.exist?
-        ruby_cmd = File.new(rvmrc).readline.strip + " exec"
-      else
-        ruby_cmd = "#{Thor::Util.ruby_command} -S"
-      end
-      run "#{ruby_cmd} unicorn_rails -D -c #{app_root.join("config", "unicorn.rb")}"
+    desc "version", "RSM gem version"
+    def version
+      require 'rsm/version'
+      say "RSM version #{Rsm::VERSION}"
     end
   end
 end

data/lib/rsm/unicorn.rb

@@ -0,0 +1,13 @@
+module Rsm
+  class Unicorn < Base
+    def unicorn_rails
+      rvmrc = application_root.join(".rvmrc")
+      if rvmrc.exist?
+        ruby_cmd = File.new(rvmrc).readline.strip + " exec"
+      else
+        ruby_cmd = "#{Thor::Util.ruby_command} -S"
+      end
+      run "#{ruby_cmd} unicorn_rails -D -E production -c #{application_root.join("config", "unicorn.rb")}"
+    end
+  end
+end

data/lib/rsm.rb

@@ -6,6 +6,8 @@ require 'thor/util'
 module Rsm
   autoload :Actions, 'rsm/actions'
   autoload :Runner, 'rsm/runner'
+  autoload :Base, 'rsm/base'
+  autoload :Unicorn, 'rsm/unicorn'
 
   module Install
     autoload :Nginx, 'rsm/install/nginx'

data/templates/{nginx-vhost.conf.erb → nginx-unicorn.conf.erb}

@@ -1,5 +1,5 @@
 upstream <%= name %>_server {
-   server unix:/var/www/<%= name %>/tmp/sockets/unicorn.sock fail_timeout=0; # Местоположение сокета должно совпадать с настройками файла config/unicorn.rb от корня вашего приложения.
+   server unix:<%= application_root %>/tmp/sockets/unicorn.sock fail_timeout=0; # Местоположение сокета должно совпадать с настройками файла config/unicorn.rb от корня вашего приложения.
 }
 
 server {
@@ -8,12 +8,12 @@ server {
 
     client_max_body_size 1G; # Максимальный размер тела запроса (а простым языком - ограничение на размер заливаемого на сервер файла).
     keepalive_timeout 5;
-    root /var/www/<%= name %>/public; # Эта строка всегда должна указывать в директорию public Rails приложения. А current там потому что деплой происходит через Capistrano
+    root <%= application_root %>/public; # Эта строка всегда должна указывать в директорию public Rails приложения. А current там потому что деплой происходит через Capistrano
 
     try_files $uri/index.html $uri.html $uri @<%= name %>; # Имя переменной не важно - главное, чтобы в блоке location ниже было аналогичное
 
-    access_log /var/www/<%= name %>/log/access.log;
-    error_log /var/www/<%= name %>/log/error.log;
+    access_log <%= application_root %>/log/access.log;
+    error_log <%= application_root %>/log/error.log;
 
     location @<%= name %> {
         proxy_pass http://<%= name %>_server; # Часть после http:// должна полностью соответствовать имени в блоке upstream выше.
@@ -24,7 +24,7 @@ server {
 
     error_page 500 502 503 504 /500.html;
     location = /500.html {
-      root /var/www/<%= name %>/public;
+      root <%= application_root %>/public;
     }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsm
 version: !ruby/object:Gem::Version 
-  hash: 62196313
+  hash: 62196319
   prerelease: 4
   segments: 
   - 0
   - 1
   - beta
-  - 1
-  version: 0.1.beta1
+  - 2
+  version: 0.1.beta2
 platform: ruby
 authors: 
 - Oleksandr Ulianytskyi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -55,12 +55,14 @@ files:
 - bin/rsm
 - lib/rsm.rb
 - lib/rsm/actions.rb
+- lib/rsm/base.rb
 - lib/rsm/install/nginx.rb
 - lib/rsm/install/rails.rb
 - lib/rsm/runner.rb
+- lib/rsm/unicorn.rb
 - lib/rsm/version.rb
 - rsm.gemspec
-- templates/nginx-vhost.conf.erb
+- templates/nginx-unicorn.conf.erb
 - templates/unicorn.rb.erb
 homepage: https://github.com/asux/rsm
 licenses: