github_issues_cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3672afbc8205c0742de2b4d9d34b01c02a291a0
-  data.tar.gz: 2974bcf3df15e6fed060b3a80e5144ce17de9b94
+  metadata.gz: 0376d42fb4e4fc15680042b1811d7816b443af81
+  data.tar.gz: 695cfa3f9ca72a87d6c1e2cd3f49a87b74e5690e
 SHA512:
-  metadata.gz: 226d54775ed24548111425e7add4cea6cfe51c4fcf5b5870f7d14a6e7b130346bfa1cbf0258eadd25d180e2f424a0df47e217de1c1016f1bfe33035d609b3d74
-  data.tar.gz: dbc7736f5bbbd548eb836aa052fd06ca2cfb3c6d8bb72d8d9f7101d448bc9e7bb107d19132032f87d6f8d06df8c5e1f0711464c860c5d9c7c97cc7330f3077d9
+  metadata.gz: 9667643179161eecef46b651caf57ea94c28373590d0b8bfaf70c319557b227a6b325eda2427b05526f8a1971eaad4329007b9cfac7f256464d2bc1cd74d1e83
+  data.tar.gz: 85ca6c275b4020e4824f416b016efb0e2be1920bf487c3287616a17a7dbe45e9a7008c0d74f96bfa700154300b1d429ca3829e3bacb58ddc968d05e18afab1fe

data/lib/github_issues_cli/command/checkout.rb

@@ -12,6 +12,9 @@ module GithubIssuesCli
       else
         source = get_source issue_number
         if source.nil?
+          github_repo = get_github_repo
+          request = {:user => github_repo[:user], :repo => github_repo[:name], :number => issue_number}
+          Github::Issues.new.get request rescue raise 'Can\'t find issue #' + issue_number
           repo.remote('upstream').fetch
           source = 'upstream/master'
         end
@@ -19,7 +22,7 @@ module GithubIssuesCli
       end
       print on_green ' '
       print ' Checked out #' + issue_number
-      print ' (' + source.split('/').first.sub(/^gi-/, '') + ')' if source
+      print ' (' + source.split('/').first + ')' if source
       puts
     end
   end

data/lib/github_issues_cli/command/show.rb

@@ -2,9 +2,10 @@ module GithubIssuesCli
   class Command::Show < Command
 
     def execute
+      github_repo = get_github_repo
       issue_number = get_issue_number
       issues_client = Github::Issues.new
-      issue = issues_client.get :number => issue_number
+      issue = issues_client.get :user => github_repo[:user], :repo => github_repo[:name], :number => issue_number
       comments = issues_client.comments.all :issue_id => issue_number
 
       puts

data/lib/github_issues_cli/command.rb

@@ -69,12 +69,11 @@ module GithubIssuesCli
 
     def get_source issue_number
       github_repo = get_github_repo
-      pull_requests_client = Github::PullRequests.new
-      pull_request = pull_requests_client.get :user => github_repo[:user], :repo => github_repo[:name], :number => issue_number rescue return nil
-      user = pull_request.head.repo.owner.login
+      pull_request = Github::PullRequests.new.get :user => github_repo[:user], :repo => github_repo[:name], :number => issue_number rescue return nil
+      username = pull_request.head.repo.owner.login
       url = pull_request.head.repo.ssh_url
-      ref = pull_request.head.ref
-      remote_name = 'gi-' + user
+      branch = pull_request.head.ref
+      remote_name = username == @username ? 'origin' : username
       repo = get_git_repo
       remote = repo.remote remote_name
       if remote.url.nil?
@@ -86,7 +85,7 @@ module GithubIssuesCli
         raise '`' + remote_name + '` remote\'s url differs from expected: `' + remote.url + ' != ' + url + '`'
       end
       remote.fetch
-      remote.name + '/' + ref
+      remote.name + '/' + branch
     end
 
     def run(arguments)
@@ -95,11 +94,13 @@ module GithubIssuesCli
       rescue Exception => e
         print on_red ' '
         print bold ' Error: '
-        puts e.message
+        if e.message.empty?
+          puts 'Unknown error/Interrupt'
+        else
+          puts e.message
+        end
         exit 1
       end
     end
-
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_issues_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tomasz Durka