fleet-api 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40cafdb1518899f8d9da9e7621e01bb0b77b2282
-  data.tar.gz: 29fdaa40bb4ff55aa9af252a2f75658d9b5d1c61
+  metadata.gz: e76824863766406ea4fa859149d71e42147f7509
+  data.tar.gz: 4fc476f3c9c283b7cc91f22f67ecb87fc8e4e6d6
 SHA512:
-  metadata.gz: 892ebd1582a5b7a84e7460e08573962dd66cf0cd446b111403f2e4f80623ad812cf6756e84df60dc48a53060bfcdba06f3b9172010530b2cda1e32fec51c0df2
-  data.tar.gz: 6748da6745a7a3dac060f9fbd56797cd01a91d5849da9e149bdd382373c778bd5977d8c4287c2802801f390aeee17c12cc8fd971e02efea1cb4503b02cf114d1
+  metadata.gz: b14298bc17e6aaf575e0fa1b7d130420c5345f808e66f38c23bb8ea9c4ee93359d4315ff13507f368825fda568016c659d587cbe0fa232fa5fe00ee89fe29971
+  data.tar.gz: 1fde940443cf548edd7e1255e7f654dfaffc1922fd65f13642785347b07cf8e252f4ff7551912ebc3ed1afe6ee2315554b0c2a51ef586393129a58d8dd6dbc65

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+1.1.0 - 2015-02-19
+------------------
+
+### Added
+- New submit method for submitting units without loading them
+
+### Fixed
+- Error where units are not loaded when submitted via the load method
+- Out-dated Gemfile.lock
+
 1.0.0 - 2015-02-17
 ------------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleet-api (0.6.0)
+    fleet-api (1.1.0)
       excon (>= 0.27.4)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     diff-lcs (1.2.5)
     docile (1.1.5)
-    excon (0.41.0)
+    excon (0.44.2)
     multi_json (1.10.1)
     rake (10.3.2)
     rspec (3.0.0)

data/README.md

@@ -66,9 +66,9 @@ If you need mutiple values for a single statement (like multiple `ExecStart` ins
       }
     }
 	
-#### Loading a Unit File
+#### Submitting a Unit File
 
-Equivalent of `fleetctl load`:
+Equivalent of `fleetctl submit`:
 
 	service = {
 	  'Unit' => {
@@ -80,9 +80,16 @@ Equivalent of `fleetctl load`:
 	}
 	
 	client = Fleet.new
-	client.load('forever.service', service)
+	client.submit('forever.service', service)
 	
-Note that the name you pass-in as the first parameter to the `.load` method should end in ".service"
+Note that the name you pass-in as the first parameter to the `.submit` method should end in ".service"
+
+#### Loading a Unit File
+
+Equivalent of `fleetctl load`:
+
+	client = Fleet.new
+	client.load('forever.service')
 
 #### Starting a Service
 

data/lib/fleet/client.rb

@@ -44,25 +44,30 @@ module Fleet
       end
     end
 
-    def load(name, service_def=nil)
+    def submit(name, service_def)
 
       unless name =~ /\A[a-zA-Z0-9:_.@-]+\Z/
         raise ArgumentError, 'name may only contain [a-zA-Z0-9:_.@-]'
       end
 
+      unless service_def.is_a?(ServiceDefinition)
+        service_def = ServiceDefinition.new(service_def)
+      end
+
+      begin
+        create_unit(name, service_def.to_unit(name))
+      rescue Fleet::PreconditionFailed
+      end
+    end
+
+    def load(name, service_def=nil)
+
       if service_def
-        unless service_def.is_a?(ServiceDefinition)
-          service_def = ServiceDefinition.new(service_def)
-        end
-
-        begin
-          create_unit(name, service_def.to_unit(name))
-        rescue Fleet::PreconditionFailed
-        end
-      else
-        opts = { 'desiredState' => 'loaded', 'name' => name }
-        update_unit(name, opts)
+        submit(name, service_def)
       end
+
+      opts = { 'desiredState' => 'loaded', 'name' => name }
+      update_unit(name, opts)
     end
 
     def start(name)

data/lib/fleet/version.rb

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

data/spec/fleet/client_spec.rb

@@ -77,83 +77,98 @@ describe Fleet::Client do
     end
   end
 
-  describe '#load' do
-
+  describe '#submit' do
     let(:name) { 'foo.service' }
     let(:service_def) { { 'Unit' => { 'Description' => 'bar' } } }
     let(:sd) { Fleet::ServiceDefinition.new(service_def) }
     let(:response) { double(:response) }
 
-    context 'when a service definition is provided' do
-      before do
-        allow(subject).to receive(:create_unit).and_return(response)
-        allow(Fleet::ServiceDefinition).to receive(:new).and_return(sd)
-      end
+    before do
+      allow(subject).to receive(:create_unit).and_return(response)
+      allow(Fleet::ServiceDefinition).to receive(:new).and_return(sd)
+    end
 
-      it 'invokes #create_unit' do
-        expect(subject).to receive(:create_unit)
-          .with(name, sd.to_unit(name))
+    it 'invokes #create_unit' do
+      expect(subject).to receive(:create_unit)
+        .with(name, sd.to_unit(name))
 
-        subject.load(name, service_def)
+      subject.submit(name, service_def)
+    end
+
+    it 'returns the #create_unit response' do
+      r = subject.submit(name, service_def)
+      expect(r).to eq response
+    end
+
+    context 'when #create_unit raises PreconditionFailed' do
+
+      before do
+        allow(subject).to receive(:create_unit)
+          .and_raise(Fleet::PreconditionFailed.new('boom'))
       end
 
-      it 'returns the #create_unit response' do
-        r = subject.load(name, service_def)
-        expect(r).to eq response
+      it 'does not blow up' do
+        expect { subject.submit(name, service_def) }.to_not raise_error
       end
+    end
 
-      context 'when #create_unit raises PreconditionFailed' do
+    context 'when #create_unit raises something other than PreconditionFailed' do
 
-        before do
-          allow(subject).to receive(:create_unit)
-            .and_raise(Fleet::PreconditionFailed.new('boom'))
-        end
+      before do
+        allow(subject).to receive(:create_unit)
+          .and_raise(Fleet::BadRequest.new('boom'))
+      end
 
-        it 'does not blow up' do
-          expect { subject.load(name, service_def) }.to_not raise_error
-        end
+      it 'propagates the error' do
+        expect { subject.submit(name, service_def) }.to(raise_error(Fleet::BadRequest))
       end
+    end
 
-      context 'when #create_unit raises something other than PreconditionFailed' do
+    context 'when the supplied name is invalid' do
 
-        before do
-          allow(subject).to receive(:create_unit)
-            .and_raise(Fleet::BadRequest.new('boom'))
-        end
+      let(:name) { 'foo!.service' }
 
-        it 'propagates the error' do
-          expect { subject.load(name, service_def) }.to(raise_error(Fleet::BadRequest))
-        end
+      it 'raises an ArgumentError' do
+        expect { subject.submit(name, nil) }.to raise_error(ArgumentError, /only contain/)
       end
     end
+  end
 
-    context 'when no service definition is provided' do
+  describe '#load' do
 
-      before do
-        allow(subject).to receive(:update_unit).and_return(response)
-      end
+    let(:name) { 'foo.service' }
+    let(:response) { double(:response) }
 
-      it 'does NOT invoke #create_unit' do
-        expect(subject).to_not receive(:create_unit)
-        subject.load(name)
-      end
+    before do
+      allow(subject).to receive(:update_unit).and_return(response)
+    end
 
-      it 'invokes #update' do
-        expect(subject).to receive(:update_unit)
-          .with(name, { 'desiredState' => 'loaded', 'name' => name })
+    it 'does NOT invoke #submit' do
+      expect(subject).not_to receive(:submit)
+      subject.load(name)
+    end
 
-        subject.load(name)
-      end
+    it 'invokes #update' do
+      expect(subject).to receive(:update_unit)
+        .with(name, { 'desiredState' => 'loaded', 'name' => name })
+
+      subject.load(name)
     end
 
-    context 'when the supplied name is invalid' do
+    context 'when a service definition is provided' do
 
-      let(:name) { 'foo!.service' }
+      let(:service_def) { { 'Unit' => { 'Description' => 'bar' } } }
 
-      it 'raises an ArgumentError' do
-        expect { subject.load(name, nil) }.to raise_error(ArgumentError, /only contain/)
+      before do
+        allow(subject).to receive(:submit)
+      end
+      
+      it 'invokes #load' do
+        expect(subject).to receive(:submit)
+        subject.load(name, service_def)
       end
     end
+
   end
 
   describe '#start' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleet-api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - CenturyLink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon