git-review 0.6.6 → 0.6.7

data/lib/git-review.rb

@@ -7,21 +7,6 @@ class GitReview
 
   ## COMMANDS ##
 
-  # Default command to show a quick reference of available commands.
-  def help
-    puts 'Usage: git review <command>'
-    puts 'Manage review workflow for projects hosted on GitHub (using pull requests).'
-    puts
-    puts 'Available commands:'
-    puts '   list [--reverse]          List all pending requests.'
-    puts '   show <number> [--full]    Show details of a single request.'
-    puts '   browse <number>           Open a browser window and review a specified request.'
-    puts '   checkout <number>         Checkout a specified request\'s changes to your local repository.'
-    puts '   merge <number>            Accept a specified request by merging it into master.'
-    puts '   close <number>            Close a specified request.'
-    puts '   create                    Create a new request.'
-  end
-
   # List all pending requests.
   def list
     @pending_requests.reverse! if @args.shift == '--reverse'
@@ -150,20 +135,36 @@ class GitReview
   # Setup variables and call actual commands.
   def initialize(args)
     command = args.shift
-    @user, @repo = repo_info
-    @args = args
-    configure_github_access
-    if command && self.respond_to?(command)
+    if command and self.respond_to?(command)
+      @user, @repo = repo_info
+      return if @user.nil? or @repo.nil?
+      @args = args
+      return unless configure_github_access
       update
       self.send command
     else
-      unless command.nil? or command.empty? or %w(-h --help).include?(command)
+      unless command.nil? or command.empty? or %w(help -h --help).include?(command)
         puts "git-review: '#{command}' is not a valid command.\n\n"
       end
       help
     end
   end
 
+  # Show a quick reference of available commands.
+  def help
+    puts 'Usage: git review <command>'
+    puts 'Manage review workflow for projects hosted on GitHub (using pull requests).'
+    puts
+    puts 'Available commands:'
+    puts '   list [--reverse]          List all pending requests.'
+    puts '   show <number> [--full]    Show details of a single request.'
+    puts '   browse <number>           Open a browser window and review a specified request.'
+    puts '   checkout <number>         Checkout a specified request\'s changes to your local repository.'
+    puts '   merge <number>            Accept a specified request by merging it into master.'
+    puts '   close <number>            Close a specified request.'
+    puts '   create                    Create a new request.'
+  end
+
   # Check existence of specified request and assign @pending_request.
   def request_exists?(request_id = nil)
     # NOTE: If request_id is set explicitly we might need to update to get the
@@ -246,16 +247,17 @@ class GitReview
 
   # Checks '~/.gitconfig' for credentials and
   def configure_github_access
-    if (github_token.empty? or github_login.empty?)
+    if github_token.empty? or github_login.empty?
       puts 'Please update your git config and provide your GitHub user name and token.'
       puts 'Some commands won\'t work properly without these credentials.'
-    else
-      Octokit.configure do |config|
-        config.login = github_login
-        config.token = github_token
-        config.endpoint = github_endpoint
-      end
+      return false
+    end
+    Octokit.configure do |config|
+      config.login = github_login
+      config.token = github_token
+      config.endpoint = github_endpoint
     end
+    true
   end
 
   # Get GitHub user name.
@@ -285,6 +287,10 @@ class GitReview
     end
     # Extract user and project name from GitHub URL.
     url = config_hash['remote.origin.url']
+    if url.nil?
+      puts "Error: Not a git repository."
+      return [nil, nil]
+    end
     user, project = github_user_and_project(url)
     # If there are no results yet, look for 'insteadof' substitutions in URL and try again.
     unless (user and project)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Dominik Bamberger, Cristian Messel