reviewr 0.0.3 → 0.1.0

data/History.txt

@@ -1,11 +1,4 @@
 
-=== 0.0.3 / 2010-04-09
-
-* 1 bug fix:
-
-  * Make it push to the correct remote repository
-  * Format the diff against the correct remote repository
-
 === 0.0.2 / 2010-04-08
 
 * 1 minor enhancement:

data/lib/reviewr.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
+require 'bundler'
 
+Bundler.setup
 require 'reviewr/cli'
 require 'reviewr/git'
 require 'reviewr/mailer'

data/lib/reviewr/cli/main.rb

@@ -1,5 +1,4 @@
 require 'termios'
-require 'ruby-debug'
 
 module Reviewr
   module CLI

data/lib/reviewr/cli/request.rb

@@ -11,10 +11,12 @@ module Reviewr
       end
 
       def call
+        original_branch = project.current_branch
         project.create_review_branch
         project.create_review_commit(commit_msg)
         project.push_review_branch
         Mailer.new(project).send(email_body)
+        project.change_branch(original_branch)
       end
 
       def compare_url

data/lib/reviewr/git.rb

@@ -28,13 +28,22 @@ module Reviewr
       execute("git commit --allow-empty -m \"#{msg}\"")
     end
 
+    def current_branch
+      m = execute("git branch").match(/^\* +(\w+)$/)
+      m && m[1]
+    end
+
+    def change_branch(branch_name)
+      execute("git checkout #{branch_name}")
+    end
+
     def user_email
       email = execute('git config user.email')
       email && email.chomp
     end
 
     def push_branch(branch_name)
-      execute("git push #{remote_repo} #{branch_name}")
+      execute("git push origin #{branch_name}")
     end
 
     def origin_location
@@ -43,7 +52,7 @@ module Reviewr
     end
 
     def origin_master_commit
-      r = execute("git ls-remote #{remote_repo} refs/heads/master")
+      r = execute("git ls-remote origin refs/heads/master")
       r && r.split(/\s+/)[0]
     end
 

data/lib/reviewr/mailer.rb

@@ -2,6 +2,8 @@ require 'pony'
 
 module Reviewr
   class Mailer
+    attr_reader :project
+
     def initialize(project)
       @project = project
     end
@@ -21,6 +23,11 @@ module Reviewr
                   :auth     => :plain,
                   :domain   => @project.email_server
                 })
+      true
+    rescue => e
+      $stderr.puts "Error sending email:"
+      $stderr.puts e.inspect
+      false
     end
   end
 end

data/lib/reviewr/project.rb

@@ -9,7 +9,7 @@ module Reviewr
     attr_writer :user_email
 
     def_delegators :git, :push_branch, :origin_location, :remote_repo,
-                   :remote_repo=
+                   :remote_repo=, :current_branch, :change_branch
 
     def initialize(to, git = Git.instance)
       @to, @git = to, git

data/lib/reviewr/version.rb

@@ -1,3 +1,3 @@
 module Reviewr
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ryan Burrows
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 -07:00
+date: 2010-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency