fleet-api 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3632dd50614806a6d05b70c954da24146cebf83
-  data.tar.gz: 94458c2c48317cab5e2e7e18c8ea1ea0aae1c9c6
+  metadata.gz: 5c53fd4743be330713996996781ccfc244868131
+  data.tar.gz: 3e3fcb5fc7aa92b37944954975ea663dd2c7cb96
 SHA512:
-  metadata.gz: c55fa3e17aa13c9167d048196d373295ad39dfeb334567299b9f1b9e4a54a92c02dc4d9d695ded62aee0f173d1bd312925eb76fba5cf66197dc615f6f9be0e54
-  data.tar.gz: e82ec57fd09b71077a5b48e8f74d8daf053f4519ec263da0f3b729f728a1e445c60459eb07ea92188080ed7877276ffa061eabff9391edfd83eb01addaa38b49
+  metadata.gz: 9e10c7a3c3db3aa443dd971f636fe0b99185a06a2535908243b514eae402d8b39e9087724b1c7304bfb28ce3b865eadd8ac9dde1b90ef854c2394ea5105ac13d
+  data.tar.gz: 661108e5c653840a37e6c9921b516c327eeeda9f1cb0fe67301099d025b0d7178988e688fc574edb926f1db2a425eb84aa9000ce28e9bcbcf53a62ed93e6b315

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+0.8.0 - 2014-11-07
+------------------
+
+### Added
+- Support for mutl-value options in unit file
+- Enforcement of Fleet service naming conventions
+
 0.6.1 - 2014-09-20
 ------------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleet-api (0.6.1)
+    fleet-api (0.8.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.6.0 of Fleet.
+The current version of the *fleet-api* gem is known to work with version 0.8.0 of Fleet.
 
 ### Installation
 

data/lib/fleet/client.rb

@@ -34,6 +34,10 @@ module Fleet
 
     def load(name, service_def=nil, sync=false)
 
+      unless name =~ /\A[a-zA-Z0-9:_.@-]+\Z/
+        raise ArgumentError, 'name may only contain [a-zA-Z0-9:_.@-]'
+      end
+
       if service_def
         unless service_def.is_a?(ServiceDefinition)
           service_def = ServiceDefinition.new(name, service_def)

data/lib/fleet/service_definition.rb

@@ -35,7 +35,11 @@ module Fleet
 
         if section.is_a?(Enumerable)
           section.each do |key, value|
-            raw_string += "#{key}=#{value}\n"
+            if value.is_a?(Enumerable)
+              value.each { |command| raw_string += "#{key}=#{command}\n" }
+            else
+              raw_string += "#{key}=#{value}\n"
+            end
           end
         end
 

data/lib/fleet/version.rb

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

data/spec/fleet/client_spec.rb

@@ -162,6 +162,15 @@ describe Fleet::Client do
         end
       end
     end
+
+    context 'when the supplied name is invalid' do
+
+      let(:name) { 'foo!.service' }
+
+      it 'raises an ArgumentError' do
+        expect { subject.load(name, nil) }.to raise_error(ArgumentError, /only contain/)
+      end
+    end
   end
 
   describe '#start' do

data/spec/fleet/service_definition_spec.rb

@@ -10,6 +10,7 @@ describe Fleet::ServiceDefinition do
         'Description' => 'infinite loop'
       },
       'Service' => {
+        'ExecStartPre' => ['foo', 'bar'],
         'ExecStart' => "/bin/bash -c \"while true; do sleep 1; done\""
       }
     }
@@ -41,6 +42,8 @@ describe Fleet::ServiceDefinition do
 Description=#{service_hash['Unit']['Description']}
 
 [Service]
+ExecStartPre=#{service_hash['Service']['ExecStartPre'].first}
+ExecStartPre=#{service_hash['Service']['ExecStartPre'].last}
 ExecStart=#{service_hash['Service']['ExecStart']}
 UNIT_FILE
 
@@ -58,7 +61,7 @@ UNIT_FILE
 
       expected = {
         'Name' => name,
-        'UnitHash' => [111, 150, 87, 109, 217, 26, 190, 221, 31, 28, 8, 211, 198, 126, 76, 157, 106, 164, 220, 134]
+        'UnitHash' => [173,163,19,156,23,184,6,223,77,240,208,230,238,54,179,201,80,147,228,89]
       }
 
       expect(subject.to_job).to eq expected
@@ -70,7 +73,7 @@ UNIT_FILE
     subject { described_class.new(name, service_hash) }
 
     it 'generates the appropriate sha1 hash' do
-      expect(subject.sha1).to eq '6f96576dd91abedd1f1c08d3c67e4c9d6aa4dc86'
+      expect(subject.sha1).to eq 'ada3139c17b806df4df0d0e6ee36b3c95093e459'
     end
   end
 end

metadata

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