bard 0.5.2 → 0.5.3

data/Rakefile

@@ -25,6 +25,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
+task :release do
+  Rake::Task["gemcutter:release"].invoke
+end
+
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]

data/features/bard_check.feature

@@ -89,3 +89,11 @@ Feature: Bard can check its environment for missing dependencies and potential p
     And the git hook on the staging server is bad
     When I type "bard check ." on the staging server
     Then I should see the fatal error "improper git hook"
+
+  @wip
+  Scenario: Bard check detects missing receive.denyCurrentBranch git variable on staging
+    Given a shared rails project
+    And my "RAILS_ENV" environment variable is "staging"
+    And the staging server git config for receive.denyCurrentBranch is not "ignore"
+    When I type "bard check ." on the staging server
+    Then I should see the fatal error "denyCurrentBranch"

data/features/bard_push.feature

@@ -29,20 +29,20 @@ Feature: bard push
     Given I have committed a set of changes that includes a new submodule
     When I type "bard push"
     Then there should be one new submodule on the remote
-    And the remote submodule should be checked out
+    And the submodule branch should match the submodule origin branch
   
   Scenario: Pushing a change that includes a submodule update
     Given a submodule
     And I have committed a set of changes that includes a submodule update
     When I type "bard push"
-    Then the remote submodule should be updated
+    Then the submodule branch should match the submodule origin branch
 
   Scenario: Pushing a change that includes a submodule url change
     Given a submodule
-    Given I have committed a set of changes that includes a submodule url change
+    And I have committed a set of changes that includes a submodule url change
     When I type "bard push"
     Then the remote submodule url should be changed
-    And the remote submodule should be checked out
+    And the submodule branch should match the submodule origin branch
 
   # TODO
   #Scenario: Pushing a change that includes a submodule deletion

data/features/step_definitions/check_steps.rb

@@ -69,3 +69,8 @@ Given /^the git hook on the staging server is bad$/ do
   end
 end
 
+Given /^the staging server git config for receive.denyCurrentBranch is not "ignore"$/ do
+  Dir.chdir "#{ROOT}/tmp/origin" do
+    type "git config --unset receive.denyCurrentBranch"
+  end
+end

data/features/step_definitions/global_steps.rb

@@ -8,6 +8,7 @@ Given /^a shared rails project$/ do
   Dir.mkdir 'tmp'
   type "cp -R fixtures/repo tmp/origin"
   Dir.chdir 'tmp/origin' do
+    type "git config receive.denyCurrentBranch ignore"
     File.open ".git/hooks/post-receive", "w" do |f|
       f.puts <<-BASH
 #!/bin/bash

data/features/step_definitions/submodule_steps.rb

@@ -4,7 +4,10 @@ Given /^a submodule$/ do
     type "git checkout integration"
     type "git pull --rebase"
     type "git submodule init"
-    type "git submodule update --merge"
+    type "git submodule update"
+    Dir.chdir "submodule" do
+      type "git checkout master"
+    end
     @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
     @submodule_commit = type "git submodule status"
   end
@@ -19,7 +22,6 @@ end
 
 Given /^I have committed a set of changes to the submodule$/ do
   Dir.chdir "#{ROOT}/tmp/local/submodule" do
-    type "git checkout -b master"
     type "echo 'submodule_update' > submodule_update"
     type "git add ."
     type "git commit -am 'update in submodule'"
@@ -29,10 +31,8 @@ end
 Given /^the remote integration branch has had a commit that includes a new submodule$/ do
   Dir.chdir "#{ROOT}/tmp/origin" do 
     type "git submodule add #{ROOT}/tmp/submodule submodule"
-    Dir.chdir "submodule" do
-      type "git checkout -b master"
-      type "grb track master"
-    end
+    type "git submodule init"
+    type "git submodule update"
     type "git add ."
     type "git commit -m 'added submodule'"
   end
@@ -40,8 +40,9 @@ end
 
 Given /^I have committed a set of changes that includes a new submodule$/ do
   type "git submodule add #{ROOT}/tmp/submodule submodule"
+  type "git submodule init"
+  type "git submodule update --merge"
   Dir.chdir "submodule" do
-    type "git checkout -b master"
     type "grb track master"
   end
   type "git add ."

data/lib/bard.rb

@@ -155,6 +155,7 @@ class Bard < Thor
           else
             errors << "missing git hook" 
           end
+          errors << "the git config variable receive.denyCurrentBranch is not set to ignore" if `git config receive.denyCurrentBranch`.chomp != "ignore"
         end
 
         warnings << "RAILS_ENV is not set" if ENV['RAILS_ENV'].nil? or ENV['RAILS_ENV'].empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Micah Geisel