cheftacular 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46547d3aa90d80b995df07810a4675b88f3d4822
-  data.tar.gz: 1e8ea61b705880d022271335953a9c2364b200a7
+  metadata.gz: d1824b19ce37e0733ceb249e6bbac87eecbb81d5
+  data.tar.gz: b448ce029765480b636de8ec62f4b0bd74a214a0
 SHA512:
-  metadata.gz: b5a4f09cba60332a5d60ed2de80747b900601006132a5dbcb6e10ed9fa6f741c2b82482bcc5ac4c6689a30cbfb708b24d253f66bae9c9fdf82f8c0895170a293
-  data.tar.gz: 5e0101b89e3f56ad978669ca89c5f0a460e0aa19dfde40d1ee73ec0f2dfb9aed5565854b497a1b2eab5b56e8bc239e5384b5a2aa5f1a0f258ba53c30ce475bbf
+  metadata.gz: 513496fe5d458cc5131dfad0bf573888b6a05a762b1bce7070bf2dd639eabe03bf1ccfba52a2e8a3919048cfd22ff3a2eac0217f09417c207a005d48cadbe599
+  data.tar.gz: 941ccd83c2d7eaf0fcdaa40512a4f7b87c96d9b8f89caa5d6df5b9c608639ed86838c70c6eee2a83056a500f2c8a20161506a3b2ff44c0c2b14e44b4dda8149b

data/lib/cheftacular/README.md

@@ -53,7 +53,7 @@
 
 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.
 
@@ -82,6 +82,8 @@
 
     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.
 
+    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).
+
 7. `cft disk_report` will fetch useful statistics from every server for every environment and output it into your log directory.
 
 8. `cft environment boot|destroy` will boot / destroy the current environment
@@ -187,7 +189,7 @@
 
 9. `cft cloud <FIRST_LEVEL_ARG> [<SECOND_LEVEL_ARG>[:<SECOND_LEVEL_ARG_QUERY>]*] ` this command handles talking to various cloud APIs. If no args are passed nothing will happen.
 
-    1. `domain` 1st level argument for interacting with cloud domains
+    1. `domain` first level argument for interacting with cloud domains
 
         1. `list` default behavior
 
@@ -207,7 +209,7 @@
 
         9. `update_record:TOP_LEVEL_DOMAIN:SUBDOMAIN_NAME:IP_ADDRESS[:RECORD_TYPE[:TTL]]` similar to `create_record`.
 
-    2. `server` 1st level argument for interacting with cloud servers, if no additional args are passed the command will return a list of all servers on the preferred cloud.
+    2. `server` first level argument for interacting with cloud servers, if no additional args are passed the command will return a list of all servers on the preferred cloud.
 
         1.  `list` default behavior
 
@@ -220,7 +222,7 @@
             2. NOTE! Most flavors have spaces in them, you must use quotes at the command line to utilize them!
 
         4. `destroy:SERVER_NAME` destroys the server on the cloud. This must be an exact match of the server's actual name or the script will error.
-        
+
         5. `poll:SERVER_NAME` polls the cloud's server for the status of the SERVER_NAME. This command will stop polling if / when the status of the server is ACTIVE and its build progress is 100%.
 
         6. `attach_volume:SERVER_NAME:VOLUME_NAME[:VOLUME_SIZE[:DEVICE_LOCATION]]` If VOLUME_NAME exists it will attach it if it is unattached otherwise it will create it
@@ -239,7 +241,7 @@
 
         9. `read_volume:SERVER_NAME:VOLUME_NAME` returns the data of VOLUME_NAME if it is attached to the server.
 
-    3. `volume` 1st level argument for interacting with cloud storage volumes, if no additional args are passed the command will return a list of all cloud storage containers.
+    3. `volume` first level argument for interacting with cloud storage volumes, if no additional args are passed the command will return a list of all cloud storage containers.
 
         1. `list` default behavior
 
@@ -249,7 +251,7 @@
 
         4. `destroy:VOLUME_NAME` destroys the volume. This operation will not work if the volume is attached to a server.
 
-    4. `flavor` 1st level argument for listing the flavors available on the cloud service
+    4. `flavor` first level argument for listing the flavors available on the cloud service
 
         1. `list` default behavior
 

data/lib/cheftacular/actions/deploy.rb

@@ -31,12 +31,19 @@ class Cheftacular
 
         puts("Beginning chef client run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
 
-        log_data, timestamp = start_deploy( n.name, n.public_ipaddress, options, locs, passwords)
+        log_data, timestamp, exit_status = start_deploy( n.name, n.public_ipaddress, options, locs, passwords)
 
-        logs_bag_hash["#{ n.name }-deploy"] = { text: log_data.scrub_pretty_text, timestamp: timestamp }
+        logs_bag_hash["#{ n.name }-deploy"] = { "text" => log_data.scrub_pretty_text, "timestamp" => timestamp, "exit_status" => exit_status }
+      end
+
+      #Yes, you will get pinged on EVERY deploy until you fix the problem
+      if @config['cheftacular']['slack']['webhook']
+        logs_bag_hash.each_pair do |key, hash|
+          @config['stateless_action'].slack(hash['text'].prepend('```').insert(-1, '```')) if hash['exit_status'] && hash['exit_status'] == 1
+        end
       end
       
-      #@config['ChefDataBag'].save_logs_bag unless @options['debug'] #We don't really need to store entire chef runs in the logs bag
+      @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']
 
@@ -83,7 +90,15 @@ module SSHKit
 
         puts "Succeeded deploy of #{ name } (#{ ip_address }) on role #{ options['role'] }"
 
-        [out, timestamp] #return out to send to logs_bag
+        ['Successful Deploy', timestamp, 0] #return out to send to logs_bag
+      rescue SSHKit::Command::Failed => e
+        puts "@@@@@CRITICAL! Deploy failed for #{ name } (#{ ip_address })! Please check your #{ log_loc }/failed-deploy for the logs!@@@@@"
+
+        lines = e.message.split("\n").last(100).join("\n")
+
+        ::File.open("#{ log_loc }/failed-deploy/#{ name }-deploy-#{ timestamp }.txt", "w") { |f| f.write(lines.scrub_pretty_text) }
+
+        [lines, timestamp, 1]
       end
     end
   end

data/lib/cheftacular/chef/data_bag.rb

@@ -23,6 +23,8 @@ class Cheftacular
     end
 
     def save_logs_bag bag_env="options"
+      return true if @config['helper'].running_on_chef_node?
+      
       env = bag_env == 'options' ? @options['env'] : bag_env
 
       item = @config[env]['logs_bag'].reload

data/lib/cheftacular/dns.rb

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

data/lib/cheftacular/initializer.rb

@@ -417,7 +417,7 @@ class Cheftacular
     end
 
     def initialize_directories
-      ['applog', 'deploy', 'rolelog', 'rvm', 'stashedlog'].each do |sub_log_directory|
+      ['applog', 'deploy', 'failed-deploy', 'rolelog', 'rvm', 'stashedlog'].each do |sub_log_directory|
         FileUtils.mkdir_p File.join( @config['locs']['chef-log'], sub_log_directory )
       end
 

data/lib/cheftacular/stateless_actions/clean_cookbooks.rb

@@ -44,7 +44,7 @@ class Cheftacular
           berkshelf_cookbooks.keys.each do |processed_berkshelf_cookbook|
             if processed_berkshelf_cookbook.rpartition('-').first == berkshelf_cookbook.rpartition('-').first
               cookbook_mtime  = File.mtime(File.expand_path("#{ @config['locs']['berks'] }/#{ berkshelf_cookbook }"))
-              pcookbook_mtime = File.mtime(File.expand_path("#{ @locs['locs']['berks'] }/#{ processed_berkshelf_cookbook }"))
+              pcookbook_mtime = File.mtime(File.expand_path("#{ @config['locs']['berks'] }/#{ processed_berkshelf_cookbook }"))
 
               skip = true if cookbook_mtime < pcookbook_mtime #get only the latest version, berkshelf pulls in multiple commits from git repos for SOME REASON
             end
@@ -62,7 +62,7 @@ class Cheftacular
         chef_repo_cookbooks = {}
 
         Dir.foreach(@config['locs']['cookbooks']) do |chef_repo_cookbook|
-          next if @config['helper'].is_junk_filename?(berkshelf_cookbook)
+          next if @config['helper'].is_junk_filename?(chef_repo_cookbook)
             
           new_name = chef_repo_cookbook.rpartition('-').first
 

data/lib/cheftacular/stateless_actions/slack.rb

@@ -16,11 +16,14 @@ class Cheftacular
   end
 
   class StatelessAction
-    def slack
-      notifier = Slack::Notifier.new @config['cheftacular']['slack_webhook'], username: 'Cheftacular'
+    def slack message='', channel=''
+      @slack_notifier ||= Slack::Notifier.new @config['cheftacular']['slack']['webhook'], username: 'Cheftacular'
+
+      message = ARGV[1] if message.blank?
+      channel = ARGV[2] if channel.blank?
 
-      notifier.channel = ARGV[2] ? ARGV[2] : '#default'  
-      notifier.ping ARGV[1]
+      @slack_notifier.channel = channel.nil? ? @config['cheftacular']['slack']['default_channel'] : channel
+      @slack_notifier.ping message
     end
   end
 end

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.4.0"
+  VERSION      = "2.4.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.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -59,7 +59,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement