alpha_omega 0.0.111 → 0.0.113

data/README.mkd

@@ -9,18 +9,20 @@ Getting Started
 ===============
 
 Your local machine must let you ssh and run sudo without a password
-during the deploy.
+during the deploy.  It must also have access to opsdb directly or via a
+proxy dpeloy host.
 
 Move the example Capfile.
 
     mv Capfile.example Capfile
 
-Run the deploy script.
+Run the hosts script to see what hosts are visible.
 
-    bundle exec deploy
-    bundle exec deploy stage
-    bundle exec deploy
-    bundle exec deploy rollback
+    bin/hosts world
+
+Run the deploy script with host and group arguments to deploy.
+
+    bin/deploy XXX
 
 LICENSE
 -------

data/VERSION

@@ -1 +1 @@
-0.0.111
+0.0.113

data/lib/alpha_omega/deploy/scm/git.rb

@@ -75,7 +75,8 @@ module Capistrano
           execute = []
 
           execute << "[[ -d #{destination}/.git ]] || #{git} clone #{verbose} #{variable(:repository)} #{destination}"
-          execute << "cd #{destination} && #{git} fetch -q && #{git} reset --hard #{revision} && #{git} submodule update --init --recursive"
+          execute << "cd #{destination} && #{git} fetch -q && #{git} checkout -q --force #{revision}"
+          execute << "cd #{destination} && #{git} reset --hard #{revision} && #{git} submodule update --init --recursive"
 
           execute
         end

data/lib/alpha_omega/deploy.rb

@@ -60,49 +60,47 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   # =========================================================================
 
   _cset(:source)            { Capistrano::Deploy::SCM.new(scm, self) }
-  _cset(:real_revision)     { source.local.query_revision(revision) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } } }
-
   _cset(:strategy)          { Capistrano::Deploy::Strategy.new(deploy_via, self) }
+  _cset(:real_revision)     { source.local.query_revision(revision) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } } }
 
-  _cset(:version_dir)       { releases.length > 0 ? "releases" : "" }
-  _cset :current_dir,       "current"
-  _cset :service_dir,       "service"
-  _cset :log_dir,           "log"
-  _cset :releases,          %w(alpha omega)
-
-  _cset(:releases_path)     { File.join(deploy_to, version_dir) }
-  _cset(:current_path)      { File.join(deploy_to, current_dir) }
-  _cset(:service_path)      { File.join(deploy_to, service_dir) }
-  _cset(:log_path)          { File.join(deploy_to, log_dir) }
-  _cset(:service_drop)      { File.join(deploy_to, ".#{service_dir}.d") }
-  _cset(:release_path)      { File.join(releases_path, release_name) }
-
-  _cset(:current_release)   { release_path }
   _cset(:current_workarea)  { capture("readlink #{current_path} || true").strip.split("/")[-1] }
-
-  _cset(:previous_release) { 
+  _cset(:release_name) { 
     if releases.length > 0
       w = current_workarea
-      releases.index(w) && releases[(releases.index(w)-1)%releases.length] || nil
+      stage = releases[((releases.index(w)?releases.index(w):-1)+1)%releases.length]
+      system "#{figlet} -w 200 on #{stage}"
+      stage
     else
       ""
     end
   }
 
-  _cset(:release_name) { 
+  _cset :releases,          [ "alpha", "beta", "omega" ]
+  _cset(:releases_dir)      { releases.length > 0 ? "releases" : "" }
+  _cset :previous_dir,        "previous"
+  _cset :current_dir,         "current"
+  _cset :service_dir,         "service"
+  _cset :log_dir,             "log"
+
+
+  _cset(:releases_path)     { File.join(deploy_to, releases_dir) }
+  _cset(:release_path)      { File.join(releases_path, release_name) }
+  _cset(:previous_path) { 
     if releases.length > 0
       w = current_workarea
-      stage = releases[((releases.index(w)?releases.index(w):-1)+1)%releases.length]
-      system "#{figlet} -w 200 on #{stage}"
-      stage
+      releases.index(w) && releases[(releases.index(w)-1)%releases.length] || ""
     else
       ""
     end
   }
+  _cset(:current_path)      { File.join(deploy_to, current_dir) }
+  _cset(:service_path)      { File.join(deploy_to, service_dir) }
+  _cset(:service_drop)      { File.join(deploy_to, ".#{service_dir}.d") }
+  _cset(:log_path)          { File.join(deploy_to, log_dir) }
 
+  _cset(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).chomp if previous_release }
   _cset(:current_revision)  { capture("cat #{current_path}/REVISION",     :except => { :no_release => true }).chomp }
   _cset(:latest_revision)   { capture("cat #{current_release}/REVISION",  :except => { :no_release => true }).chomp }
-  _cset(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).chomp if previous_release }
 
   _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
 
@@ -115,7 +113,9 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   # standalone case, or during deployment.
   #
   # with persistent releases, the latest release is always the current release
-  _cset(:latest_release) { current_release }
+  _cset(:previous_release)  { previous_path }
+  _cset(:current_release)   { release_path }
+  _cset(:latest_release)    { current_release }
 
   # =========================================================================
   # deploy:lock defaults
@@ -517,7 +517,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
 
       run_script = <<-SCRIPT
-        echo #{epoch} #{ENV['USER']} > #{log_path}/.#{application}_deploy_lock;
+        echo #{epoch} #{ENV['AO_USER']} > #{log_path}/.#{application}_deploy_lock;
       SCRIPT
 
       at_exit { self.unlock; }
@@ -538,7 +538,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       SCRIPT
 
       run_script += <<-SCRIPT
-        #{ruby_loader} bundle check 2>&1 > /dev/null || { #{ruby_loader} bundle install --quiet --local #{bundler_options} && #{ruby_loader} bundle check; };
+        #{ruby_loader} bundle check 2>&1 > /dev/null || { #{ruby_loader} bundle install --quiet --local #{bundler_options} && #{ruby_loader} bundle check > /dev/null; };
       SCRIPT
 
       run run_script.gsub(/[\n\r]+[ \t]+/, " ")

data/lib/alpha_omega/utils.rb

@@ -140,28 +140,19 @@ module AlphaOmega
     end
   end
 
-  def self.what_branch (allowed = %w(production master develop))
-    if ENV["BRANCH"]
-      ENV["BRANCH"]
-    elsif ENV["TAG"]
-      ENV["TAG"]
-    else
-      current = `git branch`.split("\n").find {|b| b.split(" ")[0] == '*' } # use Grit
-      if current
-        star, branch_name = current.split(" ")
-        branch_type, branch_feature = branch_name.split("/")
-        if %w(feature hotfix).member?(branch_type)
-          branch_name
-        elsif allowed.any? {|rx| rx.match(branch_name) }
-          branch_name
-        else
-          puts "current branch must be #{allowed.join(', ')}, feature/xyz, or hotfix/xyz"
-          abort
-        end
+  def self.what_branch (allowed = %w(production staging master develop) + [%r(/)])
+    current = `git branch`.split("\n").find {|b| b.split(" ")[0] == '*' } # use Grit
+    if current
+      star, branch_name = current.split(" ")
+      if allowed.any? {|rx| rx.match(branch_name) }
+        branch_name
       else
-        puts "could not find a suitable branch"
+        puts "current branch must be one of #{allowed.join(', ')}"
         abort
       end
+    else
+      puts "could not find a suitable branch"
+      abort
     end
   end
 

data/libexec/activate

@@ -36,35 +36,78 @@ case "$(basename $0)" in
     } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
     ;;
 
+  bump)
+    case "$1" in
+      patch|minor|major)
+        bump=$1; shift
+        set $(cat VERSION | sed 's#\.# #g')
+        case "$bump" in
+          patch)
+            echo "$1.$2.$(($3 + 1))"
+            ;;
+          minor)
+            echo "$1.$(($2 + 1)).0"
+            ;;
+          major)
+            echo "$(($1 + 1)).0.0"
+            ;;
+        esac > VERSION
+        ;;
+      *)
+        ver_new=$1; shift
+        set $(echo "$ver_new" | sed 's#\.# #g') 0
+        M=$1; shift
+        m=$1; shift
+        p=$1; shift
+
+        tmp_version=$(mktemp -t XXXXXXXXX)
+        (echo "$(($M+0)).$(($m+0)).$(($p+0))" > $tmp_version) 2>&-
+        ver_new_same=$(cat $tmp_version)
+        rm -f $tmp_version
+
+        if [[ $ver_new = $ver_new_same ]]; then
+          echo "$ver_new" > VERSION
+        else
+          echo "ERROR: invalid version: $ver_new" 1>&2
+          exit 1
+        fi
+        ;;
+    esac
+
+    if [[ -f Gemfile ]]; then
+      bundle check 2>&1 >/dev/null || { bundle --quiet install --local --path vendor/bundle || bundle check > /dev/null; }
+      git add Gemfile.lock
+    fi
+
+    git add VERSION
+
+    ver_bumped=$(cat VERSION)
+    git commit -m "bump: $ver_bumped"
+    git tag "v$ver_bumped"
+    echo $ver_bumped
+    ;;
+
   *)
     set $(for a in "$@"; do echo $a.app; done)
     case "$(basename $0)" in
-      deploy|release)
+      deploy)
         bundle exec cap "$@" deploy
         ;;
 
-      rollback)
-        bundle exec cap "$@" deploy:rollback
+      release)
+        bundle exec cap "$@" deploy
         ;;
 
       stage)
         bundle exec cap "$@" deploy:update_code
         ;;
 
-      activate)
-        bundle exec cap "$@" deploy:symlink deploy:restart
-        ;;
-
-      compare)
-        bundle exec cap "$@" deploy:compare
-        ;;
-
       restart)
         bundle exec cap "$@" deploy:restart
         ;;
 
-      restart)
-        bundle exec cap "$@" deploy:restart
+      config)
+        bundle exec cap "$@" deploy:config
         ;;
 
       build)
@@ -75,8 +118,32 @@ case "$(basename $0)" in
         bundle exec cap "$@" deploy:dist
         ;;
 
-      config)
-        bundle exec cap "$@" deploy:config
+      activate)
+        bundle exec cap "$@" deploy:symlink deploy:restart
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      check)
+        bundle exec cap "$@" deploy:check
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      plan)
+        bundle exec cap "$@" deploy:plan
+        ;;
+
+      lock)
+        bundle exec cap "$@" deploy:lock
+        ;;
+
+      unlock)
+        bundle exec cap "$@" deploy:unlock
         ;;
 
       invoke)

data/libexec/build

@@ -36,35 +36,78 @@ case "$(basename $0)" in
     } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
     ;;
 
+  bump)
+    case "$1" in
+      patch|minor|major)
+        bump=$1; shift
+        set $(cat VERSION | sed 's#\.# #g')
+        case "$bump" in
+          patch)
+            echo "$1.$2.$(($3 + 1))"
+            ;;
+          minor)
+            echo "$1.$(($2 + 1)).0"
+            ;;
+          major)
+            echo "$(($1 + 1)).0.0"
+            ;;
+        esac > VERSION
+        ;;
+      *)
+        ver_new=$1; shift
+        set $(echo "$ver_new" | sed 's#\.# #g') 0
+        M=$1; shift
+        m=$1; shift
+        p=$1; shift
+
+        tmp_version=$(mktemp -t XXXXXXXXX)
+        (echo "$(($M+0)).$(($m+0)).$(($p+0))" > $tmp_version) 2>&-
+        ver_new_same=$(cat $tmp_version)
+        rm -f $tmp_version
+
+        if [[ $ver_new = $ver_new_same ]]; then
+          echo "$ver_new" > VERSION
+        else
+          echo "ERROR: invalid version: $ver_new" 1>&2
+          exit 1
+        fi
+        ;;
+    esac
+
+    if [[ -f Gemfile ]]; then
+      bundle check 2>&1 >/dev/null || { bundle --quiet install --local --path vendor/bundle || bundle check > /dev/null; }
+      git add Gemfile.lock
+    fi
+
+    git add VERSION
+
+    ver_bumped=$(cat VERSION)
+    git commit -m "bump: $ver_bumped"
+    git tag "v$ver_bumped"
+    echo $ver_bumped
+    ;;
+
   *)
     set $(for a in "$@"; do echo $a.app; done)
     case "$(basename $0)" in
-      deploy|release)
+      deploy)
         bundle exec cap "$@" deploy
         ;;
 
-      rollback)
-        bundle exec cap "$@" deploy:rollback
+      release)
+        bundle exec cap "$@" deploy
         ;;
 
       stage)
         bundle exec cap "$@" deploy:update_code
         ;;
 
-      activate)
-        bundle exec cap "$@" deploy:symlink deploy:restart
-        ;;
-
-      compare)
-        bundle exec cap "$@" deploy:compare
-        ;;
-
       restart)
         bundle exec cap "$@" deploy:restart
         ;;
 
-      restart)
-        bundle exec cap "$@" deploy:restart
+      config)
+        bundle exec cap "$@" deploy:config
         ;;
 
       build)
@@ -75,8 +118,32 @@ case "$(basename $0)" in
         bundle exec cap "$@" deploy:dist
         ;;
 
-      config)
-        bundle exec cap "$@" deploy:config
+      activate)
+        bundle exec cap "$@" deploy:symlink deploy:restart
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      check)
+        bundle exec cap "$@" deploy:check
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      plan)
+        bundle exec cap "$@" deploy:plan
+        ;;
+
+      lock)
+        bundle exec cap "$@" deploy:lock
+        ;;
+
+      unlock)
+        bundle exec cap "$@" deploy:unlock
         ;;
 
       invoke)

data/libexec/bump

@@ -0,0 +1,162 @@
+#!/bin/bash -e
+
+hst_this=$(hostname -s)
+if ! echo "$hst_this" | egrep -q "^(admin|develop)"; then
+  # unless the .ao_no_proxy file exists
+  if [[ ! -f ".ao_no_proxy" ]]; then
+    # ssh into deploy host and run from there
+    exec bin/proxy $(basename $0) "$@"
+    exit 1
+  fi
+fi
+
+case "$(basename $0)" in
+  debug)
+    export LOCAL_ONLY=true
+
+    {
+    cap $(for a in "$@"; do echo $a.echo; done)
+    }
+    ;;
+
+  hosts)
+    export LOCAL_ONLY=true
+
+    {
+    cap $(for a in "$@"; do echo $a.echo; done)
+    } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | awk '{print $NF}' | sort -u
+    ;;
+
+  dna)
+    export LOCAL_ONLY=true
+
+    {
+      echo "eea914aaa8dde6fdae29242b1084a2b0415eefaf ---"
+      cap $(for a in "$@"; do echo $a.yaml; done)
+    } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
+    ;;
+
+  bump)
+    case "$1" in
+      patch|minor|major)
+        bump=$1; shift
+        set $(cat VERSION | sed 's#\.# #g')
+        case "$bump" in
+          patch)
+            echo "$1.$2.$(($3 + 1))"
+            ;;
+          minor)
+            echo "$1.$(($2 + 1)).0"
+            ;;
+          major)
+            echo "$(($1 + 1)).0.0"
+            ;;
+        esac > VERSION
+        ;;
+      *)
+        ver_new=$1; shift
+        set $(echo "$ver_new" | sed 's#\.# #g') 0
+        M=$1; shift
+        m=$1; shift
+        p=$1; shift
+
+        tmp_version=$(mktemp -t XXXXXXXXX)
+        (echo "$(($M+0)).$(($m+0)).$(($p+0))" > $tmp_version) 2>&-
+        ver_new_same=$(cat $tmp_version)
+        rm -f $tmp_version
+
+        if [[ $ver_new = $ver_new_same ]]; then
+          echo "$ver_new" > VERSION
+        else
+          echo "ERROR: invalid version: $ver_new" 1>&2
+          exit 1
+        fi
+        ;;
+    esac
+
+    if [[ -f Gemfile ]]; then
+      bundle check 2>&1 >/dev/null || { bundle --quiet install --local --path vendor/bundle || bundle check > /dev/null; }
+      git add Gemfile.lock
+    fi
+
+    git add VERSION
+
+    ver_bumped=$(cat VERSION)
+    git commit -m "bump: $ver_bumped"
+    git tag "v$ver_bumped"
+    echo $ver_bumped
+    ;;
+
+  *)
+    set $(for a in "$@"; do echo $a.app; done)
+    case "$(basename $0)" in
+      deploy)
+        bundle exec cap "$@" deploy
+        ;;
+
+      release)
+        bundle exec cap "$@" deploy
+        ;;
+
+      stage)
+        bundle exec cap "$@" deploy:update_code
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      config)
+        bundle exec cap "$@" deploy:config
+        ;;
+
+      build)
+        bundle exec cap "$@" deploy:build
+        ;;
+
+      dist)
+        bundle exec cap "$@" deploy:dist
+        ;;
+
+      activate)
+        bundle exec cap "$@" deploy:symlink deploy:restart
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      check)
+        bundle exec cap "$@" deploy:check
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      plan)
+        bundle exec cap "$@" deploy:plan
+        ;;
+
+      lock)
+        bundle exec cap "$@" deploy:lock
+        ;;
+
+      unlock)
+        bundle exec cap "$@" deploy:unlock
+        ;;
+
+      invoke)
+        bundle exec cap "$@" invoke
+        ;;
+
+      shell)
+        bundle exec cap "$@" shell
+        ;;
+
+      *)
+        bundle exec cap "$@"
+        ;;
+  esac
+esac
+