capistrano-hivequeen 1.1.0 → 2.0.0

data/capistrano-hivequeen.gemspec

@@ -37,7 +37,6 @@ 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-ext', '= 1.2.1')
   s.add_dependency('capistrano', '~> 2.11.2')
   s.add_dependency('json')
   s.add_dependency('excon', '>= 0.6.0') # Perhaps we can support older. Haven't checked.

data/lib/capistrano/hivequeen/capistrano_configuration.rb

@@ -8,17 +8,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   HiveQueen.logger = logger
   HiveQueen.get_credentials!
 
-  # Redefine stage tasks from multistage extension
-  # Set the list of available stages
-  set :stages, HiveQueen.environment_names
-
   # 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/', '')
-  unless current_branch.empty?
-    env_name = HiveQueen.environment_for_branch(current_branch)
-    set(:default_stage, env_name) if env_name
-  end
+  #current_branch = `git symbolic-ref HEAD`.chomp.sub('refs/heads/', '')
 
   set :repository, HiveQueen.repository
   set :scm, :git
@@ -39,13 +31,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     `git log #{current_commit}...#{real_revision} --pretty="%n%h %an: %s (%ar)" --stat --no-color`
   end
 
-  # Load capistrano multi-stage extension
-  require 'fileutils' # required until https://github.com/capistrano/capistrano-ext/commit/930ca840a0b4adad0ec53546790b3f5ffe726538 is released
-  require 'capistrano/ext/multistage'
-  require 'capistrano/hivequeen/setup'
-  require 'capistrano/hivequeen/deploy'
-
-  # Redefine stage tasks from multistage extension
+  # Define environment tasks
   HiveQueen.environments.each do |env|
     name = env['name']
     hive_queen_id = env['id']
@@ -53,22 +39,22 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Use environment #{name}"
     task name do
-      environment = HiveQueen.roles(hive_queen_id)
+      env = HiveQueen.roles(hive_queen_id)
       # Check if environment is ready
-      unless environment['state'] == 'running'
-        abort "Environment #{name} is not ready. State: #{environment['state']}"
+      unless env['state'] == 'running'
+        abort "Environment #{name} is not ready. State: #{env['state']}"
       end
 
-      set :stage, name.to_sym
+      set :environment, name.to_sym
       set :rails_env, name
       set :environment_id, hive_queen_id
       set :current_commit, current_commit
       unless exists?(:branch)
-        set :branch, environment['branch']
+        set :branch, env['branch']
       end
 
       # Set servers for each role
-      environment['roles'].each do |role_name, role_config|
+      env['roles'].each do |role_name, role_config|
         role(role_name.to_sym) { role_config['servers'] }
       end
 
@@ -85,4 +71,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     end
   end
+  require 'capistrano/hivequeen/setup'
+  require 'capistrano/hivequeen/deploy'
+
+
 end

data/lib/capistrano/hivequeen/deploy.rb

@@ -9,11 +9,18 @@ Capistrano::Configuration.instance.load do
   end
 
   before "deploy:update_code", "hivequeen:start"
+  on :start, "hivequeen:require_environment", :except => HiveQueen.environment_names
   namespace :hivequeen do
+
+    desc "[internal] abort if no environment specified"
+    task :require_environment do
+      abort "No environment specified." if !exists?(:environment)
+    end
+
     desc "[internal] Start a deployment in hivequeen"
     task :start do
       # TODO: is there a better way to determine what cap tasks are running?
-      tasks = ARGV.reject{|task_name| stage.to_s == task_name}
+      tasks = ARGV.reject{|task_name| environment.to_s == task_name}
 
       params = {
         :task => tasks.join(' '),

data/lib/capistrano/hivequeen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: capistrano-ext
-  requirement: &70268421688220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70268421688220
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70268421687740 !ruby/object:Gem::Requirement
+  requirement: &70343268557220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +21,10 @@ dependencies:
         version: 2.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70268421687740
+  version_requirements: *70343268557220
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70268421687360 !ruby/object:Gem::Requirement
+  requirement: &70343268555960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70268421687360
+  version_requirements: *70343268555960
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70268421686800 !ruby/object:Gem::Requirement
+  requirement: &70343268554420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70268421686800
+  version_requirements: *70343268554420
 description: Capistrano extensions for interacting with HiveQueen
 email: aaron@kickstarter.com
 executables: []