git-pivotal-tracker-integration 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af83c4208875d093dba4ab8cd22ea6f157179c41
-  data.tar.gz: ac6a9da4a881480cceca563859bbfce3016b572f
+  metadata.gz: 0ab6418812979b1d65b9e4c9d33a67975836f6c8
+  data.tar.gz: 45724b0f38f57772b3aeeac354c9ebebdec5ab5f
 SHA512:
-  metadata.gz: 5e6a3d913df8b5c473aa16eb8d624d7e9abec62dd10cf959195f41c68c90b5bb48c253c5aacf858be6d4917705edfc7fbf9b4bc2d40bd5476985b06028f4a92c
-  data.tar.gz: 8ff57d1fd8e35a4d28803a522612ee77dada8c74ecc1746e5c1d0279e875cec4db3f64b3f4f9fc2695a5ab0b73808e75dabc15ec876eff89d2288e39ce658b49
+  metadata.gz: f24d98487c07c4202880bf4bba635b4c6d5dd7e366cf154250653b0a040e5af8ee47024c161b129b89905ad9916d2df0711ad343c4764ef33efd22d2e98e0e8f
+  data.tar.gz: a1a44ebbbc319615ca85f75db4bde6a43cd3e3468456e2405ed5984393add4dbc70110f81efb938ebee357c88ca5e15d741b9cde9193f2343c5b2d96548fafc5

data/lib/git-pivotal-tracker-integration/command/start.rb

@@ -57,7 +57,10 @@ class GitPivotalTrackerIntegration::Command::Start < GitPivotalTrackerIntegratio
 
   def start_on_tracker(story)
     print "Starting story on Pivotal Tracker... "
-    story.update(:current_state => "started")
+    story.update(
+      :current_state => "started",
+      :owned_by => GitPivotalTrackerIntegration::Util::Git.get_config("user.name")
+    )
     puts "OK"
   end
 

data/lib/git-pivotal-tracker-integration/util/git.rb

@@ -211,17 +211,17 @@ class GitPivotalTrackerIntegration::Util::Git
   def self.trivial_merge?
     development_branch = branch_name
     root_branch = get_config @@KEY_ROOT_BRANCH, :branch
-    root_remote = get_config @@KEY_ROOT_REMOTE, :branch
 
     print "Checking for trivial merge from #{development_branch} to #{root_branch}... "
 
-    GitPivotalTrackerIntegration::Util::Shell.exec "git fetch #{root_remote}"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{root_branch}"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git pull --quiet --ff-only"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{development_branch}"
 
-    remote_tip = GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse #{root_remote}/#{root_branch}"
-    local_tip = GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse #{root_branch}"
+    root_tip = GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse #{root_branch}"
     common_ancestor = GitPivotalTrackerIntegration::Util::Shell.exec "git merge-base #{root_branch} #{development_branch}"
 
-    if remote_tip != local_tip || local_tip != common_ancestor
+    if root_tip != common_ancestor
       abort "FAIL"
     end
 

data/spec/git-pivotal-tracker-integration/command/start_spec.rb

@@ -43,7 +43,11 @@ describe GitPivotalTrackerIntegration::Command::Start do
     GitPivotalTrackerIntegration::Util::Git.should_receive(:create_branch).with("12345678-development_branch")
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:story=)
     GitPivotalTrackerIntegration::Util::Git.should_receive(:add_hook)
-    @story.should_receive(:update).with(:current_state => "started")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("user.name").and_return("test_owner")
+    @story.should_receive(:update).with(
+      :current_state => "started",
+      :owned_by => "test_owner"
+    )
 
     @start.run "test_filter"
   end

data/spec/git-pivotal-tracker-integration/util/git_spec.rb

@@ -152,27 +152,13 @@ describe GitPivotalTrackerIntegration::Util::Git do
     end
   end
 
-  it "should fail if remote tip and local tip do not match" do
+  it "should fail if root tip and common_ancestor do not match" do
     GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
     GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-remote", :branch).and_return("origin")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git fetch origin")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse origin/master").and_return("remote_tip")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("local_tip")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge-base master development_branch").and_return("common_ancestor")
-
-    lambda { GitPivotalTrackerIntegration::Util::Git.trivial_merge? }.should raise_error(SystemExit)
-
-    expect($stderr.string).to match(/FAIL/)
-  end
-
-  it "should fail if local tip and common ancestor do not match" do
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-remote", :branch).and_return("origin")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git fetch origin")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse origin/master").and_return("HEAD")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("HEAD")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git checkout --quiet master")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git pull --quiet --ff-only")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git checkout --quiet development_branch")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("root_tip")
     GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge-base master development_branch").and_return("common_ancestor")
 
     lambda { GitPivotalTrackerIntegration::Util::Git.trivial_merge? }.should raise_error(SystemExit)
@@ -180,12 +166,12 @@ describe GitPivotalTrackerIntegration::Util::Git do
     expect($stderr.string).to match(/FAIL/)
   end
 
-  it "should pass if remote tip, local tip, and common ancestor all match" do
+  it "should pass if root tip and common ancestor match" do
     GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
     GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-remote", :branch).and_return("origin")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git fetch origin")
-    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse origin/master").and_return("HEAD")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git checkout --quiet master")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git pull --quiet --ff-only")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git checkout --quiet development_branch")
     GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("HEAD")
     GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge-base master development_branch").and_return("HEAD")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-pivotal-tracker-integration
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ben Hale