reviewr 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,21 @@
+=== 0.2.1 / 2010-06-17
+
+* 1 minor enhancement:
+
+  * Change the review request email to show information about the
+    requested review from the commit message
+  * Default rake task to run all the tests
+
+* 1 Bug fix:
+
+  * Let accept use remote repositories other than 'origin'
+
+=== 0.2.0 / 2010-04-28
+
+* 1 major enhancement:
+
+  * Accept command
+
 === 0.1.3 / 2010-04-13
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/reviewr.rb
 lib/reviewr/cli.rb
 lib/reviewr/git.rb
 lib/reviewr/mailer.rb
+lib/reviewr/pretend_git.rb
 lib/reviewr/project.rb
 lib/reviewr/version.rb
 lib/reviewr/cli/accept.rb

data/lib/reviewr.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 
 require 'reviewr/cli'
 require 'reviewr/git'
+require 'reviewr/pretend_git'
 require 'reviewr/mailer'
 require 'reviewr/project'
 require 'reviewr/version'

data/lib/reviewr/cli/accept.rb

@@ -8,7 +8,7 @@ module Reviewr
         prompt_for_user
         project.fetch_review_branch
         project.fetch_master
-        project.create_review_branch("origin/#{arguments.first}")
+        project.create_review_branch("#{project.remote_repo}/#{arguments.first}")
 
         unless project.rebase_review
           output.print "Branch '#{arguments.first}' won't merge cleanly"

data/lib/reviewr/cli/main.rb

@@ -8,6 +8,10 @@ module Reviewr
 
       def initialize(args, input = STDIN, output = STDOUT)
         @command = args.shift
+        if @command == "-p"
+          Git.instance = PretendGit.new(output)
+          @command = args.shift
+        end
         @arguments = args
         @input, @output = input, output
       end

data/lib/reviewr/git.rb

@@ -12,12 +12,20 @@ module Reviewr
 
     attr_writer :remote_repo
 
-    def remote_repo
-      @remote_repo ||= "origin"
+    def last_commit_sha
+      execute(%(git show --pretty=format:"%H" HEAD)).split("\n").first
+    end
+
+    def last_commit_subject
+      execute(%(git show --pretty=format:"%s" HEAD^)).split("\n").first
     end
 
-    def last_commit
-      execute('git show --pretty=format:"%H" HEAD').split("\n")[0]
+    def last_commit_body
+      execute(%(git show --pretty=format:"%b:::::" HEAD^)).split(":::::").first
+    end
+
+    def remote_repo
+      @remote_repo ||= "origin"
     end
 
     def rebase(base, branch)

data/lib/reviewr/mailer.rb

@@ -12,7 +12,7 @@ module Reviewr
       Pony.mail(:from => @project.user_email,
                 :to   => @project.to,
                 :body => body,
-                :subject => "Code review request from #{@project.user_email}",
+                :subject => "Code review request: #{@project.review_subject}",
                 :via  => :smtp,
                 :smtp => {
                   :host     => 'smtp.gmail.com',

data/lib/reviewr/pretend_git.rb

@@ -0,0 +1,47 @@
+module Reviewr
+  class PretendGit < Git
+    attr_reader :output
+
+    def initialize(output)
+      @output = output
+    end
+
+    def rebase(base, branch)
+      pretend_execute("git rebase #{base} #{branch}")
+      true
+    end
+
+    def create_branch(branch_name, base)
+      pretend_execute("git branch #{branch_name} #{base}")
+    end
+
+    def commit(msg)
+      pretend_execute("git commit --allow-empty -m \"#{msg}\"")
+    end
+
+    def change_branch(branch_name)
+      pretend_execute("git checkout #{branch_name}")
+    end
+
+    def fetch(branch_name)
+      pretend_execute("git fetch #{remote_repo} #{branch_name}")
+    end
+
+    def push_branch(branch_name)
+      pretend_execute("git push #{remote_repo} #{branch_name}")
+    end
+
+    def cherry_pick(commit)
+      pretend_execute("git cherry-pick -s #{commit}")
+    end
+
+    def execute(cmd)
+      output.puts(cmd)
+      super(cmd)
+    end
+
+    def pretend_execute(cmd)
+      output.puts(cmd)
+    end
+  end
+end

data/lib/reviewr/project.rb

@@ -41,7 +41,15 @@ module Reviewr
     end
 
     def review_sha
-      @review_sha ||= git.last_commit.slice(0, 8)
+      @review_sha ||= git.last_commit_sha.slice(0, 8)
+    end
+
+    def review_subject
+      @review_subject ||= git.last_commit_subject
+    end
+
+    def review_body
+      @review_body ||= git.last_commit_body
     end
 
     def master_sha

data/lib/reviewr/templates/request_email.erb

@@ -1,12 +1,10 @@
-Hi,
-
-Could you please code review and comment on the following changes:
+<%= project.review_body %>
 
 <%= compare_url %>
 
-If you find the changes acceptable please run:
+Accept:
   reviewr accept <%= project.review_branch %>
-If you think more work needs to be done please run:
+Reject:
   reviewr reject <%= project.review_branch %>
 
 Thanks!

data/lib/reviewr/version.rb

@@ -1,3 +1,3 @@
 module Reviewr
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ryan Burrows
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2010-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - lib/reviewr/cli.rb
 - lib/reviewr/git.rb
 - lib/reviewr/mailer.rb
+- lib/reviewr/pretend_git.rb
 - lib/reviewr/project.rb
 - lib/reviewr/version.rb
 - lib/reviewr/cli/accept.rb