vlad-thin 1.1.1 → 1.2.0

data/README.rdoc

@@ -8,7 +8,7 @@ Yell at me (via an issue) if thin’s bundled vlad.rake changes, I’m totally n
 
 == Thanks
 
-* [MichaelXavier](https://github.com/MichaelXavier)
+* https://github.com/MichaelXavier
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/vlad/thin.rb

@@ -7,8 +7,8 @@ namespace :vlad do
   ##
   # Thin app server
 
-  set :thin_address,       "127.0.0.1"
-  set :thin_command,       'thin'
+  set :thin_address,       nil
+  set :thin_command,       "thin"
   set(:thin_conf)          { "#{shared_path}/thin_cluster.conf" }
   set :thin_environment,   "production"
   set :thin_group,         nil
@@ -19,46 +19,51 @@ namespace :vlad do
   set :thin_prefix,        nil
   set :thin_servers,       2
   set :thin_user,          nil
+  
+  set :thin_uses_bundler,  true
 
   desc "Prepares application servers for deployment. thin
 configuration is set via the thin_* variables.".cleanup
 
   remote_task :setup_app, :roles => :app do
-  
-    raise(ArgumentError, "Please provide either thin_socket or thin_port") if thin_port.nil? && thin_socket.nil?
-  
     cmd = [
-           "#{thin_command} config",
-           "-s #{thin_servers}",
-           ("-S #{thin_socket}" if thin_socket),
-           "-e #{thin_environment}",
-           "-a #{thin_address}",
-           "-c #{current_path}",
-           "-C #{thin_conf}",
-           ("-P #{thin_pid_file}" if thin_pid_file),
-           ("-l #{thin_log_file}" if thin_log_file),
-           ("--user #{thin_user}" if thin_user),
-           ("--group #{thin_group}" if thin_group),
-           ("--prefix #{thin_prefix}" if thin_prefix),
-           ("-p #{thin_port}" if thin_port),
+           "config",
+           (%(-s "#{thin_servers}") if thin_servers),
+           (%(-S "#{thin_socket}") if thin_socket),
+           (%(-e "#{thin_environment}") if thin_environment),
+           (%(-a "#{thin_address}") if thin_address),
+           %(-c "#{current_path}"),
+           (%(-C "#{thin_conf}") if thin_conf),
+           (%(-P "#{thin_pid_file}") if thin_pid_file),
+           (%(-l "#{thin_log_file}") if thin_log_file),
+           (%(--user "#{thin_user}") if thin_user),
+           (%(--group "#{thin_group}") if thin_group),
+           (%(--prefix "#{thin_prefix}") if thin_prefix),
+           (%(-p "#{thin_port}") if thin_port),
           ].compact.join ' '
 
-    run cmd
+    thin(cmd)
   end
 
   def thin(cmd) # :nodoc:
-    "#{thin_command} #{cmd} -C #{thin_conf}"
+    command = if thin_uses_bundler
+      %(BUNDLE_GEMFILE="#{current_path}/Gemfile" bundle exec #{thin_command} #{cmd} -C "#{thin_conf}")
+    else
+      %(#{thin_command} #{cmd} -C "#{thin_conf}")
+    end
+
+    %(cd "#{current_path}" && #{command})
   end
 
   desc "Restart the app servers"
 
   remote_task :start_app, :roles => :app do
-    run thin("restart -O -s #{thin_servers}")
+    run thin(%(restart -O -s "#{thin_servers}"))
   end
 
   desc "Stop the app servers"
 
   remote_task :stop_app, :roles => :app do
-    run thin("stop -s #{thin_servers}")
+    run thin(%(stop -s "#{thin_servers}"))
   end
 end

data/vlad-thin.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "vlad-thin"
-  s.version = "1.1.1"
+  s.name = %q{vlad-thin}
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Smith"]
-  s.date = "2012-03-02"
-  s.description = "This is thin's own example/vlad.rake in a gem"
-  s.email = "phil.h.smith@gmail.com"
+  s.date = %q{2013-02-06}
+  s.description = %q{This is thin's own example/vlad.rake in a gem}
+  s.email = %q{phil.h.smith@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -25,15 +25,16 @@ Gem::Specification.new do |s|
     "lib/vlad/thin.rb",
     "vlad-thin.gemspec"
   ]
-  s.homepage = "http://github.com/phs/vlad-thin"
+  s.homepage = %q{http://github.com/phs/vlad-thin}
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
-  s.summary = "Control thin with vlad"
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Control thin with vlad}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-thin
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Phil Smith
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2013-02-06 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -50,6 +48,7 @@ files:
 - VERSION
 - lib/vlad/thin.rb
 - vlad-thin.gemspec
+has_rdoc: true
 homepage: http://github.com/phs/vlad-thin
 licenses: []
 
@@ -59,27 +58,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Control thin with vlad