cheftacular 2.14.1 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827adc94d0f767ea316d7bcf827cfb10cd3fa2ee
-  data.tar.gz: f5cf035f7411a8a7ec542c836e28f5820581dbb7
+  metadata.gz: 762ef5692d31be7837a7650547269c06c510abbd
+  data.tar.gz: 1bdc839a22e03b37935c26430964bdf610e69895
 SHA512:
-  metadata.gz: 0f5e9bc8c1f3e075fa0f084857bf6ba940b2adf3434be56f903e2f6ed3ca35aad6ea1914dbdd5011e35332cec9da7a0e6bb7b2babbe092758bef1fe316f46318
-  data.tar.gz: b2360f856866988ff682fa1aa4f1b223fb955bbe89604f73fb9309603de1e1796367505dc31bcbc6455943e80fd55f87c1d998df5cc77491a8c4cad23cdb50ab
+  metadata.gz: 8d711abe36bb50ac08e7021bfe597fc1436cdedc4fbfba0c063bea93cfbe3efeb3fe01ac490e89fd10fbf84b4b4a0a7797074f16ccc7d56f0d5a6df8e3b3fd53
+  data.tar.gz: 5ee2d5ef64a6ffffb4059a134734dafbb6a1fadfb76c852bb07edcedcee1794685058eacab46b9b334611e4850dc68761496ce6464b14d3fc94830c61fd62f4d

data/lib/cheftacular/actions/console.rb

@@ -19,9 +19,9 @@ class Cheftacular
 
   class Action
     def console
-      self.send("console_#{ @config['getter'].get_current_stack }")
+      nodes = self.send("console_#{ @config['getter'].get_current_stack }")
 
-      @config['auditor'].notify_slack_on_completion("console run completed\n") if @config['cheftacular']['auditing']
+      @config['auditor'].notify_slack_on_completion("console run completed on #{ nodes.map { |node| node.name }.join(', ') }\n") if @config['cheftacular']['auditing']
     end
 
     def console_ruby_on_rails node_args=[{unless: 'role[rails]'}]
@@ -39,6 +39,8 @@ class Cheftacular
 
         start_console_ruby_on_rails(n.public_ipaddress, n.run_list)
       end
+
+      consolable_nodes
     end
 
     def console_nodejs

data/lib/cheftacular/actions/db_console.rb

@@ -19,7 +19,7 @@ class Cheftacular
 
   class Action
     def db_console
-      self.send("db_console_#{ @config['getter'].get_current_database }")
+      nodes = self.send("db_console_#{ @config['getter'].get_current_database }")
     end
 
     def db_console_postgresql

data/lib/cheftacular/actions/deploy.rb

@@ -23,7 +23,9 @@ class Cheftacular
 
           "    7. The `cft deploy verify` argument will force a check AND verify run under the same environment as the initial deploy. This is also aliased to `cft d ve`",
 
-          "    8. Aliased to `cft d`"
+          "    8. Deploy locks (if set in the cheftacular.yml for the repo(s)) can be bypassed with the `--override-deploy-locks` flag",
+
+          "    9. Aliased to `cft d`"
         ]
       ]
 
@@ -66,7 +68,7 @@ class Cheftacular
 
       @config['action'].check('verify') if run_verify && !@options['run_migration_already']
 
-      @config['auditor'].notify_slack_on_completion("deploy run completed on #{ nodes.map {|n| n.name }.join(', ') }\n") if @config['cheftacular']['auditing'] && !@options['run_migration_already']
+      @config['auditor'].notify_slack_on_completion_for_deploy(nodes.map {|n| n.name }, logs_bag_hash) if @config['cheftacular']['auditing'] && !@options['run_migration_already']
 
       @config['action'].migrate(nodes) if @config['getter'].get_current_repo_config['database'] != 'none' && !@options['run_migration_already']
 

data/lib/cheftacular/actions/migrate.rb

@@ -49,7 +49,7 @@ class Cheftacular
 
       #restart the servers again after a deploy with a migration just in case
       if !log_data.empty? && log_data != @config['cheftacular']['repositories'][@options['role']]['not_a_migration_message']
-        @config['auditor'].notify_slack_on_completion("migrate run completed\n") if @config['cheftacular']['auditing']
+        @config['auditor'].notify_slack_on_completion("migrate run completed on #{ nodes.map { |node| node.name }.join(', ') }\n") if @config['cheftacular']['auditing']
 
         @config['action'].deploy
       end

data/lib/cheftacular/actions/run.rb

@@ -30,9 +30,9 @@ class Cheftacular
     def run
       command = @config['parser'].parse_runtime_arguments 0, 'range'
 
-      self.send("run_#{ @config['getter'].get_current_stack }", command)
+      nodes = self.send("run_#{ @config['getter'].get_current_stack }", command)
 
-      @config['auditor'].notify_slack_on_completion("run #{ command } completed\n") if @config['cheftacular']['auditing']
+      @config['auditor'].notify_slack_on_completion("run #{ command } completed on #{ nodes.map { |node| node.name }.join(', ') }\n") if @config['cheftacular']['auditing']
     end
 
     def run_ruby_on_rails command
@@ -84,6 +84,8 @@ class Cheftacular
       @config['ChefDataBag'].save_logs_bag
 
       @config['helper'].send_log_bag_hash_slack_notification(logs_bag_hash, __method__, 'Failing command detected, exiting...')
+
+      nodes
     end
   end
 end

data/lib/cheftacular/actions/tail.rb

@@ -47,7 +47,7 @@ class Cheftacular
     def start_tail_role_map ip_address, run_list, pattern_to_match
       log_loc = @config['getter'].get_current_role_map(run_list)['log_location'].split(',').first.gsub('|current_repo_location|', "#{ @config['cheftacular']['base_file_path'] }/#{ @options['repository'] }/current")
 
-      `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`
+      `ssh #{ Cheftacular::SSH_INLINE_VARS } -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 start_tail_ruby_on_rails ip_address, run_list, pattern_to_match
@@ -56,7 +56,7 @@ 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`
+      `ssh #{ Cheftacular::SSH_INLINE_VARS } -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 start_tail_nodejs ip_address, run_list, pattern_to_match

data/lib/cheftacular/auditor.rb

@@ -31,6 +31,9 @@ class Cheftacular
       options_to_ignore << :preferred_cloud_region if @options['preferred_cloud_region'] == @config['cheftacular']['preferred_cloud_region']
       options_to_ignore << :virtualization_mode    if @options['virtualization_mode'] == @config['cheftacular']['virtualization_mode']
       options_to_ignore << :route_dns_changes_via  if @options['route_dns_changes_via'] == @config['cheftacular']['route_dns_changes_via']
+      options_to_ignore << :role                   unless @options['repository'].nil?
+      options_to_ignore << :role                   if @config['helper'].is_stateless_command?(@options['command'])
+      options_to_ignore << :repository             if @config['helper'].is_stateless_command?(@options['command'])
       options_to_ignore << :sub_env
       options_to_ignore << :command
 
@@ -49,8 +52,10 @@ class Cheftacular
       ret_array << "  Hostname:  #{ audit_hash['hostname'] }#{ directory_content }#{ version_content }"
 
       if mode =~ /normal/
-        ret_array << "  Arguments: #{ audit_hash['arguments'] }"       if !audit_hash['arguments'].nil? && !audit_hash['arguments'].empty?
-        ret_array << "  Options:   #{ audit_hash['options'].to_hash }" unless audit_hash['options'].empty?
+        arg_opts_string = ''
+        arg_opts_string << "  Arguments: #{ audit_hash['arguments'] }".ljust(38) if !audit_hash['arguments'].nil? && !audit_hash['arguments'].empty?
+        arg_opts_string << "  Options:   #{ audit_hash['options'].to_hash }" unless audit_hash['options'].empty?
+        ret_array       << arg_opts_string
       end
       
       ret_array = ret_array.map { |entry| entry.prepend('    ')} unless entry_number == 0
@@ -62,6 +67,20 @@ class Cheftacular
       audit_command_to_slack_queue(audit_run_as_hash, 'short', msg)
     end
 
+    def notify_slack_on_completion_for_deploy node_name_array, logs_bag_hash, msg='', failed_node_names=[]
+      node_name_array.each do |node_name|
+        if logs_bag_hash.has_key?("#{ node_name }-deploy") && logs_bag_hash["#{ node_name }-deploy"]['exit_status'] == 1
+          failed_node_names << node_name_array.delete(node_name)
+        end
+      end
+
+      msg << "deploy run succeeded on #{ node_name_array.join(', ') }\n" unless node_name_array.empty?
+
+      msg << "#{ 'and ' unless msg.blank? }deploy run FAILED on #{ failed_node_names.join(', ') }\n" unless failed_node_names.empty?
+
+      audit_command_to_slack_queue(audit_run_as_hash, 'short', msg)
+    end
+
     def return_true_command command
       final_command = command
 

data/lib/cheftacular/cheftacular.rb

@@ -55,6 +55,8 @@ class Cheftacular
 
       @config['parser'].parse_context
 
+      @config['helper'].unset_repository_if_role_has_no_repository
+
       puts("Preparing to run command \"#{ @options['command'] }\"...") if @options['verbose']
 
       @config['auditor'].audit_run if @config['cheftacular']['auditing']

data/lib/cheftacular/getter.rb

@@ -170,7 +170,6 @@ class Cheftacular
               skip = true if repo_hash[key.to_s] != val && restrict_hash.has_key?(:ignore_value)
               skip = true if val == 'NOT NIL' && repo_hash[key.to_s].nil?
               skip = true if val == 'NIL'     && !repo_hash[key.to_s].nil?
-              puts "#{ name } => k:#{ key }::v:#{ val }:::#{ skip }:[#{ repo_hash[key.to_s] }]"
             end
           end
 

data/lib/cheftacular/helper.rb

@@ -213,14 +213,20 @@ class Cheftacular
       end
     end
 
+    def get_cheftacular_yml_override filename='override.cheftacular.yml', ret_hash={}
+      ret_hash = get_cheftacular_yml_as_hash(filename) if File.exist?(File.join( Dir.getwd, 'config', filename ))
+
+      ret_hash
+    end
+
     #this must be in helpers because getter class is not yet loaded at the time this method is needed.
-    def get_cheftacular_yml_as_hash
-      config_location = if File.exist?(File.join( Dir.getwd, 'config', 'cheftacular.yml' ))
-                          File.join( Dir.getwd, 'config', 'cheftacular.yml' )
-                        elsif File.exist?('/root/cheftacular.yml')
-                          '/root/cheftacular.yml'
+    def get_cheftacular_yml_as_hash filename='cheftacular.yml'
+      config_location = if File.exist?(File.join( Dir.getwd, 'config', filename ))
+                          File.join( Dir.getwd, 'config', filename )
+                        elsif File.exist?("/root/#{ filename }")
+                          "/root/#{ filename }"
                         else
-                          raise "cheftacular.yml configuration file could not be found in either #{ File.join( Dir.getwd, 'config', 'cheftacular.yml' ) } or /root/cheftacular.yml"
+                          raise "cheftacular.yml configuration file could not be found in either #{ File.join( Dir.getwd, 'config', filename ) } or /root/#{ filename }"
                         end
 
       YAML::load(ERB.new(IO.read(File.open(config_location))).result)
@@ -330,7 +336,7 @@ class Cheftacular
     end
 
     def display_cheftacular_config_diff
-      diff_hash = @config['initial_cheftacular_yml'].deep_diff(@config['default']['cheftacular_bag_hash'], true).except('mode', 'default_repository').compact
+      diff_hash = @config['initial_cheftacular_yml'].deep_diff(@config['default']['cheftacular_bag_hash'], true).except('mode', 'default_repository', 'default_environment').compact
 
       recursive_hash_scrub(diff_hash)
 
@@ -364,6 +370,10 @@ class Cheftacular
         end
       end
     end
+
+    def unset_repository_if_role_has_no_repository #at this point, we should of already verified that the role exists so the repository key is useless data
+      @options.delete('repository') if @config['getter'].get_repository_from_role_name(@options['role'], 'do_not_raise_on_unknown').nil?
+    end
   end
 end
 

data/lib/cheftacular/initializer.rb

@@ -8,6 +8,8 @@ class Cheftacular
 
       initialize_yaml_configuration
 
+      initialize_override_yaml_configuration
+
       initialize_default_cheftacular_options
 
       initialize_locations
@@ -92,6 +94,10 @@ class Cheftacular
           @options['env'] = 'staging'
         end
 
+        #opts.on('-S', '--split-staging', "Set the sub-environment to split_staging") do
+        #  @options['sub_env'] = 'split-staging'
+        #end
+
         opts.on('--split-env SPLIT_ENV_NAME', "Set the sub-environment to the specified split_env") do |sub_env|
           @options['sub_env'] = sub_env
         end
@@ -131,11 +137,11 @@ class Cheftacular
           @options['repository'] = name
         end
 
-        opts.on('-s', '--search-node-name NODE_NAME', 'For commands that support searching, return results with NODE_NAME in them') do |name|
+        opts.on('-N', '--search-node-name NODE_NAME', 'For commands that support searching, return results with NODE_NAME in them') do |name|
           @options['search_node_name'] = name
         end
 
-        opts.on('-S', '--search-role-name ROLE_NAME', 'For commands that support searching, return results with ROLE_NAME in them') do |name|
+        opts.on('-L', '--search-role-name ROLE_NAME', 'For commands that support searching, return results with ROLE_NAME in them') do |name|
           @options['search_role_name'] = name
         end
 
@@ -263,6 +269,17 @@ class Cheftacular
       @config['cheftacular'] = @config['helper'].get_cheftacular_yml_as_hash
     end
 
+    def initialize_override_yaml_configuration
+      @config['cheftacular_overrides'] = @config['helper'].get_cheftacular_yml_override
+
+      @config['cheftacular'] = @config['cheftacular'].merge(@config['cheftacular_overrides'])
+    end    
+
+    def initialize_default_cheftacular_options
+      @options['env']        = @config['cheftacular']['default_environment'] if @config['cheftacular'].has_key?('default_environment')
+      @options['repository'] = @config['cheftacular']['default_repository']  if @config['cheftacular'].has_key?('default_repository')
+    end
+
     def initialize_data_bag_cheftacular_hash
       initialize_ridley
 
@@ -285,11 +302,6 @@ class Cheftacular
       @config['filesystem'].write_local_cheftacular_cache_file parsed_cheftacular
     end
 
-    def initialize_default_cheftacular_options
-      @options['env']        = @config['cheftacular']['default_environment'] if @config['cheftacular'].has_key?('default_environment')
-      @options['repository'] = @config['cheftacular']['default_repository']  if @config['cheftacular'].has_key?('default_repository')
-    end
-
     def initialize_monkeypatches
       if File.exists?(File.expand_path("#{ @config['locs']['app-root'] }/config/initializers/cheftacular.rb"))
         puts "Cheftacular Monkeypatch file detected! Preparing to require..."

data/lib/cheftacular/parser.rb

@@ -9,12 +9,10 @@ class Cheftacular
     def parse_context
       return if @config['repository'] && @config['command'] && @config['role']
 
-      roles ||= []
-
-      @config['chef_roles'].each {|r| roles << r.name }
-
       @options['command'] = ARGV[0] unless @options['command']
 
+      parse_role(@options['role']) unless @options['role'].nil?
+
       parse_repository(@options['repository'])
 
       parse_node_name(@options['node_name']) if @options['node_name']

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -16,6 +16,8 @@ class Cheftacular
 
         '5.  `-s|--staging` toggles on staging mode. Commands passed to cft will hit the staging server(s) instead of the default server(s)',
 
+        #'6.  `-S|--split-staging` toggles on split-staging as a sub environment.',
+
         '6.  `--split-env SPLIT_ENV_NAME` sets the sub-environment to SPLIT_ENV_NAME. This only slightly affects certain commands.',
 
         '7.  `-t|--test` toggles on test mode. Commands passed to cft will hit the test server(s) instead of the default server(s)',
@@ -36,9 +38,9 @@ class Cheftacular
 
         '7.  `-R|--repository NAME` will make the command run against a specific repository or context (automatically set for application mode)',
 
-        '8.  `-s|--search-node-name NODE_NAME` option will make this command return results that INCLUDE the NODE_NAME.',
+        '8.  `-N|--search-node-name NODE_NAME` option will make this command return results that INCLUDE the NODE_NAME.',
 
-        '9.  `-S|--search-role-name ROLE_NAME` option will make this command return results that INCLUDE the ROLE_NAME.',
+        '9.  `-L|--search-role-name ROLE_NAME` option will make this command return results that INCLUDE the ROLE_NAME.',
 
         '10. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment.',
 

data/lib/cheftacular/stateless_actions/environment.rb

@@ -21,7 +21,9 @@ class Cheftacular
 
           "    6. This command also accepts a *comma delimited list* of server names to boot / destroy instead of all the stored ones for an environment.",
 
-          "    7. Aliased to `cft e`"
+          "    7. This command works with all the flags that `cft deploy` works with, like -Z -z -O and so on.",
+
+          "    8. Aliased to `cft e`"
         ]
       ]
 

data/lib/cheftacular/stateless_actions/get_active_ssh_connections.rb

@@ -6,7 +6,9 @@ class Cheftacular
         "`cft get_active_ssh_connections` will fetch the active ssh connections from every server and output it into your log directory.",
 
         [
-          "    1. This command runs on all servers in an environment by default"
+          "    1. This command runs on all servers in an environment by default",
+          
+          "    2. Packets can be examined more closely with `tcpdump src port PORT`"
         ]
       ]
 

data/lib/cheftacular/stateless_actions/ssh.rb

@@ -4,8 +4,12 @@ class Cheftacular
     def ssh
       @config['documentation']['stateless_action'][__method__] ||= {}
       @config['documentation']['stateless_action'][__method__]['long_description'] = [
-        "`cft ssh NODE_NAME` ssh you into the node name you are trying to access. "+
-        "It will also drop the server's sudo password into your clipboard. "
+        "`cft ssh NODE_NAME [exec] [command]` ssh you into the node name you are trying to access. "+
+        "It will also drop the server's sudo password into your clipboard. ",
+
+        [
+          "    1. `cft ssh NODE_NAME exec COMMAND` will execute a command on the server as root"
+        ]
       ]
 
       @config['documentation']['stateless_action'][__method__]['short_description'] = 'SSHs you into a node regardless of environment'
@@ -15,26 +19,30 @@ class Cheftacular
   end
 
   class StatelessAction
-    def ssh
+    def ssh node_name='', command=''
       @options['node_name'] = ARGV[1] unless @options['node_name']
 
-      @config['stateless_action'].pass(@options['node_name'])
+      command = ARGV[3] if command.blank? && ARGV[2] == 'exec' 
+
+      @config['stateless_action'].pass(@options['node_name']) if command.blank?
 
       nodes = @config['error'].is_valid_node_name_option?
 
       nodes.each do |n|
         puts("Beginning ssh run for #{ n.name } (#{ n.public_ipaddress })") unless @options['quiet']
 
-        start_ssh_session(n.public_ipaddress)
+        start_ssh_session(n.public_ipaddress, command)
       end
 
-      @config['auditor'].notify_slack_on_completion("ssh run completed on #{ @options['node_name'] } (#{ nodes.first.public_ipaddress })\n") if @config['cheftacular']['auditing']
+      @config['auditor'].notify_slack_on_completion("ssh run completed on #{ @options['node_name'] } (#{ nodes.first.public_ipaddress })\n") if @config['cheftacular']['auditing'] && command.blank?
     end
 
     private
 
-    def start_ssh_session ip_address
-      `ssh #{ Cheftacular::SSH_INLINE_VARS } -t #{ @config['cheftacular']['deploy_user'] }@#{ ip_address } > /dev/tty`
+    def start_ssh_session ip_address, command
+      puts(`ssh #{ Cheftacular::SSH_INLINE_VARS } -tt #{ @config['cheftacular']['deploy_user'] }@#{ ip_address } "#{ @config['helper'].sudo(ip_address) } #{ command }" > /dev/tty`) unless command.blank?
+
+      `ssh #{ Cheftacular::SSH_INLINE_VARS } -t #{ @config['cheftacular']['deploy_user'] }@#{ ip_address } > /dev/tty` if command.blank?
     end
   end
 end

data/lib/cheftacular/stateless_actions/update_cookbook.rb

@@ -37,7 +37,7 @@ class Cheftacular
           `rm -Rf #{ @config['locs']['cookbooks'] }/#{ cookbook }` if File.exists?(File.expand_path("#{ @config['locs']['cookbooks'] }/#{ cookbook }"))
           `cp -Rf #{ @config['locs']['true-root'] }/#{ cookbook } #{ @config['locs']['cookbooks'] }/#{ cookbook }`
 
-          `rm -Rf #{ @config['locs']['true-root'] }/#{ cookbook }/.git`
+          `rm -Rf #{ @config['locs']['cookbooks'] }/#{ cookbook }/.git`
         else
           puts "You do not have #{ cookbook } under the #{ @config['locs']['true-root'] } directory!"
         end

data/lib/cheftacular/stateless_actions/update_the_cheftacular_cookbook_and_knife_upload.rb

@@ -12,7 +12,7 @@ class Cheftacular
         ]
       ]
 
-      @config['documentation']['stateless_action']['utccaku']['short_description'] = 'Runs `update_cookbook` and `knife_upload` for the cheftacular cookbook'
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Runs `update_cookbook` and `knife_upload` for the cheftacular cookbook'
     end
   end
 

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.14.1"
+  VERSION      = "2.15.0"
   RUBY_VERSION = "2.2.2"
 end

data/lib/sshkit/getters.rb

@@ -8,9 +8,9 @@ module SSHKit
 
         repositories.each_pair { |key, repo_hash| repo_role_name = key if repo_hash['repo_name'] == name }
 
-        if repositories.has_key?(name) && args.empty?
+        if repositories.has_key?(name) && ( args.empty? || args.include?('do_not_raise_on_unknown') )
           return repositories[name]['repo_name']
-        elsif !repo_role_name.empty? && args.empty?
+        elsif !repo_role_name.empty? && ( args.empty? || args.include?('do_not_raise_on_unknown') )
           return repo_role_name
         end
 
@@ -20,7 +20,9 @@ module SSHKit
           return !repo_role_name.empty?
         end
 
-        raise "Unknown repository or rolename for #{ name }"
+        raise "Unknown repository or rolename for #{ name }" unless args.include?('do_not_raise_on_unknown')
+
+        nil
       end
 
       def get_node_from_address nodes, address, ret_node=nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.15.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie