cheftacular 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cacccbd73021b45400cb3eda03bb8cb22f1ba9fe
-  data.tar.gz: 70f82785708bd038080088e905a0ef5cf4f84598
+  metadata.gz: 46547d3aa90d80b995df07810a4675b88f3d4822
+  data.tar.gz: 1e8ea61b705880d022271335953a9c2364b200a7
 SHA512:
-  metadata.gz: 08b9fbaee4acc4edebff56241cdf369a30fc1684dbee05f37021c4e3d85002f267fd9c942303d6003fcbd095010d34a0a1a775d30c8e73c71f2cbca3134d8b2b
-  data.tar.gz: 2dee13991458ac134f24af9b2685e2c9e389934a5214a100d737612a23220d9d4ef5eca643a652c1be978471d685b1bcb93d90e7a9784b742bf4dce2a923583a
+  metadata.gz: b5a4f09cba60332a5d60ed2de80747b900601006132a5dbcb6e10ed9fa6f741c2b82482bcc5ac4c6689a30cbfb708b24d253f66bae9c9fdf82f8c0895170a293
+  data.tar.gz: 5e0101b89e3f56ad978669ca89c5f0a460e0aa19dfde40d1ee73ec0f2dfb9aed5565854b497a1b2eab5b56e8bc239e5384b5a2aa5f1a0f258ba53c30ce475bbf

data/lib/cheftacular/actions/console.rb

@@ -41,7 +41,7 @@ class Cheftacular
 
     def start_console_ruby_on_rails ip_address, run_list
       app_loc  = "#{ @config['cheftacular']['base_file_path'] }/#{ @options['repository'] }/current"
-      true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'], @options['env']
+      true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'][@options['env']], @options['env']
 
       #the >/dev/tty after the ssh block redirects the full output to stdout, not /dev/null where it normally goes  
       `ssh -oStrictHostKeyChecking=no -tt deploy@#{ ip_address } "cd #{ app_loc } && RAILS_ENV=#{ true_env } #{ @config['bundle_command'] } exec rails c" > /dev/tty`

data/lib/cheftacular/actions/deploy.rb

@@ -7,7 +7,10 @@ class Cheftacular
         
         [
           "    1.  This command also restarts services on the server and updates the code. Changes behavior slightly with the `-z|-Z` args " +
-          "but only if your cookbooks support switching revisions based on tags / branch names."
+          "but only if your cookbooks support switching revisions based on tags / branch names.",
+
+          "    2.  This command will also run migrations on both an role's normal servers and its split servers if certain " +
+          "conditions are met (such as the role having a database, etc)."
         ]
       ]
     end
@@ -36,6 +39,26 @@ class Cheftacular
       #@config['ChefDataBag'].save_logs_bag unless @options['debug'] #We don't really need to store entire chef runs in the logs bag
 
       migrate(nodes) if @config['getter'].get_current_repo_config['database'] != 'none' && !@options['run_migration_already']
+
+      split_nodes_hash = {}
+
+      @config['cheftacular']['run_list_environments'][@options['env']].each_key do |role_name|
+        split_nodes_hash[role_name] = @config['parser'].exclude_nodes( nodes, [{ unless: "role[#{ role_name }]" }])
+      end
+
+      split_nodes_hash.each_pair do |role, split_nodes|
+        next if split_nodes.empty?
+
+        unless @options["run_#{ role }_migrations_already"]
+          @options["run_#{ role }_migrations_already"] = true
+          
+          if @config['getter'].get_current_repo_config['database'] != 'none'
+            puts("Running migration on split environment #{ role }...") if !@options['quiet']
+            
+            migrate(split_nodes)
+          end
+        end
+      end
     end
   end
 end

data/lib/cheftacular/actions/log.rb

@@ -76,7 +76,7 @@ module SSHKit
 
       def start_log_fetch_ruby_on_rails name, ip_address, run_list, options, locs, cheftacular, passwords, out=""
         log_loc, timestamp  = set_log_loc_and_timestamp(locs)
-        true_env            = get_true_environment run_list, cheftacular['run_list_environments'], options['env']
+        true_env            = get_true_environment run_list, cheftacular['run_list_environments'][options['env']], options['env']
         app_log_loc         = "#{ cheftacular['base_file_path'] }/#{ options['repository'] }/current/log"
         log_cmnd, log_lines = get_log_command_and_lines(options)
 

data/lib/cheftacular/actions/tail.rb

@@ -43,7 +43,7 @@ class Cheftacular
     end
 
     def start_tail_ruby_on_rails ip_address, run_list
-      true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'], @options['env']
+      true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'][@options['env']], @options['env']
 
       #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"

data/lib/cheftacular/cheftacular.rb

@@ -46,7 +46,7 @@ class Cheftacular
 
     puts("Preparing to run command \"#{ @options['command'] }\"...") if @options['verbose']
 
-    @config['auditor'].audit_run if @config['cheftacular']['auditing'] == 'true'
+    @config['auditor'].audit_run if @config['cheftacular']['auditing']
 
     @config['action'].send(@options['command']) if @config['helper'].is_command?(@options['command'])
 

data/lib/cheftacular/dns.rb

@@ -143,7 +143,7 @@ class Cheftacular
       #puts "repositories:#{ repository_hash['role'] }:#{ repository_hash['repo_name'] }:route_wildcard_requests_for_tld"
 
       if @config['helper'].does_cheftacular_config_have?(["repositories:#{ repository_hash['role'] }:route_wildcard_requests_for_tld"])
-        should_route_requests = @config['cheftacular']['repositories'][repository_hash['role']]['route_wildcard_requests_for_tld'] == 'true'
+        should_route_requests = @config['cheftacular']['repositories'][repository_hash['role']]['route_wildcard_requests_for_tld']
       end
 
       should_route_requests

data/lib/cheftacular/getter.rb

@@ -122,7 +122,7 @@ class Cheftacular
 
     def get_split_branch_hash ret={}
       @config['cheftacular']['repositories'].each_pair do |name, repo_hash|
-        ret[repo_hash['name']] = repo_hash if repo_hash.has_key?('has_split_branches') && repo_hash['has_split_branches'] == 'true'
+        ret[repo_hash['name']] = repo_hash if repo_hash.has_key?('has_split_branches') && repo_hash['has_split_branches']
       end
 
       ret

data/lib/cheftacular/helper.rb

@@ -251,7 +251,6 @@ class Cheftacular
           FileUtils.rm("#{ base_dir }/#{ entry }") if File.file?("#{ base_dir }/#{ entry }") && entry.include?(Time.now.strftime("%Y%m%d"))
         end
 
-
         if File.exists?("#{ base_dir }/#{ entry }") && File.directory?("#{ base_dir }/#{ entry }")
           FileUtils.rm_rf("#{ base_dir }/#{ entry }") if !check_current_day_entry && !entry.include?(Time.now.strftime("%Y%m%d"))
           
@@ -314,6 +313,45 @@ class Cheftacular
       end
     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'
+                        else
+                          raise "cheftacular.yml configuration file could not be found in either #{ File.join( Dir.getwd, 'config', 'cheftacular.yml' ) } or /root/cheftacular.yml"
+                        end
+
+      YAML::load(ERB.new(IO.read(File.open(config_location))).result)
+    rescue StandardError => e
+      puts "The cheftacular.yml configuration file could not be parsed."
+      puts "Error message: #{ e }\n#{ e.backtrace.join("\n") }"
+      
+      exit
+    end
+
+    def current_chef_repo_cheftacular_file_cache_path
+      current_file_path "chef_repo_cheftacular_cache"
+    end
+
+    def write_chef_repo_cheftacular_cache_file hash
+      File.open( current_chef_repo_cheftacular_file_cache_path, "w") { |f| f.write(hash) }
+    end
+
+    def compile_chef_repo_cheftacular_yml_as_hash
+      master_hash = get_cheftacular_yml_as_hash
+      master_hash['replace_keys_in_chef_repo'].each_pair do |key, val|
+        master_hash[key] = val
+      end
+
+      master_hash
+    end
+
+    def write_chef_repo_cheftacular_yml_file file_location
+      File.open( file_location, "w") { |f| f.write(compile_chef_repo_cheftacular_yml_as_hash.to_yaml) }
+    end
+
     private
     def current_file_path file_name
       File.join( @config['locs']['app-root'], 'tmp', declassify, "#{ Time.now.strftime("%Y%m%d") }-#{ file_name }")

data/lib/cheftacular/initializer.rb

@@ -48,9 +48,11 @@ class Cheftacular
 
       @config['helper'].completion_rate? 100, 'initializer'
 
-      initialize_version_check if @config['cheftacular']['strict_version_checks'] == 'true'
+      initialize_version_check if @config['cheftacular']['strict_version_checks']
 
-      initialize_auditing_checks if @config['cheftacular']['auditing'] == 'true'
+      initialize_auditing_checks if @config['cheftacular']['auditing']
+
+      initialize_chef_repo_up_to_date if @config['cheftacular']['keep_chef_repo_cheftacular_yml_up_to_date']
     end
 
     #changes to arguments should show up in the documentation methods in their appropriate method file
@@ -212,20 +214,7 @@ class Cheftacular
     end
 
     def initialize_yaml_configuration
-      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'
-                        else
-                          raise "cheftacular.yml configuration file could not be found in either #{ File.join( Dir.getwd, 'config', 'cheftacular.yml' ) } or /root/cheftacular.yml"
-                        end
-
-      @config['cheftacular'] = YAML::load(ERB.new(IO.read(File.open(config_location))).result)
-    rescue StandardError => e
-      puts "The cheftacular.yml configuration file could not be parsed."
-      puts "Error message: #{ e }\n#{ e.backtrace.join("\n") }"
-      
-      exit
+      @config['cheftacular'] = @config['helper'].get_cheftacular_yml_as_hash
     end
 
     def initialize_default_cheftacular_options
@@ -299,7 +288,7 @@ class Cheftacular
         client_name:               (@config['helper'].running_on_chef_node? ? @config['helper'].parse_node_name_from_client_file : @config['cheftacular']['cheftacular_chef_user']),
         client_key:                File.expand_path("#{ @config['locs']['chef'] }/#{ @config['helper'].running_on_chef_node? ? 'client' : @config['cheftacular']['cheftacular_chef_user'] }.pem"),
         encrypted_data_bag_secret: @config['data_bag_secret'],
-        ssl:                       { verify: @config['cheftacular']['ssl_verify'] == 'true' }
+        ssl:                       { verify: @config['cheftacular']['ssl_verify'] }
       )
     end
 
@@ -393,7 +382,7 @@ 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 } and restart this process.\n"
+        puts "Please update the gemfile to #{ detected_version }, bundle install and then restart this process.\n"
 
         exit
       else
@@ -439,6 +428,39 @@ class Cheftacular
       @config['helper'].cleanup_file_caches
     end
 
+    def initialize_chef_repo_up_to_date
+      if @config['helper'].running_in_mode?('devops')
+        @config['cheftacular']['wrapper_cookbooks'].split(',').each do |wrapper_cookbook|
+          parsed_hash = if File.exists?( @config['helper'].current_chef_repo_cheftacular_file_cache_path ) 
+                          File.read( @config['helper'].current_chef_repo_cheftacular_file_cache_path )
+                        else
+                          Digest::SHA2.hexdigest(@config['helper'].compile_chef_repo_cheftacular_yml_as_hash.to_yaml.to_s)
+                        end
+
+          wrapper_cookbook_cheftacular_loc = "#{ @config['locs']['cookbooks'] }/#{ wrapper_cookbook }" +
+            @config['cheftacular']['location_of_chef_repo_cheftacular_yml'] + '/cheftacular.yml'
+
+          unless File.exist?(wrapper_cookbook_cheftacular_loc)
+            puts "Wrapper cookbook \"#{ wrapper_cookbook }\" does not have a cheftacular.yml file in #{ @config['cheftacular']['location_of_chef_repo_cheftacular_yml'] }! Creating..."
+
+            @config['helper'].write_chef_repo_cheftacular_yml_file wrapper_cookbook_cheftacular_loc
+          end
+
+          if parsed_hash == Digest::SHA2.hexdigest(File.read(wrapper_cookbook_cheftacular_loc))
+            next if File.exists?( @config['helper'].current_chef_repo_cheftacular_file_cache_path )
+          else
+            puts "Wrapper cookbook (#{ wrapper_cookbook }) does not have a current cheftacular.yml file in #{ @config['cheftacular']['location_of_chef_repo_cheftacular_yml'] }\"! Overwriting..."
+
+            @config['helper'].write_chef_repo_cheftacular_yml_file wrapper_cookbook_cheftacular_loc
+          end
+
+          puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") }'s cheftacular.yml."
+
+          @config['helper'].write_chef_repo_cheftacular_cache_file parsed_hash
+        end
+      end
+    end
+
     def initialize_bag_for_all_environments bag_name, total_percent=100
       total_bags   = @config['chef_environments'].count
       current_bags = 1

data/lib/cheftacular/parser.rb

@@ -191,9 +191,9 @@ class Cheftacular
 
     def parse_to_dns dns_string
       raise "Unable to parse DNS without @option['node_name'] for #{ dns_string }!" if dns_string.include?('NODE_NAME') && @options['node_name'].nil?
-      raise "Unable to parse DNS without a tld set in the config bag for #{ @options['env'] }!" if dns_string.include?('ENV_TLD') && @config[@options['env']]['config_bag_hash']['tld'].nil?
+      raise "Unable to parse DNS without a tld set in the config bag for #{ @options['env'] }!" if dns_string.include?('ENV_TLD') && @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'].nil?
 
-      dns_string.gsub('NODE_NAME', @options['node_name']).gsub('ENV_TLD', @config[@options['env']]['config_bag_hash']['tld'])
+      dns_string.gsub('NODE_NAME', @options['node_name']).gsub('ENV_TLD', @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'])
     end
 
     def parse_repository_hash_from_string string

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -48,7 +48,7 @@ class Cheftacular
 
         '2.  `-z|--unset-revision` 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 or a branch name.",
+        "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.'
       ]

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

@@ -51,7 +51,7 @@ class Cheftacular
 
       final_commands = []
 
-      if @config['cheftacular']['install_rvm_on_boot'] == 'true'
+      if @config['cheftacular']['install_rvm_on_boot']
         deploy_commands << "gpg --keyserver hkp://keys.gnupg.net --recv-keys #{ @config['cheftacular']['rvm_gpg_key'] }"
         deploy_commands << "curl -L https://get.rvm.io | bash -s stable"
 

data/lib/cheftacular/stateless_actions/compile_audit_log.rb

@@ -27,17 +27,17 @@ class Cheftacular
         end
       end
 
-      compiled_audit_hash.each_pair do |day, time_log_hash|
+      compiled_audit_hash.keys.sort.each do |day|
         out << "# Audit Log Entries for #{ Date.parse(day) }"
 
         entry_count, int_times = 1, []
 
-        time_log_hash.keys.each do |time|
+        compiled_audit_hash[day].keys.each do |time|
           out << "#{ entry_count }. #{ time }"
 
           log_array_entry_count = 1
 
-          time_log_hash[time].each do |log_arr|
+          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'] }"
@@ -47,7 +47,7 @@ class Cheftacular
 
               log_array_entry_count += 1
             end
-          end if time_log_hash.has_key?(time)
+          end if compiled_audit_hash[day].has_key?(time)
 
           entry_count += 1
         end

data/lib/cheftacular/stateless_actions/environment.rb

@@ -38,7 +38,7 @@ class Cheftacular
       @options['force_yes']  = true
       @options['in_scaling'] = true
 
-      initial_servers = @config['cheftacular']['env_boot_nodes']["#{ @options['env'] }_node_names"]
+      initial_servers = @config['cheftacular']['env_boot_nodes']["#{ @options['env'] }_nodes"]
 
       if initial_servers.empty?
         puts "There are no servers defined for #{ @options['env'] } in the env_boot_nodes hash in your cheftacular.yml... Exiting"
@@ -49,12 +49,12 @@ class Cheftacular
       case type
       when 'boot'
         initial_servers.each_pair do |name, config_hash|
+          next if nodes.map { |n| n.name }.include?(name)
+
           @options['node_name']   = name
           @options['flavor_name'] = config_hash.has_key?('flavor') ? config_hash['flavor'] : @config['cheftacular']['default_flavor_name']
           @options['descriptor']  = config_hash.has_key?('descriptor') ? config_hash['descriptor'] : name
           @options['with_dn']     = config_hash.has_key?('dns_config') ? @config['parser'].parse_to_dns(config_hash['dns_config']) : @config['parser'].parse_to_dns('NODE_NAME.ENV_TLD')
-                                    
-          next if nodes.map { |n| n.name }.include?(@options['node_name'])
 
           puts("Preparing to boot server #{ @options['node_name'] } for #{ @options['env'] }!") unless @options['quiet']
 

data/lib/cheftacular/stateless_actions/initialize_data_bag_contents.rb

@@ -91,7 +91,7 @@ class Cheftacular
         end
       end
 
-      if @config['cheftacular']['git_based_deploys'] == 'true'
+      if @config['cheftacular']['git_based_deploys']
         if !hash.has_key?('git_private_key') || !hash.has_key?('git_public_key') || !hash.has_key?('git_OAuth')
           puts "Warning! github user credentials in default authentication bag were not found! Please run `cft help create_git_key` and then run that command itself!" unless @command == 'help'
         end
@@ -161,8 +161,8 @@ class Cheftacular
 
       config_fix_message = "\n\n knife data bag edit #{ main_env } config\n\n"
 
-      if @config['cheftacular']['split_environments'].has_key?(main_env)
-        @config['cheftacular']['split_environments'][main_env].each_key do |sub_env|
+      if @config['cheftacular']['run_list_environments'].has_key?(main_env)
+        @config['cheftacular']['run_list_environments'][main_env].each_value do |sub_env|
           envs_to_build_in_hash << sub_env
         end
       end

data/lib/cheftacular/stateless_actions/test_env.rb

@@ -30,7 +30,9 @@ class Cheftacular
 
       type = ARGV[env_index] if ARGV[env_index]
 
-      raise "Unknown split_env: #{ split_env }, can only be #{ @config['cheftacular']['run_list_environments'].values.join(', ') }" unless (split_env =~ /#{ @config['cheftacular']['run_list_environments'].values.join('|') }/) == 0
+      split_envs = @config['cheftacular']['run_list_environments'][@options['env']]
+
+      raise "Unknown split_env: #{ split_env }, can only be #{ split_envs.values.join(', ') }" unless (split_env =~ /#{ split_envs.values.join('|') }/) == 0
 
       raise "Unknown type: #{ type }, can only be 'boot' or 'destroy'" unless (type =~ /boot|destroy/) == 0
 
@@ -44,7 +46,9 @@ class Cheftacular
       case type
       when 'boot'
         @config['cheftacular']['split_env_nodes'].each_pair do |name, config_hash|
-          true_name               = name.gsub('SPLITENV', split_env) 
+          config_hash           ||= {}
+          true_name               = name.gsub('SPLITENV', split_env)
+          @options['sub_env']     = split_env
           @options['node_name']   = "#{ true_name }#{ 'p' if @options['env'] == 'production' }" 
           @options['flavor_name'] = config_hash.has_key?('flavor') ? config_hash['flavor'] : @config['cheftacular']['default_flavor_name']
           @options['descriptor']  = config_hash.has_key?('descriptor') ? "#{ config_hash['descriptor'] }-#{ split_env }" : name

data/lib/cheftacular/stateless_actions/update_split_branches.rb

@@ -48,10 +48,12 @@ class Cheftacular
         "git fetch origin",
       ]
 
-      @config['run_list_environments'].each_key do |branch_name|
-        true_branch_name = branch_name.gsub('_','-')
+      @config['run_list_environments'].each_pair do |env, branch_hash|
+        branch_hash.keys.each do |branch_name|        
+          true_branch_name = branch_name.gsub('_','-')
 
-        commands << ["git checkout #{ true_branch_name }", "git pull origin #{ true_branch_name }", 'git merge master --no-edit', "git push origin #{ true_branch_name }"]
+          commands << ["git checkout #{ true_branch_name }", "git pull origin #{ true_branch_name }", 'git merge master --no-edit', "git push origin #{ true_branch_name }"]
+        end
       end
 
       commands << "git checkout #{ current_revision }"

data/lib/cheftacular/version.rb

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

data/lib/cloud_interactor/cloud_interactor.rb

@@ -18,6 +18,9 @@ class CloudInteractor
   def run args
     parse_args(args) unless args.empty?
 
+    #clear out the main_obj so repeated runs do not cause strange data
+    @main_obj = @main_obj.keep_if {|key, value| key == 'output'}
+
     @main_obj['output']
   end
 end

data/lib/sshkit/actions/start_task.rb

@@ -3,7 +3,7 @@ module SSHKit
     class Netssh
       def start_task name, ip_address, run_list, command, options, locs, cheftacular, out=""
         log_loc, timestamp = set_log_loc_and_timestamp(locs)
-        true_env = get_true_environment run_list, cheftacular['run_list_environments'], options['env']
+        true_env = get_true_environment run_list, cheftacular['run_list_environments'][options['env']], options['env']
 
         puts "Running #{ command } for #{ name } (#{ ip_address }) (Run with with --debug to generate a log as well)"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie