hull 0.0.3 → 0.0.4

data/lib/hull/command.rb

@@ -42,6 +42,16 @@ module Hull
       end
     end
 
+    def validate_config
+      if username == '' || api_token == ''
+        error('github.user and github.token not found in git config')
+        Help.new
+        false
+      else
+        true
+      end
+    end
+
     def username
       @username ||= repo.config['github.user']
     end
@@ -50,10 +60,14 @@ module Hull
       @api_token ||= repo.config['github.token']
     end
 
+    def remote_name
+      @remote_name ||= repo.config['hull.remote'] || 'origin'
+    end
+
     def github_url
       @github_url ||=
         begin
-          _, owner, project = repo.config['remote.origin.url'].match(/^git@github.com:([^\/]*)\/(.*)\.git/).to_a
+          _, owner, project = repo.config["remote.#{remote}.url"].match(/^git@github.com:([^\/]*)\/(.*)(\.git)?/).to_a
           "https://github.com/api/v2/json/pulls/#{owner}/#{project}"
         end
     end
@@ -61,7 +75,7 @@ module Hull
     def repo
       @repo ||= Grit::Repo.new(".")
       unless valid_repository?(@repo)
-        raise InvalidRepository.new('Origin must be a GitHub repository')
+        raise InvalidRepository.new("#{remote} must be a GitHub repository")
       end
       @repo
     end
@@ -77,8 +91,8 @@ module Hull
     end
 
     def valid_repository?(repository)
-      repository.remote_list.include?('origin') &&
-        repository.config['remote.origin.url'].match(/^git@github.com:/)
+      repository.remote_list.include?(remote) &&
+        repository.config["remote.#{remote}.url"].match(/^git@github.com:/)
     end
   end
 

data/lib/hull/list.rb

@@ -1,6 +1,7 @@
 module Hull
   class List < Command
     def initialize
+      validate_config
       json = get_json(github_url)
       if json['error'].to_s != ''
         return error("Pull request ##{request_number} might not exist.")
@@ -11,8 +12,8 @@ module Hull
       return if pulls.length == 0
 
       branch_names = pulls.map { |pull| pull['head']['label'].split(/:/) }
-      repo_len   = [ branch_names.map(&:first).map(&:length).max, 15 ].min
-      branch_len = [ branch_names.map(&:last).map(&:length).max,  30 ].min
+      @repo_len   = [ branch_names.map(&:first).map(&:length).max, 15 ].min
+      @branch_len = [ branch_names.map(&:last).map(&:length).max,  30 ].min
 
       pulls.each do |pull|
         puts pull_info(pull)
@@ -38,9 +39,9 @@ module Hull
       end
 
       number      = pad_left(number, 6)
-      title       = pad_right(title, column_size - repo_len - branch_len - 10)
-      repo_name   = pad_left(repo_name, repo_len)
-      branch_name = pad_right(branch_name, branch_len)
+      title       = pad_right(title, column_size - @repo_len - @branch_len - 10)
+      repo_name   = pad_left(repo_name, @repo_len)
+      branch_name = pad_right(branch_name, @branch_len)
 
       [
         write(number, color),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hull
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70121121747680 !ruby/object:Gem::Requirement
+  requirement: &70268322637340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121121747680
+  version_requirements: *70268322637340
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70121121747240 !ruby/object:Gem::Requirement
+  requirement: &70268322636900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121121747240
+  version_requirements: *70268322636900
 description: Code Review helper using GitHub's Pull Requests
 email: hc5duke@gmail.com
 executables: