cheftacular 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe23950f4d89fd436f8f7123dc8c8f97a37142c
-  data.tar.gz: b51e27e4ccfff017252831899bb337807cb880e5
+  metadata.gz: 8949fa37858773111202176ac29af437fcbb10b4
+  data.tar.gz: 672dfda5a31ed376cbd1f73ad486af1e3f9f1407
 SHA512:
-  metadata.gz: 4b4e7adec32f861223b857e4854e4a31ed3bcfb0bd3ecd2a3f59f6e60891f7a83dfddbb7417764250bf87038622f825fdeffb9cbb2707ef3ebc0837b9e0eb758
-  data.tar.gz: 58f52b6c9c6f1a551086e4cce607f6e673107f8d2582fc661c0978b1b40cf8e837b83c8279bf49ee1c2ba5c592a9343a73bef763694a9313ff8a8a28e4257634
+  metadata.gz: 983c929c9118974e86668048b1e4d67b5f53fc6903355e7abc668b6a69b46e7e34c35e2a74f76f5e28dcaedfa1cca12ab182b999321844344603e87778f5a8f8
+  data.tar.gz: c0aead1166459633e9fa03dbfd08f80ee2d23b65e78ea90a014474f34c1ae3db8c7d5af91ad4e0a96a0757ee8aab6744ea762ebbd90d361c7af7325cea8bfabb

data/lib/cheftacular/actions/deploy.rb

@@ -35,7 +35,7 @@ class Cheftacular
       options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
 
       #on is namespaced to SSHKit::Backend::Netssh.on 
-      on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ), in: :groups, limit: 10, wait: 5 do |host|
+      on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ), in: :groups, limit: 6, wait: 5 do |host|
         n = get_node_from_address(nodes, host.hostname)
 
         puts("Beginning chef client run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']

data/lib/cheftacular/actions/migrate.rb

@@ -54,13 +54,13 @@ class Cheftacular
     def migrate_wordpress nodes=[]
       puts "Method #{ __method__ } is not yet implemented"
 
-      exit
+      return false
     end
 
     def migrate_nodejs nodes=[]
       puts "Method #{ __method__ } is not yet implemented"
 
-      exit
+      return false
     end
 
     def migrate_all nodes=[]

data/lib/cheftacular/auditor.rb

@@ -9,19 +9,20 @@ class Cheftacular
       current_day  = Time.now.strftime('%Y%m%d')
       current_time = Time.now.strftime('%H:%M')
 
+      audit_data = audit_run_as_hash
+
       @config[@options['env']]['audit_bag_hash']['audit_log'][current_day] ||= {}
       @config[@options['env']]['audit_bag_hash']['audit_log'][current_day][current_time] ||= []
-      @config[@options['env']]['audit_bag_hash']['audit_log'][current_day][current_time] << read_audit_cache_file_to_hash
+      @config[@options['env']]['audit_bag_hash']['audit_log'][current_day][current_time] << audit_data
 
       @config['ChefDataBag'].save_audit_bag
-    end
 
-    def write_audit_cache_file
-      File.open( @config['filesystem'].current_audit_file_path, "w") { |f| f.write( fetch_audit_data_hash ) }
+      audit_command_to_slack_queue(audit_data) unless @config['cheftacular']['slack']['notify_on_command_execute'].blank?
     end
 
-    def read_audit_cache_file_to_hash ret_hash={}, options_to_ignore=[]
-      ret_hash = Hash.class_eval( File.read( @config['filesystem'].current_audit_file_path ))
+    def audit_run_as_hash ret_hash={}, options_to_ignore=[]
+      ret_hash['hostname']  = Socket.gethostname
+      ret_hash['directory'] = @config['locs']['root']
       ret_hash['command']   = @options['command']
       
       options_to_ignore << :preferred_cloud        if @options['preferred_cloud'] == @config['cheftacular']['preferred_cloud']
@@ -29,6 +30,8 @@ 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 << :sub_env
+      options_to_ignore << :command
 
       ret_hash['options']   = @options.dup.delete_if { |key, value| options_to_ignore.include?(key.to_sym) }
 
@@ -37,14 +40,24 @@ class Cheftacular
       ret_hash
     end
 
-    def fetch_audit_data_hash ret_hash={}, ip=""
-      ret_hash['hostname']  = Socket.gethostname
+    def compile_audit_hash_entry_as_array audit_hash, entry_number=0, ret_array=[]
+      ret_array << "#{ (entry_number.to_s + '. ') unless entry_number == 0 }#{ audit_hash['command'] }"
+      ret_array << "  Hostname:  #{ audit_hash['hostname'] }"
+      ret_array << "  Directory: #{ audit_hash['directory'] }"       if audit_hash.has_key?('directory')
+      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?
+      
+      ret_array = ret_array.map { |entry| entry.prepend('    ')} unless entry_number == 0
 
-      ret_hash
-    rescue StandardError => exception
-      @config['filesystem'].cleanup_file_caches('current-audit-only')
+      ret_array
+    end
+
+    private
+
+    def audit_command_to_slack_queue audit_hash, msg=''
+      msg << compile_audit_hash_entry_as_array(audit_hash).join("\n")
 
-      @config['error'].exception_output "Unable to finish parsing auditing hash", exception
+      @config['slack_queue'] << { message: msg.prepend('```').insert(-1, '```'), channel: @config['cheftacular']['slack']['notify_on_command_execute'] }
     end
   end
 end

data/lib/cheftacular/cheftacular.rb

@@ -39,8 +39,6 @@ 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'].initialize_data_bag_contents(@options['env']) #ensure basic structure are always maintained before each run
 
       @config['parser'].parse_application_context if @config['helper'].running_in_mode?('application')
@@ -50,6 +48,8 @@ class Cheftacular
       puts("Preparing to run command \"#{ @options['command'] }\"...") if @options['verbose']
 
       @config['auditor'].audit_run if @config['cheftacular']['auditing']
+
+      @config['queue_master'].work_off_slack_queue #this occurs twice so commands that don't "end" can be queued
     end
 
     @config['stateless_action'].check_cheftacular_yml_keys unless @config['helper'].is_initialization_command?(ARGV[0])

data/lib/cheftacular/file_system.rb

@@ -177,7 +177,7 @@ class Cheftacular
       chef_repo_cookbooks
     end
 
-     def parse_version_from_berkshelf_cookbook berkshelf_cookbook
+    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
@@ -185,6 +185,10 @@ class Cheftacular
       end
     end
 
+    def parse_gemfile_gem_version gem_name
+      File.read(File.expand_path("#{ @config['locs']['root'] }/Gemfile"))[/#{ gem_name }.*([\d\.]+)/][/([\d\.]+)/]
+    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/helper.rb

@@ -48,7 +48,7 @@ class Cheftacular
     def fetch_remote_version
       puts "Checking remote #{ declassify } version..."
 
-      `gem list #{ declassify } --remote`[/(\d+\.\d+\.\d+)/]
+      `gem list #{ declassify } --remote`[/([\d\.]+)/]
     end
 
     def completion_rate? percent, mode
@@ -274,7 +274,7 @@ class Cheftacular
           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['slack_queue'] << { message: hash['text'].prepend('```').insert(-1, '```') }
 
             @config['error'].exception_output(on_failing_exit_status_message) if !on_failing_exit_status_message.blank?
           end
@@ -285,9 +285,22 @@ class Cheftacular
     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']
+      msg << "the revision to #{ @options['target_revision'] }\n"         if @options['target_revision']
+      msg << "In the environment: #{ @options['env'] }"
       
-      @config['stateless_action'].slack(msg.prepend('```').insert(-1, '```'), @config['cheftacular']['slack']['notify_on_deployment_args'])
+      @config['slack_queue'] << { message: msg.prepend('```').insert(-1, '```'), channel: @config['cheftacular']['slack']['notify_on_deployment_args'] }
+    end
+
+    def display_currently_installed_version
+      puts "The current version of cheftacular is #{ Cheftacular::VERSION }"
+    end
+
+    def set_detected_cheftacular_version
+      @config['detected_cheftacular_version'] ||= if File.exists?( @config['filesystem'].current_version_file_path )
+                                                    File.read( @config['filesystem'].current_version_file_path )
+                                                  else 
+                                                    @config['helper'].fetch_remote_version
+                                                  end
     end
   end
 end

data/lib/cheftacular/initializer.rb

@@ -55,9 +55,7 @@ class Cheftacular
 
         @config['helper'].completion_rate? 100, 'initializer'
 
-        initialize_version_check if @config['cheftacular']['strict_version_checks']
-
-        initialize_auditing_checks if @config['cheftacular']['auditing']
+        initialize_version_check        if @config['cheftacular']['strict_version_checks']
 
         initialize_chef_repo_up_to_date if @config['cheftacular']['keep_chef_repo_cheftacular_yml_up_to_date']
       end
@@ -133,6 +131,12 @@ class Cheftacular
           @options['verbose'] = true
         end
 
+        opts.on('-V', '--version', "Displays the current version of cheftacular") do
+          @config['helper'].display_currently_installed_version
+
+          exit
+        end
+
         opts.on('--no-logs', "Do not make logs for any command") do
           @options['no_logs'] = true
         end
@@ -426,38 +430,30 @@ class Cheftacular
       end
     end
 
-    def initialize_version_check detected_version=""
+    def initialize_version_check
       current_version = Cheftacular::VERSION
 
-      detected_version = File.exists?( @config['filesystem'].current_version_file_path ) ? File.read( @config['filesystem'].current_version_file_path ) : @config['helper'].fetch_remote_version
+      @config['helper'].set_detected_cheftacular_version
 
-      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"
+      if @config['helper'].is_higher_version? @config['detected_cheftacular_version'], current_version
+        puts "\n Your Cheftacular is out of date. Currently #{ current_version } and remote version is #{ @config['detected_cheftacular_version'] }.\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"
+          @config['stateless_action'].update_cheftacular
         end
 
         exit
       else
         unless File.exists?( @config['filesystem'].current_version_file_path )
-          puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") } (#{ detected_version }). No new version detected."
+          puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") } (#{ @config['detected_cheftacular_version'] }). No new version detected."
 
-          @config['filesystem'].write_version_file detected_version
+          @config['filesystem'].write_version_file @config['detected_cheftacular_version']
         end
       end
     end
 
-    def initialize_auditing_checks
-      unless File.exists? @config['filesystem'].current_audit_file_path
-        puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") } audit data..."
-
-        @config['auditor'].write_audit_cache_file
-      end
-    end
-
     def initialize_classes
       @config['auditor']                        = Cheftacular::Auditor.new(@options, @config)
       @config['parser']                         = Cheftacular::Parser.new(@options, @config)

data/lib/cheftacular/queue_master.rb

@@ -8,9 +8,11 @@ class Cheftacular
     def work_off_slack_queue
       return true if @config['slack_queue'].empty?
       
-      @config['slack_queue'].each do |message|
-        @config['stateless_action'].slack(message)
+      @config['slack_queue'].each do |slack_hash|
+        @config['stateless_action'].slack(slack_hash[:message], slack_hash[:channel])
       end
+
+      @config['slack_queue'] = []
     end
   end
 end

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -72,5 +72,7 @@ class Cheftacular
 
       puts @config['documentation']['arguments']
     end
+
+    alias_method :flags, :arguments
   end
 end

data/lib/cheftacular/stateless_actions/check_cheftacular_yml_keys.rb

@@ -16,13 +16,32 @@ 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.10.0################################################
+
+      unless @config['cheftacular'].has_key?('self_update_repository')
+        puts base_message.gsub('KEY', 'self_update_repository').gsub('DEFAULT', 'blank')
+
+        @config['cheftacular']['self_update_repository'] = ''
+
+        warn_on_missing = true
+      end
+
+      #############################2.9.2################################################
+
+      unless @config['cheftacular']['slack'].has_key?('notify_on_command_execute')
+        puts base_message.gsub('KEY', 'slack:notify_on_command_execute').gsub('DEFAULT', 'blank')
+
+        @config['cheftacular']['slack']['notify_command_execute'] = ''
+
+        warn_on_missing = true
+      end
+
       #############################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')
+        puts base_message.gsub('KEY', 'slack:notify_on_deployment_args').gsub('DEFAULT', 'blank')
 
-        @config['cheftacular']['slack']['notify_on_deployment_args'] = false
+        @config['cheftacular']['slack']['notify_on_deployment_args'] = ''
 
         warn_on_missing = true
       end
@@ -30,8 +49,7 @@ class Cheftacular
       #############################2.7.0################################################
 
       unless @config['cheftacular'].has_key?('backup_config')
-        #backup_config:global_backup_role_name
-        base_message.gsub('KEY', 'backup_config').gsub('DEFAULT', 'nil')
+        puts base_message.gsub('KEY', 'backup_config').gsub('DEFAULT', 'nil')
 
         warn_on_missing = true
       end

data/lib/cheftacular/stateless_actions/cheftacular_config.rb

@@ -4,7 +4,7 @@ class Cheftacular
     def cheftacular_config
       @config['documentation']['stateless_action'][__method__] ||= {}
       @config['documentation']['stateless_action'][__method__]['long_description'] = [
-        "`cft cheftacular_config [display|sync|overwrite]` this command " +
+        "`cft cheftacular_config [diff|display|sync|overwrite]` this command " +
         "Allows you to interact with your complete cheftacular configuration, the union of all repository's cheftacular.ymls. ",
 
         [
@@ -27,7 +27,7 @@ class Cheftacular
     def cheftacular_config command=''
       command = ARGV[1] if command.blank?
 
-      raise "Unsupported command (#{ command }) for cft cheftacular_config" unless command =~ /display|sync|overwrite/
+      raise "Unsupported command (#{ command }) for cft cheftacular_config" unless command =~ /diff|display|sync|overwrite/
 
       self.send("cheftacular_config_#{ command }")
     end

data/lib/cheftacular/stateless_actions/compile_audit_log.rb

@@ -42,11 +42,7 @@ class Cheftacular
 
           compiled_audit_hash[day][time].each do |log_arr|
             log_arr.each do |log_hash|
-              out << "    #{ log_array_entry_count }. #{ log_hash['command'] }"
-              out << "        1. Hostname:  #{ log_hash['hostname'] }"
-              out << "        3. Arguments: #{ log_hash['arguments'] }"
-              out << "        4. Options:   #{ log_hash['options'].to_hash }"
-              out << ""
+              out << @config['auditor'].compile_audit_hash_entry_as_array(log_hash, log_array_entry_count)
 
               log_array_entry_count += 1
             end
@@ -56,7 +52,7 @@ class Cheftacular
         end
       end
 
-      File.open("#{ @config['locs']['chef-log'] }/audit-log-#{ Time.now.strftime("%Y%m%d%H%M%S") }.md", "w") { |f| f.write(out.join("\n")) }
+      File.open("#{ @config['locs']['chef-log'] }/audit-log-#{ Time.now.strftime("%Y%m%d%H%M%S") }.md", "w") { |f| f.write(out.flatten.join("\n")) }
     end
   end
 end

data/lib/cheftacular/stateless_actions/slack.rb

@@ -20,10 +20,12 @@ class Cheftacular
 
   class StatelessAction
     def slack message='', channel=''
+      return false if @config['cheftacular']['slack']['webhook'].nil?
+
       @slack_notifier ||= Slack::Notifier.new @config['cheftacular']['slack']['webhook'], username: 'Cheftacular'
 
-      message = ARGV[1] if message.blank?
-      channel = ARGV[2] if channel.blank?
+      message = ARGV[1] if !message.nil? && message.blank?
+      channel = ARGV[2] if !channel.nil? && channel.blank?
 
       @slack_notifier.channel = channel.nil? ? @config['cheftacular']['slack']['default_channel'] : channel
       @slack_notifier.ping message

data/lib/cheftacular/stateless_actions/update_cheftacular.rb

@@ -0,0 +1,85 @@
+
+class Cheftacular
+  class StatelessActionDocumentation
+    def update_cheftacular
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
+        "`cft #{ __method__ }` this command attempts to update cheftacular to the latest version."
+      ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Update cheftacular to the latest version'
+
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
+    end
+  end
+
+  class StatelessAction
+    def update_cheftacular status_hash={}
+      update_cheftacular_not_configured_to_update if @config['cheftacular']['self_update_repository'] != @config['locs']['root']
+
+      @config['helper'].set_detected_cheftacular_version
+
+      puts "Attempting to update cheftacular from #{ Cheftacular::VERSION } to #{ @config['detected_cheftacular_version'] }..."
+
+      status_hash['gemfile_is_latest_version'] = update_cheftacular_from_git
+      status_hash['gemfile_is_latest_version'] = update_cheftacular_gemfile unless status_hash['gemfile_is_latest_version']
+      status_hash['bundled_latest_version']    = update_cheftacular_bundle if status_hash['gemfile_is_latest_version']
+
+      if !status_hash['gemfile_is_latest_version'] || !status_hash['bundled_latest_version']
+        puts(
+          "Issues occured in automatically updating your cheftacular " +
+          "to #{ @config['detected_cheftacular_version'] }, please send " +
+          "the output of this command to your DevOps administrator or add " +
+          "it as an issue at this gem's github page."
+        )
+      else
+        puts "Successfully installed version #{ @config['detected_cheftacular_version'] }, please re-run your command."
+      end
+    end
+
+    private
+    def update_cheftacular_from_git out=[]
+      out << `git reset --hard origin/master && git pull origin master`
+
+      parsed_gemfile_version = @config['filesystem'].parse_gemfile_gem_version('cheftacular')
+
+      puts "After git update, Gemfile lists version #{ parsed_gemfile_version } versus latest version: #{ @config['detected_cheftacular_version'] }"
+
+      return parsed_gemfile_version == @config['detected_cheftacular_version']
+    end
+
+    def update_cheftacular_gemfile
+      puts "Forcing gemfile update to the latest version of cheftacular..."
+
+      gemfile_path           = File.expand_path("#{ @config['locs']['root'] }/Gemfile")
+      parsed_gemfile_version = @config['filesystem'].parse_gemfile_gem_version('cheftacular')
+      new_file_content       = File.read(gemfile_path).gsub(parsed_gemfile_version, @config['detected_cheftacular_version'])
+
+      File.open( gemfile_path, "w") { |f| f.write(new_file_content) }
+
+      new_parsed_gemfile_version = @config['filesystem'].parse_gemfile_gem_version('cheftacular')
+
+      puts "After forced gemfile update, Gemfile lists version #{ new_parsed_gemfile_version } versus latest version: #{ @config['detected_cheftacular_version'] }"
+
+      return new_parsed_gemfile_version == @config['detected_cheftacular_version']
+    end
+
+    def update_cheftacular_bundle out=[]
+      puts "Running bundle install..."
+
+      out << `bundle install`
+
+      cheftacular_bundle_version = out.first[/cheftacular.*([\d\.]+)/][/([\d\.]+)/]
+
+      puts "After bundle install, version is #{ cheftacular_bundle_version } versus latest version: #{ @config['detected_cheftacular_version'] }"
+
+      return cheftacular_bundle_version == @config['detected_cheftacular_version']
+    end
+
+    def update_cheftacular_not_configured_to_update
+      puts "Please update the gemfile to #{ @config['detected_cheftacular_version'] }, bundle install and then restart this process.\n"
+
+      exit
+    end
+  end
+end

data/lib/cheftacular/stateless_actions/version.rb

@@ -0,0 +1,27 @@
+
+class Cheftacular
+  class StatelessActionDocumentation
+    def version
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
+        "`cft version` this command prints out the current version of cheftacular.",
+      ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Displays the current version of cheftacular'
+
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
+    end
+  end
+
+  class InitializationAction
+    def version
+      
+    end
+  end
+
+  class StatelessAction
+    def version
+      @config['helper'].display_currently_installed_version
+    end
+  end
+end

data/lib/cheftacular/version.rb

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

data/lib/sshkit/getters.rb

@@ -36,11 +36,13 @@ module SSHKit
       end
 
       def get_true_environment run_list, chef_env_roles, default_env
-        chef_env_roles.each_pair do |role, env|
-          if run_list.include?("role[#{ role }]")
-            default_env = env
+        unless chef_env_roles.nil?
+          chef_env_roles.each_pair do |role, env|
+            if run_list.include?("role[#{ role }]")
+              default_env = env
 
-            break
+              break
+            end
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -303,12 +303,14 @@ files:
 - lib/cheftacular/stateless_actions/slack.rb
 - lib/cheftacular/stateless_actions/test_env.rb
 - lib/cheftacular/stateless_actions/update_chef_client.rb
+- lib/cheftacular/stateless_actions/update_cheftacular.rb
 - lib/cheftacular/stateless_actions/update_cloudflare_dns_from_cloud.rb
 - lib/cheftacular/stateless_actions/update_split_branches.rb
 - lib/cheftacular/stateless_actions/update_thecheftacularcookbook.rb
 - lib/cheftacular/stateless_actions/update_tld.rb
 - lib/cheftacular/stateless_actions/upload_nodes.rb
 - lib/cheftacular/stateless_actions/upload_roles.rb
+- lib/cheftacular/stateless_actions/version.rb
 - lib/cheftacular/version.rb
 - lib/cloud_interactor/authentication.rb
 - lib/cloud_interactor/cloud_interactor.rb