cheftacular 2.15.2 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05f90c2978ae89eb69550b45a8784c274b114fe9
-  data.tar.gz: 6406c670ac6daf9b05d7852f655678d001f1007d
+  metadata.gz: ca73f1c5b5983aa8a6c458af1b3dca0cfce09d1b
+  data.tar.gz: 53377d874c956a367e8fb60ee0c78430b535ea62
 SHA512:
-  metadata.gz: 7067830d11b95fad95e141022d575d94697bac18a72b96b2d44de035cb02808e3a38532237cccde2ac77dd77f8f6d05ff228db5819d5d73b9528db403a27d4d2
-  data.tar.gz: 887a72065e1ace867ed8fcb7fd6fca9fde90d282a67907f517bc98b9544ff90ee57bc4c1defd9a811a22ca5cab6a659ba979045f55dced0bc5363882b5deb382
+  metadata.gz: 49e6ccedb14b9b42b96c1f269b45220c0249a4fabe9d440dd871b782d29ba9d78b83c8bf968c8da474b7c5df07db89c7a32625d699986008ab16e56cae66b62d
+  data.tar.gz: 79d8c50bff33e56277018e7a5b5ca4fc68ab73ecbe5beea639e01a7690291c78effd316ca49e9eda4703a6cd78c41d852a9c7b708a8e056b8f898596c1510c78

data/lib/cheftacular/actions/application.rb

@@ -0,0 +1,50 @@
+
+class Cheftacular
+  class StatelessActionDocumentation
+    def application
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
+        "`cft application boot|boot_without_deploy|destroy|destroy_raw_servers [SERVER_NAMES]` will boot / destroy the servers for current repository you are connected to",
+
+        [
+          "    1. `boot` will spin up servers and bring them to a stable state. " +
+          "This includes setting up their subdomains for the target environment.",
+
+          "    2. `destroy` will destroy all servers needed for the target environment",
+
+          "    3. `destroy_raw_servers` will destroy the servers without destroying the node data.",
+
+          "    4. `boot_without_deploy` will spin up servers and bring them to a state where they are ready to be deployed",
+
+          "    5. This command will prompt when attempting to destroy servers in staging or production. " + 
+          "Additionally, only devops clients will be able to destroy servers in those environments.",
+
+          "    6. This command also accepts a *comma delimited list* of server names to boot / destroy instead of all the stored ones for an environment.",
+
+          "    7. This command works with all the flags that `cft deploy` works with, like -Z -z -O and so on.",
+
+          "    8. Aliased to `cft a` and `cft app`"
+        ]
+      ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Boots (or destroys) an application based on data stored in cheftacular.yml'
+
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
+    end
+  end
+
+  class StatelessAction
+    def application type='boot'
+      type = ARGV[1] if ARGV[1]
+
+      unless (type =~ /boot|destroy|destroy_raw_servers|boot_without_deploy/) == 0
+        raise "Unknown type: #{ type }, can only be 'boot'/'boot_without_deploy'/'destroy'/'destroy_raw_servers'"
+      end
+
+      @config['stateless_action'].environment(type, true)
+    end
+
+    alias_method :a, :application
+    alias_method :app, :application
+  end
+end

data/lib/cheftacular/actions/migrate.rb

@@ -26,23 +26,14 @@ class Cheftacular
       #must have rails stack to run migrations, only want ONE node
       nodes = @config['parser'].exclude_nodes(nodes, [{ unless: "role[#{ @options['role'] }]" }, { unless: 'role[rails]' }], true)
 
-      log_data = ""
+      logs_bag_hash = run_ruby_on_rails('rake db:migrate', __method__.to_s, ['return_logs_bag_hash'], nodes)
 
-      #this must always precede on () calls so they have the instance variables they need
-      options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
+      if logs_bag_hash["#{ nodes.first.name }-#{ __method__ }"]['text'].empty? || 
+        ( cheftacular['repositories'][options['role']].has_key?('not_a_migration_message') && logs_bag_hash["#{ nodes.first.name }-#{ __method__ }"]['text'] == cheftacular['repositories'][options['role']]['not_a_migration_message'] )
 
-      on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
-        n = get_node_from_address(nodes, host.hostname)
-
-        puts("Beginning migration run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
-
-        log_data, timestamp, exit_status = start_task( n.name, n.public_ipaddress, n.run_list, "#{ bundle_command } exec rake db:migrate", options, locs, cheftacular, passwords)
-
-        logs_bag_hash["#{ n.name }-#{ __method__ }"] = { "text" => log_data.scrub_pretty_text.force_encoding('UTF-8'), "timestamp" => timestamp, "exit_status" => exit_status }
+        puts("Nothing to migrate for #{ options['role'] }...")
       end
 
-      @config['ChefDataBag'].save_logs_bag
-
       @config['helper'].send_log_bag_hash_slack_notification(logs_bag_hash, __method__, 'Failing migration detected, please fix this and deploy again, exiting...')
 
       @options['run_migration_already'] = true

data/lib/cheftacular/actions/run.rb

@@ -35,16 +35,16 @@ class Cheftacular
       @config['auditor'].notify_slack_on_completion("run #{ command } completed on #{ nodes.map { |node| node.name }.join(', ') }\n") if @config['cheftacular']['auditing']
     end
 
-    def run_ruby_on_rails command
-      run_command(command, __method__.to_s, "#{ @config['bundle_command'] } exec")
+    def run_ruby_on_rails command, modes=['normal_output'], nodes=[]
+      run_command(command, __method__.to_s, "RAILS_ENV=TRUE_ENVIRONMENT #{ @config['bundle_command'] } exec", modes, nodes)
     end
 
     def run_nodejs command
       self.send("run_#{ @config['getter'].get_current_sub_stack }", command)
     end
 
-    def run_meteor command
-      run_command(command, __method__.to_s, '/usr/local/bin/meteor', true)
+    def run_meteor command, modes=['sudo', 'normal_output']
+      run_command(command, __method__.t, '/usr/local/bin/meteor', modes)
     end
 
     def run_wordpress command
@@ -65,27 +65,37 @@ class Cheftacular
 
     private
 
-    def run_command command, descriptor, executable, sudo=false
-      nodes = @config['getter'].get_current_role_nodes
+    def run_command command, descriptor, executable, modes=['normal'], nodes=[]
+      nodes = @config['getter'].get_current_role_nodes if nodes.empty?
 
       #this must always precede on () calls so they have the instance variables they need
       options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
 
-      on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
-        n = get_node_from_address(nodes, host.hostname)
-
+      nodes.each do |n|
         puts("Beginning #{ descriptor } run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
 
-        log_data, timestamp, exit_status = start_task( n.name, n.public_ipaddress, n.run_list, "#{ executable } #{ command }", options, locs, cheftacular, passwords, sudo)
+        true_env = @config['dummy_sshkit'].get_true_environment n.run_list, @config['cheftacular']['run_list_environments'][@options['env']], @options['env']
+        true_env = @config['dummy_sshkit'].get_override_environment @config['cheftacular']['repositories'][@options['role']], @options['env']
+
+        base_exec      = "ssh #{ Cheftacular::SSH_INLINE_VARS } #{ @config['cheftacular']['deploy_user'] }@#{ n.public_ipaddress }"
+        final_command  = ["cd #{ @config['cheftacular']['base_file_path'] }/#{ @options['repository'] }/current"]
+        final_command << @config['helper'].sudo(ip_address) if modes.include?('sudo')
+        final_command << ( executable.gsub('TRUE_ENVIRONMENT', true_env) + ' ' + command )
+
+        puts "#{ base_exec } \"#{ final_command.join(' && ') }\" > /dev/tty"
 
-        logs_bag_hash["#{ n.name }-#{ descriptor }"] = { "text" => log_data.scrub_pretty_text.force_encoding('UTF-8'), "timestamp" => timestamp, "exit_status" => exit_status }
+        log_output = `#{ base_exec } "#{ final_command.join(' && ') }" > /dev/tty`
+
+        logs_bag_hash["#{ n.name }-#{ descriptor }"] = { "text" => log_output.scrub_pretty_text.force_encoding('UTF-8'), "timestamp" => Time.now.strftime("%Y%m%d%H%M%S"), "exit_status" => $?.to_i }
       end
 
       @config['ChefDataBag'].save_logs_bag
 
-      @config['helper'].send_log_bag_hash_slack_notification(logs_bag_hash, __method__, 'Failing command detected, exiting...')
+      @config['helper'].send_log_bag_hash_slack_notification(logs_bag_hash, __method__, 'Failing command detected, exiting...') if modes.include?('normal_output')
+
+      return nodes if modes.include?('normal_output')
 
-      nodes
+      return logs_bag_hash if modes.include?('return_logs_bag_hash')
     end
   end
 end

data/lib/cheftacular/actions/tail.rb

@@ -13,7 +13,9 @@ class Cheftacular
           "Worker and job servers should tail their log to the master log (/var/log/syslog) where <b>all</b> of the major processes on the server output to. " +
           "While the vast majority of this syslog will be relevant to application developers, some will not (usually firewall blocks and the like).",
 
-          "    3. if the `PATTERN_TO_MATCH` argument exists, the tail will only return entries that have that pattern rather than everything written to the file."
+          "    3. if the `PATTERN_TO_MATCH` argument exists, the tail will only return entries that have that pattern rather than everything written to the file.",
+
+          "    4. If `--nginx` is specified, the tail will instead try and fetch data from the nginx instance on the matching node rather than the default."
         ]
       ]
 
@@ -36,6 +38,8 @@ class Cheftacular
 
         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, pattern_to_match )
+        elsif @options['get_nginx_logs']
+          start_tail_role_map( n.public_ipaddress, n.run_list, pattern_to_match, "/var/log/nginx/#{ @options['repository'] }_access.log")
         else
           self.send("start_tail_#{ @config['getter'].get_current_stack }", n.public_ipaddress, n.run_list, pattern_to_match )
         end
@@ -44,8 +48,8 @@ class Cheftacular
 
     private
 
-    def start_tail_role_map ip_address, run_list, pattern_to_match
-      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")
+    def start_tail_role_map ip_address, run_list, pattern_to_match, log_loc='default'
+      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") if log_loc == 'default'
 
       `ssh #{ Cheftacular::SSH_INLINE_VARS } -tt #{ @config['cheftacular']['deploy_user'] }@#{ ip_address } "#{ @config['helper'].sudo(ip_address) } tail -f #{ log_loc } #{ get_tail_grep_string(pattern_to_match) }" > /dev/tty`
     end

data/lib/cheftacular/auditor.rb

@@ -106,6 +106,7 @@ class Cheftacular
 
     def aliased_command_hash
       {
+        application:                                      ['a', 'app'],
         check:                                            ['ch'],
         console:                                          ['co'],
         deploy:                                           ['d'],

data/lib/cheftacular/initializer.rb

@@ -212,6 +212,11 @@ class Cheftacular
           @options['run_on_all'] = true
         end
 
+        #cft service
+        opts.on('--sv', "On cft service calls, utilize the runsv syntax instead of the service syntax (can restart sv programs)") do
+          @options['runsv'] = true
+        end
+
         #cloud_bootstrap
 
         opts.on('--with-dn DOMAIN_NAME', "On hip rax_bootstrap allows you to specify a domain structure other than the default environment one") do |domain|

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -63,7 +63,9 @@ class Cheftacular
         "4.  The `-O ORGANIZATION` flag can be used with TheCheftacularCookbook to set an *organization* your app can try " +
         "deploying from, your git user needs access to these forks / organization(s).",
 
-        "    3.  The `-z|--unset-github-deploy-args` option will clear your current `-Z` and `-O` flags."
+        "    3.  The `-z|--unset-github-deploy-args` option will clear your current `-Z` and `-O` flags.",
+
+        "5.  `--nginx` will fetch logs for various logging commands from nginx instead of the default location."
       ] if @config['documentation']['arguments'].empty?
     end
 

data/lib/cheftacular/stateless_actions/env_ssh_exec.rb

@@ -7,7 +7,9 @@ class Cheftacular
         "`cft env_ssh_exec [command]` will ssh into each server in an environment and run the command as sudo. ",
 
         [
-          "    1. To deactivate logstash: `cft env_ssh_exec sv stop logstash_agent`"
+          "    1. To deactivate logstash: `cft env_ssh_exec sv stop logstash_agent`",
+
+          "    2. To view a tree of all processes running on each server, run pstree -g"
         ]
       ]
 

data/lib/cheftacular/stateless_actions/environment.rb

@@ -34,7 +34,7 @@ class Cheftacular
   end
 
   class StatelessAction
-    def environment type="boot", ask_on_destroy=false, remove=true, servers_to_interact_with=[], threads=[]
+    def environment type="boot", treat_as_stateful=false, servers_to_interact_with=[], ask_on_destroy=false, remove=true, threads=[]
       ask_on_destroy = case @options['env']
                        when 'staging'    then true
                        when 'production' then true
@@ -49,7 +49,7 @@ class Cheftacular
         raise "Unknown type: #{ type }, can only be 'boot'/'boot_without_deploy'/'destroy'/'destroy_raw_servers'"
       end
 
-      nodes = @config['getter'].get_true_node_objects(true)
+      nodes = @config['getter'].get_true_node_objects(!treat_as_stateful)
 
       nodes = @config['parser'].exclude_nodes( nodes, [{ unless: { env: @options['env'] }}])
 
@@ -62,6 +62,12 @@ class Cheftacular
         initial_servers = initial_servers.delete_if {|name, config_hash| !servers_to_interact_with.include?(name)}
       end
 
+      if treat_as_stateful
+        initial_servers = initial_servers.delete_if { |name, config_hash| config_hash.nil? || !config_hash.has_key?('descriptor') }
+
+        initial_servers = initial_servers.delete_if { |name, config_hash| !config_hash['descriptor'].include?(@options['repository']) if !config_hash.nil? && config_hash.has_key?('descriptor') }
+      end
+
       if initial_servers.empty?
         puts "There are no servers defined for #{ @options['env'] } in the env_boot_nodes hash in your cheftacular.yml... Exiting"
 

data/lib/cheftacular/stateless_actions/file.rb

@@ -131,7 +131,7 @@ class Cheftacular
 
         download_location = @options['save_to_file'] ? @options['save_to_file'] : "#{ @config['locs']['chef-log'] }/#{ file_name.split('/').last }"
 
-        `scp -oStrictHostKeyChecking=no #{ @config['cheftacular']['deploy_user'] }@#{ n.public_ipaddress }:#{ location }/#{ file_name } #{ download_location } > /dev/tty`
+        `scp ssh #{ Cheftacular::SSH_INLINE_VARS } #{ @config['cheftacular']['deploy_user'] }@#{ n.public_ipaddress }:#{ location }/#{ file_name } #{ download_location } > /dev/tty`
 
         puts "Finished downloading #{ file_name } to #{ download_location }!"
       end

data/lib/cheftacular/stateless_actions/service.rb

@@ -13,7 +13,9 @@ class Cheftacular
           "    2. When `list` is passed, the above behavior is performed ",
 
           "    3. When `restart|stop|start SERVICE` is passed, the command will attempt to restart|stop|start the " + 
-          "service if it has a .conf file on the remote server in the /etc/init directory."
+          "service if it has a .conf file on the remote server in the /etc/init directory.",
+
+          "    4. `--sv` will use sv syntax for processes that use runsv instead of the older service paradigm."
         ]
       ]
 
@@ -23,21 +25,29 @@ class Cheftacular
 
   class StatelessAction
     def service
-      raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
+      #raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
 
       command = case ARGV[1]
-                when nil                then 'list'
-                when /list/             then 'list'
-                when 'restart'          then "#{ ARGV[2] } restart"
-                when 'stop'             then "#{ ARGV[2] } stop"
-                when 'start'            then "#{ ARGV[2] } start"
-                else                         'list'
+                when nil                then 'ls /etc/init'
+                when /list/             then 'ls /etc/init'
+                when 'restart'          then "service #{ ARGV[2] } restart"
+                when 'stop'             then "service #{ ARGV[2] } stop"
+                when 'start'            then "service #{ ARGV[2] } start"
+                else                         'ls /etc/init'
                 end
 
-      raise "You did not pass a service to #{ ARGV[1] }" if ARGV[1] =~ /restart|stop|start/ && ARGV[2].nil?
+      command = case ARGV[1]
+                when nil                then 'ls /etc/init.d'
+                when /list/             then 'ls /etc/init.d'
+                when 'restart'          then "sv restart #{ ARGV[2] }"
+                when 'stop'             then "sv stop #{ ARGV[2] }"
+                when 'start'            then "sv start #{ ARGV[2] }"
+                else                         'ls /etc/init.d'
+                end if @options['runsv']
 
-      service_location = "#{ ARGV[2] }.conf"
+      raise "You did not pass a service to #{ ARGV[1] }" if ARGV[1] =~ /restart|stop|start/ && ARGV[2].nil?
 
+      #initctl list | awk '{ print $1 }' | xargs -n1 initctl show-config
       nodes = @config['getter'].get_true_node_objects
 
       nodes = @config['parser'].exclude_nodes( nodes, [{ unless: { env: @options['env'] }}], true )
@@ -47,9 +57,9 @@ class Cheftacular
       on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
         n = get_node_from_address(nodes, host.hostname)
 
-        puts "Beginning run of \"service #{ command }\" for #{ n.name } (#{ n.public_ipaddress })"
+        puts "Beginning run of \"#{ command }\" for #{ n.name } (#{ n.public_ipaddress })"
 
-        start_service_run( n.name, n.public_ipaddress, options, locs, passwords, command, cheftacular, service_location )
+        start_service_run( n.name, n.public_ipaddress, options, locs, passwords, command, cheftacular)
       end
     end
   end
@@ -58,26 +68,10 @@ end
 module SSHKit
   module Backend
     class Netssh
-      def start_service_run name, ip_address, options, locs, passwords, command, cheftacular, service_location, out=""
+      def start_service_run name, ip_address, options, locs, passwords, command, cheftacular, out=""
         log_loc, timestamp = set_log_loc_and_timestamp(locs)
-        run_list_command   = command == 'list'
-
-        #puts "Generating service run log file for #{ name } (#{ ip_address }) at #{ log_loc }/rolelog/#{ name }-service-#{ timestamp }.txt"
-
-        #TODO check other locations for services!
-        if !run_list_command && !sudo_test( passwords[ip_address], "/etc/init/#{ service_location }" ) #true if file exists
-          puts "#{ name } (#{ ip_address }) cannot run #{ command } as it's .conf file does not exist! Running list instead..."
-
-          run_list_command = true
-        end
-
-        if run_list_command
-          out << capture( :ls, '-al', '/etc/init' ) 
-        else
-          out << sudo_capture( passwords[ip_address], 'service', command)
-        end
 
-        #::File.open("#{ log_loc }/rolelog/#{ name }-service-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) } unless options['no_logs']
+        out << sudo_capture( passwords[ip_address], command)
 
         puts out.scrub_pretty_text
 

data/lib/cheftacular/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.15.3
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -252,6 +252,7 @@ files:
 - lib/cheftacular.rb
 - lib/cheftacular/README.md
 - lib/cheftacular/action.rb
+- lib/cheftacular/actions/application.rb
 - lib/cheftacular/actions/backups.rb
 - lib/cheftacular/actions/check.rb
 - lib/cheftacular/actions/console.rb
@@ -383,7 +384,6 @@ files:
 - lib/cloud_interactor/volume/read.rb
 - lib/cloudflare/monkeypatches.rb
 - lib/ridley/monkeypatches.rb
-- lib/sshkit/actions/start_task.rb
 - lib/sshkit/getters.rb
 - lib/sshkit/helpers.rb
 - lib/sshkit/monkeypatches.rb

data/lib/sshkit/actions/start_task.rb

@@ -1,47 +0,0 @@
-module SSHKit
-  module Backend
-    class Netssh
-      def start_task name, ip_address, run_list, command, options, locs, cheftacular, passwords, sudo=false, out=""
-        log_loc, timestamp = set_log_loc_and_timestamp(locs)
-        true_env = get_true_environment run_list, cheftacular['run_list_environments'][options['env']], options['env']
-        true_env = get_override_environment cheftacular['repositories'][options['role']], options['env']
-
-        puts "Running #{ command } for #{ name } (#{ ip_address }) (Run with with --debug to generate a log as well)"
-
-        target_loc = "#{ cheftacular['base_file_path'] }/#{ options['repository'] }/current"
-
-        if !sudo_test( passwords[ip_address], target_loc )
-          puts "#{ name } (#{ ip_address }) cannot run #{ command } as there is no directory at #{ target_loc }!"
-
-          return ['', timestamp]
-        end
-
-        capture_args =  []
-        capture_args << ["RAILS_ENV=#{ true_env }"] if cheftacular['repositories'][options['role']]['stack'] == 'ruby_on_rails'
-        capture_args << command.split(' ')
-
-        within target_loc do
-          out << (sudo ? sudo_capture(passwords[ip_address], *capture_args.flatten) : capture( *capture_args.flatten ))
-        end
-
-        ::File.open("#{ log_loc }/#{ name }-task-#{ timestamp }.txt", "w") {|f| f.write(out.scrub_pretty_text) } if options['debug']
-        
-        puts out
-
-        if out.empty? || ( cheftacular['repositories'][options['role']].has_key?('not_a_migration_message') && out == cheftacular['repositories'][options['role']]['not_a_migration_message'] )
-          puts("Nothing to migrate for #{ options['role'] }...")
-        end
-
-        [out, timestamp, 0] #return out to send to logs_bag
-      rescue SSHKit::Command::Failed => e
-        puts "@@@@@CRITICAL! #{ command } failed for #{ name } (#{ ip_address })! Please check your #{ log_loc }/failed-deploy for the logs!@@@@@"
-
-        puts(e.message)
-
-        ::File.open("#{ log_loc }/failed-deploy/#{ name }-task-#{ timestamp }.txt", "w") { |f| f.write(e.message.scrub_pretty_text) }
-
-        [e.message, timestamp, 1]
-      end
-    end
-  end
-end