capistrano-hivequeen 0.7.0 → 0.7.1

data/capistrano-hivequeen.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'capistrano-hivequeen'
-  s.version           = '0.7.0'
+  s.version           = '0.7.1'
   s.date              = Time.now.strftime("%Y-%m-%d")
 
   ## Make sure your summary is short. The description may be as long

data/lib/capistrano/hivequeen.rb

@@ -13,9 +13,10 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   # 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/head/', '')
+  current_branch = `git symbolic-ref HEAD`.chomp.sub('refs/heads/', '')
   unless current_branch.empty?
-    set :default_stage, current_branch.to_sym
+    env_name = HiveQueen.environment_for_branch(current_branch)
+    set(:default_stage, env_name) if env_name
   end
 
   set :repository, HiveQueen.repository

data/lib/capistrano/hivequeen/server.rb

@@ -26,6 +26,11 @@ class HiveQueen
       environments.map{|e| e['name'].to_sym }
     end
 
+    def environment_for_branch(branch)
+      env = environments.detect{|e| e['branch'] == branch }
+      env['name'] if env
+    end
+
     def repository
       project_data['repo']
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Aaron Suggs