capper 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capper (0.2.1)
+    capper (0.2.2)
       capistrano
       capistrano_colors
       erubis

data/capper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capper"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
   s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
   s.authors = ["Benedikt Böhm"]

data/lib/capper/templates/unicorn.rb.erb

@@ -6,7 +6,7 @@
 
 # Use at least one worker per core if you're on a dedicated server,
 # more will usually help for _short_ waits on databases/caches.
-worker_processes <%= unicorn_worker_processes %>
+worker_processes <%= worker_processes %>
 
 # Help ensure your application will always spawn in the symlinked
 # "current" directory that Capistrano sets up.

data/lib/capper/unicorn.rb

@@ -37,9 +37,9 @@ Capper.load do
     desc "Generate unicorn configuration files"
     task :setup, :roles => :app, :except => { :no_release => true } do
       upload_template("unicorn.rb", unicorn_config,
-                      :mode => "0644")
+                      :mode => "0644", :prefix => "unicorn")
       upload_template("unicorn.sh", unicorn_script,
-                      :mode => "0755")
+                      :mode => "0755", :prefix => "unicorn")
     end
 
     desc "Kill unicorn (this should only be used if all else fails)"

data/lib/capper/utils/templates.rb

@@ -15,6 +15,7 @@ class Capper
         end
 
         erb = Erubis::Eruby.new(File.open(template).read)
+        prefix = options.delete(:prefix)
 
         if task = current_task
           servers = find_servers_for_task(task, options)
@@ -27,7 +28,7 @@ class Capper
         end
 
         servers.each do |server|
-          result = erb.result(get_binding(server.host))
+          result = erb.result(get_binding(prefix, server.host))
           put(result, path, options.merge!(:host => server.host))
         end
       end
@@ -38,10 +39,12 @@ class Capper
       #   "app1.example.com" => 4,
       #   "app2.example.com" => 8,
       # }
-      def get_binding(server)
+      def get_binding(prefix, server)
         b = binding()
 
-        variables.keys.each do |k|
+        variables.keys.select do |k|
+          k =~ /^#{prefix}_/
+        end.each do |k|
           v = fetch(k)
 
           if v.kind_of?(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &11915860 !ruby/object:Gem::Requirement
+  requirement: &16425020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11915860
+  version_requirements: *16425020
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &11915420 !ruby/object:Gem::Requirement
+  requirement: &16424580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11915420
+  version_requirements: *16424580
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &11915000 !ruby/object:Gem::Requirement
+  requirement: &16424160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11915000
+  version_requirements: *16424160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11914500 !ruby/object:Gem::Requirement
+  requirement: &16423660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11914500
+  version_requirements: *16423660
 description: Capistrano is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de