cheftacular 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 691c10d8f335d581eee5c51c26d573348d1fba52
-  data.tar.gz: 8f2ef29f362b2f9f4eeedc1da079fc7f5f68f5eb
+  metadata.gz: 827adc94d0f767ea316d7bcf827cfb10cd3fa2ee
+  data.tar.gz: f5cf035f7411a8a7ec542c836e28f5820581dbb7
 SHA512:
-  metadata.gz: c33b2dfa6a1c1dd0feed92c44b3e14c6fb4acb2e8a5cf45f4b1d598ed0c969d630eac266b31b0abe62510d4e9bc93b9bcb29fd5bdec2e33399ab005aad26fc9e
-  data.tar.gz: f85efd25195630c862b2dd0ab477ab7a2a049bf604360c736774be10053d52ea39954763cc9a98032b6d6ffd75c62c60a11b8a5e8961734d20f1fc86ed1cdc98
+  metadata.gz: 0f5e9bc8c1f3e075fa0f084857bf6ba940b2adf3434be56f903e2f6ed3ca35aad6ea1914dbdd5011e35332cec9da7a0e6bb7b2babbe092758bef1fe316f46318
+  data.tar.gz: b2360f856866988ff682fa1aa4f1b223fb955bbe89604f73fb9309603de1e1796367505dc31bcbc6455943e80fd55f87c1d998df5cc77491a8c4cad23cdb50ab

data/lib/cheftacular/actions/backups.rb

@@ -1,6 +1,6 @@
 
 class Cheftacular
-  class StatelessActionDocumentation
+  class ActionDocumentation
     def backups
       @config['documentation']['action'][__method__] ||= {}
       @config['documentation']['action'][__method__]['long_description'] = [
@@ -18,7 +18,8 @@ class Cheftacular
           "    4. `load` will fetch the latest backup from the production primary **if it doesn't already exist on " +
           "the server** and run the _backup loading command_ to load this backup into the env.",
 
-          "    5. `restore` will simply just run the _backup loading command_ to load the latest backup onto the server.",
+          "    5. `restore` will simply just run the _backup loading command_ to load the latest backup onto the server. This " +
+          "command is REPOSITORY SENSITIVE, to restore a repo other than default, you must use the -R REPOSITORY flag.",
 
           "    6. `status` will display the current state of the backups",
 
@@ -30,7 +31,7 @@ class Cheftacular
     end
   end
 
-  class StatelessAction
+  class Action
     def backups command=''
       command = ARGV[1] if command.blank?
 
@@ -74,8 +75,9 @@ class Cheftacular
                     end
 
       target_db_primary, nodes = @config['getter'].get_db_primary_node_and_nodes
-      applications_as_string   = @config['getter'].get_repo_names_for_repositories({ database: @config['getter'].get_current_database }).keys.join(',')
+      applications_as_string   = @config['getter'].get_repo_names_for_repositories([{ database: @config['getter'].get_current_database }, { restore_backup_file_name: 'NOT NIL' , ignore_val: true}]).keys.join(',')
       env_db_pass              = @config[@options['env']]['chef_passwords_bag_hash']["#{ backup_mode }_pass"]
+      env_db_user              = @config['getter'].get_current_repo_config['application_database_user']
       env_db_mode              = @config['getter'].get_current_database
 
       options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
@@ -87,7 +89,7 @@ class Cheftacular
 
         puts("Beginning db_backup_run for #{ n.name } (#{ n.public_ipaddress }) for env #{ options['env'] }") unless options['quiet']
 
-        start_db_backup_restore( n.name, n.public_ipaddress, options, locs, cheftacular, passwords, applications_as_string, env_db_pass, ruby_command, env_db_mode )
+        start_db_backup_restore( n.name, n.public_ipaddress, options, locs, cheftacular, passwords, applications_as_string, env_db_pass, ruby_command, env_db_mode, env_db_user )
       end
     end
 
@@ -235,7 +237,7 @@ module SSHKit
         puts "Finished transferring #{ full_backup_path } to #{ name }(#{ ip_address })..."
       end
 
-      def start_db_backup_restore name, ip_address, options, locs, cheftacular, passwords, applications_as_string, env_db_pass, ruby_command, env_db_mode, out=''
+      def start_db_backup_restore name, ip_address, options, locs, cheftacular, passwords, applications_as_string, env_db_pass, ruby_command, env_db_mode, env_db_user, out=''
         log_loc, timestamp = set_log_loc_and_timestamp(locs)
 
         puts "Beginning backup run on #{ name } (#{ ip_address }), this command may take a while to complete..."
@@ -244,7 +246,7 @@ module SSHKit
         when 'backup_gem'
           command = cheftacular['backup_config']['backup_load_command']
           command = command.gsub('ENVIRONMENT', options['env']).gsub('APPLICATIONS', applications_as_string).gsub('DB_PASS', env_db_pass)
-          command = command.gsub('RUBY_COMMAND', ruby_command ).gsub('MODE', env_db_mode)
+          command = command.gsub('RUBY_COMMAND', ruby_command ).gsub('MODE', env_db_mode).gsub('DATABASE_USER', env_db_user)
 
           out << sudo_capture( passwords[ip_address], command )
         when 'raw'

data/lib/cheftacular/actions/check.rb

@@ -11,7 +11,7 @@ class Cheftacular
 
           "    2. If the all argument is provided, all repositories will be checked for the current environment",
 
-          "    3. If the verify argument is provided, cft will attempt to see if the servers are using the latest commits",
+          "    3. If the verify argument is provided, cft will attempt to see if the servers are using the latest commits. This is also aliased to `cft ch ve`",
 
           "    4. Aliased to `cft ch`"
         ]
@@ -25,7 +25,7 @@ class Cheftacular
       @config['filesystem'].cleanup_file_caches('current-nodes')
 
       fetch_all_repository_data = ARGV[1] == 'all'
-      verify_state_is_latest    = ARGV[1] == 'verify'
+      verify_state_is_latest    = ARGV[1] == 'verify' || ARGV[1] == 've'
       verify_state_is_latest    = mode    == 'verify' if ARGV[1] != 'verify'
       
       nodes = @config['getter'].get_true_node_objects(fetch_all_repository_data)

data/lib/cheftacular/actions/db_console.rb

@@ -37,6 +37,8 @@ class Cheftacular
 
         start_console_postgresql(n.public_ipaddress, private_database_host_address )
       end
+
+      @config['auditor'].notify_slack_on_completion("psql run completed on #{ nodes.first.name } (#{ nodes.first.public_ipaddress })\n") if @config['cheftacular']['auditing']
     end
 
     def db_console_mongodb private_database_host_address=nil
@@ -56,6 +58,8 @@ class Cheftacular
 
         start_console_mongodb(n.public_ipaddress, private_database_host_address)
       end
+
+      @config['auditor'].notify_slack_on_completion("mongo run completed on #{ nodes.first.name } (#{ nodes.first.public_ipaddress })\n") if @config['cheftacular']['auditing']
     end
 
     def db_console_mysql

data/lib/cheftacular/actions/deploy.rb

@@ -19,9 +19,9 @@ class Cheftacular
 
           "    5. The `-v|--verbose` option will cause failed deploys to output to the terminal window and to their normal log file. Useful for debugging.",
 
-          "    6. The `cft deploy check` argument will force a check run under the same environment as the initial deploy.",
+          "    6. The `cft deploy check` argument will force a check run under the same environment as the initial deploy. This is also aliased to `cft d ch`",
 
-          "    7. The `cft deploy verify` argument will force a check AND verify run under the same environment as the initial deploy",
+          "    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`"
         ]
@@ -33,8 +33,8 @@ class Cheftacular
 
   class Action
     def deploy deployment_args={ in: :groups, limit: 6, wait: 5 }
-      run_check  = ARGV[1] == 'check'
-      run_verify = ARGV[1] == 'verify'
+      run_check  = ARGV[1] == 'check' || ARGV[1] == 'ch'
+      run_verify = ARGV[1] == 'verify' || ARGV[1] == 've'
 
       nodes = @config['getter'].get_true_node_objects(false) #when this is run in scaling we'll need to make sure we deploy to new nodes
 
@@ -66,6 +66,8 @@ 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['action'].migrate(nodes) if @config['getter'].get_current_repo_config['database'] != 'none' && !@options['run_migration_already']
 
       split_nodes_hash = {}

data/lib/cheftacular/actions/verify.rb

@@ -5,7 +5,9 @@ class Cheftacular
       @config['documentation']['action'][__method__]['long_description']  = [
         "`cft verify` Checks to see if the servers for the current state are running the latest commits. ",
         [
-          "    1. This command is functionally the same as `cft check verify`."
+          "    1. This command is functionally the same as `cft check verify`.",
+
+          "    2. This command is aliased to `cft ve`"
         ]
       ]
       @config['documentation']['action'][__method__]['short_description'] = "Checks the commits currently deployed to an env for your repo"
@@ -16,5 +18,7 @@ class Cheftacular
     def verify
       @config['action'].check('verify')
     end
+
+    alias_method :ve, :verify
   end
 end

data/lib/cheftacular/auditor.rb

@@ -85,22 +85,25 @@ class Cheftacular
 
     def aliased_command_hash
       {
-        check:                ['ch'],
-        console:              ['co'],
-        deploy:               ['d'],
-        cheftacular_config:   ['cc'],
-        cheftacular_yml_help: ['yml_help'],
-        client_list:          ['cl'],
-        environment:          ['e'],
-        fix_known_hosts:      ['fkh'],
-        knife_upload:         ['ku'],
-        location_aliases:     ['la'],
-        remove_client:        ['rc'],
-        role_toggle:          ['rt'],
-        update_cookbook:      ['uc'],
-        upload_nodes:         ['un'],
-        upload_roles:         ['ur'],
-        version:              ['v']
+        check:                                            ['ch'],
+        console:                                          ['co'],
+        deploy:                                           ['d'],
+        cheftacular_config:                               ['cc'],
+        cheftacular_yml_help:                             ['yml_help'],
+        client_list:                                      ['cl'],
+        cloud_bootstrap:                                  ['cb'],
+        environment:                                      ['e'],
+        fix_known_hosts:                                  ['fkh'],
+        knife_upload:                                     ['ku'],
+        location_aliases:                                 ['la'],
+        remove_client:                                    ['rc'],
+        role_toggle:                                      ['rt'],
+        update_cookbook:                                  ['uc'],
+        update_the_cheftacular_cookbook_and_knife_upload: ['utcc', 'utccaku'],
+        upload_nodes:                                     ['un'],
+        upload_roles:                                     ['ur'],
+        verify:                                           ['ve'],
+        version:                                          ['v']
       }
     end
   end

data/lib/cheftacular/getter.rb

@@ -161,12 +161,17 @@ class Cheftacular
       ret
     end
 
-    def get_repo_names_for_repositories restrict_to={}, ret={}
+    def get_repo_names_for_repositories restrict_to=[{}], ret={}
       @config['cheftacular']['repositories'].each_pair do |name, repo_hash|
         unless restrict_to.empty?
           skip = false
-          restrict_to.each_pair do |key, val|
-            skip = true if repo_hash[key.to_s] == val
+          restrict_to.each do |restrict_hash|
+            restrict_hash.each_pair do |key, val|
+              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
 
           next if skip

data/lib/cheftacular/helper.rb

@@ -303,6 +303,12 @@ class Cheftacular
       if git_output.blank?
         puts "! The remote organization #{ org_name_to_check } does not have the repository: #{ @options['repository'] }! Please verify your repositories and try again"
 
+        exit
+      elsif !git_output.include?(revision_to_check) && output_mode == 'display_for_check'
+        puts "WARNING! The commit #{ repo_state_hash['revision'] } is NOT the latest for the branch #{ repo_state_hash['branch'] } in organization #{ repo_state_hash['deploy_organization'] }!"
+
+        puts "Please re-run your deploy again and if this continues to not work, check with your DevOps personel!"
+
         exit
       elsif !git_output.include?(revision_to_check)
         puts "! The remote organization #{ org_name_to_check } does not have a revision / branch #{ revision_to_check } for repository: #{ @options['repository'] } !"

data/lib/cheftacular/initializer.rb

@@ -330,6 +330,7 @@ class Cheftacular
       end
 
       locs['chef-repo']             = Dir.getwd
+      locs['true-root']             = File.expand_path("#{ locs['chef-repo'] }/..")
       locs['roles']                 = File.expand_path("#{ locs['chef-repo'] }/roles")
       locs['nodes']                 = File.expand_path("#{ locs['chef-repo'] }/nodes_dir") #DO NOT RENAME THIS TO NODES
       locs['root']                  = locs['chef-repo']                                    unless locs['root']

data/lib/cheftacular/stateless_actions/server_update.rb

@@ -48,7 +48,7 @@ class Cheftacular
 
         log_data, timestamp = start_apt_updater( n.name, n.public_ipaddress, options, locs, passwords)
 
-        logs_bag_hash["#{ n.name }-upgrade"] = { text: log_data.scrub_pretty_text, timestamp: timestamp }
+        #logs_bag_hash["#{ n.name }-upgrade"] = { text: log_data.scrub_pretty_text, timestamp: timestamp }
       end
 
       on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ), in: :groups, limit: 5, wait: 120 do |host|
@@ -59,7 +59,7 @@ class Cheftacular
         start_sys_restarter( n.name, n.public_ipaddress, options, locs, passwords)
       end if @options['rolling_restart']
 
-      @config['ChefDataBag'].save_logs_bag
+      #@config['ChefDataBag'].save_logs_bag
     end
   end
 end

data/lib/cheftacular/stateless_actions/update_cookbook.rb

@@ -4,12 +4,14 @@ class Cheftacular
     def update_cookbook
       @config['documentation']['stateless_action'][__method__] ||= {}
       @config['documentation']['stateless_action'][__method__]['long_description'] = [
-        "`cft update_cookbook [COOKBOOK_NAME] [INSTALL_VERSION]` allows you to specifically update a single cookbook",
+        "`cft update_cookbook [COOKBOOK_NAME] [INSTALL_VERSION|local]` allows you to specifically update a single cookbook",
 
         [
           "    1. This command passed with no arguments will update TheCheftacularCookbook",
 
-          "    2. Aliased to `cft uc`"
+          "    2. If the 2nd argument is local, the command will drop a local version of the cookbook onto your chef-repo",
+
+          "    3. Aliased to `cft uc`"
         ]
       ]
 
@@ -17,6 +19,12 @@ class Cheftacular
     end
   end
 
+  class InitializationAction
+    def update_cookbook
+
+    end
+  end
+
   class StatelessAction
     def update_cookbook cookbook='TheCheftacularCookbook', version='latest'
       raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
@@ -24,23 +32,34 @@ class Cheftacular
       cookbook = ARGV[1] if ARGV[1]
       version  = ARGV[2] if ARGV[2]
 
-      @config['cheftacular']['wrapper_cookbooks'].split(',').each do |wrapper_cookbook|
-        wrapper_cookbook_loc = "#{ @config['locs']['cookbooks'] }/#{ wrapper_cookbook }"
-        FileUtils.rm_rf(File.expand_path("#{ @config['locs']['berks'] }/cookbooks")) if File.exists?(File.expand_path("#{ @config['locs']['berks'] }/cookbooks"))
-        
-        Dir.chdir wrapper_cookbook_loc
-        puts "Installing new cookbooks..."
-        out = `berks install`
-        puts "#{out}\nFinished fetching cookbooks, moving #{ cookbook } into local chef repo"
+      if version == 'local' 
+        if File.exists?(File.expand_path("#{ @config['locs']['true-root'] }/#{ cookbook }"))
+          `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`
+        else
+          puts "You do not have #{ cookbook } under the #{ @config['locs']['true-root'] } directory!"
+        end
+      else
+        @config['cheftacular']['wrapper_cookbooks'].split(',').each do |wrapper_cookbook|
+          wrapper_cookbook_loc = "#{ @config['locs']['cookbooks'] }/#{ wrapper_cookbook }"
+          FileUtils.rm_rf(File.expand_path("#{ @config['locs']['berks'] }/cookbooks")) if File.exists?(File.expand_path("#{ @config['locs']['berks'] }/cookbooks"))
+          
+          Dir.chdir wrapper_cookbook_loc
+          puts "Installing new cookbooks..."
+          out = `berks install`
+          puts "#{out}\nFinished fetching cookbooks, moving #{ cookbook } into local chef repo"
 
-        specific_cookbook = @config['filesystem'].parse_berkshelf_cookbook_versions(version).select {|key| key.include?(cookbook)}[cookbook]
+          specific_cookbook = @config['filesystem'].parse_berkshelf_cookbook_versions(version).select {|key| key.include?(cookbook)}[cookbook]
 
-        puts "Moving #{ cookbook } (#{ specific_cookbook['version'] })[#{ specific_cookbook['mtime'] }] to your chef-repo!"
+          puts "Moving #{ cookbook } (#{ specific_cookbook['version'] })[#{ specific_cookbook['mtime'] }] to your chef-repo!"
 
-        `rm -Rf #{ @config['locs']['cookbooks'] }/#{ cookbook }` if File.exists?(File.expand_path("#{ @config['locs']['cookbooks'] }/#{ cookbook }"))
-        `cp -Rf #{ @config['locs']['berks'] }/#{ specific_cookbook['location'] } #{ @config['locs']['cookbooks'] }/#{ cookbook }`
-        
-        break
+          `rm -Rf #{ @config['locs']['cookbooks'] }/#{ cookbook }` if File.exists?(File.expand_path("#{ @config['locs']['cookbooks'] }/#{ cookbook }"))
+          `cp -Rf #{ @config['locs']['berks'] }/#{ specific_cookbook['location'] } #{ @config['locs']['cookbooks'] }/#{ cookbook }`
+          
+          break
+        end
       end
     end
 

data/lib/cheftacular/stateless_actions/update_the_cheftacular_cookbook_and_knife_upload.rb

@@ -0,0 +1,31 @@
+
+class Cheftacular
+  class StatelessActionDocumentation
+    def update_the_cheftacular_cookbook_and_knife_upload
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
+        "`cft update_the_cheftacular_cookbook_and_knife_upload` update your local cheftacular cookbook with your local (out of chef-repo) cheftacular " + 
+        "cookbook and knife_upload afterwards.",
+
+        [
+          "    1. This method is aliased to `cft utccaku` and `cft utcc`."
+        ]
+      ]
+
+      @config['documentation']['stateless_action']['utccaku']['short_description'] = 'Runs `update_cookbook` and `knife_upload` for the cheftacular cookbook'
+    end
+  end
+
+  class StatelessAction
+    def update_the_cheftacular_cookbook_and_knife_upload
+      raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
+
+      @config['stateless_action'].update_cookbook('TheCheftacularCookbook', 'local')
+
+      @config['stateless_action'].knife_upload
+    end
+
+    alias_method :utccaku, :update_the_cheftacular_cookbook_and_knife_upload
+    alias_method :utcc, :update_the_cheftacular_cookbook_and_knife_upload
+  end
+end

data/lib/cheftacular/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -338,6 +338,7 @@ files:
 - lib/cheftacular/stateless_actions/update_cloudflare_dns_from_cloud.rb
 - lib/cheftacular/stateless_actions/update_cookbook.rb
 - lib/cheftacular/stateless_actions/update_split_branches.rb
+- lib/cheftacular/stateless_actions/update_the_cheftacular_cookbook_and_knife_upload.rb
 - lib/cheftacular/stateless_actions/update_tld.rb
 - lib/cheftacular/stateless_actions/upload_nodes.rb
 - lib/cheftacular/stateless_actions/upload_roles.rb