fleet-api 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c53fd4743be330713996996781ccfc244868131
-  data.tar.gz: 3e3fcb5fc7aa92b37944954975ea663dd2c7cb96
+  metadata.gz: 68e27564af5b67b5721f95aa609aedeb84f1fadd
+  data.tar.gz: 40f0c7cec0121c38fd9a560bd6445b96977f7108
 SHA512:
-  metadata.gz: 9e10c7a3c3db3aa443dd971f636fe0b99185a06a2535908243b514eae402d8b39e9087724b1c7304bfb28ce3b865eadd8ac9dde1b90ef854c2394ea5105ac13d
-  data.tar.gz: 661108e5c653840a37e6c9921b516c327eeeda9f1cb0fe67301099d025b0d7178988e688fc574edb926f1db2a425eb84aa9000ce28e9bcbcf53a62ed93e6b315
+  metadata.gz: 3c0a1bc9e12034e59186ee1abdc87a025475a027e038b564d3c8e1fb90c1873a0da79a1afb1534be69f301758261fbf53bf25fe81bbea8e2d5795b53caeb2752
+  data.tar.gz: 69d67b8d08c127b5771e5727ebb593ea03d3f184df22924cee95c5b88a642819ccb37f0162d545dde689fdb2a4527c1446075a8b3b38c948885646d7f8c35649

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.5
+  - 2.2.0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+0.9.0 - 2015-01-14
+------------------
+
+### Added
+- Support for listing all loaded units
+
 0.8.0 - 2014-11-07
 ------------------
 

data/README.md

@@ -2,7 +2,7 @@ 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/53f3a91a5491229d0207e4d9/badge/master)](https://www.shippable.com/projects/53f3a91a5491229d0207e4d9)
+[![Build Status](https://api.shippable.com/projects/540e7b283479c5ea8f9ebd66/badge?branchName=master)](https://www.shippable.com/projects/53f3a91a5491229d0207e4d9)
 
 Provides a Ruby wrapper around the CoreOS Fleet API.
 
@@ -64,6 +64,17 @@ This unit file would be represented as the following Ruby hash.
 	  }
 	}
 	
+If you need mutiple values for a single statement (like multiple `ExecStart` instructions) you can use an array of strings:
+
+	{
+	  'Unit' => {
+	    'Description' => 'Useless infinite loop'
+	  },
+	  'Service' => {
+	    'ExecStart' => ["/bin/bash -c \"while true; do sleep 1; done\"", "some other command"]
+	  }
+	}
+
 #### Loading a Unit File
 
 Equivalent of `fleetctl load`:
@@ -116,3 +127,10 @@ Equivalent of `fleetctl status`:
 
     client = Fleet.new
     client.status('forever.service')
+
+#### Listing Services
+
+Equivalent of `fleetctl list-units`:
+
+    client = Fleet.new
+    client.list

data/lib/fleet/client.rb

@@ -32,6 +32,29 @@ module Fleet
     include Fleet::Client::State
     include Fleet::Client::Unit
 
+    def list
+      machines = list_machines['node']['nodes'] || []
+      machine_ips = machines.each_with_object({}) do |machine, h|
+        m = JSON.parse(machine['nodes'].first['value'])
+        h[m['ID']] = m['PublicIP']
+      end
+
+      states = list_states['node']['nodes'] || []
+      states.map do |service|
+        s = JSON.parse(service['value'])
+        machine_id = s['machineState']['ID']
+
+        {
+          name: service['key'].split('/').last,
+          load_state: s['loadState'],
+          active_state: s['activeState'],
+          sub_state: s['subState'],
+          machine_id: machine_id,
+          machine_ip: machine_ips[machine_id]
+        }
+      end
+    end
+
     def load(name, service_def=nil, sync=false)
 
       unless name =~ /\A[a-zA-Z0-9:_.@-]+\Z/

data/lib/fleet/version.rb

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

data/spec/fleet/client_spec.rb

@@ -23,6 +23,64 @@ describe Fleet::Client do
     end
   end
 
+  describe '#list' do
+
+    let(:machine_list) do
+      {
+        'node' => {
+          'nodes' => [
+            {
+              'nodes' => [
+                { 'value' => '{"ID":"123","PublicIP":"1.1.1.1"}' }
+              ]
+            }
+          ]
+        }
+      }
+    end
+
+    let(:state_list) do
+      {
+        'node' => {
+          'nodes' => [
+            {
+              'key' => '/_coreos.com/fleet/state/foo.service',
+              'value' => '{"loadState":"a","activeState":"b","subState":"c","machineState":{"ID":"123"}}'
+            }
+          ]
+        }
+      }
+    end
+
+    before do
+      allow(subject).to receive(:list_machines).and_return(machine_list)
+      allow(subject).to receive(:list_states).and_return(state_list)
+    end
+
+    it 'looks-up the list of machines' do
+        expect(subject).to receive(:list_machines)
+        subject.list
+    end
+
+    it 'looks-up the list of job states' do
+        expect(subject).to receive(:list_states)
+        subject.list
+    end
+
+    it 'returns the list of units' do
+      expected = [{
+        name: 'foo.service', 
+        load_state: 'a', 
+        active_state: 'b',
+        sub_state: 'c',
+        machine_id: '123',
+        machine_ip: '1.1.1.1'
+      }]
+
+      expect(subject.list).to eq(expected)
+    end
+  end
+
   describe '#load' do
 
     let(:name) { 'foo.service' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleet-api
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - CenturyLink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday