fleet-api 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e76824863766406ea4fa859149d71e42147f7509
-  data.tar.gz: 4fc476f3c9c283b7cc91f22f67ecb87fc8e4e6d6
+  metadata.gz: 432b71f5c32088d0776432ac6b6461e6572a1b8e
+  data.tar.gz: 95f6d020f76071b07ef7588286f1b17ec1ae96c9
 SHA512:
-  metadata.gz: b14298bc17e6aaf575e0fa1b7d130420c5345f808e66f38c23bb8ea9c4ee93359d4315ff13507f368825fda568016c659d587cbe0fa232fa5fe00ee89fe29971
-  data.tar.gz: 1fde940443cf548edd7e1255e7f654dfaffc1922fd65f13642785347b07cf8e252f4ff7551912ebc3ed1afe6ee2315554b0c2a51ef586393129a58d8dd6dbc65
+  metadata.gz: 813b9b6a98b6bbbddd0147339712b2d1487240a730be884f620572f896f91063ce48a0532173c4553c7e078ec13a1d0f6c1d39b6fffa2b5e2226ea6253b9efe1
+  data.tar.gz: a1c4e1e8c50f5edb6a7ae2b64cf166bd39fc0b1ab3ed5f079c2ce106b5d76c7e29ee5f486a948913ecb8212ced0fa941970575c51cde0420cd27a5206debddd5

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+1.2.0 - 2015-08-13
+------------------
+
+### Added
+- Support for paginated responses (robholland)
+
 1.1.0 - 2015-02-19
 ------------------
 

data/README.md

@@ -2,12 +2,16 @@ fleet-api
 =========
 
 [![Gem Version](https://badge.fury.io/rb/fleet-api.svg)](http://badge.fury.io/rb/fleet-api)
-[![Build Status](https://api.shippable.com/projects/540e7b283479c5ea8f9ebd66/badge?branchName=master)](https://app.shippable.com/projects/540e7b283479c5ea8f9ebd66/builds/latest)
+[![Circle CI](https://circleci.com/gh/CenturyLinkLabs/fleet-api.svg?style=svg)](https://circleci.com/gh/CenturyLinkLabs/fleet-api)
 
 Provides a Ruby wrapper around the CoreOS Fleet API.
 
 The client allows programmatic access to most of the *fleetctl* commands including the ability to load, start, stop, unload and destroy unit files.
 
+**Important Note:** As of version 1.0.0, this gem is now using the official Fleet REST API. Previous versions of this gem communicated with Fleet by reading/writing directly from/to the etcd key-value store. While this approach was functional, it was extremely brittle due to the fact that we were essentially using a private API. Now that the Fleet API has hit version 1.0 and is presumably stable it makes more sense to leverage the official API.
+
+Users migrating from an older version of the Gem will simply need to make sure they configure it with the Fleet API endpoint instead of the etcd API endpoint.
+
 ### Installation
 
 Install the gem directly:

data/circle.yml

@@ -0,0 +1,13 @@
+dependencies:
+  override:
+    - 'rvm-exec 1.9.3 bundle install'
+    - 'rvm-exec 2.0.0 bundle install'
+    - 'rvm-exec 2.1.5 bundle install'
+    - 'rvm-exec 2.2.0 bundle install'
+
+test:
+  override:
+    - 'rvm-exec 1.9.3 bundle exec rake'
+    - 'rvm-exec 2.0.0 bundle exec rake'
+    - 'rvm-exec 2.1.5 bundle exec rake'
+    - 'rvm-exec 2.2.0 bundle exec rake'

data/lib/fleet/request.rb

@@ -13,6 +13,22 @@ module Fleet
     end
 
     def request(connection, method, path, options)
+      response = perform_request(connection, method, path, options)
+      return response if method != :get
+
+      next_page_token = response.delete('nextPageToken')
+      while next_page_token
+        next_options = options.merge('nextPageToken' => next_page_token)
+        next_response = perform_request(connection, method, path, next_options)
+        next_page_token = next_response.delete('nextPageToken')
+        next_response.each { |k, v| response[k] += v }
+      end
+      response
+    end
+
+    private
+
+    def perform_request(connection, method, path, options)
       req = {
         path: escape_path(path),
       }
@@ -41,8 +57,6 @@ module Fleet
       raise Fleet::ConnectionError, ex.message
     end
 
-    private
-
     def escape_path(path)
       URI.escape(path).gsub(/@/, '%40')
     end

data/lib/fleet/version.rb

@@ -1,3 +1,3 @@
 module Fleet
-  VERSION = '1.1.0'.freeze unless defined?(Fleet::VERSION)
+  VERSION = '1.2.0'.freeze unless defined?(Fleet::VERSION)
 end

data/spec/fleet/request_spec.rb

@@ -34,6 +34,28 @@ describe Fleet::Request do
       expect(subject.send(:get, path, options)).to eq('name' => 'foo')
     end
 
+    context 'when there is pagination' do
+      let(:first_response) do
+        double(:first_response, body: '{"things":[{"name":"foo"}], "nextPageToken":"123"}', status: 200)
+      end
+      let(:second_response) do
+        double(:second_response, body: '{"things":[{"name":"bah"}], "nextPageToken":"456"}', status: 200)
+      end
+      let(:third_response) do
+        double(:second_response, body: '{"things":[{"name":"tah"}]}', status: 200)
+      end
+
+      it 'merges the responses' do
+        expect(connection).to receive(:send).with(:get, anything).and_return(first_response)
+        expect(connection).to receive(:send).with(:get, hash_including(query: { 'nextPageToken' => '123' })).and_return(second_response)
+        expect(connection).to receive(:send).with(:get, hash_including(query: {'nextPageToken' => '456'})).and_return(third_response)
+
+        expect(subject.send(:get, path)).to eql(
+          'things' => [{ 'name' => 'foo' }, { 'name' => 'bah' }, { 'name' => 'tah' }]
+        )
+      end
+    end
+
     context 'when there is a SocketError' do
       before do
         allow(connection).to receive(:send)
@@ -58,13 +80,13 @@ describe Fleet::Request do
 
   describe '#put' do
 
-    let(:options) do 
-      { foo: 'bar' } 
+    let(:options) do
+      { foo: 'bar' }
     end
 
     it 'invokes #put on the connection with the correct params' do
-      opts = { 
-        path: '/foo%20bar%40', 
+      opts = {
+        path: '/foo%20bar%40',
         headers: { 'Content-Type' => 'application/json' },
         body: JSON.dump(options)
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleet-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - CenturyLink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -95,6 +95,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
 - fleet-api.gemspec
 - lib/fleet.rb
 - lib/fleet/client.rb