etsy-deployinator 1.0.1 → 1.1.1

data/lib/deployinator/helpers/version.rb

@@ -1,62 +1,62 @@
 module Deployinator
   module Helpers
-		module VersionHelpers
-			# Public: wrapper function to get the short SHA of a revision. The function
-			# checks retrieves the part of the string before the first dash. If the part
-			# is a valid default git short rev, i.e. alphanumeric and length 7 it is
-			# returned. For an invalid rev, nil is returned.
-			#
-			# ver - String representing the revision
-			#
-			# Returns the short SHA consisting of the alphanumerics until the first dash
-			# or nil for an invalid version string
-			def get_build(ver)
-					# return the short sha of the rev
-					the_sha = (ver || "")[/^([^-]+)/]
-					# check that we have a default git SHA
-					val = /^[a-zA-Z0-9]{7,}$/.match the_sha
-					val.nil? ? nil : the_sha
-			end
+    module VersionHelpers
+      # Public: wrapper function to get the short SHA of a revision. The function
+      # checks retrieves the part of the string before the first dash. If the part
+      # is a valid default git short rev, i.e. alphanumeric and length 7 it is
+      # returned. For an invalid rev, nil is returned.
+      #
+      # ver - String representing the revision
+      #
+      # Returns the short SHA consisting of the alphanumerics until the first dash
+      # or nil for an invalid version string
+      def get_build(ver)
+        # return the short sha of the rev
+        the_sha = (ver || "")[/^([^-]+)/]
+        # check that we have a default git SHA
+        val = /^[a-zA-Z0-9]{7,}$/.match the_sha
+        val.nil? ? nil : the_sha
+      end
       module_function :get_build
 
-			# Public: function to get the current software version running on a host
-			#
-			# host - String of the hostname to check
-			#
-			# Returns the full version of the current software running on the host
-			def get_version(host)
-					host_url = "http://#{host}/"
-					get_version_by_url("#{host_url}version.txt")
-			end
+      # Public: function to get the current software version running on a host
+      #
+      # host - String of the hostname to check
+      #
+      # Returns the full version of the current software running on the host
+      def get_version(host)
+        host_url = "https://#{host}/"
+        get_version_by_url("#{host_url}version.txt")
+      end
       module_function :get_version
 
-			# Public: function to fetch a version string from a URL. The version string
-			# is validated to have a valid format. The function calls a lower level
-			# implementation method for actually getting the version.
-			#
-			# url - String representing where to get the version from
-			#
-			# Returns the version string or nil if the format is invalid
-			def get_version_by_url(url)
-					version = curl_get_url(url)
-					val = /^[a-zA-Z0-9]{7,}-[0-9]{8}-[0-9]{6}-UTC$/.match version
-					val.nil? ? nil : version.chomp
-			end
+      # Public: function to fetch a version string from a URL. The version string
+      # is validated to have a valid format. The function calls a lower level
+      # implementation method for actually getting the version.
+      #
+      # url - String representing where to get the version from
+      #
+      # Returns the version string or nil if the format is invalid
+      def get_version_by_url(url)
+        version = curl_get_url(url)
+        val = /^[a-zA-Z0-9]{7,}-[0-9]{8}-[0-9]{6}-UTC$/.match version
+        val.nil? ? nil : version.chomp
+      end
       module_function :get_version_by_url
 
-			# Public: this helper function wraps the actual call to get the contents of a
-			# version file. This helps with reducing code duplication and also stubbing
-			# out the actual call for unit testing.
-			#
-			# url - String representing the complete URL to query
-			#
-			# Returns the contents of the URL resource
-			def curl_get_url(url)
-					with_timeout 2, "getting version via curl from #{url}" do
-					`curl -s #{url}`
-					end
-			end
+      # Public: this helper function wraps the actual call to get the contents of a
+      # version file. This helps with reducing code duplication and also stubbing
+      # out the actual call for unit testing.
+      #
+      # url - String representing the complete URL to query
+      #
+      # Returns the contents of the URL resource
+      def curl_get_url(url)
+        with_timeout 2, "getting version via curl from #{url}" do
+          `curl -s #{url}`
+        end
+      end
       module_function :curl_get_url
-	  end
-	end
+    end
+  end
 end

data/lib/deployinator/helpers.rb

@@ -75,11 +75,37 @@ module Deployinator
     #
     # Returns nothing
     def log_and_stream(output)
-      write_file output, @filename if @filename
+      write_file output, runlog_filename if runlog_filename
       return @block.call(output) unless @block.nil?
       ""
     end
 
+    # gives the filename to send runlog to based on whether we are in the main thread or not
+    # We do this because we want to be able to use log_and_stream seamlessly in a
+    # parallel thread. So, all log_and_stream calls in all but the main thread will
+    # log to a seaparate file
+    # output - String filename to log to
+    def runlog_filename(name=nil)
+      if @filename
+        if Thread.main == Thread.current
+          @filename
+        elsif Thread.current[:logfile_name]
+          Thread.current[:logfile_name]
+        elsif name
+          Thread.current[:logfile_name] = runlog_thread_filename(name)
+          Thread.current[:logfile_name]
+        else
+          raise 'Logfile name not defined in thread. Expecting name parameter to be passed in.'
+        end
+      end
+    end
+
+    # gives us the filename to log to in thread
+    # output - String filename for thread
+    def runlog_thread_filename(name)
+      @filename + '-' + name.to_s
+    end
+
     # Run external command with timing information
     # streams and logs the output of the command as well
     # If the command fails, it is retried some number of times
@@ -343,7 +369,7 @@ module Deployinator
       end
     end
 
-    # Public: gets the contes from a cache file if it hasn't expired
+    # Public: gets the contents from a cache file if it hasn't expired
     #
     # Paramaters:
     #    cache_file: path to a cache file
@@ -370,14 +396,30 @@ module Deployinator
       end
     end
 
+    # Public: writes the supplied contents to the cache file, ensuring that
+    # encoding is correct
+    #
+    # Parameters:
+    #    cache_file: path to the cache file
+    #    content: the data to write to the file
+    #
+    # Returns nothing
+    def write_to_cache(cache_file, contents)
+      File.open(cache_file, 'w:UTF-8') do |f|
+        f.write(contents.force_encoding('UTF-8'))
+      end
+    end
+
     def lock_pushes(stack, who, method)
-      log_and_stream("LOCKING #{stack}")
+      log_and_stream("LOCKING #{stack}<br>")
       if lock_info = push_lock_info(stack)
-        return log_and_stream("Pushes locked by #{lock_info[:who]} - #{lock_info[:method]}")
+        log_and_stream("Pushes locked by #{lock_info[:who]} - #{lock_info[:method]}<br>")
+        return false
       end
 
       dt = Time.now.strftime("%m/%d/%Y %H:%M")
       log_string_to_file("#{who}|#{method}|#{dt}", push_lock_path(stack))
+      return true
     end
 
     def unlock_pushes(stack)
@@ -424,16 +466,19 @@ module Deployinator
 
     # Public: wrap a block into a timeout
     #
-    # seconds     - timeout in seconds
-    # description - optional description for logging (default:"")
-    # &block      - block to call
+    # seconds         - timeout in seconds
+    # description     - optional description for logging (default:"")
+    # throw_exception - options param to throw exception back up stack
+    # quiet           - optional boolean for logging as a big red warning using the stderr div class
+    # extra_opts      - optional hash to pass along to plugins
+    # &block          - block to call
     #
     # Example
     #   with_timeout(20){system("curl -s http://google.com")}
     #   with_timeout 30 do; system("curl -s http://google.com"); end
     #
     # Returns nothing
-    def with_timeout(seconds, description=nil,  &block)
+    def with_timeout(seconds, description=nil, throw_exception=false, quiet=false, extra_opts={}, &block)
       begin
         Timeout.timeout(seconds) do
           yield
@@ -443,13 +488,22 @@ module Deployinator
         info += " for #{description}" unless description.nil?
         # log and stream if log filename is not undefined
         if (/undefined/ =~ @filename).nil?
-          log_and_stream "<div class=\"stderr\">#{info}</div>"
+          if quiet
+            log_and_stream "#{info}<br>"
+          else
+            log_and_stream "<div class=\"stderr\">#{info}</div>"
+          end
         end
         state = {
           :seconds => seconds,
-          :info => info
+          :info => info,
+          :stack => stack,
+          :extra_opts => extra_opts
         }
         raise_event(:timeout, state)
+        if throw_exception
+          raise e
+        end
         ""
       end
     end
@@ -492,7 +546,7 @@ module Deployinator
       raise "Must have stack" unless options[:stack]
 
       options[:env] ||= "PROD"
-      options[:nice_env] = nicify_env(options[:env])
+      options[:nice_env] ||= nicify_env(options[:env])
       options[:user] ||= @username
       options[:start] = @start_time unless options[:start] || ! @start_time
 
@@ -548,7 +602,7 @@ module Deployinator
       # stack should be the last part of the log line from the last pipe to the end
       # modified this to take into account the run_log entry at the end
       unless stacks.empty? && env.empty?
-        grep = "| egrep '#{env}.*\\|\(#{stacks.join("|")}\)(|(\\||$))?'"
+        grep = "| egrep '#{env}.*\\|\(#{stacks.join("|")}\)\\|'"
       end
 
       # extra grep does another filter to the line, needed to get CONFIG PRODUCTION
@@ -600,11 +654,53 @@ module Deployinator
       log_msg = e.nil? ? msg : "#{msg} (#{e.message})"
       log_and_stream "<div class=\"stderr\">#{log_msg}</div>"
       if !e.nil?
-        log_and_stream e.backtrace.inspect
+        begin
+          template = open("#{File.dirname(__FILE__)}/templates/exception.mustache").read
+
+          regex = /(?<file>.*?):(?<line>\d+):.*?`(?<method>.*)'/
+          context = e.backtrace.map do |line|
+            match = regex.match(line)
+            {
+              :file => match['file'],
+              :line => match['line'],
+              :method => match['method']
+            }
+          end
+
+          output = Mustache.render(template, {:exceptions => context})
+          log_and_stream output
+        rescue
+          log_and_stream e.backtrace.inspect
+        end
       end
       # This is so we have something in the log if/when this fails
       puts log_msg
     end
 
+    # Public: helper method to check if the current user is part of
+    # an group. This method let's you pass in groups for explicitness and
+    # testing but will fall back on @group and Deployinator.admin_groups.
+    #
+    # Param:
+    #  user_groups  - groups a user is part of
+    #  admin_groups - admin groups
+    #
+    # Returns true if the current user is part of and admin group and false
+    # otherwise
+    def is_admin?(user_groups=nil, admin_groups=nil)
+      user_groups  ||= @groups
+      admin_groups ||= Deployinator.admin_groups
+
+      return false if user_groups.nil?
+      return false if admin_groups.nil?
+
+      intersected_groups = user_groups & admin_groups
+
+      # if we found an intersection between admin and user groups, the current
+      # user is an admin
+      return (intersected_groups.length > 0)
+
+    end
+
   end
 end

data/lib/deployinator/static/css/maintenance.css

@@ -0,0 +1,9 @@
+#maintenance {
+  position: relative;
+  font-size: 18pt;
+  text-align: center;
+}
+
+#maintenance h1 {
+  margin: 35px;
+}

data/lib/deployinator/static/css/style.css

@@ -941,19 +941,29 @@ section#main.config{
 /*consol*/
 .code {
   background-color: #222;
-  color: #ccc;
-  font-family: monospace;
+  color: #ddd;
+  font-size: 16px;
   padding: 8px;
+
 }
 
 .code .command {
+  font-family: monospace;
+  font-size:14px;
+  margin-top:2px;
   border-top: 1px solid #555;
-  padding: 20px 0;
+  padding: 10px 20px 5px 10px;
 }
 .code .command h4 {
-  color: #fff;
+  color: #ccc;
   font-weight: normal;
 }
+
+.code .command h5 {
+    color: #abc;
+    font-size: 12px;
+    margin-bottom:10px;
+}
 .code .command p {
   margin: 10px;
 }
@@ -967,6 +977,17 @@ section#main.config{
   font-size: 12px;
   white-space: pre;
 }
+.code .success_msg {
+  color: #7fbf4d;
+  font-size: 12px;
+  white-space: pre;
+}
+.code .warning_msg {
+  color: #f0ad4e;
+  font-size: 12px;
+  white-space: pre;
+}
+
 .hidden {
   display:none;
 }
@@ -1135,7 +1156,6 @@ header.web_config {
     margin-top: 20px;
     -webkit-column-width: 220px;
     -moz-column-width: 220px;
-    height: 420px;
 }
 
 .pinned-stack-list { 

data/lib/deployinator/static/js/stats_load.js

@@ -0,0 +1,10 @@
+$(function() {
+    $.each(data, function(key, val) {
+        $("#choices").append('<h3><input type="checkbox" name="' + key +
+           '" checked="checked" id="id' + key + '">' +
+           '<label for="id' + key + '">'+ val.label + '</label></h3>');
+    });
+    
+    $("#choices").find("input").click(drawGraphs);
+    drawGraphs();
+})

data/lib/deployinator/templates/exception.mustache

@@ -0,0 +1,11 @@
+<div>
+  <code>
+    {{#exceptions}}
+    <div style='white-space: nowrap;'>
+      <span>{{file}}</span>
+      <span>+{{line}}</span>
+      <span>({{method}})</span>
+    </div>
+    {{/exceptions}}
+  </code>
+</div>

data/lib/deployinator/templates/generic_single_push.mustache

@@ -50,8 +50,9 @@
     <div class="push-topic">
         <div class="title"></div>
         <span class="log-run">
-            <form action="/run_logs">
+            <form action="/log">
                 <button class="button small" type="submit">See run logs</button>
+                <input type="hidden" name="stack" value="{{stack}}" />
             </form>
         </span>
     </div>

data/lib/deployinator/templates/layout.mustache

@@ -2,10 +2,10 @@
 <html>
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-        <title>Deployinator</title>
+        <title>Deployinator{{#stack}} - {{stack}}{{/stack}}</title>
         <link rel="shortcut icon" href="/favicon.ico">
         <link rel="stylesheet" href="/static/css/highlight.css" type="text/css" media="screen">
-        <link rel="stylesheet" href="/static/css/style.css?v=10" type="text/css" media="screen">
+        <link rel="stylesheet" href="/static/css/style.css?v=11" type="text/css" media="screen">
         <link rel="stylesheet" href="/static/css/diff_style.css" type="text/css" media="screen">
         <script src="/js/jquery-1.8.3.min.js"></script>
         <script src="/js/jquery-ui-1.8.24.min.js"></script>
@@ -53,6 +53,7 @@ _  __  / _  _ \___  __ \__  / _  __ \__  / / /__  / __  __ \_  __ `/_  __/_  __
                        <span class="label">Stack: </span>
                        <span>
                            <select name='stacks' id='stacks'>
+                           <option>Choose...</option>
                            {{#get_stack_select}}
                            <option value="{{stack}}"{{#current}} selected{{/current}}>{{stack}}</option>
                            {{/get_stack_select}}
@@ -99,7 +100,7 @@ _  __  / _  _ \___  __ \__  / _  __ \__  / / /__  / __  __ \_  __ `/_  __/_  __
                     window.location = '/' + stack;
                 });
 
-                // listen for changes on the watch button 
+                // listen for changes on the watch button
                 $('.watch').click(function () {
                     $.ajax({
                         url : '/{{stack}}/can-deploy',
@@ -110,7 +111,7 @@ _  __  / _  _ \___  __ \__  / _  __ \__  / / /__  / __  __ \_  __ `/_  __/_  __
                             console.log(form);
                             if (form.length == 1) {
                                 stream_log_websocket(form[0]);
-                            } 
+                            }
                         }
                     });
                 });

data/lib/deployinator/templates/log_table.mustache

@@ -3,7 +3,12 @@
         <tr>
             <th>
                 {{# prev_page }}
-                  <a href="?page={{prev_page}}">prev</a>
+                <form action="/log">
+                    {{#prev_page_params}}
+                    <input type="hidden" name="{{name}}" value="{{value}}" />
+                    {{/prev_page_params}}
+                    <button class="button small">Prev</button>
+                </form>
                 {{/ prev_page }}
             </th>
             <th></th>
@@ -11,9 +16,13 @@
             <th></th>
             <th></th>
             <th></th>
-            <th></th>
             <th>
-                <a href="?page={{next_page}}">next</a>
+                <form action="/log">
+                    {{#next_page_params}}
+                    <input type="hidden" name="{{name}}" value="{{value}}" />
+                    {{/next_page_params}}
+                    <button class="button small">Next</button>
+                </form>
             </th>
         </tr>
         <tr>
@@ -67,7 +76,9 @@
             <th>
                 {{# prev_page }}
                 <form action="/log">
-                    <input type="hidden" name="page" value="{{prev_page}}" />
+                    {{#prev_page_params}}
+                    <input type="hidden" name="{{name}}" value="{{value}}" />
+                    {{/prev_page_params}}
                     <button class="button small">Prev</button>
                 </form>
                 {{/ prev_page }}
@@ -79,7 +90,9 @@
             <th></th>
             <th>
                 <form action="/log">
-                    <input type="hidden" name="page" value="{{next_page}}" />
+                    {{#next_page_params}}
+                    <input type="hidden" name="{{name}}" value="{{value}}" />
+                    {{/next_page_params}}
                     <button class="button small">Next</button>
                 </form>
 

data/lib/deployinator/templates/maintenance.mustache

@@ -0,0 +1,5 @@
+<div id="maintenance">
+  <h1> Deployinator is in maintenance mode.</h1>
+  <img src="/images/maintenance.gif"></img>
+  <h1> We'll be back shortly. But please see {{ maintenance_contact }} for more details.  </h1>
+</div>