gub 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c545f5df605b71f6616e721cb7cede555e6f27b
-  data.tar.gz: 35c55cf02011c7f5429cf1d8613ad775589caf4c
+  metadata.gz: 5c34013ffa3a6dd074cc20b2c444daa3d098ddd5
+  data.tar.gz: 2d9571b41254e697ba4a39580acd2f39c78b558b
 SHA512:
-  metadata.gz: b29a59c7b85457da01e38dfc53a825526c0e527129fb04596ad860da5b03cadbd89cd2e7031e675139f30fbf43404c12dd65c56a14b89aacf8b6b199227b1cff
-  data.tar.gz: 7d77d4cad52a3aba03447d358a577b1ef5e0f885f31f28aa6f6167f740653f3e56a3d6394343a92001cbe0340c9302ace20752f63ae7e33f84f6748082826525
+  metadata.gz: a876cee97d4f8af56f9435949ca16e0ed689a59e3adef6c1515c81047693d291de4e56bd8bef15278e6ee66a7f7638e694830abbc61cdff4676c0075eeb2cc53
+  data.tar.gz: aff50cfb351cd7c96ac0fa226161daf7e60862355817c5840edeca5512c04389208b5f198458e218b28e81837f3bdf297df30f9cf01b122653b23ffe0076fd26

data/lib/gub/cli.rb

@@ -7,6 +7,8 @@ module Gub
   class CLI < Thor
     include Thor::Actions
     
+    trap(:INT) { exit 1 }
+    
     default_task :help
     
     desc 'repos', 'List Github repositories'
@@ -27,6 +29,8 @@ module Gub
         end
       end
       puts table
+    rescue Gub::Unauthorized
+      reauthorize
     end
   
     desc 'issue [id]', 'Show a Github issue'
@@ -41,6 +45,8 @@ module Gub
       rows << ['Description:', word_wrap(issue.body, line_width: 70)]
       Gub.log.info "Hint: use 'gub start #{id}' to start working on this issue."
       say table rows, ["Issue ##{id}:", issue.title]
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'issues', 'List Github issues'
@@ -49,18 +55,18 @@ module Gub
     def issues
       args = {}
       repository = Gub::Repository.new
-      if options.mine
-        args[:assignee] = Gub.github.user.login
-      end
       if options.all || repository.full_name.nil?
-        Gub.log.info "Listing issues assigned to you:"
+        say "Listing all issues:"
         issues = Gub.github.user_issues
       else
+        if options.mine
+          args[:assignee] = Gub.github.user.login
+        end
         if repository.has_issues?
-          Gub.log.info "Listing issues for #{repository.full_name}:"
+          say "Listing issues for #{repository.full_name}:"
         else
-          Gub.log.info "Issues disabled #{repository.full_name}."
-          Gub.log.info "Listing issues for #{repository.parent}:"
+          say "Issues disabled #{repository.full_name}.", :yellow
+          say "Listing issues for #{repository.parent}:"
         end
         issues = repository.issues(args)
       end
@@ -76,30 +82,32 @@ module Gub
           rows << row
         end
         say table rows, ['ID', 'Title', 'Author', 'Assignee', 'Status']
-        Gub.log.info "Found #{issues.count} issue(s)."
-        Gub.log.info 'Hint: use "gub start" to start working on an issue.'
+        say "Found #{issues.count} issue(s)."
+        say 'Hint: use "gub start" to start working on an issue.', :green
       end
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'start [id]', 'Start working on a Github issue'
     def start id
       if id.nil?
-        Gub.log.fatal 'Issue ID required.'
-        exit 1
+        panic 'Issue ID required.'
       else
         repository = Repository.new
         Gub.git.sync
         repository.assign_issue id
         Gub.git.checkout('-b', "issue-#{id}")
       end
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'finish [id]', 'Finish working on a Github issue'
     def finish id = nil
       id ||= `git rev-parse --abbrev-ref HEAD`.split('-').last.to_s.chop
       if id.nil?
-        Gub.log.fatal "Unable to guess issue ID from branch name. You might want to specify it explicitly."
-        exit 1
+        panic "Unable to guess issue ID from branch name. You might want to specify it explicitly."
       else
         repository = Repository.new
         Gub.log.info 'Pushing branch...'
@@ -108,6 +116,8 @@ module Gub
         repository.issue_pull_request(id)
         Gub.git.checkout('master')
       end
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'clone [repo]', 'Clone a Github repository'
@@ -123,18 +133,24 @@ module Gub
       `cd #{repo.split('/').last}`
       repository = Repository.new
       repository.add_upstream
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'add_upstream', 'Add repo upstream'
     def add_upstream
       repository = Repository.new
       repository.add_upstream
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'sync', 'Synchronize fork with upstream repository'
     def sync
       Gub.log.info 'Synchroizing with upstream...'
       Gub.git.sync
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'info', 'Show current respository information'
@@ -142,6 +158,8 @@ module Gub
       repo = Gub::Repository.new
       say "Github repository: #{repo.full_name}"
       say "Forked from: #{repo.parent}" if repo.parent
+    rescue Gub::Unauthorized
+      reauthorize
     end
     
     desc 'setup', 'Setup Gub for the first time'
@@ -161,6 +179,16 @@ module Gub
       say Gub::VERSION
     end
     
+    no_commands do
+      def reauthorize
+        say "Unable to find token. You might need to run 'gub setup'.", :red
+      end
+      
+      def panic message
+        say message, :red
+        exit 1
+      end
+    end
     
     private
     def table rows, header = []

data/lib/gub/clients/github.rb

@@ -1,4 +1,5 @@
 require 'octokit'
+require 'gub/exceptions'
 
 module Gub
   class Github
@@ -14,6 +15,8 @@ module Gub
     
     def method_missing meth, *args, &block
       @connection.send(meth, *args, &block)
+      rescue Octokit::Unauthorized, Octokit::NotFound
+        raise Gub::Unauthorized
     end
   end
 end

data/lib/gub/exceptions.rb

@@ -0,0 +1,3 @@
+module Gub
+  class Unauthorized < Exception; end
+end

data/lib/gub/version.rb

@@ -1,3 +1,3 @@
 module Gub
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gub
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Omar Abdel-Wahab
@@ -129,6 +129,7 @@ files:
 - lib/gub/clients/git.rb
 - lib/gub/clients/github.rb
 - lib/gub/config.rb
+- lib/gub/exceptions.rb
 - lib/gub/extensions.rb
 - lib/gub/logger.rb
 - lib/gub/repository.rb