cheftacular 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3685f590daa72f5455eb81a3c70148ed502e2260
-  data.tar.gz: dde96719a915f11f60fadfa4b7959d65c8d14600
+  metadata.gz: dab07a85b0c1c0d66ad4c40632410460e12cb085
+  data.tar.gz: 0ea6a7fd5c2cc3ec3599b96dae67aa6124db2645
 SHA512:
-  metadata.gz: 8f591cb44744dca95f25434c5f8bcfc3ad6b92521cdcedd287c6a23907c6774eebfd206da369feb0951ae7eaf0365f1631becc81d324870f8b8844ae5855ad94
-  data.tar.gz: 0816925f0b578665398228834f802f975b4d3349f7939b19d55f529fd8857100873f43b27b112bea5db7f0e197405138fd4ef0a9b8e31540890d5b1bb898f300
+  metadata.gz: 30c885801868c04eb02fc1679457c35ad755b785c74a906ac44e98fc60c9e01e27af59d01561204fb9e156dadd4d5c66953edfa46d78e44141ea751d29c8fda6
+  data.tar.gz: 4aa577cba2465797c2a1991868e54e5559cb92bbab65dca30ac544a637543252d6f72fceebfaa7f1caaa1934cfde2be1613ddbb5243922fa3e264ea05fad70a1

data/lib/cheftacular/actions/log.rb

@@ -36,8 +36,8 @@ class Cheftacular
 
         puts("Beginning log fetch run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
 
-        if getter.get_current_stack.nil?
-          start_log_role_map( name, n.public_ipaddress, getter.get_current_role_map['log_location'], options, locs, cheftacular, passwords)
+        if has_run_list_in_role_map?(n.run_list, cheftacular['role_maps'])
+          start_log_role_map( n.name, n.public_ipaddress, getter.get_current_role_map(n.run_list)['log_location'], options, locs, cheftacular, passwords)
         else
           self.send("start_log_fetch_#{ getter.get_current_stack }", n.name, n.public_ipaddress, n.run_list, options, locs, cheftacular, passwords)
         end

data/lib/cheftacular/actions/tail.rb

@@ -26,9 +26,8 @@ class Cheftacular
       nodes.each do |n|
         puts("Beginning tail run for #{ n.name } (#{ n.public_ipaddress }) on role #{ @options['role'] }") unless @options['quiet']
 
-
-        if @config['getter'].get_current_stack.nil?
-          start_tail_role_map( n.public_ipaddress )
+        if @config['dummy_sshkit'].has_run_list_in_role_map?(n.run_list, @config['cheftacular']['role_maps'])
+          start_tail_role_map( n.public_ipaddress, n.run_list )
         else
           self.send("start_tail_#{ @config['getter'].get_current_stack }", n.public_ipaddress, n.run_list )
         end
@@ -37,8 +36,8 @@ class Cheftacular
 
     private
 
-    def start_tail_role_map ip_address
-      log_loc = @config['getter'].get_current_role_map['log_location'].split(',').first
+    def start_tail_role_map ip_address, run_list
+      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 deploy@#{ ip_address } "#{ @config['helper'].sudo(ip_address) } tail -f #{ log_loc }" > /dev/tty`
     end

data/lib/cheftacular/getters.rb

@@ -103,9 +103,9 @@ class Cheftacular
       end
     end
 
-    def get_current_role_map ret=""
+    def get_current_role_map run_list, ret={}
       @config['cheftacular']['role_maps'].each_pair do |main_role, role_hash|
-        ret = role_hash if role_hash['role_name'] == @options['role']
+        ret = role_hash if run_list.include?("role[#{ role_hash['role_name'] }]")
       end
 
       ret

data/lib/cheftacular/version.rb

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

data/lib/sshkit/actions/start_log_fetch.rb

@@ -5,23 +5,24 @@ module SSHKit
         log_loc, timestamp  = set_log_loc_and_timestamp(locs)
         log_cmnd, log_lines = get_log_command_and_lines(options)
 
-        if !test("[ -e #{ target_log_loc }]") #true if file exists
-          puts "#{ name } (#{ ip_address }) does not have a log file for #{ options['env'] } at the moment..."
+        
+        puts "Fetching log file(s) for #{ name } (#{ ip_address }). Outputting to #{ log_loc } with timestamp: #{ timestamp }"
 
-        else
-          puts "Fetching log file(s) for #{ name } (#{ ip_address }). Outputting to #{ log_loc }/#{ name }-#{ options['role'] }-log-#{ timestamp }.txt"
+        target_log_loc.split(',').each do |parsed_log_loc|
+          parsed_log_loc = parsed_log_loc.gsub('|current_repo_location|', "#{ cheftacular['base_file_path'] }/#{ options['repository'] }/current")
 
-          target_log_loc.split(',').each do |parsed_log_loc|
-            parsed_log_loc = parsed_log_loc.gsub('|current_repo_location|', "#{ cheftacular['base_file_path'] }/#{ options['repository'] }/current")
+          if parsed_log_loc != '/var/log/syslog' && !test("[ -e #{ parsed_log_loc }]") #true if file exists ()
+            puts "#{ name } (#{ ip_address }) does not have a #{ parsed_log_loc } log file for #{ options['env'] } at the moment..."
+          else
             if log_lines.nil?
               out << sudo_capture(passwords[ip_address], log_cmnd.to_sym, parsed_log_loc)
 
             else
               out << sudo_capture(passwords[ip_address], log_cmnd.to_sym, log_lines, parsed_log_loc)
             end
-          end
 
-          ::File.open("#{ log_loc }/#{ name }-#{ options['role'] }-log-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) } unless options['no_logs']
+            ::File.open("#{ log_loc }/#{ name }-#{ parsed_log_loc.split('/').last.split('.').first }-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) } unless options['no_logs']
+          end
         end
       end
 

data/lib/sshkit/helpers.rb

@@ -8,6 +8,14 @@ module SSHKit
       def sudo_capture pass, *args
         capture :echo, pass, :|, :sudo, '-S', *args
       end
+
+      def has_run_list_in_role_map? run_list, role_map_hash
+        role_map_hash.each_value do |map_hash|
+          return true if run_list.include?("role[#{ map_hash['role_name'] }]")
+        end
+
+        false
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Louis Alridge