gaptool-server 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e104a2cebdd054aa5135023d63ea35747dc367
-  data.tar.gz: 26f121dc66677f2c348accb0b977427949ffdff1
+  metadata.gz: acb18904b52ada4b97f260049347f4b31369a539
+  data.tar.gz: b147d771e2bee618239ce46c766f6618e386b197
 SHA512:
-  metadata.gz: 7067320bf747342049bb78ef54c87e9004c80ffa5ef758658ab66f65ad0e85acea0c512c1fe0656bdd42525eaab6855cabce6581d813922f921909d84efb2794
-  data.tar.gz: ca4b22b55230e0c75b889fc39d6e201c606be3dbefc3f035fb0bf3c056d6f6d2e00250e219b3c1714d1dccb04f10d5da6f8d82314b3146772bab5026ff2b44dd
+  metadata.gz: 1e9507428e6b1eb2bb0b6ca231c99a38912d94c31f0a7698b53d09ad2aa4daa5734c4acc1747ef3f35c442670fc618b3f8c03df1f8f4258e0bbb3136c345b2b0
+  data.tar.gz: 58c46d2d01fa4d1a1d7ea888f8ce33e61558dc4e5f469e9016e4e1103f25dfad00533309d82b4b9805016cea3da9655abb8b659af5bdeaff737e88d5941dec8a

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/routes.rb

@@ -104,6 +104,8 @@ module Gaptool
       initkey = Gaptool::Data.get_config('initkey')
       jdata = Gaptool::Data.server_chef_json(instance_id, env,
                                              'identity': initkey)
+      # force runlist
+      jdata['run_list'] ||= Gaptool::Data.default_runlist
 
       erb :init, locals: {
         initkey: initkey,

data/test/api_test.rb

@@ -56,7 +56,7 @@ describe 'Test API' do
   end
 
   def expanded_runlist
-    ['recipe[init]', 'recipe[myrecipe]']
+    ['role[base]', 'recipe[myrecipe]']
   end
 
   def version
@@ -190,14 +190,14 @@ describe 'Test API' do
   end
 
   it 'should remove default runlist' do
-    id = add_and_register_server(host_data.merge('chef_runlist' => ['recipe[init]']))['instance']
+    id = add_and_register_server(host_data.merge('chef_runlist' => ['role[base]']))['instance']
     get "/host/testrole/testenv/#{id}"
     resp = JSON.parse(last_response.body)
     expect(resp.keys).not_to include('chef_runlist')
   end
 
   it 'should remove default runlist from role' do
-    DH.save_role_data(host_data['role'], chef_runlist: ['recipe[init]'].to_json)
+    DH.save_role_data(host_data['role'], chef_runlist: ['role[base]'].to_json)
     id = add_and_register_server(host_data.reject { |k, _v| k == 'chef_runlist' })['instance']
     get "/host/testrole/testenv/#{id}"
     resp = JSON.parse(last_response.body)
@@ -280,6 +280,17 @@ describe 'Test API' do
     expect(last_response.body).to include("-E #{host_data['environment']}")
   end
 
+  it 'should init with the default runlist' do
+    hdata = host_data.select{ |k, _v| k != 'chef_runlist' }
+    add_and_register_server(hdata)
+    expect(last_response.body).to include('"run_list":["role[base]"],')
+  end
+
+  it 'should init with the host runlist' do
+    add_and_register_server
+    expect(last_response.body).to include('"run_list":["role[base]","recipe[myrecipe]"],')
+  end
+
   it 'should not find any hosts' do
     post '/init', host_data.to_json
     expect(last_response.status).to eq(200)
@@ -390,7 +401,7 @@ describe 'Test API' do
       'migrate' => false,
       'role' => host_data['role'],
       'rollback' => false,
-      'run_list' => ['recipe[init]', 'recipe[myrecipe]']
+      'run_list' => expanded_runlist
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Matt Bailey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra