capper 0.2.0 → 0.2.1

data/Gemfile.lock

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

data/capper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capper"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   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 <%= worker_processes %>
+worker_processes <%= unicorn_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", :prefix => "unicorn")
+                      :mode => "0644")
       upload_template("unicorn.sh", unicorn_script,
-                      :mode => "0755", :prefix => "unicorn")
+                      :mode => "0755")
     end
 
     desc "Kill unicorn (this should only be used if all else fails)"

data/lib/capper/utils/templates.rb

@@ -15,7 +15,6 @@ 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)
@@ -28,7 +27,7 @@ class Capper
         end
 
         servers.each do |server|
-          result = erb.result(get_binding(prefix, server.host))
+          result = erb.result(get_binding(server.host))
           put(result, path, options.merge!(:host => server.host))
         end
       end
@@ -39,19 +38,16 @@ class Capper
       #   "app1.example.com" => 4,
       #   "app2.example.com" => 8,
       # }
-      def get_binding(prefix, server)
+      def get_binding(server)
         b = binding()
 
-        variables.keys.select do |k|
-          k =~ /^#{prefix}_/
-        end.each do |k|
-          new_k = k.to_s.gsub(/^#{prefix}_/, '')
-          new_v = fetch(k)
+        variables.keys.each do |k|
+          v = fetch(k)
 
-          if new_v.kind_of?(Hash)
-            eval("set(:#{new_k}, \"#{new_v[server] || new_v["default"]}\")", b)
+          if v.kind_of?(Hash)
+            eval("set(:#{k}, \"#{v[server] || v["default"]}\")", b)
           else
-            eval("set(:#{new_k}, \"#{new_v}\")", b)
+            eval("set(:#{k}, \"#{v}\")", b)
           end
         end
 

metadata

@@ -1,73 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capper
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
-- "Benedikt B\xC3\xB6hm"
+authors:
+- Benedikt Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-26 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: erubis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11915860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11915860
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &11915420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano_colors
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *11915420
+- !ruby/object:Gem::Dependency
+  name: capistrano_colors
+  requirement: &11915000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *11915000
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &11914500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *11914500
 description: Capistrano is a collection of opinionated Capistrano recipes
-email: 
+email:
 - bb@xnull.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
 - .gitignore
 - .rvmrc
@@ -91,33 +87,29 @@ files:
 - lib/capper/utils/multistage.rb
 - lib/capper/utils/templates.rb
 - lib/capper/whenever.rb
-has_rdoc: true
 homepage: http://github.com/hollow/capper
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Capistrano is a collection of opinionated Capistrano recipes
 test_files: []
-