akitaonrails-locarails 1.1.0 → 1.1.1

data/Manifest

@@ -8,7 +8,7 @@ lib/locarails.rb
 lib/locarails/version.rb
 templates/database.locaweb.yml.erb
 templates/deploy.rb.erb
-templates/deploy.common.rb
+templates/deploy.common.rb.erb
 templates/locaweb_backup.rb
 templates/ssh_helper.rb
 templates/.gitignore

data/bin/locarails

@@ -137,7 +137,8 @@ FileUtils.copy_file("#{config.bin_path}/../templates/locaweb_backup.rb",
 File.open("#{config.local_path}/config/deploy.rb", 'w+') do |out| 
   erb = ERB.new(File.read("#{config.bin_path}/../templates/deploy.rb.erb"))
   buffer = erb.result(config.send(:binding))
-  buffer << File.read("#{config.bin_path}/../templates/deploy.common.rb")
+  erb = ERB.new(File.read("#{config.bin_path}/../templates/deploy.common.rb.erb"))
+  buffer << erb.result(config.send(:binding)) 
   out.puts buffer
 end
 

data/lib/locarails/version.rb

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

data/locarails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{locarails}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = %q{A maneira mais simples para instalar aplicacoes Rails na hospedagem Linux da Locaweb.}
   s.email = %q{fabio.akita@locaweb.com.br}
   s.executables = ["locarails"]
-  s.files = ["bin/locarails", "bin/locarails.cmd", "LICENSE", "Manifest", "README", "locarails.gemspec", "lib/locarails.rb", "lib/locarails/version.rb", "templates/database.locaweb.yml.erb", "templates/deploy.rb.erb", "templates/deploy.common.rb", "templates/locaweb_backup.rb", "templates/ssh_helper.rb", "templates/.gitignore"]
+  s.files = ["bin/locarails", "bin/locarails.cmd", "LICENSE", "Manifest", "README", "locarails.gemspec", "lib/locarails.rb", "lib/locarails/version.rb", "templates/database.locaweb.yml.erb", "templates/deploy.rb.erb", "templates/deploy.common.rb.erb", "templates/locaweb_backup.rb", "templates/ssh_helper.rb", "templates/.gitignore"]
   s.has_rdoc = true
   s.homepage = %q{http://www.locaweb.com.br/rails}
   s.require_paths = ["lib"]

data/templates/{deploy.common.rb → deploy.common.rb.erb}

@@ -13,16 +13,18 @@ end
 desc "Garante que as configuracoes estao adequadas"
 task :before_setup do
   ts = Time.now.strftime("%y%m%d%H%M%S")
+  <% if config.mode == 'git' %>
   # git folder
+  has_git = false
   run "test -d #{git_repo} || mkdir -p -m 755 #{git_repo}"
   run "test -d #{git_repo}/.git || cd #{git_repo} && git init"
   git_config = File.join(File.dirname(__FILE__), "../.git/config")
-  has_git = false
   if File.exists?(git_config) && File.read(git_config) !~ /locaweb/
     `git remote add locaweb #{repository}`
     `git push locaweb #{branch}`
     has_git = true
   end
+  <% end %>
   
   run "if [ -d #{deploy_to} ]; then mv #{deploy_to} #{deploy_to}-#{ts}.old ; fi"
   run "test -d #{deploy_to} || mkdir -m 755 #{deploy_to}"
@@ -31,12 +33,13 @@ task :before_setup do
   run "if [ -h #{site_path} ]; then mv #{site_path} #{site_path}-#{ts}.old ; fi"
   run "ln -s #{deploy_to}/current/public #{public_html}/#{application}"
   put File.read(File.dirname(__FILE__) + "/database.locaweb.yml"), "#{deploy_to}/etc/database.yml"
-
-  # ssh keygen
-  put File.read(File.dirname(__FILE__) + "/ssh_helper.rb"), "#{deploy_to}/etc/ssh_helper.rb"
-  run "test -f .ssh/id_rsa || ruby #{deploy_to}/etc/ssh_helper.rb /home/#{user}/.ssh/id_rsa #{domain} #{user}"
   
-  unless has_git
+  <% if config.mode == 'git' %>
+  if has_git
+    # ssh keygen
+    put File.read(File.dirname(__FILE__) + "/ssh_helper.rb"), "#{deploy_to}/etc/ssh_helper.rb"
+    run "test -f .ssh/id_rsa || ruby #{deploy_to}/etc/ssh_helper.rb /home/#{user}/.ssh/id_rsa #{domain} #{user}"
+  else
     3.times { puts "" }
     puts "==============================================================="
     puts "Rode os seguintes comandos depois de criar seu repositorio Git:"
@@ -46,6 +49,7 @@ task :before_setup do
     puts "==============================================================="
     3.times { puts "" }
   end
+  <% end %>
 end
 
 desc "Prepare the production database before migration"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: akitaonrails-locarails
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Fabio Akita
@@ -32,7 +32,7 @@ files:
 - lib/locarails/version.rb
 - templates/database.locaweb.yml.erb
 - templates/deploy.rb.erb
-- templates/deploy.common.rb
+- templates/deploy.common.rb.erb
 - templates/locaweb_backup.rb
 - templates/ssh_helper.rb
 - templates/.gitignore