git-review-notes 0.0.3 → 0.0.5

data/features/git-review.feature

@@ -7,13 +7,15 @@ Feature: Adding 'Reviewed-By:' note for reviewed commits
     When I run `git checkout branch-for-review`
     And I run `git log`
     Then the output should not contain "Reviewed-By:"
-    When I run `git review`
+    When I run `git review` interactively
+    And I type "y"
     Then the output should contain "Reviewed-By: Reviewer <reviewer@example.com>"
-    And the output should contain "2 commits are marked as reviewed by you."
+    And the output should contain "refs/notes/commits -> refs/notes/commits"
 
   Scenario: Mark already merged commits
     When I run `git log`
     Then the output should not contain "Reviewed-By:"
-    When I run `git review commits HEAD HEAD~1`
+    When I run `git review commits HEAD HEAD~1` interactively
+    And I type "y"
     Then the output should contain "Reviewed-By: Reviewer <reviewer@example.com>"
-    And the output should contain "2 commits are marked as reviewed by you."
+    And the output should contain "refs/notes/commits -> refs/notes/commits"

data/features/support/setup_sample_repository.rb

@@ -2,33 +2,46 @@ require 'active_support/core_ext/kernel/reporting'
 
 Before do
   setup_sample_repository
+  @dirs = ["tmp/aruba/workcopy"]
 end
 
 def setup_sample_repository
   silence_stream(STDERR) do
     silence_stream(STDOUT) do
       system <<-SHELL
-    rm -rf tmp/aruba
-    mkdir tmp/aruba
-    cd tmp/aruba
-    git init
-    git config --add user.name Reviewer
-    git config --add user.email reviewer@example.com
-    touch README
-    git add README
-    git commit -m 'first commit.'
-    touch Gemfile
-    git add Gemfile
-    git commit -m 'second commit.'
-    git branch branch-for-review
-    git checkout branch-for-review
-    touch file1
-    git add file1
-    git commit -m 'commit 1 in branch-for-review.'
-    touch file2
-    git add file2
-    git commit -m 'commit 2 in branch-for-review.'
-    git checkout master
+        rm -rf tmp/aruba
+        mkdir -p tmp/aruba/origin
+
+        cd tmp/aruba/origin
+        git init --bare
+        cd ..
+
+        git clone origin/ workcopy/
+        cd workcopy
+        pwd
+
+        git config --add user.name Reviewer
+        git config --add user.email reviewer@example.com
+
+        touch README
+        git add README
+        git commit -m 'first commit.'
+        touch Gemfile
+        git add Gemfile
+        git commit -m 'second commit.'
+        git push origin master
+
+        git branch branch-for-review
+        git checkout branch-for-review
+        touch file1
+        git add file1
+        git commit -m 'commit 1 in branch-for-review.'
+        touch file2
+        git add file2
+        git commit -m 'commit 2 in branch-for-review.'
+        git push origin branch-for-review
+
+        git checkout master
   SHELL
     end
   end

data/lib/git_review_notes/cli.rb

@@ -9,20 +9,18 @@ module GitReviewNotes
 
       current_branch_commits = git.log.between("master", git.current_branch)
       add_reviewed_by(current_branch_commits)
-      push_refs_notes
 
       system "git log master..#{git.current_branch}"
-      display_report(current_branch_commits)
+      ask_for_pushing_review(current_branch_commits)
     end
 
     desc "commits", "Add not with Reviewed-By: for specified commits separated by space."
     def commits(*commits_shas)
       commits = commits_shas.map {|sha| git.object(sha)}
       add_reviewed_by(commits)
-      push_refs_notes
 
       system "git log"
-      display_report(commits)
+      ask_for_pushing_review(commits)
     end
 
 
@@ -43,9 +41,11 @@ module GitReviewNotes
       system "git push origin refs/notes/*"
     end
 
-    def display_report(commits)
+    def ask_for_pushing_review(commits)
       puts
-      say "#{commits.size} commits are marked as reviewed by you.", :green
+      if yes?("Are you sure about to push this review for #{commits.size} commit(s)? [y/N]", :green)
+        push_refs_notes
+      end
     end
 
     def git

data/lib/git_review_notes/version.rb

@@ -1,3 +1,3 @@
 module GitReviewNotes
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review-notes
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Aleksei Gusev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: git