etsy-deployinator 1.0.2 → 1.1.0

data/lib/deployinator/helpers/concurrency.rb

@@ -0,0 +1,70 @@
+require 'celluloid'
+require 'celluloid/autostart'
+
+module Deployinator
+  module Helpers
+    module ConcurrencyHelpers
+      extend Celluloid
+      # Hash of future objects that have been instantiated so far
+      @@futures = {}
+      # Public: run block of code in parallel
+      #
+      # Returns Handle to future object created
+      def run_parallel(name, &block)
+        name = name.to_sym
+        if reference_taken? name
+          raise DuplicateReferenceError, "Name #{name} already taken for future."
+        end
+        log_and_stream '</br>Queueing  execution of future: ' + name.to_s + '</br>'
+        @@futures[name] = Celluloid::Future.new do
+          # Set filename for thread
+          runlog_filename(name)
+          # setting up separate logger
+          log_and_stream '</br>Starting execution of future: ' + name.to_s + '</br>'
+          block.call
+        end
+        @@futures[name]
+      end
+
+
+
+      
+      # Public: check if the reference name for future is taken
+      #
+      # Returns boolean 
+      def reference_taken?(name)
+        return @@futures.has_key?(name)
+      end
+      
+      # Public: returns the value of the code block execution
+      # This also sends all the logged data in stream back to main 
+      # log file and removes the temporary log file created for the thread
+      # Returns the return value of the last line executed in block 
+      def get_value(future, timeout=nil)
+        if @filename
+          file_path = "#{RUN_LOG_PATH}" + runlog_thread_filename(future)
+          return_value = @@futures[future.to_sym].value(timeout)
+          log_and_stream File.read(file_path) 
+          File.delete(file_path) if File.exists?(file_path)
+          return_value
+        else
+          @@futures[future.to_sym].value 
+        end
+      end
+      
+      # Public: returns the values of the specified futures
+      #
+      # Returns hash of values
+      def get_values(*futures)
+        value_hash = {}
+        futures.each do |future|
+          value_hash[future] = get_value(future)
+        end
+        value_hash
+      end
+
+      class DuplicateReferenceError < StandardError
+      end
+    end
+  end
+end

data/lib/deployinator/helpers/dsh.rb

@@ -5,14 +5,19 @@ module Deployinator
         @dsh_fanout || 30
       end
 
-      def run_dsh(groups, cmd, &block)
+      def run_dsh(groups, cmd, only_stdout=true, &block)
         groups = [groups] unless groups.is_a?(Array)
         dsh_groups = groups.map {|group| "-g #{group} "}.join("")
-        run_cmd(%Q{ssh #{Deployinator.default_user}@#{Deployinator.deploy_host} dsh #{dsh_groups} -r ssh -F #{dsh_fanout} "#{cmd}"}, &block)[:stdout]
+        cmd_return = run_cmd(%Q{ssh #{Deployinator.default_user}@#{Deployinator.deploy_host} dsh #{dsh_groups} -r ssh -F #{dsh_fanout} "#{cmd}"}, &block)
+        if only_stdout
+          cmd_return[:stdout]
+        else
+          cmd_return
+        end
       end
 
       # run dsh against a given host or array of hosts
-      def run_dsh_hosts(hosts, cmd, extra_opts='', &block)
+      def run_dsh_hosts(hosts, cmd, extra_opts='', only_stdout=true, &block)
         hosts = [hosts] unless hosts.is_a?(Array)
         if extra_opts.length > 0
           run_cmd %Q{ssh #{Deployinator.default_user}@#{Deployinator.deploy_host} 'dsh -m #{hosts.join(',')} -r ssh -F #{dsh_fanout} #{extra_opts} -- "#{cmd}"'}, &block
@@ -21,9 +26,14 @@ module Deployinator
         end
       end
 
-      def run_dsh_extra(dsh_group, cmd, extra_opts, &block)
+      def run_dsh_extra(dsh_group, cmd, extra_opts, only_stdout=true, &block)
         # runs dsh to a single group with extra args to dsh
-        run_cmd(%Q{ssh #{Deployinator.default_user}@#{Deployinator.deploy_host} dsh -g #{dsh_group} -r ssh #{extra_opts} -F #{dsh_fanout} "#{cmd}"}, &block)[:stdout]
+        cmd_return = run_cmd(%Q{ssh #{Deployinator.default_user}@#{Deployinator.deploy_host} dsh -g #{dsh_group} -r ssh #{extra_opts} -F #{dsh_fanout} "#{cmd}"}, &block)
+        if only_stdout
+          cmd_return[:stdout]
+        else
+          cmd_return
+        end
       end
 
       def hosts_for(group)

data/lib/deployinator/helpers/git.rb

@@ -93,10 +93,16 @@ module Deployinator
       # branch    - the branch to checkout after the fetch
       #
       # Returns nothing
-      def git_freshen_clone(stack, extra_cmd="", path=nil, branch="master")
+      def git_freshen_clone(stack, extra_cmd="", path=nil, branch="master", force_checkout=false)
         path ||= git_checkout_path(checkout_root, stack)
-        cmd = "cd #{path} && git fetch --quiet origin +refs/heads/#{branch}:refs/remotes/origin/#{branch} && git reset --hard origin/#{branch} 2>&1"
-        cmd = build_git_cmd(cmd, extra_cmd)
+        cmd = [
+          "cd #{path}",
+          "git fetch --quiet origin +refs/heads/#{branch}:refs/remotes/origin/#{branch}",
+          "git reset --hard origin/#{branch} 2>&1",
+          "git checkout #{'--force' if force_checkout} #{branch} 2>&1",
+        ]
+        cmd << "git reset --hard origin/#{branch} 2>&1"
+        cmd = build_git_cmd(cmd.join(" && "), extra_cmd)
         run_cmd cmd
         yield "#{path}" if block_given?
       end
@@ -117,15 +123,15 @@ module Deployinator
       # read_write    - boolean; True means clone the repo read/write
       #
       # Returns stdout of the respective git command.
-      def git_freshen_or_clone(stack, extra_cmd, checkout_root, branch="master", read_write=false)
+      def git_freshen_or_clone(stack, extra_cmd, checkout_root, branch="master", read_write=false, protocol="git", force_checkout=false)
         path = git_checkout_path(checkout_root, stack)
         is_git = is_git_repo(path, extra_cmd)
         if is_git == :true
           log_and_stream "</br>Refreshing repo #{stack} at #{path}</br>"
-          git_freshen_clone(stack, extra_cmd, path, branch)
+          git_freshen_clone(stack, extra_cmd, path, branch, force_checkout)
         elsif is_git == :missing
           log_and_stream "</br>Cloning branch #{branch} of #{stack} repo into #{path}</br>"
-          git_clone(stack, git_url(stack, "git", read_write), extra_cmd, checkout_root, branch)
+          git_clone(stack, git_url(stack, protocol, read_write), extra_cmd, checkout_root, branch)
         else
           log_and_stream "</br><span class=\"stderr\">The path for #{stack} at #{path} exists but is not a git repo.</span></br>"
         end
@@ -188,7 +194,7 @@ module Deployinator
 
         unless head_rev
           head_rev = get_git_head_rev(stack, branch)
-          File.open(filename, 'w') {|f| f.write(head_rev) }
+          write_to_cache(filename, head_rev)
         end
 
         return head_rev
@@ -329,11 +335,12 @@ module Deployinator
       #   ssh_cmd: string ssh cmd to get to a host where you've got this repo checked out
       #   extra: string any extra cmds like cd that you need to do on the remote host to get to your checkout
       #   quiet: boolean - if true we make no additional output and just return the files
+      #   diff_filter: string to pass to git to make it only show certain types of changes (added/removed)
       #
       # Returns:
       #   Array of files names changed between these revs
-      def git_show_changed_files(rev1, rev2, ssh_cmd, extra=nil, quiet=false)
-        cmd = %Q{git log --name-only --pretty=oneline --full-index #{rev1}..#{rev2} | grep -vE '^[0-9a-f]{40} ' | sort | uniq}
+      def git_show_changed_files(rev1, rev2, ssh_cmd, extra=nil, quiet=false, diff_filter="")
+        cmd = %Q{git log --name-only --pretty=oneline --full-index #{rev1}..#{rev2} --diff-filter=#{diff_filter} | grep -vE '^[0-9a-f]{40} ' | sort | uniq}
         extra = "#{extra} &&" unless extra.nil?
         if quiet
           list_of_touched_files = %x{#{ssh_cmd} "#{extra} #{cmd}"}

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/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>