bard 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/bard.gemspec

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

data/features/bard_pull.feature

@@ -12,14 +12,14 @@ Feature: bard pull
     When I type "bard pull"
     Then the "integration" branch should match the "origin/integration" branch
     And there should be one new submodule
-    And the submodule should be checked out
+    And the submodule branch should match the submodule origin branch
 
   Scenario: Pulling down when the latest changes include a submodule update
     Given a submodule
     And the remote integration branch has had a commit that includes a submodule update
     When I type "bard pull"
     Then the "integration" branch should match the "origin/integration" branch
-    And the submodule should be updated
+    And the submodule branch should match the submodule origin branch
 
   Scenario: Pulling down when the latest changes include a submodule url change
     Given a submodule
@@ -27,7 +27,7 @@ Feature: bard pull
     When I type "bard pull"
     Then the "integration" branch should match the "origin/integration" branch
     And the submodule url should be changed
-    And the submodule should be checked out
+    And the submodule branch should match the submodule origin branch
 
   # TODO
   #Scenario: Pulling down when the latest changes include a submodule deletion

data/features/step_definitions/submodule_steps.rb

@@ -4,7 +4,7 @@ Given /^a submodule$/ do
     type "git checkout integration"
     type "git pull --rebase"
     type "git submodule init"
-    type "git submodule update"
+    type "git submodule update --merge"
     @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
     @submodule_commit = type "git submodule status"
   end
@@ -117,10 +117,20 @@ Then /^there should be one new submodule on the remote$/ do
   end
 end
 
-Then /^the submodule should be checked out$/ do
+Then /^the submodule branch should match the submodule origin branch$/ do
   @submodule_url = File.read(".gitmodules").match(/url = (.*)$/)[1]
   @submodule_commit = type "git submodule status"
   @submodule_commit.should match %r( [a-z0-9]{40} submodule)
+  Dir.chdir "submodule" do
+    @submodule = Grit::Repo.new "."
+    branch = @submodule.head.name rescue nil
+    remote_branch = @submodule.remotes.find {|n| n.name == "origin/HEAD" }.commit.id[/\w+$/]
+    branch.should_not be_nil
+    remote_branch.should_not be_nil
+    branch.should == remote_branch
+    type("git rev-parse HEAD").should == type("git rev-parse origin/HEAD")
+    type("git name-rev --name-only HEAD").should == type("git name-rev --name-only origin/HEAD")
+  end
 end
 
 Then /^the remote submodule should be checked out$/ do

data/lib/bard.rb

@@ -14,7 +14,6 @@ class Bard < Thor
   desc "check [PROJECT]", "check PROJECT or environment for missing dependencies"
   def check(project = nil)
     return check_project(project) if project
-    puts ENV['ASDF']
 
     required = {
       'bard'     => `gem list bard --remote`[/[0-9]+\.[0-9]+\.[0-9]+/],
@@ -50,7 +49,6 @@ class Bard < Thor
     run_crucial "git pull --rebase origin integration"
 
     changed_files = run_crucial("git diff #{@common_ancestor} origin/integration --diff-filter=ACDMR --name-only").split("\n") 
-    puts changed_files.inspect
    
     if changed_files.any? { |f| f =~ %r(^db/migrate/.+) }
       run_crucial "rake db:migrate"
@@ -61,7 +59,7 @@ class Bard < Thor
       run_crucial "git submodule sync"
       run_crucial "git submodule init"
     end
-    run_crucial "git submodule update"
+    run_crucial "git submodule update --merge"
    
     if changed_files.any? { |f| f =~ %r(^config/environment.+) }
       run_crucial "rake gems:install"

metadata

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