cmdeploy 0.2.5 → 0.2.6

data/bin/cmdeploy

@@ -3,59 +3,63 @@
 require 'fileutils'
 require 'erb'
 
-def template(application,from,to)
-  erb = File.read("#{File.dirname(__FILE__)}/../lib/cmdeploy/recipes/templates/#{from}")
-  File.open(to,"w") do |output|
-    output.write(ERB.new(erb).result(binding))
-  end
-end
+module CMDeploy
 
-if ARGV.size == 0
-  # no arguments provided, show usage
-  puts "Usage of #{File.basename(__FILE__)}: bundle exec cmdeploy [-f] APPNAME"
-  puts " -f => force to overwrite existing files"
-else
-  force = false
-  application = nil
-
-  ARGV.each do |arg|
-    case arg
-      when /-f/ then
-        force = true
-      else
-        application = application || arg   
+  def self.template(application,from,to)
+    erb = File.read("#{File.dirname(__FILE__)}/../lib/cmdeploy/recipes/templates/#{from}")
+    File.open(to,"w") do |output|
+      output.write(ERB.new(erb).result(binding))
     end
   end
 
-  # checking where we are...
-  puts "Installing templates #{"[force mode] " if force}for application [#{application}]..."
-  puts "Checking actual folder..."
-  %w(app app/controllers config).each do |folder|
-    unless File.exists?(folder) && File.directory?(folder)
-      puts "=> Could not find folder [#{folder}]. You need to be in a Ruby On Rails root folder"
-      exit 1
+  if ARGV.size == 0
+    # no arguments provided, show usage
+    puts "Usage of #{File.basename(__FILE__)}: bundle exec cmdeploy [-f] APPNAME"
+    puts " -f => force to overwrite existing files"
+  else
+    force = false
+    application = nil
+
+    ARGV.each do |arg|
+      case arg
+        when /-f/ then
+          force = true
+        else
+          application = application || arg   
+      end
     end
-  end
 
-  list = []
-  list << ["deploy_rb.erb","config/deploy.rb"]
-  list << ["unicorn_rb.erb","config/unicorn.rb"]
+    # checking where we are...
+    puts "Installing templates #{"[force mode] " if force}for application [#{application}]..."
+    puts "Checking actual folder..."
+    %w(app app/controllers config).each do |folder|
+      unless File.exists?(folder) && File.directory?(folder)
+        puts "=> Could not find folder [#{folder}]. You need to be in a Ruby On Rails root folder"
+        exit 1
+      end
+    end
 
-  list.each do |item|
-    from = item[0]
-    to  = item[1]
+    list = []
+    list << ["deploy_rb.erb","config/deploy.rb"]
+    list << ["unicorn_rb.erb","config/unicorn.rb"]
 
-    puts "Processing [#{to}]..."
+    list.each do |item|
+      from = item[0]
+      to  = item[1]
 
-    if File.exists?(to)
-      if force
-        puts "overwrite existing file"
-      else
-        puts "=> File [#{to}] exists. Please delete or use -f to overwrite."
-        exit 1
+      puts "Processing [#{to}]..."
+
+      if File.exists?(to)
+        if force
+          puts "overwrite existing file"
+        else
+          puts "=> File [#{to}] exists. Please delete or use -f to overwrite."
+          exit 1
+        end
       end
+      CMDeploy.template(application,from,to)
     end
-    template(application,from,to)
+
   end
 
 end

data/lib/cmdeploy/recipes/assets.rb

@@ -1,17 +1,15 @@
-module CMDeploy
-  configuration = Capistrano::Configuration.respond_to?(:instance) ?
-    Capistrano::Configuration.instance(:must_exist) :
-    Capistrano.configuration(:must_exist)
+configuration = Capistrano::Configuration.respond_to?(:instance) ?
+  Capistrano::Configuration.instance(:must_exist) :
+  Capistrano.configuration(:must_exist)
 
-  configuration.load do
+configuration.load do
 
-    namespace :deploy do
-      namespace :assets do
-        desc "cmdeploy: Assets precompilation"
-        task :precompile do
-          run "cd #{release_path} && #{rake} RAILS_RELATIVE_URL_ROOT=#{app_relative_root_url} RAILS_ENV=#{stage} RAILS_GROUPS=assets assets:precompile"
-        end
+  namespace :deploy do
+    namespace :assets do
+      desc "cmdeploy: Assets precompilation"
+      task :precompile do
+        run "cd #{release_path} && #{rake} RAILS_RELATIVE_URL_ROOT=#{app_relative_root_url} RAILS_ENV=#{stage} RAILS_GROUPS=assets assets:precompile"
       end
     end
   end
-end
+end

data/lib/cmdeploy/recipes/base.rb

@@ -1,11 +1,4 @@
-module CMDeploy
-  def set_default(name, *args, &block)
-    set(name, *args, &block) unless exists?(name)
-  end
-
-  def template(from, to)
-    erb = File.read("#{File.dirname(__FILE__)}/templates/#{from}")
-    put ERB.new(erb).result(binding), to
-  end
-
+def cmdeploy_template(from, to)
+  erb = File.read("#{File.dirname(__FILE__)}/templates/#{from}")
+  put ERB.new(erb).result(binding), to
 end

data/lib/cmdeploy/recipes/bundler.rb

@@ -1,20 +1,18 @@
-module CMDeploy
-  configuration = Capistrano::Configuration.respond_to?(:instance) ?
-    Capistrano::Configuration.instance(:must_exist) :
-    Capistrano.configuration(:must_exist)
+configuration = Capistrano::Configuration.respond_to?(:instance) ?
+  Capistrano::Configuration.instance(:must_exist) :
+  Capistrano.configuration(:must_exist)
 
-  configuration.load do
+configuration.load do
 
-    namespace :deploy do
-
-      desc "cmdeploy: check and install gems via bundler"
-      task :bundle_setup, roles: :app do
-        run ". ~/.bashrc && cd #{release_path} && (bundle check || bundle install --without development) && bundle install --binstubs"
-      end
-      after "deploy:assets:symlink", "deploy:bundle_setup"
+  namespace :deploy do
 
+    desc "cmdeploy: check and install gems via bundler"
+    task :bundle_setup, roles: :app do
+      run ". ~/.bashrc && cd #{release_path} && (bundle check || bundle install --without development) && bundle install --binstubs"
     end
-
+    after "deploy:assets:symlink", "deploy:bundle_setup"
 
   end
-end
+
+
+end

data/lib/cmdeploy/recipes/nginx.rb

@@ -1,30 +1,27 @@
-module CMDeploy
-  configuration = Capistrano::Configuration.respond_to?(:instance) ?
-    Capistrano::Configuration.instance(:must_exist) :
-    Capistrano.configuration(:must_exist)
+configuration = Capistrano::Configuration.respond_to?(:instance) ?
+  Capistrano::Configuration.instance(:must_exist) :
+  Capistrano.configuration(:must_exist)
 
-  configuration.load do
+configuration.load do
 
-    namespace :nginx do
-      desc "cmdeploy: setup nginx configuration for this application"
-      task :setup, roles: :web do
-        template("nginx_unicorn.erb","/tmp/nginx_unicorn")
-        run "mv /tmp/nginx_unicorn #{nginx_conf_folder}/#{application}.conf"
+  namespace :nginx do
+    desc "cmdeploy: setup nginx configuration for this application"
+    task :setup, roles: :web do
+      cmdeploy_template("nginx_unicorn.erb","/tmp/nginx_unicorn")
+      run "mv /tmp/nginx_unicorn #{nginx_conf_folder}/#{application}.conf"
 
-        template("nginx_unicorn_upstream.erb","/tmp/nginx_unicorn_upstream")
-        run "mv /tmp/nginx_unicorn_upstream #{nginx_conf_folder}/upstream/#{application}.conf"
-      end
-      after "deploy:setup", "nginx:setup"
+      cmdeploy_template("nginx_unicorn_upstream.erb","/tmp/nginx_unicorn_upstream")
+      run "mv /tmp/nginx_unicorn_upstream #{nginx_conf_folder}/upstream/#{application}.conf"
+    end
+    after "deploy:setup", "nginx:setup"
 
-      %w[start stop restart status reload configtest].each do |command|
-        desc "cmdeploy: #{command} nginx"
-        task command, roles: :web do
-          run "#{sudo} /sbin/service nginx #{command}"
-        end
+    %w[start stop restart status reload configtest].each do |command|
+      desc "cmdeploy: #{command} nginx"
+      task command, roles: :web do
+        run "#{sudo} /sbin/service nginx #{command}"
       end
-
     end
 
-
   end
+
 end

data/lib/cmdeploy/recipes/password_file.rb

@@ -1,4 +1,4 @@
-module CMDeploy
+
   configuration = Capistrano::Configuration.respond_to?(:instance) ?
     Capistrano::Configuration.instance(:must_exist) :
     Capistrano.configuration(:must_exist)
@@ -21,4 +21,3 @@ module CMDeploy
 
 
   end
-end

data/lib/cmdeploy/recipes/revision_history.rb

@@ -1,19 +1,17 @@
-module CMDeploy
-  configuration = Capistrano::Configuration.respond_to?(:instance) ?
-    Capistrano::Configuration.instance(:must_exist) :
-    Capistrano.configuration(:must_exist)
+configuration = Capistrano::Configuration.respond_to?(:instance) ?
+  Capistrano::Configuration.instance(:must_exist) :
+  Capistrano.configuration(:must_exist)
 
-  configuration.load do
+configuration.load do
 
-    namespace :deploy do
-
-      desc "cmdeploy: fetch revision history"
-      task :fetch_revision_history,  roles: :app do
-        run "cd #{release_path} && svn log --xml #{release_path} > revision.xml"
-      end
+  namespace :deploy do
 
+    desc "cmdeploy: fetch revision history"
+    task :fetch_revision_history,  roles: :app do
+      run "cd #{release_path} && svn log --xml #{release_path} > revision.xml"
     end
-    after "deploy:assets:precompile", "deploy:fetch_revision_history"
 
   end
-end
+  after "deploy:assets:precompile", "deploy:fetch_revision_history"
+
+end

data/lib/cmdeploy/recipes/templates/nginx_unicorn.erb

@@ -1,5 +1,5 @@
 # deliver static assets as gzip files
-location ~ ^/<%= application %>/assets/ {
+location ~ ^<%= [nil,'','/'].include?(app_relative_root_url) ? "/" : "#{app_relative_root_url}/" %>assets/ {
   root /CHBS/apps/apps/<%= application %>/current/public;
   gzip_static on; # to serve pre-gzipped version
   expires max;
@@ -7,7 +7,7 @@ location ~ ^/<%= application %>/assets/ {
 }
 
 # pass request to rails app
-location ~ <%= app_relative_root_url %> {
+location <%=  [nil,'','/'].include?(app_relative_root_url) ? "/" : "~ ^#{app_relative_root_url}" %> {
   root /CHBS/apps/apps/<%= application %>/current/public;
 
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

data/lib/cmdeploy/recipes/unicorn.rb

@@ -1,29 +1,27 @@
-module CMDeploy
-  configuration = Capistrano::Configuration.respond_to?(:instance) ?
-    Capistrano::Configuration.instance(:must_exist) :
-    Capistrano.configuration(:must_exist)
+configuration = Capistrano::Configuration.respond_to?(:instance) ?
+  Capistrano::Configuration.instance(:must_exist) :
+  Capistrano.configuration(:must_exist)
 
-  configuration.load do
+configuration.load do
 
-    namespace :unicorn do
-      desc "cmdeploy: create unicorn startup script"
-      task :setup, roles: :app do
-        run "mkdir -p #{unicorn_conf_folder}"
-        template("unicorn_conf.erb","/tmp/unicorn_conf")
-        run "mv /tmp/unicorn_conf #{unicorn_conf_folder}/#{application}.conf"
-      end
-      after "deploy:setup", "unicorn:setup"
+  namespace :unicorn do
+    desc "cmdeploy: create unicorn startup script"
+    task :setup, roles: :app do
+      run "mkdir -p #{unicorn_conf_folder}"
+      cmdeploy_template("unicorn_conf.erb","/tmp/unicorn_conf")
+      run "mv /tmp/unicorn_conf #{unicorn_conf_folder}/#{application}.conf"
+    end
+    after "deploy:setup", "unicorn:setup"
 
-      %w[start stop restart reload upgrade status rotate].each do |command|
-        desc "cmdeploy: #{command} unicorn"
-        task command, roles: :app do
-          run ". ~/.bashrc && uc #{command} ~/etc/unicorn/#{application}.conf"
-        end
+    %w[start stop restart reload upgrade status rotate].each do |command|
+      desc "cmdeploy: #{command} unicorn"
+      task command, roles: :app do
+        run ". ~/.bashrc && uc #{command} ~/etc/unicorn/#{application}.conf"
       end
-      after "deploy:restart", "unicorn:reload"
-
     end
-
+    after "deploy:restart", "unicorn:reload"
 
   end
+
+
 end

data/lib/cmdeploy/recipes/variables.rb

@@ -1,9 +1,8 @@
-module CMDeploy
-  configuration = Capistrano::Configuration.respond_to?(:instance) ?
-    Capistrano::Configuration.instance(:must_exist) :
-    Capistrano.configuration(:must_exist)
+configuration = Capistrano::Configuration.respond_to?(:instance) ?
+Capistrano::Configuration.instance(:must_exist) :
+Capistrano.configuration(:must_exist)
 
-  configuration.load do
+configuration.load do
 
     # cm specific settings
     set :stage, 'test'
@@ -20,7 +19,7 @@ module CMDeploy
     # scm
     set :scm, :subversion
     set :repository, "http://svn.nibr.novartis.intra/svn/SDM/cm/module/#{application}/branches/master/src/rails"
-   
+
     # sudo
     set :use_sudo, false
 
@@ -34,5 +33,4 @@ module CMDeploy
     # per default only 5 release will be kept
     after "deploy:assets:precompile", "deploy:cleanup"
 
-  end
-end
+end

data/lib/cmdeploy/version.rb

@@ -1,3 +1,3 @@
 module CMDeploy
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmdeploy
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies: []
 description: CM specific deployment recipes
 email: