gub 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8576c0e8367a0d8c054b8b1c0663d897e8212be4
-  data.tar.gz: a55371c54605d614bb343ae0108875e8e70b48e1
+  metadata.gz: 63cc87efc78a3425e09f29cd40ee3cef3daa98a3
+  data.tar.gz: 89f6490382d896b46dcf7c534ee39ae253132e7d
 SHA512:
-  metadata.gz: bb5f7d5cc4ea0947141a103b0fa4610abada77a82bee4ca3f8b05f41b6daaba21dd10c29d65befced63f6761e2638f8e8ea860b98e7128e5b58561ef07f5da00
-  data.tar.gz: 924b4d5afa7d1d99e3eebe126969c3d187dde57ea1300a61e80e142deb9b8836a42a277637fd2baee6b3adec81e7d5ecd9563c308c3b788ac8fb8740642ab86f
+  metadata.gz: 0c0e6e656618166ea72b59b6a941e8ce271709de66829b307a07a16a470a04fa6190648693dc7174ba4d0ba61bedd5144510dcb49e87a55b2c4f8723041f4b6c
+  data.tar.gz: 31e157be199547fbc78c7ec5982c43cca2a7ec217df3bb46bb6802a4c34632ce1b8a50ed5bd19aff37187592462b670be6e05f2f928c051f0bebe59489afc993

data/gub.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'octokit'
   spec.add_dependency 'terminal-table'
   spec.add_dependency 'highline'
+  spec.add_dependency 'launchy'
 end

data/lib/gub.rb

@@ -5,12 +5,13 @@ require 'gub/version'
 require 'gub/clients/git'
 require 'gub/clients/github'
 require 'gub/repository'
+require 'gub/issue'
 require 'gub/cli'
 require 'gub/config'
 require 'gub/logger'
 
 module Gub
-  # TODO: Understand this
+  # TODO: Understand the following code
   class << self
     attr_accessor :debug, :log, :config, :git, :github
     
@@ -26,5 +27,9 @@ module Gub
       # Invoke our CLI
       Gub::CLI.start
     end
+    
+    def current_user
+      @github.user.login
+    end
   end
 end

data/lib/gub/cli.rb

@@ -1,4 +1,3 @@
-require 'gub/version'
 require 'thor'
 require 'terminal-table'
 require 'highline'
@@ -31,22 +30,51 @@ module Gub
       puts table
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
+    end
+    
+    desc 'browse', 'Browse current repository'
+    def browse
+      repository = Gub::Repository.new(origin_name)
+      repository.browse
     end
   
-    desc 'issue [id]', 'Show a Github issue'
+    desc 'issue [id]', 'Show or edit a Github issue'
+    method_option :assign, type: :boolean, aliases: '-i', desc: 'Assign the issue'
+    method_option :comment, type: :string, aliases: '-m', desc: 'Add a comment to the issue'
+    method_option :close, type: :boolean, aliases: '-c', desc: 'Close the issue'
+    method_option :reopen, type: :boolean, aliases: '-r', desc: 'Reopen the issue'
     def issue(id)
-      repository = Gub::Repository.new
-      issue = repository.issue(id)
-      rows = []
-      rows << ['Status:', issue.state]
-      rows << ['Milestone:', issue.milestone.title]
-      rows << ['Author:', issue.user.login]
-      rows << ['Assignee:', (issue.assignee.nil? ? '-' : issue.assignee.login)]
-      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]
+      repository = Gub::Repository.new(origin_name)
+      if options.comment
+        repository.issue(id).comment(options.comment)
+      elsif options.close
+        repository.issue(id).close
+      elsif options.assign
+        repository.issue(id).assign
+      elsif options.reopen
+        repository.issue(id).reopen
+      else
+        issue = repository.issue(id)
+        rows = []
+        rows << ['Status:', issue.state]
+        rows << ['Milestone:', issue.milestone.title]
+        rows << ['Author:', issue.user.login]
+        rows << ['Assignee:', (issue.assignee.nil? ? '-' : issue.assignee.login)]
+        rows << ['Description:', word_wrap(issue.body, line_width: 70)]
+        comments = []
+        issue.comments.each do |comment|
+          comments << [comment.user.login, "On #{comment.updated_at}: #{comment.body}"]
+        end
+        Gub.log.info "Hint: use 'gub start #{id}' to start working on this issue."
+        puts table rows, ["Issue ##{id}:", issue.title]
+        puts table comments, ['', 'Comments']
+      end
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'issues', 'List Github issues'
@@ -54,7 +82,7 @@ module Gub
     method_option :mine, type: :boolean, aliases: '-m', desc: 'Only issues assigned to me'
     def issues
       args = {}
-      repository = Gub::Repository.new
+      repository = Gub::Repository.new(origin_name)
       if options.all || repository.full_name.nil?
         say "Listing all issues:"
         issues = Gub.github.user_issues
@@ -87,6 +115,8 @@ module Gub
       end
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'start [id]', 'Start working on a Github issue'
@@ -94,18 +124,21 @@ module Gub
       if id.nil?
         panic 'Issue ID required.'
       else
-        branch = "issue-#{id}"
-        if Gub.git.branch().include?('issue-111')
-          Gub.git.checkout(branch)
+        repository = Repository.new(origin_name)
+        issue = repository.issue(id)
+        if repository.branches.include?(issue.branch)
+          Gub.git.checkout(issue.branch)
         else
-          repository = Repository.new
-          Gub.git.sync
-          repository.assign_issue id
-          Gub.git.checkout('-b', branch)
+          repository = Repository.new(origin_name)
+          repository.sync
+          issue.assign
+          Gub.git.checkout('-b', issue.branch)
         end
       end
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'finish [id]', 'Finish working on a Github issue'
@@ -114,15 +147,18 @@ module Gub
       if id.nil?
         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...'
-        Gub.git.push('origin', "issue-#{id}")
-        Gub.log.info "Creating pull-request for issue ##{id}..."
-        repository.issue_pull_request(id)
+        repository = Repository.new(origin_name)
+        issue = repository.issue(id)
+        say 'Pushing branch...'
+        Gub.git.push('origin', issue.branch)
+        say "Creating pull-request for issue ##{id}..."
+        issue.request_pull
         Gub.git.checkout('master')
       end
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'clone [repo]', 'Clone a Github repository'
@@ -136,35 +172,43 @@ module Gub
       Gub.log.info "Cloning from #{url}..."
       Gub.git.clone(url)
       `cd #{repo.split('/').last}`
-      repository = Repository.new
+      repository = Gub::Repository.new(origin_name)
       repository.add_upstream
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'add_upstream', 'Add repo upstream'
     def add_upstream
-      repository = Repository.new
+      repository = Gub::Repository.new(origin_name)
       repository.add_upstream
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'sync', 'Synchronize fork with upstream repository'
     def sync
       Gub.log.info 'Synchroizing with upstream...'
-      Gub.git.sync
+      Gub::Repository.new(origin_name).sync
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'info', 'Show current respository information'
     def info
-      repo = Gub::Repository.new
+      repo = Gub::Repository.new(origin_name)
       say "Github repository: #{repo.full_name}"
       say "Forked from: #{repo.parent}" if repo.parent
     rescue Gub::Unauthorized
       reauthorize
+    rescue Gub::Disconnected
+      panic 'Unable to connect to Github'
     end
     
     desc 'setup', 'Setup Gub for the first time'
@@ -196,6 +240,10 @@ module Gub
     end
     
     private
+    def origin_name
+      `git remote -v | grep origin | grep fetch | awk '{print $2}' | cut -d ':' -f 2`.to_s
+    end
+    
     def table rows, header = []
       Terminal::Table.new headings: header, rows: rows
     end

data/lib/gub/clients/git.rb

@@ -4,10 +4,10 @@ module Gub
   class Git
     attr_accessor :default_options
     
-    def sync
+    def sync remote
       self.checkout('master')
-      self.fetch('upstream')
-      self.merge('upstream/master')
+      self.fetch(remote)
+      self.merge("#{remote}/master")
       self.push('origin', '--all')
     end
     

data/lib/gub/clients/github.rb

@@ -9,14 +9,21 @@ module Gub
       @connection = Octokit::Client.new(opts)
     end
     
+    def url
+      'https://github.com/'
+    end
+    
     def user
       @connection.user
     end
     
     def method_missing meth, *args, &block
+      Gub.log.debug "Running command #{meth} with arguments #{args}"
       @connection.send(meth, *args, &block)
       rescue Octokit::Unauthorized, Octokit::NotFound
         raise Gub::Unauthorized
+      rescue Faraday::Error::ConnectionFailed
+        raise Gub::Disconnected
     end
   end
 end

data/lib/gub/exceptions.rb

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

data/lib/gub/issue.rb

@@ -0,0 +1,53 @@
+module Gub
+  class Issue
+    attr_accessor :parent, :id, :info
+    
+    
+    def self.all parent, params = {}
+      Gub.github.issues(parent params)
+    end
+    
+    def initialize parent, id
+      self.parent = parent
+      self.id = id
+      self.info = Gub.github.issue(self.parent, self.id)
+    end
+    
+    def repository
+      Gub::Repository.new(self.parent)
+    end
+    
+    def reopen
+      Gub.github.reopen_issue(self.parent, self.id)
+    end
+    
+    def close
+      Gub.github.close_issue(self.parent, self.id)
+    end
+    
+    def comment body
+      Gub.github.add_comment(self.parent, self.id, body)
+    end
+    
+    def comments
+      Gub.github.issue_comments(self.parent, self.id)
+    end
+    
+    def assignee
+      self.info[:user]
+    end
+    
+    def assign login = nil
+      assignee = login || Gub.github.user.login
+      Gub.github.update_issue self.parent, self.id, self.info[:title], self.info[:body], { assignee: assignee }
+    end
+    
+    def branch
+      "issue-#{self.id}"
+    end
+    
+    def request_pull
+      Gub.github.create_pull_request_for_issue(self.parent, 'master', "#{Gub.current_user}:#{self.branch}", self.id)
+    end
+  end
+end

data/lib/gub/repository.rb

@@ -2,12 +2,8 @@ module Gub
   class Repository
     attr_accessor :full_name, :info
     
-    def initialize full_name = nil
-      if full_name.nil?
-        self.full_name = `git remote -v | grep origin | grep fetch | awk '{print $2}' | cut -d ':' -f 2`.to_s.chop
-      else
-        self.full_name = full_name
-      end
+    def initialize full_name
+      self.full_name = full_name
       # Strip .git from the name
       self.full_name = self.full_name.split('.').first
       if self.full_name.nil? || self.full_name.empty?
@@ -15,12 +11,12 @@ module Gub
         exit 1
       else
         Gub.log.debug "Loading information for #{self.full_name}"
-        @info = Gub.github.repo(repo: self.full_name)
+        self.info = Gub.github.repo(repo: self.full_name)
       end
     end
     
     def name
-      @full_name.split('/').last
+      self.full_name.split('/').last
     end
     
     def has_issues?
@@ -34,33 +30,13 @@ module Gub
       issues.flatten!
     end
     
-    def issue id
-      if self.has_issues?
-        Gub.github.issue(self.full_name, id)
-      else
-        Gub.github.issue(self.parent, id)
-      end
-    end
-    
-    def assign_issue id, login = nil
-      issue = self.issue(id)
-      assignee = login || Gub.github.user.login
+    def issue id, action = :fetch, extra_args = nil
       if self.has_issues?
         name = self.full_name
       else
         name = self.parent
       end
-      Gub.github.update_issue name, issue.number, issue.title, issue.body, { assignee: assignee }
-    end
-    
-    def issue_pull_request id
-      issue = self.issue(id)
-      if self.has_issues?
-        repo = self.full_name
-      else
-        repo = self.parent
-      end
-      Gub.github.create_pull_request_for_issue(repo, 'master', "#{self.owner}:issue-#{id}", id)
+      Gub::Issue.new(name, id)
     end
     
     def owner
@@ -82,5 +58,14 @@ module Gub
     def sync
       Gub.git.sync('upstream')
     end
+    
+    def branches
+      Gub.git.branch()
+    end
+    
+    def browse
+      require 'launchy'
+      ::Launchy.open("#{Gub.github.url}#{self.full_name}")
+    end
   end
 end

data/lib/gub/version.rb

@@ -1,3 +1,3 @@
 module Gub
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gub
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Omar Abdel-Wahab
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The missing command line tool for Github
 email:
 - owahab@gmail.com
@@ -131,6 +145,7 @@ files:
 - lib/gub/config.rb
 - lib/gub/exceptions.rb
 - lib/gub/extensions.rb
+- lib/gub/issue.rb
 - lib/gub/logger.rb
 - lib/gub/repository.rb
 - lib/gub/setup.rb