rsm 0.1.10 → 0.1.11

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.1.11 / October 31, 2011
+
+  * Added support for host/port or server
+  * Environment-depended config for thin
+
 # 0.1.7 / September 12, 2011
 
   * Fixed upsream name

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/tasks/install/rails.rb

@@ -2,6 +2,8 @@ module Rsm
   module Install
     class Rails < Rsm::Base
 
+      attr_reader :socket, :host, :port
+
       class_option :user, :aliases => "-u", :default => "git", :desc => "Owners's user"
       class_option :group, :aliases => "-g", :default => "git", :desc => "Owners's group"
 
@@ -9,6 +11,10 @@ module Rsm
       class_option :tgz, :desc => "Install from TGZ (tar.gz)"
       class_option :tbz2, :desc => "Install from TBZ2 (tar.bz2)"
 
+      class_option :socket, :aliases => "-S", :type => :boolean, :defualt => false, :desc => "Use socket"
+      class_option :host, :aliases => "-h", :default => "127.0.0.1", :desc => "Application server host binding"
+      class_option :port, :aliases => "-p", :default => 3000, :desc => "Application server port binding"
+
       def download
         empty_directory "."
         inside application_root do
@@ -26,14 +32,32 @@ module Rsm
         end
       end
 
+      def define_vars
+        @socket = options[:socket]
+        @host = options[:host]
+        @port = options[:port]
+      end
+
       def unicorn_config
         template "unicorn.rb.erb", "config/unicorn.rb"
       end
       remove_task :unicorn_config
 
       def thin_config
+        env = options[:environment]
         inside "." do
-          run_with_bundler "thin config -C config/thin.yml -S tmp/sockets/thin.sock -s #{options[:worker_processes]} -e #{options[:environment]}"
+          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"
+          if socket
+            cmd << " -S tmp/sockets/thin.#{env}.sock"
+          else
+            if host
+              cmd << " -a #{host}"
+            end
+            if port
+              cmd << " -p #{port}"
+            end
+          end
+          run_with_bundler cmd
         end
       end
       remove_task :thin_config

data/lib/tasks/thin/restart.rb

@@ -3,7 +3,7 @@ module Rsm
     class Restart < Rsm::Base
 
       def thin_restart
-        run_ruby_binary "thin restart -C #{application_root}/config/thin.yml"
+        run_with_bundler "thin restart -C #{application_root}/config/thin.#{options[:environment]}.yml"
       end
 
     end

data/lib/tasks/thin/start.rb

@@ -3,7 +3,7 @@ module Rsm
     class Start < Rsm::Base
 
       def thin_start
-        run_with_bundler "thin start -C #{application_root}/config/thin.yml"
+        run_with_bundler "thin start -C #{application_root}/config/thin.#{options[:environment]}.yml"
       end
 
     end

data/lib/tasks/thin/stop.rb

@@ -3,7 +3,7 @@ module Rsm
     class Stop < Rsm::Base
 
       def thin_stop
-        run_with_bundler "thin stop -C #{application_root}/config/thin.yml"
+        run_with_bundler "thin stop -C #{application_root}/config/thin.#{options[:environment]}.yml"
       end
 
     end

data/templates/rsm/install/rails/unicorn.rb.erb

@@ -27,8 +27,10 @@ working_directory "<%= application_root %>/" # available in 0.94.0+
 
 # listen on both a Unix domain socket and a TCP port,
 # we use a shorter backlog for quicker failover when busy
-listen "<%= application_root %>/tmp/sockets/unicorn.#{environment}.sock", :backlog => 64
-#listen "127.0.0.1:8080", :tcp_nopush => true
+
+<%- if socket -%>listen "<%= application_root %>/tmp/sockets/unicorn.#{environment}.sock", :backlog => 64
+<%- else -%>listen "<%= host %>:<%= port %>", :tcp_nopush => true
+<%- end -%>
 
 # nuke workers after 30 seconds instead of 60 seconds (the default)
 timeout 30

metadata

@@ -2,7 +2,7 @@
 name: rsm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Oleksandr Ulianytskyi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 +03:00
+date: 2011-10-31 00:00:00 +02:00
 default_executable: rsm
 dependencies: 
 - !ruby/object:Gem::Dependency