alpha_omega 0.0.18 → 0.0.23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alpha_omega (0.0.17)
+    alpha_omega (0.0.23)
       HeSYINUvSBZfxqA-capistrano
       HeSYINUvSBZfxqA-capistrano_colors
       HeSYINUvSBZfxqA-capistrano_log

data/libexec/compare

@@ -3,7 +3,7 @@
 which figlet 2>&- > /dev/null
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
 if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
 else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1 --args "$@"
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
 fi

data/libexec/deploy

@@ -3,7 +3,7 @@
 which figlet 2>&- > /dev/null
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
 if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
 else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1 --args "$@"
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
 fi

data/libexec/major

@@ -3,7 +3,7 @@
 which figlet 2>&- > /dev/null
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
 if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
 else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1 --args "$@"
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
 fi

data/libexec/patch

@@ -3,7 +3,7 @@
 which figlet 2>&- > /dev/null
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
 if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
 else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1 --args "$@"
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
 fi

data/libexec/rollback

@@ -3,7 +3,7 @@
 which figlet 2>&- > /dev/null
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
 if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
 else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1 --args "$@"
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
 fi

data/libexec/stage

@@ -3,7 +3,7 @@
 which figlet 2>&- > /dev/null
 bundle check || { bundle --local --path vendor/bundle && bundle check; }
 if [[ -z $1 ]]; then
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1
 else
-  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=1,$(basename $0)=1 --args "$@"
+  exec bundle exec foreman start -f $(dirname $(dirname $0))/Procfile.rb -m 0 -c git=0,$(basename $0)=1 --args "$@"
 fi

data/recipes/alpha_omega/deploy.rb

@@ -4,6 +4,7 @@ require 'benchmark'
 require 'yaml'
 require 'alpha_omega/deploy/scm'
 require 'alpha_omega/deploy/strategy'
+require 'alpha_omega/utils'
 require 'capistrano_colors'
 require 'capistrano/log_with_awesome'
 
@@ -280,6 +281,13 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
     task :restart, :roles => :app, :except => { :no_release => true } do
     end
 
+    desc <<-DESC
+      Compares your application.
+    DESC
+    task :compare, :roles => :app, :except => { :no_release => true } do
+      update_code
+    end
+
     namespace :rollback do
       desc <<-DESC
         [internal] Points the current symlink at the previous revision.
@@ -466,7 +474,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         set -e; cd #{release_path};
         [[ -f #{ruby_env} ]] && . #{ruby_env};
         [[ -f #{ruby_rvm} ]] && { set +e; source #{ruby_rvm}; set -e; };
-        bundle check || bundle install --deployment --quiet --local --without development test || bundle check;
+        bundle check || { bundle install --deployment --quiet --local --without development test && bundle check; };
       SCRIPT
       run run_script.gsub(/[\n\r]+[ \t]+/, " ")
     end

data/recipes/alpha_omega/utils.rb

@@ -0,0 +1,72 @@
+require 'capistrano'
+
+module AlphaOmega
+
+  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 !branch_feature && allowed.member?(branch_type)
+          branch_type
+        else
+          puts "current branch must be #{allowed.join(', ')}, feature/xyz, or hotfix/xyz"
+          abort
+        end
+      else
+        puts "could not find a suitable branch"
+        abort
+      end
+    end
+  end
+
+  def self.what_hosts (nodes_spec)
+    # load all the nodes and define cap tasks
+    nodes = {}
+
+    Dir[nodes_spec].each do |fname|
+      nm_node = File.basename(fname, ".json")
+
+      node = JSON.parse(IO.read(fname))
+      node[:node_name] = nm_node
+
+      nodes[nm_node] = node
+
+      yield node if node[:node_name] && node["public_ip"] # TODO is the :node_name test necessary?
+    end
+
+    nodes
+
+  end
+
+  def self.what_groups (nodes)
+    # generalize groups
+    cap_groups = {}
+
+    nodes.each do |nm_node, node|
+      %w(chef_group cap_group).each do |nm_group| # TODO get rid of chef_group
+        if node.member?(nm_group) && !node["ignore"]
+          node[nm_group].each do |g|
+            cap_groups[g] ||= {}
+            cap_groups[g][nm_node] = node
+          end
+        end
+      end
+    end
+
+    cap_groups.each do |nm_group, group|
+      yield nm_group, group
+    end
+
+    cap_groups
+  end
+
+end
+

data/recipes/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.18"
+  Version = "0.0.23"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - David Nghiem
@@ -20,9 +20,7 @@ date: 2011-08-31 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: grit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  name: grit
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-foreman
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
+  name: HeSYINUvSBZfxqA-foreman
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-capistrano
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
+  name: HeSYINUvSBZfxqA-capistrano
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-capistrano_colors
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +71,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  requirement: *id004
+  name: HeSYINUvSBZfxqA-capistrano_colors
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-capistrano_log
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,8 +85,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
+  requirement: *id005
+  name: HeSYINUvSBZfxqA-capistrano_log
 description: Common reciples for persistent capistrano releases
 email: 
 - nghidav@gmail.com
@@ -128,6 +128,7 @@ files:
 - recipes/alpha_omega/deploy/strategy/checkout.rb
 - recipes/alpha_omega/deploy/strategy/remote.rb
 - recipes/alpha_omega/deploy/templates/maintenance.rhtml
+- recipes/alpha_omega/utils.rb
 - recipes/alpha_omega/version.rb
 - vendor/cache/HeSYINUvSBZfxqA-capistrano-2.5.21.gem
 - vendor/cache/HeSYINUvSBZfxqA-capistrano_colors-0.5.5.gem