kstrano 0.0.32 → 0.0.33

data/bin/kumafy

@@ -61,6 +61,18 @@ def update_deploy_config(ui, base, context, force)
     app_name = context["app_name"]
     deploy_gist.gsub!(/(:application,\s)(\"\")/, '\1' + "\"#{app_name}\"")
     deploy_gist.gsub!(/(:admin_runner,\s)(\"\")/, '\1' + "\"#{app_name}\"")
+
+    newrelic_appname = ui.ask("What's the name of the application in new relic?")
+    if !newrelic_appname.nil? && !newrelic_appname.empty?
+      deploy_gist.gsub!(/(:newrelic_appname,\s)(\"\")/, '\1' + "\"#{newrelic_appname}\"")
+      context["newrelic_appname"] = newrelic_appname
+    end
+
+    newrelic_license_key = ui.ask("What's the license key of your newrelic account (can be found under 'Account settings')?")
+    if !newrelic_license_key.nil? && !newrelic_license_key.empty?
+      deploy_gist.gsub!(/(:newrelic_license_key,\s)(\"\")/, '\1' + "\"#{newrelic_license_key}\"")
+      context["newrelic_license_key"] = newrelic_license_key
+    end
     
     File.open(deploy, "w") do |f|
       deploy_gist.each_line do |line|

data/lib/helpers/kuma_helper.rb

@@ -10,8 +10,8 @@ module Kumastrano
     raise msg
   end
   
-  def say(text)
-    Capistrano::CLI.ui.say("--> #{text}")
+  def say(text, prefix='--> ')
+    Capistrano::CLI.ui.say("#{prefix}#{text}")
   end
 
   def ask(question, default='n')

data/lib/kstrano.rb

@@ -8,6 +8,7 @@ set :force_migrations, false
 
 set :webserver_user,    "www-data"
 set :permission_method, :acl
+set :server_name, nil
 
 set :dump_assetic_assets, true
 set :interactive_mode, true
@@ -20,6 +21,8 @@ require "#{File.dirname(__FILE__)}/helpers/git_helper.rb"
 require "#{File.dirname(__FILE__)}/helpers/kuma_helper.rb"
 require 'rexml/document'
 require 'etc'
+require 'new_relic/recipes'
+require 'new_relic/agent'
 
 namespace :kuma do
 
@@ -35,6 +38,19 @@ namespace :kuma do
 
   end
 
+  desc "Show log of what changed compared to the deployed version"
+  task :changelog do
+    Kumastrano::GitHelper.fetch
+    changelog = `git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --no-merges #{current_revision}..#{real_revision}`
+
+    if current_revision == real_revision && changelog.strip.empty?
+      changelog = "No changes found!"
+    end
+
+    Kumastrano.say "Changelog of what will be deployed to #{domain}"
+    Kumastrano.say changelog, ''
+  end
+
   namespace :fix do
 
     desc "Run fixcron for the current project"
@@ -67,9 +83,11 @@ namespace :kuma do
 
     desc "Clear the APC cache"
     task :clear do
-      serverproject = domain.split('.')[0]
-      sudo "sh -c 'curl https://raw.github.com/gist/3987685/ > /home/projects/#{serverproject}/site/apcclear.php'"
-      sudo "chmod 777 /home/projects/#{serverproject}/site/apcclear.php"
+      if server_name.nil? || server_name.empty?
+        server_name = domain.split('.')[0]
+      end
+      sudo "sh -c 'curl https://raw.github.com/gist/3987685/ > /home/projects/#{server_name}/site/apcclear.php'"
+      sudo "chmod 777 /home/projects/#{server_name}/site/apcclear.php"
       sudo "curl http://#{domain}/apcclear.php"
     end
 
@@ -187,9 +205,21 @@ end
 before :deploy do
   Kumastrano.say "executing ssh-add"
   %x(ssh-add)
+
+  kuma.changelog
+  if !Kumastrano.ask "Are you sure you want to continue deploying?", "y"
+    exit
+  end
 end
 
 after :deploy do
   kuma.fix.cron
+ 
+  if env == "production" && !newrelic_appname.nil? && !newrelic_appname.empty? && !newrelic_license_key.nil? && !newrelic_appname.empty?
+    ::NewRelic::Agent.config.apply_config({:license_key => newrelic_license_key}, 1)
+    set :newrelic_rails_env, env
+    newrelic.notice_deployment
+  end
+
   deploy::cleanup ## cleanup old releases
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kstrano
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
   prerelease: 
 platform: ruby
 authors:
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 3.5.5.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 3.5.5.38
 description: Deploying symfony2 applications for the kDeploy server setup.
 email: support@kunstmaan.be
 executables: