alpha_omega 0.0.175 → 0.0.176

data/libexec/unlock

@@ -1,137 +1,14 @@
 #!/bin/bash -e
 
-function bump_version {
-  ensure_clean_git_status
-
-  local_file=
-  if [[ -f VERSION || -L VERSION ]]; then
-      local_file=1
-    if [[ ! -e VERSION ]]; then
-      echo "ERROR: cannot write to VERSION file" 1>&2
-      exit 1
-    fi
-  fi
-
-  tmp_version=$(mktemp -t XXXXXXXXX)
-  if [[ -n $local_file ]]; then
-    cat VERSION | perl -ne 'm{^\s*v?(\d+)\.(\d+)\.(\d+)\s*$} && printf("%03d.%03d.%03d %d.%d.%d\n",$1,$2,$3,$1,$2,$3)' | sort -r | head -1 | awk '{print $2}' > $tmp_version
-  else
-    git tag | perl -ne 'm{^v(\d+)\.(\d+)\.(\d+)$} && printf("%03d.%03d.%03d %d.%d.%d\n",$1,$2,$3,$1,$2,$3)' | sort -r | head -1 | awk '{print $2}' > $tmp_version
-  fi
-
-  case "$1" in
-    patch|minor|major)
-      bump=$1; shift
-      set -- $(cat $tmp_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 > $tmp_version
-      ;;
-    *)
-      ver_new=$1; shift
-      ver_new=${ver_new#v}
-      echo $ver_new > $tmp_version
-      ;;
-  esac
-
-  ver_new=$(cat $tmp_version)
-  set -- $(echo "$ver_new" | sed 's#\.# #g') 0
-  M=$1; shift
-  m=$1; shift
-  p=$1; shift
-
-  (echo "$(($M+0)).$(($m+0)).$(($p+0))" > $tmp_version) 2>&-
-  ver_new_same=$(cat $tmp_version)
-
-  if [[ $ver_new != $ver_new_same ]]; then
-    echo "ERROR: invalid version: $ver_new" 1>&2
-    exit 1
-  fi
-
-  ver_bumped="v$(cat $tmp_version)"
-  rm -f $tmp_version
-  ensure_git_tag_available $ver_bumped
-
-  if [[ -n $local_file ]]; then
-    echo ${ver_bumped#v} > VERSION
-    git add VERSION
-    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 commit -m "bump: $ver_bumped"
-    git push
-  fi
-
-  git_tag "$ver_bumped"
-  echo $ver_bumped
-}
-
-function ensure_git_tag_available {
-  version=$1; shift
-  git fetch --tags
-  remote_sha=$(git ls-remote origin $version | awk '{print $1}')
-  if [[ -n $remote_sha ]]; then
-    echo "ERROR: already a remote tag $version, bump again" 1>&2
-    exit 1
-  fi
-
-  local_sha=$(git show-ref $version | awk '{print $1}')
-  if [[ -n $local_sha ]]; then
-    echo "ERROR: already a local tag $version" 1>&2
-    exit 1
-  fi
-}
-
-function git_tag {
-  local version=$1; shift
-
-  ensure_git_tag_available "$version"
-
-  git tag $version
-  git push origin tag $version
-  remote_sha=$(git ls-remote origin $version | awk '{print $1}')
-  local_sha=$(git show-ref $version | awk '{print $1}')
-  if [[ $remote_sha != $local_sha ]]; then
-    echo "ERROR: remote tag $version does not match local SHA" 1>&2
+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
-}
-
-function ensure_clean_git_status {
-  local lines=$(git status -s -uno | wc -l | awk '{print $1}')
-  if [[ $lines != "0" ]]; then
-    echo "ERROR: git status is not clean, cannot tag" 1>&2
-    git status -s -uno
-    exit 1
-  fi
-}
-
-case "$(basename $0)" in
-  bump)
-    true
-    ;;
-  *)
-    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
-    ;;
-esac
+fi
 
 export LOCAL_ONLY=true
 
@@ -186,13 +63,6 @@ case "$(basename $0)" in
         } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
         ;;
 
-      bump)
-        if [[ -z $1 ]]; then
-          set patch
-        fi
-        bump_version "$@"
-        ;;
-
       *)
         LOCAL_ONLY=
         if [[ -n $1 ]]; then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 321
+  hash: 383
   prerelease: 
   segments: 
   - 0
   - 0
-  - 175
-  version: 0.0.175
+  - 176
+  version: 0.0.176
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +00:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -117,44 +116,43 @@ files:
 - LICENSE
 - VERSION
 - README.mkd
-- libexec/unlock
-- libexec/proxy
-- libexec/build
-- libexec/restart
-- libexec/stage
 - libexec/activate
-- libexec/rollback
-- libexec/plan
-- libexec/compare
-- libexec/shell
-- libexec/migrate
-- libexec/deploy
-- libexec/config
+- libexec/build
 - libexec/bump
-- libexec/dna
 - libexec/check
+- libexec/compare
+- libexec/config
 - libexec/debug
-- libexec/lock
-- libexec/invoke
+- libexec/deploy
+- libexec/dist
+- libexec/dna
 - libexec/hosts
+- libexec/invoke
+- libexec/lock
+- libexec/migrate
+- libexec/plan
+- libexec/proxy
 - libexec/release
-- libexec/dist
-- lib/alpha_omega/utils.rb
-- lib/alpha_omega/deploy.rb
-- lib/alpha_omega/version.rb
+- libexec/restart
+- libexec/rollback
+- libexec/shell
+- libexec/stage
+- libexec/unlock
+- lib/alpha_omega/deploy/dependencies.rb
 - lib/alpha_omega/deploy/local_dependency.rb
+- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/scm.rb
 - lib/alpha_omega/deploy/strategy/base.rb
 - lib/alpha_omega/deploy/strategy/checkout.rb
 - lib/alpha_omega/deploy/strategy/remote.rb
-- lib/alpha_omega/deploy/scm.rb
-- lib/alpha_omega/deploy/templates/maintenance.rhtml
 - lib/alpha_omega/deploy/strategy.rb
-- lib/alpha_omega/deploy/scm/base.rb
-- lib/alpha_omega/deploy/scm/git.rb
-- lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/templates/maintenance.rhtml
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/utils.rb
+- lib/alpha_omega/version.rb
 - bin/alpha_omega
-has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
 
@@ -184,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes