gitlab-triage 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ce6bb293cf3eb96b5c9f11179351472211bc15014fa365235013930ea8e951
-  data.tar.gz: '039d533aace6b86fd0518259e0dc2a5dc73a3b49a5ee87a55b6e4a4fa256fd52'
+  metadata.gz: 84d31b76f637fefa2bc459d2883c59ab6f67bc2675e93a5d5d96790a2f94dbc0
+  data.tar.gz: 2f930b5c98c5fb107a0a379b0e8a5319c5cf40e866bf4950abe215737858f552
 SHA512:
-  metadata.gz: 06273cdd4019d0619648b3b7b0ef8dfaa93f37fd152945faad44f92e119bcedc30c6db8235e5f8ba5c6a7126b1137a0cbad5920efe91bb732b4cb7f0d7899df2
-  data.tar.gz: c0a6940c1eb46580b77a1c0addbb2f6e19bcc69bc36f0bab34de6d36072cfa1111438cbdd057798a803e8bf252dd1acf26395c8e1095fdb57cd0ebc59f44d490
+  metadata.gz: 768c1958c5486a09ab6cb9a2984686f9a4f7b149b7f7cbf851bb5a5c2acee7142b50fd83c98d42ce22bd132b4bf0fc8a22d92b2a59518cf21b65ac477448dca3
+  data.tar.gz: b2ab624cb427cc0626fb39923ef2222077bab315882c00da245a2a728a082ce65784ca60a905f0b0114e6757bd5c0f7fe0ef2c6f007b5b5df9db82503e14e7fb

data/README.md

@@ -614,6 +614,7 @@ Here's a list of currently available Ruby expression API:
 | ----      | ----        | ----        |
 | resource  | Hash        | The hash containing the raw data of the resource |
 | milestone | Milestone   | The milestone attached to the resource |
+| instance_version | InstanceVersion | The version for the GitLab instance we're triaging with |
 
 ##### Methods for `Milestone`
 
@@ -633,6 +634,14 @@ Here's a list of currently available Ruby expression API:
 | succ        | Milestone   | The next active milestone beside this milestone |
 | active?     | Boolean     | `true` if `state` is `active`; `false` otherwise |
 
+##### Methods for `InstanceVersion`
+
+| Method        | Return type | Description |
+| ----          | ----        | ----        |
+| version       | String      | The full string of version. e.g. `11.3.0-rc11-ee` |
+| version_short | String      | The short string of version. e.g. `11.3` |
+| revision      | String      | The revision of GitLab. e.g. `231b0c7` |
+
 ### Usage
 
 ```

data/lib/gitlab/triage/network.rb

@@ -27,10 +27,19 @@ module Gitlab
 
         begin
           print '.'
+
           response = execute_with_retry(Net::ReadTimeout) do
             @adapter.get(token, response.fetch(:next_page_url) { url })
           end
-          resources += response.delete(:results)
+
+          results = response.delete(:results)
+
+          case results
+          when Array
+            resources.concat(results)
+          else
+            resources << results
+          end
         end while response.delete(:more_pages)
 
         resources.map!(&:with_indifferent_access)

data/lib/gitlab/triage/network_adapters/httparty_adapter.rb

@@ -22,7 +22,7 @@ module Gitlab
           end
 
           {
-            more_pages: (response.headers["x-next-page"] != ""),
+            more_pages: (response.headers["x-next-page"].to_s != ""),
             next_page_url: url + "&page=#{response.headers['x-next-page']}",
             results: response.parsed_response
           }

data/lib/gitlab/triage/resource/context.rb

@@ -1,5 +1,6 @@
 require_relative 'base'
 require_relative 'milestone'
+require_relative 'instance_version'
 
 module Gitlab
   module Triage
@@ -24,6 +25,10 @@ module Gitlab
 
         private
 
+        def instance_version
+          @instance_version ||= InstanceVersion.new(net)
+        end
+
         def milestone
           @milestone ||=
             resource[:milestone] && Milestone.new(resource[:milestone], net)

data/lib/gitlab/triage/resource/instance_version.rb

@@ -0,0 +1,36 @@
+require_relative 'base'
+
+module Gitlab
+  module Triage
+    module Resource
+      class InstanceVersion < Base
+        def initialize(new_net)
+          super({}, new_net)
+        end
+
+        def version
+          response[:version]
+        end
+
+        def version_short
+          version[/^\d+\.\d+/]
+        end
+
+        def revision
+          response[:revision]
+        end
+
+        private
+
+        # See https://gitlab.com/api/v4/version
+        def response
+          @response ||=
+            network.query_api_cached(
+              net[:token],
+              "#{net[:host_url]}/api/#{net[:api_version]}/version")
+              .first
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.11.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -169,6 +169,7 @@ files:
 - lib/gitlab/triage/network_adapters/test_adapter.rb
 - lib/gitlab/triage/resource/base.rb
 - lib/gitlab/triage/resource/context.rb
+- lib/gitlab/triage/resource/instance_version.rb
 - lib/gitlab/triage/resource/milestone.rb
 - lib/gitlab/triage/retryable.rb
 - lib/gitlab/triage/ui.rb