github_issues_cli 0.2.12 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d5f699c1ca85db7643383177fe178c4678dc83
-  data.tar.gz: 798ba7355e7832d27ef9e3a612aeacea9634cd4e
+  metadata.gz: 1eae2b08e31f053bc57a8509bb0f6d49328b46b1
+  data.tar.gz: ff998a2b853797aee5cf818a1cacde1ea056834d
 SHA512:
-  metadata.gz: ed8404d6c7d5ef80b9e8ebd6617257f7bbe3b03d5ccb969476c2b8b1859c1a61a84a288c557fc5c2b6c8f7807f556567c048625787d3824db273bb1f3db172db
-  data.tar.gz: 8d4c928d7197a1debf4fa32fc50889f07b5d9b671166db62daabe9995ebfd3550b8d1791cdc5fbd81f1933ea6a8b2eb42d5f14e8c7a4883fab0d2c5e6300f40a
+  metadata.gz: e18c131f6fff20450b9fa2c99c2ded9abae1878c9e1dcc5eb25028796ccfaac6bd2cf2789d0a7cfdd4937f2d5582aad1b362e5ec7297612daef232e7cfc7ae59
+  data.tar.gz: 5f75db94ababc441b5fe38b350738bec5bd5a2f3cead6ffa62c8cb8c3b1fc033cd296df26a79e15deb10f3221c932ed8e42d053407aaaa966f4c674e02643339

data/lib/github_issues_cli.rb

@@ -5,7 +5,9 @@ module GithubIssuesCli
   require 'github_api'
   require 'io/console'
   require 'json'
+  require 'pathname'
   require 'github_issues_cli/command'
+  require 'github_issues_cli/command/clone'
   require 'github_issues_cli/command/list'
   require 'github_issues_cli/command/checkout'
   require 'github_issues_cli/command/browse'
@@ -15,4 +17,5 @@ module GithubIssuesCli
   require 'github_issues_cli/command/push'
   require 'github_issues_cli/command/pull_request'
   require 'github_issues_cli/command_manager'
-end
+  require 'github_issues_cli/extensions/git'
+end

data/lib/github_issues_cli/command.rb

@@ -35,6 +35,14 @@ module GithubIssuesCli
       end
     end
 
+    def get_git_push_target
+      git_repo = get_git_repo
+      branch_name = git_repo.current_branch
+      remote_name = git_repo.lib.command_proxy('config', ['--get', "branch.#{branch_name}.remote"]) || 'origin'
+      remote_ref = git_repo.lib.command_proxy('config', ['--get', "branch.#{branch_name}.merge"]) || branch_name
+      remote_name + '/' + remote_ref
+    end
+
     # @return [Git::Base]
     def get_git_repo
       unless @git_repo
@@ -57,7 +65,7 @@ module GithubIssuesCli
       $1
     end
 
-    def get_github_repo
+    def get_upstream_repo
       url = get_git_repo.remote(:upstream).url
       if url.nil?
         raise 'No `upstream` remote found, please configure it first'
@@ -71,25 +79,35 @@ module GithubIssuesCli
       {:user => $1, :name => $2}
     end
 
-    def get_source issue_number
-      github_repo = get_github_repo
-      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
-      branch = pull_request.head.ref
+    def get_pullrequest(issue_number)
+      upstream_repo = get_upstream_repo
+      request = {
+        :user => upstream_repo[:user],
+        :repo => upstream_repo[:name],
+        :number => issue_number,
+      }
+      Github::PullRequests.new.get(request) rescue nil
+    end
+
+    def get_source_branch(issue_number)
+      git_repo = get_git_repo
+      pullrequest = get_pullrequest(issue_number)
+      return nil if pullrequest.nil?
+
+      username = pullrequest.head.repo.owner.login
       remote_name = username == @username ? 'origin' : username
-      repo = get_git_repo
-      remote = repo.remote remote_name
-      if remote.url.nil?
+      remote_url = pullrequest.head.repo.ssh_url
+      branch_name = pullrequest.head.ref
+
+      source_remote = git_repo.remote(remote_name)
+      if source_remote.url.nil?
         print 'Setting up remote `' + remote_name + '`...'
-        remote = repo.add_remote remote_name, url
+        source_remote = git_repo.add_remote(remote_name, remote_url)
         puts ' Done'
       end
-      if remote.url != url
-        raise '`' + remote_name + '` remote\'s url differs from expected: `' + remote.url + ' != ' + url + '`'
-      end
-      remote.fetch
-      remote.name + '/' + branch
+
+      source_remote.fetch
+      source_remote.name + '/' + branch_name
     end
 
     def run(arguments)
@@ -107,4 +125,4 @@ module GithubIssuesCli
       end
     end
   end
-end
+end

data/lib/github_issues_cli/command/browse.rb

@@ -2,7 +2,7 @@ module GithubIssuesCli
   class Command::Browse < Command
 
     def execute
-      github_repo = get_github_repo
+      github_repo = get_upstream_repo
       url = 'https://github.com/' + github_repo[:user] + '/' + github_repo[:name] + '/issues/' + get_issue_number
       system('open ' + url)
     end

data/lib/github_issues_cli/command/checkout.rb

@@ -6,24 +6,35 @@ module GithubIssuesCli
     def execute
       branch_name = 'issue-' + issue_number
       repo = get_git_repo
-      source = nil
-      if repo.lib.branches_all.map(&:first).include? branch_name
+
+      is_local_branch = repo.lib.branches_all.map(&:first).include? branch_name
+      if is_local_branch
         repo.checkout branch_name
       else
-        source = get_source issue_number
+        source = get_source_branch(issue_number)
+        target = source
         if source.nil?
-          github_repo = get_github_repo
+          github_repo = get_upstream_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
+          Github::Issues.new.get(request) rescue raise "Can't find issue ##{issue_number}"
           repo.remote('upstream').fetch
           source = 'upstream/master'
+          target = 'origin/' + branch_name
         end
-        repo.lib.checkout source, :new_branch => branch_name
+        repo.lib.command_proxy('checkout', ['-b', branch_name, source])
       end
       print on_green ' '
-      print ' Checked out #' + issue_number
-      print ' (' + source.split('/').first + ')' if source
+      print " Checked out ##{issue_number} "
+      print "(#{source})" unless is_local_branch
       puts
+
+      unless is_local_branch
+        print on_green ' '
+        puts " Setting upstream to (#{target})"
+      remote_name, branch_name = target.split('/')
+        repo.lib.command_proxy('config', ["branch.#{branch_name}.remote", remote_name])
+        repo.lib.command_proxy('config', ["branch.#{branch_name}.merge", "refs/heads/#{branch_name}"])
+      end
     end
   end
 end

data/lib/github_issues_cli/command/clone.rb

@@ -0,0 +1,32 @@
+module GithubIssuesCli
+  class Command::Clone < Command
+
+    parameter 'repository', 'name of the Github repository in owner/repo format', :attribute_name => :repository
+    parameter '[target]', 'target location for clone', :attribute_name => :target
+
+    def execute
+      owner, name = repository.split('/')
+      upstream_repo = Github::Repos.new.get(:user => owner, :repo => name)
+      if upstream_repo.owner.login == @username
+        origin_repo = upstream_repo
+      else
+        forks = Github::Repos::Forks.new.list(:user => owner, :repo => name)
+        fork = forks.find do |fork|
+          fork.owner.login == @username
+        end
+
+        unless fork
+          puts "Forking #{repository} for #{@username}"
+          fork = Github::Repos::Forks.new.create(:user => owner, :repo => name)
+        end
+        origin_repo = fork
+      end
+
+      target_directory = target || origin_repo.name
+      target_path = Pathname.new(target_directory).expand_path(Dir.getwd)
+      puts "Cloning #{repository} into #{target_path.to_s}"
+      git_repo = Git.clone(origin_repo.ssh_url, target_path.basename.to_s, :path => target_path.dirname.to_s)
+      git_repo.add_remote 'upstream', upstream_repo.ssh_url
+    end
+  end
+end

data/lib/github_issues_cli/command/comment.rb

@@ -4,7 +4,7 @@ module GithubIssuesCli
     parameter 'body', 'comment body', :attribute_name => :body
 
     def execute
-      github_repo = get_github_repo
+      github_repo = get_upstream_repo
       issue_number = get_issue_number
       Github::Issues.new.comments.create :user => github_repo[:user], :repo => github_repo[:name], :issue_id => issue_number, :body => body
       print on_green ' '

data/lib/github_issues_cli/command/list.rb

@@ -4,7 +4,7 @@ module GithubIssuesCli
     option '--mine', :flag, 'show only mine issues'
 
     def execute
-      github_repo = get_github_repo
+      github_repo = get_upstream_repo
       issues_client = Github::Issues.new
       request = {:user => github_repo[:user], :repo => github_repo[:name]}
       request.store(:assignee, @username) if mine?
@@ -12,11 +12,11 @@ module GithubIssuesCli
 
       issues.each do |issue|
         if not issue.assignee.nil? and issue.assignee.login == @username
-          print on_yellow ' '
+          print yellow '●'
         else
           print ' '
         end
-        print bold ' ' + ('#' + issue.number.to_s).rjust(6)
+        print bold(issue.number.to_s.rjust(5) + ':')
         print ' ' + issue.title
         puts
       end

data/lib/github_issues_cli/command/open.rb

@@ -4,14 +4,20 @@ module GithubIssuesCli
     parameter 'summary', 'issue summary', :attribute_name => :summary
 
     def execute
-      github_repo = get_github_repo
+      github_repo = get_upstream_repo
       issue = Github::Issues.new.create :user => github_repo[:user], :repo => github_repo[:name], :title => summary
       issue_number = issue[:number].to_s
 
-      get_github_repo
+      get_upstream_repo
       git_repo = get_git_repo
       git_repo.remote('upstream').fetch
-      git_repo.lib.checkout 'upstream/master', :new_branch => 'issue-' + issue_number
+      remote_name = 'origin'
+      branch_name = 'issue-' + issue_number
+
+      git_repo.lib.command_proxy('checkout', ['-b', branch_name, 'upstream/master'])
+      git_repo.lib.command_proxy('config', ["branch.#{branch_name}.remote", remote_name])
+      git_repo.lib.command_proxy('config', ["branch.#{branch_name}.merge", "refs/heads/#{branch_name}"])
+
       print on_green ' '
       print ' Checked out '
       puts bold '#' + issue_number

data/lib/github_issues_cli/command/pull_request.rb

@@ -1,23 +1,30 @@
 module GithubIssuesCli
   class Command::Pull_request < Command
 
+    parameter '[base]', 'base for pull-request', :attribute_name => :base, :default => 'master'
+
     def execute
-      github_repo = get_github_repo
       issue_number = get_issue_number
-      source = @username + ':issue-' + issue_number
+      raise "Pull-request for issue ##{issue_number} already exists" if get_pullrequest(issue_number)
+
+      github_repo = get_upstream_repo
+      git_repo = get_git_repo
+      target = get_git_push_target
+      remote, ref = target.split('/', 2)
+      puts git_repo.lib.command_proxy('push', [remote, "#{git_repo.current_branch}:#{ref}"])
+
+      raise 'Cannot create pull-request for non-origin remotes' unless remote == 'origin'
+      source = @username + ':' + ref.split('/').last
       begin
         request = {
-            :user => github_repo[:user],
-            :repo => github_repo[:name],
-            :head => source,
-            :base => 'master',
-            :issue => issue_number
+          :user => github_repo[:user],
+          :repo => github_repo[:name],
+          :base => base,
+          :head => source,
+          :issue => issue_number
         }
-        Github::PullRequests.new.create request
+        Github::PullRequests.new.create(request)
       rescue Exception => e
-        unless get_source(issue_number).nil?
-          raise 'Pull-request for issue #' + issue_number + ' already exists'
-        end
         raise "Internal error: Cannot create pull-request.\n#{e.inspect}"
       end
       print 'Pull request for issue '

data/lib/github_issues_cli/command/push.rb

@@ -2,15 +2,10 @@ module GithubIssuesCli
   class Command::Push < Command
 
     def execute
-      issue_number = get_issue_number
-      source = get_source issue_number
-      if source.nil?
-        source = 'origin/issue-' + issue_number
-      end
-      print 'Pushing code to '
-      puts bold source
-      remote, branch = source.split('/')
-      get_git_repo.push(remote, branch)
+      git_repo = get_git_repo
+      target = get_git_push_target
+      remote, ref = target.split('/', 2)
+      puts git_repo.lib.command_proxy('push', [remote, "#{git_repo.current_branch}:#{ref}"])
     end
   end
 end

data/lib/github_issues_cli/command/show.rb

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

data/lib/github_issues_cli/command_manager.rb

@@ -1,6 +1,7 @@
 module GithubIssuesCli
   class CommandManager < Clamp::Command
 
+    subcommand 'clone', 'Clones repository', Command::Clone
     subcommand 'list', 'Lists issues', Command::List
     subcommand 'checkout', 'Checkouts specific issue', Command::Checkout
     subcommand 'show', 'Show current issue details', Command::Show

data/lib/github_issues_cli/extensions/git.rb

@@ -0,0 +1,7 @@
+module Git
+  class Lib
+    def command_proxy(cmd, opts = [], chdir = true, redirect = '', &block)
+      command(cmd, opts, chdir, redirect, &block)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_issues_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomasz Durka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -28,16 +28,16 @@ dependencies:
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: github_api
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,7 @@ files:
 - lib/github_issues_cli/command.rb
 - lib/github_issues_cli/command/browse.rb
 - lib/github_issues_cli/command/checkout.rb
+- lib/github_issues_cli/command/clone.rb
 - lib/github_issues_cli/command/comment.rb
 - lib/github_issues_cli/command/list.rb
 - lib/github_issues_cli/command/open.rb
@@ -85,6 +86,7 @@ files:
 - lib/github_issues_cli/command/push.rb
 - lib/github_issues_cli/command/show.rb
 - lib/github_issues_cli/command_manager.rb
+- lib/github_issues_cli/extensions/git.rb
 homepage: https://github.com/tomaszdurka/github_issues_cli.git
 licenses:
 - MIT
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Command line tool for managing issues, pull-requests on GitHub platform