geet 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f6a2eb12fdc08bd0f4a51d842b5531f9a18e6df
-  data.tar.gz: 0d552dbf78425a735cb5e360492e875f07a24c4a
+  metadata.gz: cd0635ff3846a704465468c125761bd184c4f028
+  data.tar.gz: 7090288ba79f44a4029ae3ba7217d89e62246105
 SHA512:
-  metadata.gz: e9f68e13f8e60fd218ee73188e1593f8cb1da88cf9f03069dcf67ac29e8310be1706b87bbd3a7071fce931d19b45a4a4bd9295f21e2fc82d94670ec76358e015
-  data.tar.gz: 84e94c28cf83f49cb0b649eec8e13508c4cebc03d417d562c4460f2aaba1a606475860f899d6af3c54ebcdda262b904eb719c47f60f20dfbc99564df7fcb146a
+  metadata.gz: 9ae2941d700748eddf8ae382ca8ee7c53ff1a9fe896b752628ceaf0c244ada04312eadea1da3fc9b4ff571bebe512393a48083dbb47e9477c528043c99a4d155
+  data.tar.gz: 41ecfe2ea7c10fff999d36403cbccdb9a5b5705b210aadd87f8009d1cc3f7555fe4b9320d9f3fc89a435cb2d101c838e517fb0621fa2ad1e8fe1c7156ce8a898

data/bin/geet

@@ -11,7 +11,8 @@ configuration_helper = Helpers::ConfigurationHelper.new
 command, options = configuration_helper.decode_argv || exit
 api_token = configuration_helper.api_token
 
-repository = Git::Repository.new(api_token)
+# `:upstream` is always false in the gist command case.
+repository = Git::Repository.new(api_token, upstream: !!options[:upstream])
 
 case command
 when Helpers::ConfigurationHelper::GIST_CREATE_COMMAND

data/geet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.2.0'
   s.authors     = ["Saverio Miroddi"]
-  s.date        = "2017-10-26"
+  s.date        = "2017-10-30"
   s.email       = ["saverio.pub2@gmail.com"]
   s.homepage    = "https://github.com/saveriomiroddi/geet"
   s.summary     = "Commandline interface for performing SCM (eg. GitHub) operations (eg. PR creation)."

data/lib/geet/git/repository.rb

@@ -28,18 +28,19 @@ module Geet
       REMOTE_ORIGIN_REGEX = %r{
         \A
         (?:https://(.+?)/|git@(.+?):)
-        ([^/]+)
-        /
-        (.*?)
+        ([^/]+/.*?)
         (?:\.git)?
         \Z
       }x
 
-      def initialize(api_token)
+      ORIGIN_NAME   = 'origin'
+      UPSTREAM_NAME = 'upstream'
+
+      def initialize(api_token, upstream: false)
         the_provider_domain = provider_domain
         provider_module = DOMAIN_PROVIDERS_MAPPING[the_provider_domain] || raise("Provider not supported for domain: #{provider_domain}")
 
-        api_helper = provider_module::ApiHelper.new(api_token, user, owner, repo)
+        api_helper = provider_module::ApiHelper.new(api_token, user, path(upstream: upstream), upstream)
 
         @remote_repository = provider_module::RemoteRepository.new(self, api_helper)
         @account = provider_module::Account.new(api_helper)
@@ -52,15 +53,17 @@ module Geet
       end
 
       def provider_domain
-        remote_origin[REMOTE_ORIGIN_REGEX, 1] || remote_origin[REMOTE_ORIGIN_REGEX, 2]
-      end
+        # We assume that it's not possible to have origin and upstream on different providers.
+        #
+        remote_url = remote(ORIGIN_NAME)
 
-      def owner
-        remote_origin[REMOTE_ORIGIN_REGEX, 3]
+        remote_url[REMOTE_ORIGIN_REGEX, 1] || remote_url[REMOTE_ORIGIN_REGEX, 2]
       end
 
-      def repo
-        remote_origin[REMOTE_ORIGIN_REGEX, 4]
+      def path(upstream: false)
+        remote_name = upstream ? UPSTREAM_NAME : ORIGIN_NAME
+
+        remote(remote_name)[REMOTE_ORIGIN_REGEX, 3]
       end
 
       # DATA
@@ -75,14 +78,16 @@ module Geet
 
       # The result is in the format `git@github.com:saveriomiroddi/geet.git`
       #
-      def remote_origin
-        origin = `git ls-remote --get-url origin`.strip
+      def remote(name)
+        remote_url = `git ls-remote --get-url #{name}`.strip
 
-        if origin !~ REMOTE_ORIGIN_REGEX
-          raise("Unexpected remote reference format: #{origin.inspect}")
+        if remote_url == name
+          raise "Remote #{name.inspect} not found!"
+        elsif remote_url !~ REMOTE_ORIGIN_REGEX
+          raise "Unexpected remote reference format: #{remote_url.inspect}"
         end
 
-        origin
+        remote_url
       end
     end
   end

data/lib/geet/git_hub/abstract_issue.rb

@@ -15,8 +15,8 @@ module Geet
       # options:
       #   filter: :pr, :issue, or nil
       #
-      def self.list(repository, api_helper, filter: nil)
-        request_address = "#{api_helper.repo_link}/issues"
+      def self.list(api_helper, filter: nil)
+        request_address = "#{api_helper.api_repo_link}/issues"
 
         response = api_helper.send_request(request_address, multipage: true)
         issue_class = Struct.new(:number, :title, :link)
@@ -37,8 +37,7 @@ module Geet
         end
       end
 
-      def initialize(repository, issue_number, api_helper)
-        @repository = repository
+      def initialize(issue_number, api_helper)
         @issue_number = issue_number
         @api_helper = api_helper
       end
@@ -48,14 +47,14 @@ module Geet
       #
       def assign_user(users)
         request_data = { assignees: Array(users) }
-        request_address = "#{@api_helper.repo_link}/issues/#{@issue_number}/assignees"
+        request_address = "#{@api_helper.api_repo_link}/issues/#{@issue_number}/assignees"
 
         @api_helper.send_request(request_address, data: request_data)
       end
 
       def add_labels(labels)
         request_data = labels
-        request_address = "#{@api_helper.repo_link}/issues/#{@issue_number}/labels"
+        request_address = "#{@api_helper.api_repo_link}/issues/#{@issue_number}/labels"
 
         @api_helper.send_request(request_address, data: request_data)
       end

data/lib/geet/git_hub/api_helper.rb

@@ -8,19 +8,27 @@ require 'shellwords'
 module Geet
   module GitHub
     class ApiHelper
-      def initialize(api_token, user, owner, repo)
+      def initialize(api_token, user, repository_path, upstream)
         @api_token = api_token
         @user = user
-        @owner = owner
-        @repo = repo
+        @repository_path = repository_path
+        @upstream = upstream
       end
 
-      def base_link
+      def api_base_link
         "https://api.github.com"
       end
 
+      def api_repo_link
+        "#{api_base_link}/repos/#{@repository_path}"
+      end
+
       def repo_link
-        "#{base_link}/repos/#{@owner}/#{@repo}"
+        "https://github.com/#{@repository_path}"
+      end
+
+      def upstream?
+        @upstream
       end
 
       # Send a request.

data/lib/geet/git_hub/gist.rb

@@ -6,7 +6,7 @@ module Geet
   module GitHub
     class Gist
       def self.create(repository, filename, content, api_helper, description: nil, publik: false)
-        request_address = "#{api_helper.base_link}/gists"
+        request_address = "#{api_helper.api_base_link}/gists"
         request_data = prepare_request_data(filename, content, description, publik)
 
         response = api_helper.send_request(request_address, data: request_data)

data/lib/geet/git_hub/issue.rb

@@ -6,18 +6,18 @@ module Geet
   module GitHub
     class Issue < AbstractIssue
       def self.create(repository, title, description, api_helper)
-        request_address = "#{api_helper.repo_link}/issues"
+        request_address = "#{api_helper.api_repo_link}/issues"
         request_data = { title: title, body: description, base: 'master' }
 
         response = api_helper.send_request(request_address, data: request_data)
 
         issue_number = response.fetch('number')
 
-        new(repository, issue_number, api_helper)
+        new(issue_number, api_helper)
       end
 
       def link
-        "https://github.com/#{@repository.owner}/#{@repository.repo}/issues/#{@issue_number}"
+        "#{@api_helper.repo_link}/issues/#{@issue_number}"
       end
     end
   end

data/lib/geet/git_hub/pr.rb

@@ -6,23 +6,25 @@ module Geet
   module GitHub
     class PR < AbstractIssue
       def self.create(repository, title, description, head, api_helper)
-        request_address = "#{api_helper.repo_link}/pulls"
+        request_address = "#{api_helper.api_repo_link}/pulls"
+
+        head = "#{repository.authenticated_user}:#{head}" if api_helper.upstream?
         request_data = { title: title, body: description, head: head, base: 'master' }
 
         response = api_helper.send_request(request_address, data: request_data)
 
         issue_number = response.fetch('number')
 
-        new(repository, issue_number, api_helper)
+        new(issue_number, api_helper)
       end
 
       def link
-        "https://github.com/#{@repository.owner}/#{@repository.repo}/pull/#{@issue_number}"
+        "#{@api_helper.repo_link}/pull/#{@issue_number}"
       end
 
       def request_review(reviewers)
         request_data = { reviewers: reviewers }
-        request_address = "#{@api_helper.repo_link}/pulls/#{@issue_number}/requested_reviewers"
+        request_address = "#{@api_helper.api_repo_link}/pulls/#{@issue_number}/requested_reviewers"
 
         @api_helper.send_request(request_address, data: request_data)
       end

data/lib/geet/git_hub/remote_repository.rb

@@ -14,14 +14,14 @@ module Geet
       end
 
       def collaborators
-        url = "https://api.github.com/repos/#{@local_repository.owner}/#{@local_repository.repo}/collaborators"
+        url = "#{@api_helper.api_repo_link}/collaborators"
         response = @api_helper.send_request(url, multipage: true)
 
         response.map { |user_entry| user_entry.fetch('login') }
       end
 
       def labels
-        url = "https://api.github.com/repos/#{@local_repository.owner}/#{@local_repository.repo}/labels"
+        url = "#{@api_helper.api_repo_link}/labels"
         response = @api_helper.send_request(url, multipage: true)
 
         response.map { |label_entry| label_entry['name'] }
@@ -36,15 +36,15 @@ module Geet
       end
 
       def list_issues
-        Geet::GitHub::AbstractIssue.list(@local_repository, @api_helper, filter: :issue)
+        Geet::GitHub::AbstractIssue.list(@api_helper, filter: :issue)
       end
 
-      def create_pr(title, description, head: @local_repository.current_head)
+      def create_pr(title, description, head)
         Geet::GitHub::PR.create(@local_repository, title, description, head, @api_helper)
       end
 
       def list_prs
-        Geet::GitHub::AbstractIssue.list(@local_repository, @api_helper, filter: :pr)
+        Geet::GitHub::AbstractIssue.list(@api_helper, filter: :pr)
       end
     end
   end

data/lib/geet/helpers/configuration_helper.rb

@@ -26,22 +26,26 @@ module Geet
         ['-n', '--no-open-issue',                           "Don't open the issue link in the browser after creation"],
         ['-l', '--label-patterns "bug,help wanted"',        'Label patterns'],
         ['-a', '--assignee-patterns john,tom,adrian,kevin', 'Assignee login patterns. Defaults to authenticated user'],
+        ['-u', '--upstream',                                'Create on the upstream repository'],
         'title',
         'description'
       ].freeze
 
       ISSUE_LIST_OPTIONS = [
+        ['-u', '--upstream',                                'List on the upstream repository'],
       ].freeze
 
       PR_CREATE_OPTIONS = [
         ['-n', '--no-open-pr',                              "Don't open the PR link in the browser after creation"],
         ['-l', '--label-patterns "legacy,code review"',     'Label patterns'],
         ['-r', '--reviewer-patterns john,tom,adrian,kevin', 'Reviewer login patterns'],
+        ['-u', '--upstream',                                'Create on the upstream repository'],
         'title',
         'description'
       ].freeze
 
       PR_LIST_OPTIONS = [
+        ['-u', '--upstream',                                'List on the upstream repository'],
       ].freeze
 
       # Public interface

data/lib/geet/services/create_pr.rb

@@ -30,7 +30,7 @@ module Geet
 
         puts 'Creating PR...'
 
-        pr = repository.create_pr(title, description)
+        pr = repository.create_pr(title, description, repository.current_head)
 
         puts 'Assigning authenticated user...'
 

data/lib/geet/version.rb

@@ -1,3 +1,3 @@
 module Geet
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting