geet 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59d2f426846e6efe8e86311fdaa40c2d492c551
-  data.tar.gz: ad031d1e06cb881481c6cd8e72581e3069b365e2
+  metadata.gz: 1a2f49ae01e6ee8ffb49547325a0a863fcdbf5a3
+  data.tar.gz: 278afc31f3bde847a85888ae1a41d9f59f4bf971
 SHA512:
-  metadata.gz: 44015551198b6a04525a17079b065b85a81f5086ae2a22febcc3466596700035201da645ed2b7cb5093ddc6e4585d4fff105cf7fd806227eeb64f089f3e4e853
-  data.tar.gz: 64e7d77b762b34d4444e443ac447b9c0a9ad201724daee2eb4f5745f83598853e8dd4d5674e48bc68815756d7132530103b5e7ee1ec3756a0837d38398f056da
+  metadata.gz: a26048f5c129330b17d077172b2533d8a38f19ca8dcc588eb580cc58ebc381708581713bebc5605b6bf4d7aca45723478f49d1f93cd59377cd026921bd8e984f
+  data.tar.gz: 50de5cca0d6d813bfdb6a2ac32143a7fb4d710e090f4ee15e24f92da6499ac148abca94ae22ef6fb656c54e8ebf4a0c041aee633fe29ebe7413c9b2936199bd0

data/README.md

@@ -4,13 +4,26 @@ Command line interface for performing Git hosting service operations.
 
 The current version supports only creating PRs/issues.
 
-This tool is very similar to [Hub](https://github.com/github/hub), but it supports more complex operations, fully specified via command line.
+This tool is very similar to [Hub](https://github.com/github/hub), but it supports a different set of operations, fully specified via command line.
 
 Please see the [development status](#development-status) section for informations about the current development.
 
 ## Providers support
 
-Currently, there are many functionalities implemented for GitHub (see help), and only issues listing for GitLab.
+The functionalities currently supported are:
+
+- Github:
+  - create gist
+  - create issue
+  - create PR
+  - list issues
+  - list labels
+  - list milestones
+  - list PRs
+  - merge PR
+- Gitlab:
+  - list issues
+  - list labels
 
 ## Samples
 
@@ -87,6 +100,6 @@ Examples:
 
 ## Development status
 
-Geet is in alpha status. Although I use it daily, lots of features are being implemented, and internal/external APIs are frequently changed.
+Geet is in alpha status. Although I use it daily, new features are frequently added, and internal/external APIs/workflows may change.
 
-The public release will be 1.0, and is expected to be released in January 2018 or earlier.
+The public release will be 1.0, and is expected to be released in February 2018 or earlier.

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-11-26'
+  s.date        = '2017-11-27'
   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/github/label.rb

@@ -10,7 +10,7 @@ module Geet
         api_path = 'labels'
         response = api_interface.send_request(api_path, multipage: true)
 
-        response.map { |label_entry| label_entry['name'] }
+        response.map { |label_entry| label_entry.fetch('name') }
       end
     end
   end

data/lib/geet/gitlab/api_interface.rb

@@ -102,7 +102,13 @@ module Geet
       end
 
       def decode_and_format_error(parsed_response)
-        parsed_response.fetch('error')
+        if parsed_response.key?('error')
+          parsed_response.fetch('error')
+        elsif parsed_response.key?('message')
+          parsed_response.fetch('message')
+        else
+          "Unrecognized response: #{parsed_response}"
+        end
       end
 
       def link_next_page(response_headers)

data/lib/geet/gitlab/label.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'date'
+
+module Geet
+  module Gitlab
+    class Label
+      # Returns a flat list of names in string form.
+      def self.list(api_interface)
+        api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
+        response = api_interface.send_request(api_path, multipage: true)
+
+        response.map { |label_entry| label_entry.fetch('name') }
+      end
+    end
+  end
+end

data/lib/geet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geet
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/spec/integration/create_pr_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/create_pr'
 
 describe Geet::Services::CreatePr do
-  let(:repository) { Geet::Git::Repository.new() }
+  let(:repository) { Geet::Git::Repository.new }
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true) }
 
   context 'with labels, reviewers and milestones' do

data/spec/integration/list_issues_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_issues'
 
 describe Geet::Services::ListIssues do
-  let(:repository) { Geet::Git::Repository.new() }
+  let(:repository) { Geet::Git::Repository.new }
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true) }
 
   it 'should list the issues' do

data/spec/integration/list_labels_spec.rb

@@ -4,25 +4,53 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_labels'
 
 describe Geet::Services::ListLabels do
-  let(:repository) { Geet::Git::Repository.new() }
-
-  it 'should list the labels' do
-    allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
-
-    expected_output = <<~STR
-      - bug
-      - enhancement
-      - technical_debt
-      - top_priority
-    STR
-    expected_labels = %w[bug enhancement technical_debt top_priority]
-
-    actual_output = StringIO.new
-    actual_labels = VCR.use_cassette("list_labels") do
-      described_class.new.execute(repository, output: actual_output)
+  let(:repository) { Geet::Git::Repository.new }
+
+  context 'with github.com' do
+    it 'should list the labels' do
+      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+
+      expected_output = <<~STR
+        - bug
+        - enhancement
+        - technical_debt
+        - top_priority
+      STR
+      expected_labels = %w[bug enhancement technical_debt top_priority]
+
+      actual_output = StringIO.new
+      actual_labels = VCR.use_cassette("github.com/list_labels") do
+        described_class.new.execute(repository, output: actual_output)
+      end
+
+      expect(actual_output.string).to eql(expected_output)
+      expect(actual_labels).to eql(expected_labels)
     end
+  end
 
-    expect(actual_output.string).to eql(expected_output)
-    expect(actual_labels).to eql(expected_labels)
+  context 'with gitlab.com' do
+    it 'should list the labels' do
+      allow(repository).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+
+      expected_output = <<~STR
+        - bug
+        - confirmed
+        - critical
+        - discussion
+        - documentation
+        - enhancement
+        - suggestion
+        - support
+      STR
+      expected_labels = %w[bug confirmed critical discussion documentation enhancement suggestion support]
+
+      actual_output = StringIO.new
+      actual_labels = VCR.use_cassette("gitlab.com/list_labels") do
+        described_class.new.execute(repository, output: actual_output)
+      end
+
+      expect(actual_output.string).to eql(expected_output)
+      expect(actual_labels).to eql(expected_labels)
+    end
   end
 end

data/spec/integration/list_milestones_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_milestones'
 
 describe Geet::Services::ListMilestones do
-  let(:repository) { Geet::Git::Repository.new() }
+  let(:repository) { Geet::Git::Repository.new }
 
   it 'should list the milestones' do
     allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')

data/spec/integration/list_prs_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_prs'
 
 describe Geet::Services::ListPrs do
-  let(:repository) { Geet::Git::Repository.new() }
+  let(:repository) { Geet::Git::Repository.new }
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true) }
 
   it 'should list the PRs' do

data/spec/integration/merge_pr_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/merge_pr'
 
 describe Geet::Services::MergePr do
-  let(:repository) { Geet::Git::Repository.new() }
+  let(:repository) { Geet::Git::Repository.new }
 
   it 'should merge the PR for the current branch' do
     allow(repository).to receive(:current_branch).and_return('mybranch1')

data/spec/spec_helper.rb

@@ -14,6 +14,10 @@ VCR.configure do |config|
 
     Base64.strict_encode64("#{user}:#{api_token}")
   end
+
+  config.filter_sensitive_data('<GITLAB_CREDENTIALS>') do
+    ENV.fetch('GITLAB_API_TOKEN')
+  end
 end
 
 # This file was generated by the `rspec --init` command. Conventionally, all

data/spec/vcr_cassettes/gitlab_com/list_labels.yml

@@ -0,0 +1,80 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/labels
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Host:
+      - gitlab.com
+      Private-Token:
+      - <GITLAB_CREDENTIALS>
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 27 Nov 2017 19:57:22 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1456'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"f1657db8486bd268ddde16fe1c342d0a"
+      Link:
+      - <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/labels?id=donaldduck%2Ftestproject&page=1&per_page=20>;
+        rel="first", <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/labels?id=donaldduck%2Ftestproject&page=1&per_page=20>;
+        rel="last"
+      Vary:
+      - Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Next-Page:
+      - ''
+      X-Page:
+      - '1'
+      X-Per-Page:
+      - '20'
+      X-Prev-Page:
+      - ''
+      X-Request-Id:
+      - 0ea3d7c7-7fdf-4042-a4e8-67f7a48b4987
+      X-Runtime:
+      - '0.930769'
+      X-Total:
+      - '8'
+      X-Total-Pages:
+      - '1'
+      Strict-Transport-Security:
+      - max-age=31536000
+      Ratelimit-Limit:
+      - '600'
+      Ratelimit-Observed:
+      - '1'
+      Ratelimit-Remaining:
+      - '599'
+      Ratelimit-Reset:
+      - '1511812702'
+      Ratelimit-Resettime:
+      - Tue, 27 Nov 2017 19:58:22 GMT
+    body:
+      encoding: UTF-8
+      string: '[{"id":3081606,"name":"bug","color":"#d9534f","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081608,"name":"confirmed","color":"#d9534f","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081607,"name":"critical","color":"#d9534f","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081611,"name":"discussion","color":"#428bca","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081609,"name":"documentation","color":"#f0ad4e","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081613,"name":"enhancement","color":"#5cb85c","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081612,"name":"suggestion","color":"#428bca","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false},{"id":3081610,"name":"support","color":"#f0ad4e","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false}]'
+    http_version: 
+  recorded_at: Mon, 27 Nov 2017 19:57:22 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -57,6 +57,7 @@ files:
 - lib/geet/github/pr.rb
 - lib/geet/gitlab/api_interface.rb
 - lib/geet/gitlab/issue.rb
+- lib/geet/gitlab/label.rb
 - lib/geet/helpers/os_helper.rb
 - lib/geet/services/create_gist.rb
 - lib/geet/services/create_issue.rb
@@ -82,9 +83,10 @@ files:
 - spec/vcr_cassettes/create_issue_upstream.yml
 - spec/vcr_cassettes/create_pr.yml
 - spec/vcr_cassettes/create_pr_upstream.yml
+- spec/vcr_cassettes/github_com/list_labels.yml
+- spec/vcr_cassettes/gitlab_com/list_labels.yml
 - spec/vcr_cassettes/list_issues.yml
 - spec/vcr_cassettes/list_issues_upstream.yml
-- spec/vcr_cassettes/list_labels.yml
 - spec/vcr_cassettes/list_milestones.yml
 - spec/vcr_cassettes/list_prs.yml
 - spec/vcr_cassettes/list_prs_upstream.yml