cheftacular 2.8.0 → 2.9.0

data/lib/cheftacular/actions/migrate.rb

@@ -1,10 +1,17 @@
 class Cheftacular
   class ActionDocumentation
     def migrate
-      @config['documentation']['action'] <<  [
+      @config['documentation']['action'][__method__] ||= {}
+      @config['documentation']['action'][__method__]['long_description'] = [
         "`cft migrate` this command will grab the first alphabetical node for a repository " +
-        "and run a migration that will hit the database primary server."
+        "and run a migration that will hit the database primary server.",
+
+        [
+          "    1. Currently only supports rails stacks."
+        ]
       ]
+
+      @config['documentation']['action'][__method__]['short_description'] = 'Creates a database migration on the current environment'
     end
   end
 
@@ -29,13 +36,15 @@ class Cheftacular
 
         puts("Beginning migration run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
 
-        log_data, timestamp = start_task( n.name, n.public_ipaddress, n.run_list, "#{ bundle_command } exec rake db:migrate", options, locs, cheftacular)
+        log_data, timestamp, exit_status = start_task( n.name, n.public_ipaddress, n.run_list, "#{ bundle_command } exec rake db:migrate", options, locs, cheftacular)
 
-        logs_bag_hash["#{ n.name }-migrate"] = { text: log_data.scrub_pretty_text, timestamp: timestamp }
+        logs_bag_hash["#{ n.name }-#{ __method__ }"] = { "text" => log_data.scrub_pretty_text, "timestamp" => timestamp, "exit_status" => exit_status }
       end
 
       @config['ChefDataBag'].save_logs_bag
 
+      @config['helper'].send_log_bag_hash_slack_notification(logs_bag_hash, __method__, 'Failing migration detected, please fix this and deploy again, exiting...')
+
       @options['run_migration_already'] = true
 
       #restart the servers again after a deploy with a migration just in case
@@ -49,7 +58,9 @@ class Cheftacular
     end
 
     def migrate_nodejs nodes=[]
-      raise "Not yet implemented"
+      puts "Method #{ __method__ } is not yet implemented"
+
+      exit
     end
 
     def migrate_all nodes=[]

data/lib/cheftacular/actions/run.rb

@@ -1,7 +1,8 @@
 class Cheftacular
   class ActionDocumentation
     def run
-      @config['documentation']['action'] <<  [
+      @config['documentation']['action'][__method__] ||= {}
+      @config['documentation']['action'][__method__]['long_description'] = [
         "`cft run COMMAND [--all]` will trigger the command on the first server in the role. " + 
         "Can be used to run rake commands or anything else.",
 
@@ -18,6 +19,8 @@ class Cheftacular
           'arguments in quotes like `cft run "rake -T"`'
         ]
       ]
+
+      @config['documentation']['action'][__method__]['short_description'] = 'Runs a command on the current environment for the current repository'
     end
   end
 
@@ -33,6 +36,8 @@ class Cheftacular
       #must have rails stack to run migrations and not be a db, only want ONE node
       nodes = @config['parser'].exclude_nodes( nodes, [{ unless: "role[#{ @options['role'] }]" }], !@options['run_on_all'] )
 
+      nodes = @config['parser'].exclude_nodes( nodes, [{ if: "role[#{ @options['negative_role'] }]" }]) if @options['negative_role']
+
       #this must always precede on () calls so they have the instance variables they need
       options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
 
@@ -41,12 +46,14 @@ class Cheftacular
 
         puts("Beginning task run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
 
-        log_data, timestamp = start_task( n.name, n.public_ipaddress, n.run_list, "#{ bundle_command } exec #{ command }", options, locs, cheftacular)
+        log_data, timestamp, exit_status = start_task( n.name, n.public_ipaddress, n.run_list, "#{ bundle_command } exec #{ command }", options, locs, cheftacular)
 
-        logs_bag_hash["#{ n.name }-run"] = { text: log_data.scrub_pretty_text, timestamp: timestamp }
+        logs_bag_hash["#{ n.name }-#{ __method__ }"] = { "text" => log_data.scrub_pretty_text, "timestamp" => timestamp, "exit_status" => exit_status }
       end
 
       @config['ChefDataBag'].save_logs_bag
+
+      @config['helper'].send_log_bag_hash_slack_notification(logs_bag_hash, __method__, 'Failing command detected, exiting...')
     end
 
     def run_nodejs

data/lib/cheftacular/actions/scale.rb

@@ -3,7 +3,8 @@
 class Cheftacular
   class ActionDocumentation
     def scale
-      @config['documentation']['action'] <<  [
+      @config['documentation']['action'][__method__] ||= {}
+      @config['documentation']['action'][__method__]['long_description'] = [
         "`cft scale up|down [NUM_TO_SCALE]` will add (or remove) NUM_TO_SCALE servers from the server array. " +
         "This command will not let you scale down below 1 server.",
 
@@ -13,6 +14,8 @@ class Cheftacular
           "A failed build may require the server to be destroyed / examined by a DevOps engineer."
         ]
       ]
+
+      @config['documentation']['action'][__method__]['short_description'] = 'Scales an environment up or down (relies on roles)'
     end
   end
 

data/lib/cheftacular/actions/tail.rb

@@ -1,7 +1,8 @@
 class Cheftacular
   class ActionDocumentation
     def tail
-      @config['documentation']['action'] <<  [
+      @config['documentation']['action'][__method__] ||= {}
+      @config['documentation']['action'][__method__]['long_description'] = [
         "`cft tail [PATTERN_TO_MATCH]` will tail the logs (return continuous output) of the first node if finds " + 
         "that has an application matching the repository running on it. Currently only supports rails stacks",
 
@@ -15,6 +16,8 @@ class Cheftacular
           "    3. if the `PATTERN_TO_MATCH` argument exists, the tail will only return entries that have that pattern rather than everything written to the file."
         ]
       ]
+
+      @config['documentation']['action'][__method__]['short_description'] = 'Tails the logs of the first node found for the current repository'
     end
   end
 
@@ -26,6 +29,8 @@ class Cheftacular
 
       nodes = @config['parser'].exclude_nodes( nodes, [{ unless: "role[#{ @options['role'] }]" }], true )
 
+      nodes = @config['parser'].exclude_nodes( nodes, [{ if: "role[#{ @options['negative_role'] }]" }], true) if @options['negative_role']
+
       nodes.each do |n|
         puts("Beginning tail run for #{ n.name } (#{ n.public_ipaddress }) on role #{ @options['role'] }") unless @options['quiet']
 
@@ -50,12 +55,12 @@ class Cheftacular
 
       #special servers should be listed first as most of them will have web role
       log_loc = "#{ @config['cheftacular']['base_file_path'] }/#{ @options['repository'] }/current/log/#{ true_env }.log"
-      
+
       `ssh -oStrictHostKeyChecking=no -tt #{ @config['cheftacular']['deploy_user'] }@#{ ip_address } "#{ @config['helper'].sudo(ip_address) } tail -f #{ log_loc } #{ get_tail_grep_string(pattern_to_match) }" > /dev/tty`
     end
 
     def get_tail_grep_string pattern_to_match=''
-      "| grep -i -E #{ pattern_to_match }" unless pattern_to_match.blank?
+      "| grep -i -E \\\"#{ pattern_to_match }\\\"" unless pattern_to_match.blank?
     end
   end
 end

data/lib/cheftacular/cheftacular.rb

@@ -39,7 +39,7 @@ class Cheftacular
     if @config['helper'].is_initialization_command?(ARGV[0])
       @options['command'] = ARGV[0] #this is normally set by parse_context but that is not run for initialization commands
     else
-      @config['stateless_action'].cheftacular_config('sync') unless @config['helper'].running_on_chef_node?
+      #@config['stateless_action'].cheftacular_config('sync') unless @config['helper'].running_on_chef_node?
 
       @config['stateless_action'].initialize_data_bag_contents(@options['env']) #ensure basic structure are always maintained before each run
 

data/lib/cheftacular/cloud_provider.rb

@@ -7,11 +7,15 @@ class Cheftacular
 
     #public address, private address
     def parse_addresses_from_server_create_hash server_hash
+      ap server_hash
       case @options['preferred_cloud']
       when 'rackspace'
         [server_hash['ipv4_address'], server_hash['addresses']['private'][0]['addr']]
       when 'digitalocean'
-        [server_hash['public_ip_address'], server_hash['private_ip_address']]
+        [
+          server_hash['networks']['v4'].select { |hash| hash['type'] == 'public' }.first['ip_address'],
+          server_hash['networks']['v4'].select { |hash| hash['type'] == 'private' }.first['ip_address']
+        ]
       else raise "CRITICAL! Encountered unsupported preferred cloud #{ @options['preferred_cloud'] }"
       end
     end

data/lib/cheftacular/dns.rb

@@ -62,7 +62,7 @@ class Cheftacular
             record_hash['SRV_weight'],
             record_hash['SRV_port'],
             record_hash['SRV_target'],
-            (record_hash['activate_cloudflare'] ? 0 : 1) #service_mode
+            (record_hash['activate_cloudflare'] ? 1 : 0) #service_mode
           )
 
           print 'create'.ljust(20, '_')

data/lib/cheftacular/error.rb

@@ -20,10 +20,10 @@ class Cheftacular
       nodes
     end
 
-    def exception_output message, exception='', exit_on_call=true, suppress_error_output=false
+    def exception_output message, exception=nil, exit_on_call=true, suppress_error_output=false
       puts "#{ message }\n"
 
-      puts("Error message: #{ exception }\n#{ exception.backtrace.join("\n") }") unless suppress_error_output
+      puts("Error message: #{ exception }\n#{ exception.backtrace.join("\n") }") if !exception.nil? && !suppress_error_output
 
       exit if exit_on_call
     end

data/lib/cheftacular/file_system.rb

@@ -89,6 +89,8 @@ class Cheftacular
           FileUtils.rm_rf("#{ base_dir }/#{ entry }") if File.exists?("#{ base_dir }/#{ entry }") && File.directory?("#{ base_dir }/#{ entry }")
         when 'current-audit-only'
           FileUtils.rm("#{ base_dir }/#{ entry }") if File.file?("#{ base_dir }/#{ entry }") && entry.include?(Time.now.strftime("%Y%m%d"))
+        else
+          puts "Warning, received unknown mode (#{ mode })! Please post your logs as an issue on github!"
         end
 
         if File.exists?("#{ base_dir }/#{ entry }") && File.directory?("#{ base_dir }/#{ entry }")
@@ -135,6 +137,54 @@ class Cheftacular
       File.open( File.join(@config['locs']['chef-repo'], "config", to_be_created_filename), "w") { |f| f.write(File.read(File.join(@config['locs']['examples'], example_filename))) }
     end
 
+    def parse_latest_berkshelf_cookbook_versions berkshelf_cookbooks={}
+
+      Dir.foreach(@config['locs']['berks']) do |berkshelf_cookbook|
+        next if is_junk_filename?(berkshelf_cookbook)
+        use_current_cookbook = false
+
+        true_cookbook_name = berkshelf_cookbook.rpartition('-').first
+        cookbook_version   = parse_version_from_berkshelf_cookbook(berkshelf_cookbook)
+
+        #get only the latest version, berkshelf pulls in multiple commits from git repos for SOME REASON
+        use_current_cookbook = !berkshelf_cookbooks.has_key?(true_cookbook_name)
+        use_current_cookbook = @config['helper'].is_higher_version?(cookbook_version, berkshelf_cookbooks[true_cookbook_name]['version']) if berkshelf_cookbooks.has_key?(true_cookbook_name)
+
+        if use_current_cookbook
+          berkshelf_cookbooks[true_cookbook_name] ||= {}
+          berkshelf_cookbooks[true_cookbook_name]['version']  = cookbook_version
+          berkshelf_cookbooks[true_cookbook_name]['location'] = berkshelf_cookbook
+          berkshelf_cookbooks[true_cookbook_name]['mtime']    = File.mtime(File.expand_path("#{ @config['locs']['berks'] }/#{ berkshelf_cookbook }"))
+        end
+      end
+
+      berkshelf_cookbooks
+    end
+
+    def parse_chef_repo_cookbook_versions chef_repo_cookbooks={}
+      Dir.foreach(@config['locs']['cookbooks']) do |chef_repo_cookbook|
+        next if is_junk_filename?(chef_repo_cookbook)
+          
+        new_name = chef_repo_cookbook.rpartition('-').first
+
+        chef_repo_cookbooks[chef_repo_cookbook] = if File.exists?(File.expand_path("#{ @config['locs']['cookbooks'] }/#{ chef_repo_cookbook }/metadata.rb"))
+                                                    File.read(File.expand_path("#{ @config['locs']['cookbooks'] }/#{ chef_repo_cookbook }/metadata.rb")).gsub('"',"'").gsub(/^version[\s]*('\d[.\d]+')/).peek[/('\d[.\d]+')/].gsub("'",'')
+                                                  else
+                                                    JSON.parse(File.read(File.expand_path("#{ @config['locs']['cookbooks'] }/#{ chef_repo_cookbook }/metadata.json"))).to_hash['version']
+                                                  end
+      end
+
+      chef_repo_cookbooks
+    end
+
+     def parse_version_from_berkshelf_cookbook berkshelf_cookbook
+      if File.exists?(File.expand_path("#{ @config['locs']['berks'] }/#{ berkshelf_cookbook }/metadata.rb"))
+        File.read(File.expand_path("#{ @config['locs']['berks'] }/#{ berkshelf_cookbook }/metadata.rb")).gsub('"',"'").gsub(/^version[\s]*('\d[.\d]+')/).peek[/('\d[.\d]+')/].gsub("'",'')
+      else
+        berkshelf_cookbook.split('-').last
+      end
+    end
+
     private
     def current_file_path file_name, use_timestamp=true
       File.join( @config['locs']['app-root'], 'tmp', @config['helper'].declassify, ( use_timestamp ? "#{ Time.now.strftime("%Y%m%d") }-#{ file_name }" : file_name ))

data/lib/cheftacular/getter.rb

@@ -23,7 +23,7 @@ class Cheftacular
         true_obj = if !file_cache_nodes.empty? && @config['parser'].array_of_nodes_contains_node_name?(file_cache_nodes, n.name)
                      file_cache_nodes[@config['parser'].index_of_node_name_in_array_of_nodes(file_cache_nodes, n.name)]
                    else
-                     @config['filesystem'].cleanup_file_caches('current')
+                     @config['filesystem'].cleanup_file_caches('current-nodes')
 
                      @config['ridley'].node.find(n.name)
                    end

data/lib/cheftacular/helper.rb

@@ -30,8 +30,8 @@ class Cheftacular
 
     def is_initialization_command? command=''
       command ||= ''
-            
-      @config['initialization_action'].public_methods(false).include?(command.to_sym)
+
+      @config['initialization_action'].public_methods(false).include?(command.to_sym) || command.blank?
     end
 
     def running_on_chef_node? ret = false
@@ -140,12 +140,13 @@ class Cheftacular
     def compile_documentation_lines mode, out=[]
       doc_arr = case mode
                 when 'action'           then @config['documentation']['action']
-                when 'application'      then @config['documentation']['action'] + @config['documentation']['application']
+                when 'application'      then @config['documentation']['application'].merge(@config['documentation']['action'])
                 when 'stateless_action' then @config['documentation']['stateless_action']
-                when 'devops'           then @config['documentation']['action'] + @config['documentation']['stateless_action']
+                when 'devops'           then @config['documentation']['stateless_action'].merge(@config['documentation']['action'])
                 end
 
-      count = 1
+      doc_arr = doc_arr.to_a.map { |doc| doc[1]['long_description'] }
+      count   = 1
 
       doc_arr.sort {|a, b| a[0] <=> b[0]}.flatten(1).each do |line|
         out << "#{ count }. #{ line }" if line.class.to_s == 'String'
@@ -158,6 +159,12 @@ class Cheftacular
       out
     end
 
+    def compile_short_context_descriptions documentation_hash, padding_length=25, out=[]
+      out << documentation_hash.to_a.map { |doc| "#{ doc[0].to_s.ljust(padding_length, '_') }_#{ doc[1]['short_description'] }" }
+
+      out.flatten.sort {|a, b| a[0] <=> b[0]}.join("\n\n")
+    end
+
     #compares how close str1 is to str2
     def compare_strings str1, str2
       str1_chars = str1.split('').uniq
@@ -260,6 +267,28 @@ class Cheftacular
 
       puts("Completed rvm.sh installation into /etc/profile.d/rvm.sh") unless @options['quiet']
     end
+
+    def send_log_bag_hash_slack_notification logs_bag_hash, method, on_failing_exit_status_message=''
+      if @config['cheftacular']['slack']['webhook']
+        logs_bag_hash.each_pair do |key, hash|
+          next unless key.include?(method.to_s)
+
+          if hash['exit_status'] && hash['exit_status'] == 1
+            @config['stateless_action'].slack(hash['text'].prepend('```').insert(-1, '```'))
+
+            @config['error'].exception_output(on_failing_exit_status_message) if !on_failing_exit_status_message.blank?
+          end
+        end
+      end
+    end
+
+    def slack_current_deploy_arguments
+      msg  = "#{ Socket.gethostname } just set for the repository #{ @config['getter'].get_repository_from_role_name(@options['role']) }:\n"
+      msg << "the organization to #{ @options['deploy_organization'] }\n" if @options['deploy_organization']
+      msg << "the revision to #{ @options['target_revision'] }"           if @options['target_revision']
+      
+      @config['stateless_action'].slack(msg.prepend('```').insert(-1, '```'), @config['cheftacular']['slack']['notify_on_deployment_args'])
+    end
   end
 end
 

data/lib/cheftacular/initializer.rb

@@ -253,25 +253,9 @@ class Cheftacular
 
       @config['ChefDataBag'].init_bag('default', 'cheftacular', false)
 
-      diff_hash = @config['cheftacular'].deep_diff(@config['default']['cheftacular_bag_hash'], true).except('mode', 'default_repository').compact
+      @config['initial_cheftacular_yml'] = @config['cheftacular'].deep_dup
 
-      diff_hash.each_pair do |key, value|
-        diff_hash.delete(key) if value.empty? || value.nil?
-      end
-
-      if @config['helper'].running_in_mode?('devops') && !diff_hash.empty?
-        puts "Difference detected between local cheftacular.yml and data bag cheftacular.yml! Displaying..."
-
-        ap diff_hash
-      elsif @config['helper'].running_in_mode?('application') && @config['default']['cheftacular_bag_hash']['slack']['webhook'] && !diff_hash.empty?
-        @config['slack_queue'] << diff_hash.awesome_inspect({plain: true, indent: 2}).prepend('```').insert(-1, '```')
-      end
-
-      @config['cheftacular'] = if @config['default']['cheftacular_bag_hash']['sync_application_cheftacular_yml']
-                                 @config['default']['cheftacular_bag_hash'].deep_merge(@config['cheftacular'])
-                               else
-                                 @config['cheftacular'].deep_merge(@config['default']['cheftacular_bag_hash'].except('default_repository', 'mode'))
-                               end
+      @config['cheftacular'] = @config['default']['cheftacular_bag_hash'].deep_merge(@config['cheftacular'])
     end
 
     def initialize_default_cheftacular_options
@@ -299,10 +283,10 @@ class Cheftacular
     def initialize_documentation_hash
       @config['documentation'] ||= {}
       @config['documentation']['arguments']        ||= []
-      @config['documentation']['action']           ||= []
-      @config['documentation']['stateless_action'] ||= []
-      @config['documentation']['application']      ||= []
-      @config['documentation']['devops']           ||= []
+      @config['documentation']['action']           ||= {}
+      @config['documentation']['stateless_action'] ||= {}
+      @config['documentation']['application']      ||= {}
+      @config['documentation']['devops']           ||= {}
     end
 
     def initialize_locations
@@ -419,8 +403,10 @@ class Cheftacular
       @config['ruby_string'] = "ruby-" + @config['ruby_string'] unless @config['ruby_string'].include?('ruby-')
 
       #TODO Reevaluate for non-rvm setups
-      @config['bundle_command'] = "/home/#{ @config['cheftacular']['deploy_user'] }/.rvm/gems/#{ @config['ruby_string'].chomp }@global/bin/bundle"
-      @config['ruby_command']   = "/home/#{ @config['cheftacular']['deploy_user'] }/.rvm/rubies/#{ @config['ruby_string'].chomp }/bin/ruby"
+      @config['bundle_command']        = "/home/#{ @config['cheftacular']['deploy_user'] }/.rvm/gems/#{ @config['ruby_string'].chomp }@global/bin/bundle"
+      @config['ruby_command']          = "/home/#{ @config['cheftacular']['deploy_user'] }/.rvm/rubies/#{ @config['ruby_string'].chomp }/bin/ruby"
+      @config['internal_ruby_config']  = File.expand_path(__FILE__)[/(ruby\-[\d\.@\w]+)/]
+      #@config['internal_ruby_version'] = @config['internal_ruby_config'][/([\d\.]+)/] #reactivate when needed
     end
 
     def initialize_passwords env, refresh_bag=false
@@ -448,7 +434,11 @@ class Cheftacular
       if @config['helper'].is_higher_version? detected_version, current_version
         puts "\n Your Cheftacular is out of date. Currently #{ current_version } and remote version is #{ detected_version }.\n"
 
-        puts "Please update the gemfile to #{ detected_version }, bundle install and then restart this process.\n"
+        if @config['internal_ruby_config'].include?('@global')
+          puts "Please run rvm #{ @config['internal_ruby_config'] } do gem update cheftacular to update to the latest version"
+        else
+          puts "Please update the gemfile to #{ detected_version }, bundle install and then restart this process.\n"
+        end
 
         exit
       else

data/lib/cheftacular/parser.rb

@@ -113,6 +113,8 @@ class Cheftacular
         repo_state_hash['deploy_organization'] = nil
       end
 
+      @config['helper'].slack_current_deploy_arguments unless @config['cheftacular']['slack']['notify_on_deployment_args'].blank?
+
       @config['ChefDataBag'].save_config_bag 
     end
 

data/lib/cheftacular/stateless_actions/add_ssh_key_to_bag.rb

@@ -2,7 +2,8 @@
 class Cheftacular
   class StatelessActionDocumentation
     def add_ssh_key_to_bag
-      @config['documentation']['stateless_action'] <<  [
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
         "`cft add_ssh_key_to_bag \"<NEW SSH PUB KEY>\" [SPECIFIC_REPOSITORY]` this command will add the given ssh key to the default authentication data bag. " +
         "After this your server recipes should read the contents of the 'default' 'authentication' bag for the authorized_keys array.",
 
@@ -12,6 +13,8 @@ class Cheftacular
           "does not exist in the cheftacular.yml respositories hash. You can then use this data to give users selective ssh access to certain servers."
         ]
       ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Adds an ssh key to your authentication bag'
     end
   end
 

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -1,7 +1,7 @@
 class Cheftacular
   class StatelessActionDocumentation
     def arguments
-      @config['documentation']['arguments'] <<  [
+      @config['documentation']['arguments'] << [
         '## Arguments and flags for cheftacular',
 
         '### Environment flags',
@@ -46,11 +46,16 @@ class Cheftacular
 
         '1.  `-e|--except-role ROLE_NAME` will *prevent* any server with this role from being *deployed to* for the deploy command. Other commands will ignore this argument.',
 
-        '2.  `-z|--unset-revision` will unset a custom revision specified in the arg below and make the codebase utilize the default.',
+        '2.  `-z|--unset-github-deploy-args` will unset a custom revision specified in the arg below and make the codebase utilize the default.',
 
         "3.  `-Z|--revision REVISION` will force the role you're deploying to to utilize the revision specified here. This can be a specific commit, a branch name or even a tag.",
 
-        '    1. Note: The system does not check if the revision exists, if you pass a non-existent revision no one will be able to deploy to that role until -Z with a correction revision or -z is passed.'
+        '    1. Note: The system does not check if the revision exists, if you pass a non-existent revision no one will be able to deploy to that role until -Z with a correction revision or -z is passed.',
+        
+        "4.  The `-O ORGANIZATION` flag can be used with TheCheftacularCookbook to set an *organization* your app can try " +
+        "deploying from, your git user needs access to these forks / organization(s).",
+
+        "    3.  The `-z|--unset-github-deploy-args` option will clear your current `-Z` and `-O` flags."
       ]
     end
   end

data/lib/cheftacular/stateless_actions/backups.rb

@@ -2,7 +2,8 @@
 class Cheftacular
   class StatelessActionDocumentation
     def backups
-      @config['documentation']['stateless_action'] <<  [
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
         "`cft backups [activate|deactivate|load|restore]` this command " +
         "sets the fetch_backups and restore_backups flags in your config data bag for an environment. " +
         "These can be used to give application developers a way to trigger / untrigger restores in an environment",
@@ -19,7 +20,9 @@ class Cheftacular
         ]
       ]
 
-      @config['documentation']['application'] << @config['documentation']['stateless_action'].last
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Runs various backup commands on your current environment'
+
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
     end
   end
 

data/lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap.rb

@@ -1,11 +1,14 @@
 class Cheftacular
   class StatelessActionDocumentation
     def ubuntu_bootstrap
-      @config['documentation']['stateless_action'] <<  [
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
         "`cft ubuntu_bootstrap ADDRESS ROOT_PASS` This command will bring a fresh server to a state " +
         "where chef-client can be run on it via `cft chef-bootstrap`. It should be noted that it is in "+
         "this step where a server's randomized deploy_user sudo password is generated."
       ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Updates an ubuntu server to have more secure defaults'
     end
   end
 
@@ -85,6 +88,7 @@ class Cheftacular
 
       deploy_commands.each do |cmnd|
         puts("(#{ @options['address'] }) Running #{ cmnd.gsub("#{ new_deploy_pass }", "sudo password") }") unless @options['quiet'] || @options['in_scaling']
+        
         out << `ssh -t -oStrictHostKeyChecking=no #{ deploy_user }@#{ @options['address'] } "#{ cmnd }"`
 
         puts(out.last) unless @options['quiet'] || @options['in_scaling']
@@ -94,6 +98,7 @@ class Cheftacular
 
       final_commands.each do |cmnd|
         puts "(#{ @options['address'] }) Running #{ cmnd.gsub("#{ new_deploy_pass }", "sudo password") }"
+
         out << `ssh -t -oStrictHostKeyChecking=no #{ deploy_user }@#{ @options['address'] } "#{ cmnd }"`
 
         puts(out.last) unless @options['quiet'] || @options['in_scaling']
@@ -101,11 +106,9 @@ class Cheftacular
 
       puts("Finished ruby setup......stage 3 of 3 for server #{ @options['address'] }") if @options['in_scaling']
 
-      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-root-pass"] = @options['client_pass']
-
+      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-root-pass"]   = @options['client_pass']
       @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-deploy-pass"] = new_deploy_pass
-
-      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-name"] = @options['node_name'] if @options['node_name']
+      @config[@options['env']]['server_passwords_bag_hash']["#{ @options['address'] }-name"]        = @options['node_name'] if @options['node_name']
 
       @config['ChefDataBag'].save_server_passwords_bag unless @options['in_scaling']
     end

data/lib/cheftacular/stateless_actions/check_cheftacular_yml_keys.rb

@@ -2,10 +2,13 @@
 class Cheftacular
   class StatelessActionDocumentation
     def check_cheftacular_yml_keys
-      @config['documentation']['stateless_action'] <<  [
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
         "`cft check_cheftacular_yml_keys` allows you to check to see if your cheftacular yml keys are valid to the current version of cheftacular. " +
         "It will also set your missing keys to their likely default and let you know to update the cheftacular.yml file."
       ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = "Makes sure your cheftacular.yml has up-to-date keys for #{ Cheftacular::VERSION }"
     end
   end
 
@@ -13,6 +16,17 @@ class Cheftacular
     def check_cheftacular_yml_keys out=[], exit_on_missing=false, warn_on_missing=false
       base_message = "Your cheftacular.yml is missing the key KEY, its default value is being set to DEFAULT for this run."
 
+      #############################2.9.0################################################
+
+      unless @config['cheftacular']['slack'].has_key?('notify_on_deployment_args')
+        #backup_config:global_backup_role_name
+        base_message.gsub('KEY', 'notify_on_deployment_args').gsub('DEFAULT', 'false')
+
+        @config['cheftacular']['slack']['notify_on_deployment_args'] = false
+
+        warn_on_missing = true
+      end
+
       #############################2.7.0################################################
 
       unless @config['cheftacular'].has_key?('backup_config')

data/lib/cheftacular/stateless_actions/chef_bootstrap.rb

@@ -2,10 +2,17 @@
 class Cheftacular
   class StatelessActionDocumentation
     def chef_bootstrap
-      @config['documentation']['stateless_action'] <<  [
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
         "`cft chef_bootstrap ADDRESS NODE_NAME` allows you to register a node in the chef system, " + 
-        "remove any lingering data that may be associated with it and update the node's runlist if it has an entry in nodes_dir for its NODE_NAME."
+        "remove any lingering data that may be associated with it and update the node's runlist if it has an entry in nodes_dir for its NODE_NAME.",
+
+        [
+          "    1. This command is part of the `cft full_bootstrap` command"
+        ]
       ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Bootstraps basic chef properties on the target server'
     end
   end
 

data/lib/cheftacular/stateless_actions/chef_server.rb

@@ -1,7 +1,8 @@
 class Cheftacular
   class StatelessActionDocumentation
     def chef_server
-      @config['documentation']['stateless_action'] <<  [
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
         "`cft chef_server [restart|processes|memory]` this command can be used to query the chef server for stats if the cheftacular.yml " +
         "has the chef_server key filled out. Useful for low resource chef-servers.",
 
@@ -20,7 +21,9 @@ class Cheftacular
         ]
       ]
 
-      @config['documentation']['application'] << @config['documentation']['stateless_action'].last
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Allows you to check the state of the primary Chef server'
+
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
     end
   end