capitate 0.3.3 → 0.3.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.4 2008-05-05
+
+* Removed upload plugin (obsolete)
+* Fixing nginx host recipe
+
 == 0.3.3 2008-04-29
 
 * Adding merb init script (for Centos)

data/Manifest.txt

@@ -19,7 +19,6 @@ lib/capitate/plugins/gem.rb
 lib/capitate/plugins/prompt.rb
 lib/capitate/plugins/script.rb
 lib/capitate/plugins/templates.rb
-lib/capitate/plugins/upload.rb
 lib/capitate/plugins/utils.rb
 lib/capitate/plugins/yum.rb
 lib/capitate/recipes.rb

data/lib/capitate/version.rb

@@ -2,7 +2,7 @@ module Capitate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/capitate.rb

@@ -20,7 +20,6 @@ require 'capitate/plugins/utils'
 require 'capitate/plugins/script'
 require 'capitate/plugins/prompt'
 require 'capitate/plugins/templates'
-require 'capitate/plugins/upload'
 require 'capitate/plugins/yum'
 
 # Extensions + Patches

data/lib/recipes/memcached.rb

@@ -46,7 +46,7 @@ namespace :memcached do
     fetch_or_default(:memcached_servers, [ "localhost:11211" ])
     fetch_or_default(:memcached_yml_template, "memcached/memcached.yml.erb")    
 
-    utils.install_template(memcached_yml_template, "#{shared_path}/config/memcached.yml")
+    put(memcached_yml_template, "#{shared_path}/config/memcached.yml")
   end
 
   desc "Symlink memcached configuration after deploy."

data/lib/recipes/nginx.rb

@@ -32,13 +32,10 @@ namespace :nginx do
       fetch(:nginx_upstream_size)
       fetch(:nginx_upstream_port)
     
-      set :ports, (0...nginx_upstream_size).collect { |i| nginx_upstream_port + i }
+      set :nginx_upstream_ports, (0...nginx_upstream_size.to_i).collect { |i| nginx_upstream_port.to_i + i }
       set :public_path, current_path + "/public"
     
-      run "mkdir -p #{shared_path}/config"
-      put template.load("nginx/nginx_vhost_generic.conf.erb"), "/tmp/nginx_#{nginx_upstream_name}.conf"    
-    
-      sudo "install -o root /tmp/nginx_#{nginx_upstream_name}.conf /etc/nginx/vhosts/#{nginx_upstream_name}.conf"        
+      utils.install_template("nginx/nginx_vhost_generic.conf.erb", "/etc/nginx/vhosts/#{nginx_upstream_name}.conf")
     end
     
   end

data/lib/templates/nginx/nginx_vhost_generic.conf.erb

@@ -55,7 +55,7 @@ server {
       # For iphone unique url
       if ($http_user_agent ~* "(iPhone|iPod)") {
         rewrite ^/$ /iphone break;
-        proxy_pass http://<%= nginx_upstream %>;
+        proxy_pass http://<%= nginx_upstream_name %>;
         break;
       }
 
@@ -76,7 +76,7 @@ server {
       }
 
       if (!-f $request_filename) {
-        proxy_pass http://<%= nginx_upstream %>;
+        proxy_pass http://<%= nginx_upstream_name %>;
         break;
       }
     }

data/website/index.html

@@ -35,7 +35,7 @@
 
     <div id="version" class="clickable box" onclick='document.location = "http://rubyforge.org/projects/capitate"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.3.3</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.3.4</a>
     </div>
     
     <div id="recipes">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-29 00:00:00 -04:00
+date: 2008-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ files:
 - lib/capitate/plugins/prompt.rb
 - lib/capitate/plugins/script.rb
 - lib/capitate/plugins/templates.rb
-- lib/capitate/plugins/upload.rb
 - lib/capitate/plugins/utils.rb
 - lib/capitate/plugins/yum.rb
 - lib/capitate/recipes.rb

data/lib/capitate/plugins/upload.rb

@@ -1,62 +0,0 @@
-module Capitate::Plugins::Upload
-  
-  # Upload file with source path.
-  #
-  # Data is streamed.
-  #
-  # ==== Options
-  # +src_path+:: Source path
-  # +dest_path+:: Remote destination path
-  # +options+:: Options (see capistrano 'put')
-  #
-  # ==== Examples
-  #   upload.file("/tmp/large_file.tgz", "#{shared_path}/tmp/large_file.tgz")
-  #
-  def file(src_path, dest_path, options = {})
-    data = FileData.new(src_path)
-    put(data, dest_path, options)    
-  end
-    
-  # Stream data with Net::SFTP by looking like an Array
-  class FileData
-    
-    def initialize(path)
-      @path = path
-      @next_start = 0
-    end
-    
-    def [](start, length)
-      
-      if start != @next_start
-        raise <<-EOS
-        
-        Can only access data sequentially; so we can stream it (The next start position should have been: #{@next_start})
-        
-        EOS
-      end
-      
-      data = file.read(length)
-      
-      @next_start = start + length
-      close if @next_start >= self.length
-        
-      data
-    end
-    
-    def length
-      @file_size ||= File.size(@path)
-    end
-    
-    def file
-      @file ||= File.open(@path, "r")
-    end
-    
-    def close
-      @file.close if @file
-    end
-    
-  end
-  
-end
-  
-Capistrano.plugin :upload, Capitate::Plugins::Upload