kstrano 1.1.0 → 1.1.1

data/bin/kumafy

@@ -72,18 +72,6 @@ def update_deploy_config(ui, base, context, force)
     deploy_config_file.gsub!(/(:admin_runner,\s)(\"\")/, '\1' + "\"#{app_name}\"")
     deploy_config_file.gsub!(/(:stage_dir,\s)(\"\")/, '\1' + "\"#{RECIPES[context['recipe']]['config_path']}/deploy\"")
 
-    newrelic_appname = ui.ask("What's the name of the application in new relic?")
-    if !newrelic_appname.nil? && !newrelic_appname.empty?
-      deploy_config_file.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_config_file.gsub!(/(:newrelic_license_key,\s)(\"\")/, '\1' + "\"#{newrelic_license_key}\"")
-      context["newrelic_license_key"] = newrelic_license_key
-    end
-
     extra_config_file = "#{RESOURCES_BASE_PATH}/#{context["recipe"]}/deploy.rb"
     if File.exists? extra_config_file
       deploy_config_file << "\n\n"
@@ -123,13 +111,26 @@ def update_deploy_config(ui, base, context, force)
 
     if write
       content = read_resource_file(source_file)
+
       server = ui.ask("On which server is the #{env} environment deployed?")
       if !server.match(/^.*\.kunstmaan\.be$/) && !server.match(/^.*\.kunstmaan\.com$/)
         server = "#{server}.cloud.kunstmaan.com"
       end
-
       content.gsub!(/(:domain,\s)(\"\")/, '\1' + "\"#{server}\"")
 
+      configure_newrelic = ui.ask("Do you want to configure newrelic for the #{env} environment?  ") { |q| q.default = 'n' }
+      if configure_newrelic.match(/^y/)
+        content << "\n\n"
+        newrelic_appname = ui.ask("What's the name of the application in new relic?  ") { |q| q.default = context["app_name"] }
+        content << "set :newrelic_appname, '#{newrelic_appname}' # The name of the application in newrelic"
+        context["newrelic_appname"] = newrelic_appname
+
+        newrelic_license_key = ui.ask("What's the license key of your newrelic account (can be found under 'Account settings')?")
+        content << "\n"
+        content << "set :newrelic_license_key, '#{newrelic_license_key}' # The license key can be found under 'Account settings'"
+        context["newrelic_license_key"] = newrelic_license_key
+      end
+
       File.open(file, "w") do |f|
         content.each_line do |line|
           f.print line

data/lib/kstrano.rb

@@ -14,6 +14,9 @@ set :shared_children, false
 set :copy_node_modules, true
 set :copy_bower_vendors, true
 
+set :newrelic_appname, ''
+set :newrelic_license_key, ''
+
 namespace :files do
   namespace :move do
 
@@ -262,7 +265,7 @@ end
 after :deploy do
   kuma.fix.cron
 
-  if env == "production" && !newrelic_appname.nil? && !newrelic_appname.empty? && !newrelic_license_key.nil? && !newrelic_appname.empty?
+  if !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

data/resources/deploy.rb

@@ -25,9 +25,6 @@ ssh_options[:forward_agent] = true # http://help.github.com/deploy-with-capistra
 set :deploy_via, :remote_cache #only keeps an online cache
 set :branch, "master"
 
-set :newrelic_appname, "" # The name of the application in newrelic
-set :newrelic_license_key, "" # The license key can be found under 'Account settings'
-
 # Logging
 # - IMPORTANT = 0
 # - INFO      = 1

data/resources/deploy_production.rb

@@ -2,4 +2,4 @@ set :env, "prod"
 set :domain, ""
 set :port, 9999
 
-set :branch, "master"
+set :branch, "master"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kstrano
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capifony