ricodigo-capistrano-recipes 0.1.7 → 0.1.8

data/Gemfile

@@ -8,7 +8,7 @@ gem "unicorn"
 gem "magent"
 
 group :development do
-  gem "jeweler", "~> 1.6.0"
+  gem "jeweler", "~> 1.6.3"
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -24,8 +24,8 @@ GEM
     git (1.2.5)
     highline (1.6.2)
     i18n (0.5.0)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     kgio (2.4.0)
@@ -51,7 +51,7 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rack (1.2.2)
-    rake (0.8.7)
+    rake (0.9.2)
     rcov (0.9.9)
     shoulda (2.11.3)
     tzinfo (0.3.27)
@@ -68,7 +68,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   capistrano (>= 2.5.9)
   capistrano-ext (>= 1.2.1)
-  jeweler (~> 1.6.0)
+  jeweler (~> 1.6.3)
   magent
   mongoid
   net-ssh

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/bin/ricodigo-install-server

@@ -69,29 +69,6 @@ def install_postfix(ssh)
   end
 end
 
-def setup_firewall(ssh)
-  puts ">> Setup firewall..."
-
-  ssh.exec! "sudo ufw disable" do |channel, stream, data|
-    puts data
-  end
-
-  commands = []
-  commands << "sudo ufw allow to any port 80"
-  commands << "sudo ufw allow to any port 443"
-  commands << "sudo ufw allow to any port 22"
-  commands << "sudo ufw allow to any port 53"
-  commands << "sudo ufw allow to any port 25"
-  commands << "sudo ufw allow to any port 587"
-  commands << "sudo ufw default deny"
-
-  ssh.exec!(commands.join(" && ")) {|c,s,d| puts d }
-  ssh.exec!("sudo ufw enable") {|c,s,d| puts d; c.send_data("yes") }
-
-  ssh.exec! "iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT"
-  ssh.exec! "iptables -A INPUT -i lo -j ACCEPT"
-end
-
 def install_rvm(ssh)
   puts "Installing RVM..."
 
@@ -106,7 +83,6 @@ source /etc/rvmrc
 source /usr/local/rvm/scripts/rvm
 
 rvm install 1.9.2
-rvm install ree
 
 rvm use 1.9.2 --default
 @

data/lib/recipes/push_deploy.rb

@@ -5,11 +5,15 @@ Capistrano::Configuration.instance.load do
     task :setup, :roles => :app  do
       server = roles[:app].servers.first
 
+      origin = Capistrano::CLI.ui.ask("Enter repository url to clone:")
+
       run "rm -rf #{push_deploy_repo}"
       run "mkdir -p ~/code"
-      run "git clone --depth=1 #{repository} #{push_deploy_repo}"
+      run "git clone --depth=1 #{origin} #{push_deploy_repo}"
       run "cd #{push_deploy_repo} && git config receive.denyCurrentBranch ignore"
 
+      repo_url = "#{user}\@#{server}:#{push_deploy_repo}"
+
       hook = %@#!/bin/bash
 cd ..
 GIT_DIR=$(pwd)/.git
@@ -24,17 +28,20 @@ cap #{environment} deploy
       put hook, hook_path
       run "chmod 755 #{hook_path}"
 
+      run "cd #{current_path} && git remote rm origin && git remote add origin #{repo_url}"
+
       puts %@
 
 == Instructions
 
 add deploy repository to your remotes
 
-  git remote add deploy #{user}\@#{server}:#{push_deploy_repo}
+  git remote add deploy #{repo_url}
 
 add this to your deploy.rb
 
-  set :repository, "#{user}\@#{server}:#{push_deploy_repo}"
+  set :repository, "#{repo_url}"
+  set :branch, "origin/master"
 
 to deploy a branch just type:
 

data/ricodigo-capistrano-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ricodigo-capistrano-recipes}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2011-05-28}
+  s.date = %q{2011-07-31}
   s.default_executable = %q{ricodigo-install-server}
   s.description = %q{our capistrano recipes. forked from capistrano-recipes}
   s.email = %q{krawek@gmail.com}
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<unicorn>, [">= 0"])
       s.add_runtime_dependency(%q<magent>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongoid>, [">= 0"])
       s.add_dependency(%q<unicorn>, [">= 0"])
       s.add_dependency(%q<magent>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -89,7 +89,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<unicorn>, [">= 0"])
     s.add_dependency(%q<magent>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<rcov>, [">= 0"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 -05:00
+date: 2011-07-31 00:00:00 -05:00
 default_executable: ricodigo-install-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,8 +109,8 @@ dependencies:
         segments: 
         - 1
         - 6
-        - 0
-        version: 1.6.0
+        - 3
+        version: 1.6.3
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1375416349449447844
+      hash: 2332766521845656132
       segments: 
       - 0
       version: "0"