capistrano-hivequeen 5.4.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d68b5a273fd2e470f0f18c4e9c482fcf36747e9
-  data.tar.gz: 84b9d57cd16c58fde7a2f341406eea5cc5665544
+  metadata.gz: 00e2be23312ae02f0c4052c33a7e4a52585bc0ee
+  data.tar.gz: 945703edf96ae3dfb8df1fc4a43c49c2e88d093e
 SHA512:
-  metadata.gz: bf610520b9aa05b1df3795f747cf2abd5648afe2709ae3a1b140e57ed1b76580b37e232d9406fad04399d087a454ea780544b118dc1f3fa67477b000082ad269
-  data.tar.gz: 9f4e3d74248b47d888d794ccba9dc220e9136adf2ab31218a11301342583085ae8350da33231b6ce084c7046547ba3cc8a101c6c322b5cdccae671d731938d0d
+  metadata.gz: 573771005410ec97fe39a47a3776f679d77784b453aaa159e16a3ef22e50401293455fb77f2f6c087b6d5ccdae45a52033af8777ca4afc430afa4b12f36c2b16
+  data.tar.gz: 7af547724aa58b48a0ec1b243ed6f5d2968686adc4883ae405474f36cffcfb6ffbbb73afd3e7283b4471bed569bdcb006ff47f73d48efab9f7717f147d304d26

data/capistrano-hivequeen.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('capistrano', '>= 2.11.0')
+  s.add_dependency('activesupport', '>= 3.0.0')
   s.add_dependency('json')
   s.add_dependency('excon', '>= 0.6.0') # Perhaps we can support older. Haven't checked.
 

data/lib/capistrano/hivequeen.rb

@@ -1,5 +1,6 @@
 # HTTP Client for Hive Queen environment configuration
 require 'json'
+require 'active_support/core_ext'
 require 'fileutils'
 require 'excon'
 require 'base64'

data/lib/capistrano/hivequeen/capistrano_configuration.rb

@@ -8,43 +8,45 @@ Capistrano::Configuration.instance(:must_exist).load do
   HiveQueen.logger = logger
   HiveQueen.get_credentials!
 
-  # Require bundler extensions
-  require 'bundler/capistrano'
-
-  # Default to using the current branch as the stage name
-  # NB: current branch may not be set
-  #current_branch = `git symbolic-ref HEAD`.chomp.sub('refs/heads/', '')
-
   set :repository, HiveQueen.repository
-  set :scm, :git
   ssh_options[:forward_agent] = true
-  set :deploy_via, :remote_cache
 
   # By default, don't override deployments if there's another deployment in progress.
   # From the command line, use -s override=true to force a deployment
   set :override, false
 
-  # If a delayed_job worker doesn't stop/restart in time (probably b/c a slow job is running)
-  # trust that runit will eventually stop/restart the worker
-  set :tolerate_slow_bg, true
-
-  # Option to skip background tasks
-  set :skip_bg, false
-
   # Command to get the changes being deployed
   set :changelog_command do
     `git log #{current_commit}...#{real_revision} --pretty="%n%h %an: %s (%ar)" --stat --no-color`
   end
 
+  # Default to using `git ls-remote` to resolve SHA from github.
+  # Run with `-s github=false` to remove dependency on remote.
+  set :github, true
+
+  # Parse sha from branch; depends on remote git repo.
+  set :sha do
+    raise "Must specify a branch" unless branch.present?
+    if github
+      line = `git ls-remote #{repository} #{branch}`.split("\n").first
+      raise "Unable to find sha for branch #{branch}" unless line.presence.try {|l| l.split.last == "refs/heads/#{branch}"}
+      line.split.first
+    else
+      warn "Skipping github, using local git checkout"
+      branch
+    end
+    end
+
+  # Expand sha into a complete git sha
+  set :full_sha do
+    full_sha = `git rev-parse --verify #{sha}`.strip
+    raise "#{sha} is not a valid git ref. Run `git fetch` and try again?" if sha.empty?
+    full_sha
+  end
+
   # Limit of change log size
   set :changelog_maxbytes, 700 * 1024
 
-  # Don't mess with timestamps
-  set :normalize_asset_timestamps, false
-  # Don't mess with permissions
-  set :group_writable, false
-  set :use_sudo, false
-
   # Define environment tasks
   HiveQueen.environments.each do |env|
     name = env['name']

data/lib/capistrano/hivequeen/deploy.rb

@@ -1,16 +1,7 @@
 Capistrano::Configuration.instance.load do
-  # Symlink shared config files
-  after "deploy:update_code", "deploy:symlink_shared_config"
-  namespace :deploy do
-    desc "[internal] Symlink shared config files to current release"
-    task :symlink_shared_config do
-      run "ln -nfs #{shared_path}/config/* #{latest_release}/config"
-    end
-
-  end
 
-  before "deploy:update_code", "hivequeen:start"
-    before 'hivequeen:start', 'hivequeen:check_commit'
+  before "deploy:extract", "hivequeen:start"
+  before 'hivequeen:start', 'hivequeen:check_commit'
   on :start, "hivequeen:require_environment", :except => HiveQueen.environment_names
   namespace :hivequeen do
 
@@ -106,10 +97,6 @@ Capistrano::Configuration.instance.load do
     end
   end
 
-  # Keep all but the 5 most recent releases
-  set :keep_releases, 5
-  after "deploy", "deploy:cleanup"
-
   desc "Deploy without migrations"
   task(:hotfix) { deploy.default }
 
@@ -135,11 +122,4 @@ Capistrano::Configuration.instance.load do
     end
   end
 
-  after "deploy:restart", "deploy:restart_rails_services"
-  namespace :deploy do
-    desc "restarts all rails services concurrently"
-    task :restart_rails_services, :roles => [:app, :search, :bg, :resque] do
-      run "/etc/init.d/rails_services upgrade"
-    end
-  end
 end

data/lib/capistrano/hivequeen/egads.rb

@@ -0,0 +1,11 @@
+# Don't load this if legacy_deploy is loaded
+# Can be moved into capistrano/hivequeen/deploy.rb
+# after legacy stuff is removed
+Capistrano::Configuration.instance.load do
+  namespace :deploy do
+    desc "restarts all rails services concurrently"
+    task :restart do
+      run "if [ -x /etc/init.d/rails_services ]; then /etc/init.d/rails_services upgrade; fi"
+    end
+  end
+end

data/lib/capistrano/hivequeen/legacy_deploy.rb

@@ -0,0 +1,48 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  # Require bundler extensions
+  require 'bundler/capistrano'
+
+  # Default to using the current branch as the stage name
+  # NB: current branch may not be set
+  #current_branch = `git symbolic-ref HEAD`.chomp.sub('refs/heads/', '')
+
+  set :scm, :git
+  set :deploy_via, :remote_cache
+
+  # If a delayed_job worker doesn't stop/restart in time (probably b/c a slow job is running)
+  # trust that runit will eventually stop/restart the worker
+  set :tolerate_slow_bg, true
+
+  # Option to skip background tasks
+  set :skip_bg, false
+
+  # Don't mess with timestamps
+  set :normalize_asset_timestamps, false
+  # Don't mess with permissions
+  set :group_writable, false
+  set :use_sudo, false
+
+  # Symlink shared config files
+  after "deploy:update_code", "deploy:symlink_shared_config"
+  namespace :deploy do
+    desc "[internal] Symlink shared config files to current release"
+    task :symlink_shared_config do
+      run "ln -nfs #{shared_path}/config/* #{latest_release}/config"
+    end
+  end
+
+  before "deploy:update_code", "hivequeen:start"
+
+  # Keep all but the 5 most recent releases
+  set :keep_releases, 5
+  after "deploy", "deploy:cleanup"
+
+  after "deploy:restart", "deploy:restart_rails_services"
+  namespace :deploy do
+    desc "restarts all rails services concurrently"
+    task :restart_rails_services, :roles => [:app, :search, :bg, :resque] do
+      run "/etc/init.d/rails_services upgrade"
+    end
+  end
+
+end

data/lib/capistrano/hivequeen/version.rb

@@ -1,6 +1,6 @@
 class HiveQueen
   class Version
-    @@version = '5.4.0'
+    @@version = '6.0.0'
 
     def self.to_s
       @@version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +79,8 @@ files:
 - lib/capistrano/hivequeen.rb
 - lib/capistrano/hivequeen/capistrano_configuration.rb
 - lib/capistrano/hivequeen/deploy.rb
+- lib/capistrano/hivequeen/egads.rb
+- lib/capistrano/hivequeen/legacy_deploy.rb
 - lib/capistrano/hivequeen/multiio.rb
 - lib/capistrano/hivequeen/setup.rb
 - lib/capistrano/hivequeen/version.rb
@@ -88,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 2
 summary: Capistrano extensions for interacting with HiveQueen