fleet-api 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9884b83b1cc12a5a754d0026501f14d07f2a7eaf
-  data.tar.gz: e434bfd9213128f9c1e72e3af63251e98a116ab3
+  metadata.gz: fc67d53034f0f63cc50eb450214eb215f3a8066a
+  data.tar.gz: fa261735dc741aee77142943541075964e1b08d5
 SHA512:
-  metadata.gz: 8910d52994d4e7cad4aa417db58a1f435c0d21e9a8fa6103794f5aec29de86ddec78711d0aa78462692eda6e9a4d8d0db741e8c97800f1b812789b66c447ffd5
-  data.tar.gz: 53ac7bd82a4bf902d5c1bcc7ccf973bc317d1c594d1bd51066093875ef08908182eb2164e308292870664a3aef7fbf9e0c6bbf2de27ef49ae72165be9d33e0cd
+  metadata.gz: 7830f480923b8f7a1c6c854afe89483f02d7fd611e66c1a9d757aa26e37696c50726512720388e1b9887caa54298d0ff1360543d99cc4867c0209b6eaff60a23
+  data.tar.gz: 781530a7570c4389ecf4fe8966a33933d89d1f3fcb7300b0f98c3c5af4a8d64a8676a80e219665efd73e919ddc36cdaa906d7a8a20f765845599dcbed298b7bf

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+0.6.0 - 2014-09-05
+------------------
+
+### Added
+- Compatibility for Fleet 0.6.x (not backward compatible with older versions of Fleet)
+
 0.5.3 - 2014-08-26
 ------------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleet-api (0.5.3)
+    fleet-api (0.6.0)
       faraday (= 0.8.9)
       faraday_middleware (= 0.9.0)
 

data/README.md

@@ -14,7 +14,7 @@ As work on the actual Fleet API progresses, this library will be refactored to u
 
 An alternative implementation is available in the [cloudspace/ruby-fleetctl](https://github.com/cloudspace/ruby-fleetctl) gem. The *ruby-fleetctl* gem takes a different approach and uses SSH to interact directly with the *fleetctl* binary to send commands. Our approach of writing directly to etcd cuts out the *fleetctl* middleman but is in more danger of being broken by future releases since we're effectively using a "private API".
 
-The current version of the *fleet-api* gem is known to work with version 0.5.0 of Fleet which ships with the the current stable version of CoreOS (367.1.0)
+The current version of the *fleet-api* gem is known to work with version 0.6.0 of Fleet.
 
 ### Installation
 

data/lib/fleet/client.rb

@@ -12,8 +12,8 @@ module Fleet
   class Client
 
     FLEET_PATH = 'v2/keys/_coreos.com/fleet'
-    MAX_RETRIES = 10
-    SLEEP_TIME = (4.0 / MAX_RETRIES.to_f)
+    MAX_RETRIES = 20
+    SLEEP_TIME = (10.0 / MAX_RETRIES.to_f)
 
     attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
 
@@ -65,7 +65,7 @@ module Fleet
 
     def unload(service_name)
       update_job_target_state(service_name, :inactive)
-      wait_for_load_state(service_name, 'not-found')
+      wait_for_load_state(service_name, :no_state)
     end
 
     def destroy(service_name)

data/lib/fleet/service_definition.rb

@@ -11,10 +11,7 @@ module Fleet
     end
 
     def to_unit
-      {
-        'Contents' => unit_body,
-        'Raw' => raw
-      }
+      { 'Raw' => raw }
     end
 
     def to_job
@@ -30,14 +27,6 @@ module Fleet
 
     private
 
-    def unit_body
-      @service_def.each_with_object({}) do |(heading, section), memo|
-        memo[heading] = section.each_with_object({}) do |(key, value), memo|
-          memo[key] = [value]
-        end
-      end
-    end
-
     def raw
       raw_string = ''
 

data/lib/fleet/version.rb

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

data/spec/fleet/client_spec.rb

@@ -190,13 +190,9 @@ describe Fleet::Client do
   describe '#unload' do
     let(:service_name) { 'foo.service' }
 
-    let(:fleet_state) do
-      { 'node' => { 'value' => '{ "load_state": "not-found" }' } }
-    end
-
     before do
       allow(subject).to receive(:update_job_target_state)
-      allow(subject).to receive(:get_state).and_return(fleet_state)
+      allow(subject).to receive(:get_state).and_raise(Fleet::NotFound, 'boom')
     end
 
     it 'invokes #update_job_target_state' do
@@ -213,13 +209,17 @@ describe Fleet::Client do
 
     context 'when the unload state cannot be achieved' do
 
+      let(:fleet_state) do
+        { 'node' => { 'value' => '{ "load_state": "loaded" }' } }
+      end
+
       before do
-        allow(subject).to receive(:get_state).and_raise(Fleet::NotFound, 'boom')
+        allow(subject).to receive(:get_state).and_return(fleet_state)
         allow(subject).to receive(:sleep)
       end
 
-      it 're-checks the state 10 times' do
-        expect(subject).to receive(:get_state).exactly(10).times
+      it 're-checks the state 20 times' do
+        expect(subject).to receive(:get_state).exactly(20).times
         subject.unload(service_name) rescue nil
       end
 

data/spec/fleet/service_definition_spec.rb

@@ -44,17 +44,7 @@ Description=#{service_hash['Unit']['Description']}
 ExecStart=#{service_hash['Service']['ExecStart']}
 UNIT_FILE
 
-      expected = {
-        'Contents' => {
-          'Unit' => {
-            'Description' => [service_hash['Unit']['Description']]
-          },
-          'Service' => {
-            'ExecStart' => [service_hash['Service']['ExecStart']]
-          }
-        },
-        'Raw' => raw
-      }
+      expected = { 'Raw' => raw }
 
       expect(subject.to_unit).to eq expected
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleet-api
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - CenturyLink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday