negroku 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de78c5247527b3b8887d4e8fcf3e1c605922e884
-  data.tar.gz: 0480b92ed105a7a8b6ef356e46b82b0d96181148
+  metadata.gz: fd62aa6eebe81dc9a711f56132ac7b4d3a095447
+  data.tar.gz: e18fb631a06f03b2746c79c5b655782f4f081c6d
 SHA512:
-  metadata.gz: 1e875b138af00e89a8dfd318129225cc9d78c5d9d6b193b87f0ee0a610d2eed9743fe3251e25a550198a17fe97d64b025919fc447871585aeadb8b46405cd61c
-  data.tar.gz: 1b1c4c15c8bf80b630f57c8b26f0d6b60015e68c726bfd535ba75df5c3f5778c022c390c77cac3cb128efc36d4a883e62879ab1f1a10b6ea17442de08180af8b
+  metadata.gz: e407926f1919bcfce737429d097409646b62c1fc46485f1232b7f92d5cfe24bb7c510da865a0fb2c579379e6d493f47f6fb6d70430bb44527014eb793b8fb662
+  data.tar.gz: a52b3184d06a31a1c0f3093542c7b672728ff424d83f2094719182dc1fb41b4e986c8af26d10ea113a5fad9b34d30cd6780022c1e03999b748f0b2afe1416864

data/lib/negroku/cli.rb

@@ -54,9 +54,9 @@ class App < Thor
       if File.directory?(".git")
         local_repos = %x(git remote -v | awk '{print $2}' | uniq).split("\n")
         local_repos.each do |url|
-          menu.choice(url) do |command|
-            say("Using #{command}")
-            data[:repo] = command;
+          menu.choice(url) do |server|
+            say("Using #{server}")
+            data[:repo] = server;
           end
         end
       end
@@ -68,48 +68,59 @@ class App < Thor
     end
 
     # The application target deploy server
-    choose do |menu|
-
-      say "\nTARGET SERVERS"
-      say "=============="
-      menu.prompt = "Please choose your deployment server?".bright()
-      menu.select_by = :index
-
-      # Adds the targets in the config file if there is one
-      if config[:target]
-        config[:target].each do |val|
-          menu.choice(val) do |command|
-            say("Using #{command}")
-            data[:target_server] = command;
+    say "\nTARGET SERVERS"
+    say "==============\n"
+    %w(staging production).each do |stage|
+
+      # Stage title
+      puts "\n#{stage.upcase}".foreground(:green)
+
+      # Ask server
+      choose do |menu|
+        menu.prompt = "Please choose your #{stage} deployment server?".bright()
+        menu.select_by = :index
+
+        # Adds the targets in the config file if there is one
+        if config[:target]
+          config[:target].each do |val|
+            menu.choice(val) do |server|
+              say("Using #{server} for #{stage}")
+              data[:"#{stage}_server"] = server;
+            end
           end
+        else
+          say "[INFO] There are no target urls in the default settings".color(:yellow)
         end
-      else
-        say "[INFO] There are no target urls in the default settings".color(:yellow)
-      end
 
-      menu.choice(:other) {
-        data[:target_server] = ask "Type the hostname or ip of the server to deploy to:".bright()
-      }
-    end
+        menu.choice(:other) {
+          data[:"#{stage}_server"] = ask "Type the hostname or ip of the #{stage} server to deploy to:".bright()
+        }
+      end
 
-    # Add custom domain
-    say "\nCUSTOM DOMAIN"
-    say "============="
-    if agree "Do you want to use  #{data[:target_server].gsub(/^([a-z\d]*)/, data[:application_name])}? [y/n]", true
-      data[:domains] = data[:target_server].gsub(/^([a-z\d]*)/, data[:application_name])
-    else
-      data[:domains] = ask "Please enter the domains separated by spaces"
+      # Add custom domain
+      case stage
+      when "staging"
+        domain = data[:"#{stage}_server"].gsub(/^([a-z\d]*)/, data[:application_name])
+      when "production"
+        domain = "www.#{data[:application_name]}.com"
+      end
+      if agree "Do you want to use #{domain}? [y/n]", true
+        data[:"#{stage}_domains"] = domain
+      else
+        data[:"#{stage}_domains"] = ask "Please enter the domains separated by spaces"
+      end
     end
 
-
     init(".", data)
 
     say "\n\nWhat to do next?\n".bright()
-    say "Setup your app running " + "cap deploy:setup".color(:yellow)
+    say "Setup your app running " + "cap deploy:setup".color(:yellow) + " then " + "cap deploy:cold".color(:yellow)
     say "You can try with " + "cap -T".color(:yellow) +" to see the available tasks"
-    say "Also you can check the " + "config/deploy.rb".color(:yellow) + " file, you may want to change some things there"
-    say "NOTE: If this is the first time the app is deployed, use the task " + "cap deploy:cold".color(:yellow)
-    say "\n HAPPY DEPLOY".foreground(:green)
+    say "Also you can check the following files, you may want to change some things there"
+    say "config/deploy.rb".color(:yellow)
+    say "config/deploy/staging.rb".color(:yellow)
+    say "config/deploy/production.rb".color(:yellow)
+    say "\nHAPPY DEPLOY".foreground(:green)
   end
 end
 

data/lib/negroku/helpers.rb

@@ -1,46 +1,70 @@
 def init(target=".", data)
-  puts target
+
+  # Main locations
+  target_path    = File.expand_path(target)
+  config_path = File.join(target_path, "config")
+  deploy_path = File.join(target_path, "config", "deploy")
+  capfile = File.join(target_path, "Capfile")
+  deployfile = File.join(config_path, "deploy.rb")
+  stagingfile = File.join(deploy_path, "staging.rb")
+  productionfile = File.join(deploy_path, "production.rb")
+
   # Create the cap file if not found
-  if Dir.entries(target).include?("Capfile")
+  if Dir.entries(target_path).include?("Capfile")
     puts "[Negroku] => Found Capfile!"
   else
     puts "[Negroku] => Capifying!"
-    `capify #{File.expand_path(target)}`
+    `capify #{target_path}`
+    `rm `
   end
-  path    = File.expand_path(target)
-  capfile = File.expand_path(File.join(target, "Capfile"))
 
   # Find or create config folder
-  unless File.directory?(File.join(path, "config"))
+  unless File.directory?(config_path)
     puts "[Negroku] => Could not find the \"config\" folder. Creating it now!"
-    %x(mkdir #{File.join(path, 'config')})
+    %x(mkdir #{config_path})
+  end
+
+  # Find or create deploy folder
+  unless File.directory?(deploy_path)
+    puts "[Negroku] => Could not find the \"deploy\" folder. Creating it now!"
+    %x(mkdir #{deploy_path})
   end
 
   # replace and rename older deploy.rb
-  if File.exist?(File.join(path, "config", "deploy.rb"))
+  if File.exist?(deployfile)
     puts "[Negroku] => Backing up deploy.rb"
-    old_versions = Dir.entries(File.join(path, 'config')).map {|entree| entree if entree =~ /deploy\.old\.(\d+)\.rb$/}.compact!
+    old_versions = Dir.entries(config_path).map {|entree| entree if entree =~ /deploy\.old\.(\d+)\.rb$/}.compact!
     if old_versions.empty?
-      %x(mv #{File.join(path, 'config', 'deploy.rb')} #{File.join(path, 'config', 'deploy.old.1.rb')})
+      %x(mv #{deployfile} #{File.join(config_path, 'deploy.old.1.rb')})
     else
       version = old_versions.last.match('^deploy\.old\.(\d+)\.rb$')[1].to_i + 1
-      %x(mv #{File.join(path, 'config', 'deploy.rb')} #{File.join(path, 'config', "deploy.old.#{version}.rb")})
+      %x(mv #{deployfile} #{File.join(config_path, "deploy.old.#{version}.rb")})
     end
-  else
-    puts "[Negroku] => Could not find deploy.rb. Creating a new one!"
   end
 
   # Create the new deploy
   puts "[Negroku] => Writing new deploy.rb."
   erb = File.read(File.join(File.dirname(__FILE__), 'templates', 'deploy.rb.erb'))
-  File.open(File.join(path, 'config', 'deploy.rb'), 'w') do |f|
+  File.open(deployfile, 'w') do |f|
+    f.write ERB.new(erb).result(binding)
+  end
+
+  # Create the new configuration stages
+  puts "[Negroku] => Writing new deploy/staging.rb"
+  erb = File.read(File.join(File.dirname(__FILE__), 'templates', 'staging.rb.erb'))
+  File.open(stagingfile, 'w') do |f|
+    f.write ERB.new(erb).result(binding)
+  end
+  puts "[Negroku] => Writing new deploy/production.rb"
+  erb = File.read(File.join(File.dirname(__FILE__), 'templates', 'production.rb.erb'))
+  File.open(productionfile, 'w') do |f|
     f.write ERB.new(erb).result(binding)
   end
 
   # checks for both require "negroku" and require "negroku/initializer"
   unless File.open(File.join('Capfile'), 'r').read.include?('require "negroku"')
-    puts "[Negroku] => Adding Negroku Loader inside #{path}/Capfile."
-    File.open(File.join(path, 'Capfile'), "a") do |cfile|
+    puts "[Negroku] => Adding Negroku Loader inside #{capfile}."
+    File.open(capfile, "a") do |cfile|
   cfile << <<-capfile
   \n
   load 'deploy/assets'

data/lib/negroku/tasks/base.rb

@@ -12,11 +12,7 @@ end
 
 # Review and modify the tasks below on a per-app/language/framework basis.
 namespace :deploy do
-  after "deploy:update_code", "deploy:post"
-  desc "Performs the post-deploy tasks."
-  task :post do
-    migrate
-  end
+  after "deploy:update_code", "deploy:migrate"
 
   after "deploy:setup", "deploy:setup_shared"
   desc "Sets up additional folders/files after deploy:setup."

data/lib/negroku/tasks/unicorn.rb

@@ -37,7 +37,6 @@ namespace :unicorn do
     run "#{sudo} mv /tmp/unicorn.rb #{shared_path}/config/"
   end
 
-  after "deploy", "unicorn:restart"
   after "deploy:cold", "unicorn:start"
   after 'deploy:restart', 'unicorn:restart'
 end

data/lib/negroku/templates/deploy.rb.erb

@@ -1,5 +1,7 @@
-# Servers and their roles.
-server "<%= data[:target_server] %>", :web, :app, :db, primary: true
+# Set server stages
+set :stages, %w(production staging)
+set :default_stage, "staging"
+require 'capistrano/ext/multistage'
 
 # Server-side information.
 set :application, "<%= data[:application_name] %>"
@@ -9,16 +11,8 @@ set :deploy_to,   "/home/#{user}/applications/#{application}"
 # Repository (if any) configuration.
 set :deploy_via, :remote_cache
 set :repository, "<%= data[:repo] %>"
-set :branch,     "production"   # Optional, defaults to master
-# set :remote,   "negroku"      # Optional, defaults to origin
 # set :git_enable_submodules, 1
 
-# Web server configuration
-set :domains, "<%= data[:domains] %>"
-
-# Rails
-# set :rails_env, 		"production"
-
 # Database
 # set :migrate_env,    "migration"
 

data/lib/negroku/templates/production.rb.erb

@@ -0,0 +1,14 @@
+## PRODUCTION CONFIGURATION
+
+# Servers and their roles.
+server "<%= data[:production_server] %>", :web, :app, :db, primary: true
+
+# Web server configuration
+set :domains, 		"<%= data[:production_domains] %>"
+
+# Source
+set :branch,     	"production"		# Optional, defaults to master
+# set :remote,   	"origin"			# Optional, defaults to origin
+
+# Rails
+# set :rails_env, 	"production"		# Optional, defaults to production

data/lib/negroku/templates/staging.rb.erb

@@ -0,0 +1,14 @@
+## STAGING CONFIGURATION
+
+# Servers and their roles.
+server "<%= data[:staging_server] %>", :web, :app, :db, primary: true
+
+# Web server configuration
+set :domains, 		"<%= data[:staging_domains] %>"
+
+# Source
+set :branch,     	"production"		# Optional, defaults to master
+# set :remote,   	"origin"			# Optional, defaults to origin
+
+# Rails
+# set :rails_env, 	"staging"		# Optional, defaults to production

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -101,6 +101,8 @@ files:
 - lib/negroku/tasks/templates/unicorn.erb
 - lib/negroku/tasks/unicorn.rb
 - lib/negroku/templates/deploy.rb.erb
+- lib/negroku/templates/production.rb.erb
+- lib/negroku/templates/staging.rb.erb
 - lib/negroku/version.rb
 - lib/negroku.rb
 - README.md