rundeck 1.2.0 → 1.2.1

data/spec/cassettes/12/{create_token.yml → token/token_create.yml}

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: http://192.168.50.2:4440/api/12/tokens/admin
+    uri: http://192.168.50.2:4440/api/12/tokens/dev
     body:
       encoding: UTF-8
       string: ''
     headers:
       X-Rundeck-Auth-Token:
-      - cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd
+      - OPIfQ6MOnevhlFThG1af4GAcbPdAgh0B
       Accept:
       - application/xml
   response:
@@ -17,7 +17,7 @@ http_interactions:
       message: Created
     headers:
       Set-Cookie:
-      - JSESSIONID=1941ar9mgoofz1m1uwnn1ocgyy;Path=/
+      - JSESSIONID=nrtyr7wl9xfx2yon44aglrlh;Path=/
       Expires:
       - Thu, 01 Jan 1970 00:00:00 GMT
       X-Rundeck-Api-Xml-Response-Wrapper:
@@ -32,7 +32,7 @@ http_interactions:
       - Jetty(7.6.0.v20120127)
     body:
       encoding: UTF-8
-      string: <token id='cbsQgUIZBOyCgoipJAwKd1YgfcwPJ0FY' user='admin' />
+      string: "<token id='X52YPTWGsfivVPQWb6gXyTtAYjITJy0g' user='dev' />"
     http_version: 
-  recorded_at: Sun, 23 Nov 2014 16:00:00 GMT
+  recorded_at: Sun, 18 Jan 2015 00:33:05 GMT
 recorded_with: VCR 2.9.3

data/spec/cassettes/12/token/token_delete.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: delete
+    uri: http://192.168.50.2:4440/api/12/token/eJ17Hkuu7PCTdKAMzMcLAR0yzdzkscQX
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Rundeck-Auth-Token:
+      - OPIfQ6MOnevhlFThG1af4GAcbPdAgh0B
+      Accept:
+      - application/xml
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Set-Cookie:
+      - JSESSIONID=1o1l2lq5rwpt5w8vebv2ryef8;Path=/
+      Expires:
+      - Thu, 01 Jan 1970 00:00:00 GMT
+      Content-Type:
+      - text/html;charset=UTF-8
+      Server:
+      - Jetty(7.6.0.v20120127)
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Sun, 18 Jan 2015 04:55:22 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/12/{token_invalid.yml → token/token_error.yml}

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       X-Rundeck-Auth-Token:
-      - cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd
+      - vDCT9dP6evCJYHtWoivruQtymkLTGJXq
       Accept:
       - application/xml
   response:
@@ -17,7 +17,7 @@ http_interactions:
       message: Not Found
     headers:
       Set-Cookie:
-      - JSESSIONID=1t9cqr0wjp3o2r25nlk84cvyg;Path=/
+      - JSESSIONID=vyo63pc7bb4t1keqipdw36amh;Path=/
       Expires:
       - Thu, 01 Jan 1970 00:00:00 GMT
       Content-Type:
@@ -37,5 +37,5 @@ http_interactions:
           </error>
         </result>
     http_version: 
-  recorded_at: Sun, 23 Nov 2014 15:47:50 GMT
+  recorded_at: Sat, 17 Jan 2015 22:11:44 GMT
 recorded_with: VCR 2.9.3

data/spec/cassettes/12/{tokens_multiple.yml → token/tokens_multiple.yml}

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       X-Rundeck-Auth-Token:
-      - cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd
+      - vDCT9dP6evCJYHtWoivruQtymkLTGJXq
       Accept:
       - application/xml
   response:
@@ -17,7 +17,7 @@ http_interactions:
       message: OK
     headers:
       Set-Cookie:
-      - JSESSIONID=yibh2tyfyj2g145fkj676ob7x;Path=/
+      - JSESSIONID=1tec3q64941ofui9caz43bdpf;Path=/
       Expires:
       - Thu, 01 Jan 1970 00:00:00 GMT
       X-Rundeck-Api-Xml-Response-Wrapper:
@@ -33,10 +33,10 @@ http_interactions:
     body:
       encoding: UTF-8
       string: |-
-        <tokens count='2' allusers='true'>
-          <token id='cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd' user='admin' />
-          <token id='uuyuaroo9Cheexe0ao9cohrohjeu8shu' user='user2' />
+        <tokens count='5' allusers='true'>
+          <token id='vDCT9dP6evCJYHtWoivruQtymkLTGJXq' user='admin' />
+          <token id='GAO3Z9U73Yow3MlDC41JmU8Z2bMmAZaV' user='dev' />
         </tokens>
     http_version: 
-  recorded_at: Sun, 23 Nov 2014 15:24:02 GMT
+  recorded_at: Sat, 17 Jan 2015 22:36:41 GMT
 recorded_with: VCR 2.9.3

data/spec/cassettes/12/{tokens_single.yml → token/tokens_single.yml}

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       X-Rundeck-Auth-Token:
-      - cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd
+      - vDCT9dP6evCJYHtWoivruQtymkLTGJXq
       Accept:
       - application/xml
   response:
@@ -17,7 +17,7 @@ http_interactions:
       message: OK
     headers:
       Set-Cookie:
-      - JSESSIONID=yibh2tyfyj2g145fkj676ob7x;Path=/
+      - JSESSIONID=kqe2pxi1f10u1fmrz86b9c4r7;Path=/
       Expires:
       - Thu, 01 Jan 1970 00:00:00 GMT
       X-Rundeck-Api-Xml-Response-Wrapper:
@@ -33,9 +33,9 @@ http_interactions:
     body:
       encoding: UTF-8
       string: |-
-        <tokens count='1' allusers='true'>
-          <token id='cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd' user='admin' />
+        <tokens count='5' allusers='true'>
+          <token id='vDCT9dP6evCJYHtWoivruQtymkLTGJXq' user='admin' />
         </tokens>
     http_version: 
-  recorded_at: Sun, 23 Nov 2014 15:24:02 GMT
+  recorded_at: Sat, 17 Jan 2015 22:36:40 GMT
 recorded_with: VCR 2.9.3

data/spec/cassettes/12/{tokens_user.yml → token/tokens_user.yml}

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: http://192.168.50.2:4440/api/12/tokens/admin
+    uri: http://192.168.50.2:4440/api/12/tokens/dev
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Rundeck-Auth-Token:
-      - cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd
+      - OPIfQ6MOnevhlFThG1af4GAcbPdAgh0B
       Accept:
       - application/xml
   response:
@@ -17,7 +17,7 @@ http_interactions:
       message: OK
     headers:
       Set-Cookie:
-      - JSESSIONID=1hrguobtwmxjgvyr55bwwd495;Path=/
+      - JSESSIONID=ng8vxyg7q5qqjipbu295jctq;Path=/
       Expires:
       - Thu, 01 Jan 1970 00:00:00 GMT
       X-Rundeck-Api-Xml-Response-Wrapper:
@@ -33,9 +33,10 @@ http_interactions:
     body:
       encoding: UTF-8
       string: |-
-        <tokens count='1' user='admin'>
-          <token id='cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd' user='admin' />
+        <tokens count='5' user='dev'>
+          <token id='eJ17Hkuu7PCTdKAMzMcLAR0yzdzkscQX' user='dev' />
+          <token id='XnMEQWugSGz5hDmLtOiQ5NeqGveBQqwz' user='dev' />
         </tokens>
     http_version: 
-  recorded_at: Sun, 23 Nov 2014 15:36:11 GMT
+  recorded_at: Sun, 18 Jan 2015 00:30:08 GMT
 recorded_with: VCR 2.9.3

data/spec/rundeck/client/key_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 
 describe Rundeck::Client do
   describe '.keys' do
-    # The anvils demo doesn't have any keys by default.
-    # Create a public key at path /path/to/key and a private key
-    # at /path/to/private_key using the data from the helper methods.
-    # Create the public key first.
     context 'with a path containing multiple keys',
-            vcr: { cassette_name: 'keys_multiple' } do
+            vcr: { cassette_name: 'key/key_multiple' } do
       before do
+        prepare do
+          Rundeck.create_public_key('path/to/key', public_key)
+          Rundeck.create_private_key('path/to/private_key', private_key)
+        end
         @keys = Rundeck.keys('path/to')
       end
       subject { @keys }
 
       it { is_expected.to be_an Array }
 
-      context 'the first key' do
-        subject { @keys.first }
+      context 'the public key' do
+        subject { @keys.detect { |key| key.name == 'key' } }
 
         its(:name) { is_expected.to eq('key') }
         its(:type) { is_expected.to eq('file') }
@@ -24,9 +24,11 @@ describe Rundeck::Client do
         it { is_expected.to respond_to(:path) }
 
         describe '#resource_meta' do
-          subject { @keys.first.resource_meta }
+          subject { @keys.detect { |key| key.name == 'key' }.resource_meta }
 
-          its(:rundeck_content_type) { is_expected.to eq('application/pgp-key') }
+          its(:rundeck_content_type) do
+            is_expected.to eq('application/pgp-key')
+          end
         end
       end
 
@@ -36,7 +38,7 @@ describe Rundeck::Client do
     end
 
     context 'with a path containing no keys',
-            vcr: { cassette_name: 'keys_none' } do
+            vcr: { cassette_name: 'key/key_error' } do
       specify do
         expect do
           Rundeck.keys('path/to/nowhere')
@@ -45,7 +47,7 @@ describe Rundeck::Client do
     end
 
     context 'with a direct path to a key',
-            vcr: { cassette_name: 'keys_direct' } do
+            vcr: { cassette_name: 'key/key_direct' } do
       specify do
         expect do
           Rundeck.keys('path/to/key')
@@ -58,7 +60,7 @@ describe Rundeck::Client do
 
   describe '.key_metadata' do
     context 'with a direct path to a key',
-            vcr: { cassette_name: 'key_metadata_direct' } do
+            vcr: { cassette_name: 'key/metadata_direct' } do
       before do
         @key = Rundeck.key_metadata('path/to/key')
       end
@@ -73,7 +75,7 @@ describe Rundeck::Client do
     end
 
     context 'with a path containing multiple keys',
-            vcr: { cassette_name: 'key_metadata_multiple' } do
+            vcr: { cassette_name: 'key/metadata_multiple' } do
       specify do
         expect do
           Rundeck.key_metadata('path/to')
@@ -86,7 +88,7 @@ describe Rundeck::Client do
 
   describe '.key_contents' do
     context 'with a direct path to a key',
-            vcr: { cassette_name: 'key_contents_direct' } do
+            vcr: { cassette_name: 'key/contents_direct' } do
       before do
         @key = Rundeck.key_contents('path/to/key')
       end
@@ -104,7 +106,7 @@ describe Rundeck::Client do
     end
 
     context 'with a path containing multiple keys',
-            vcr: { cassette_name: 'key_contents_multiple' } do
+            vcr: { cassette_name: 'key/contents_multiple' } do
       specify do
         expect do
           Rundeck.key_contents('path/to')
@@ -115,7 +117,7 @@ describe Rundeck::Client do
     end
 
     context 'with a path to a private key',
-            vcr: { cassette_name: 'key_contents_private' } do
+            vcr: { cassette_name: 'key/contents_private' } do
       specify do
         expect do
           Rundeck.key_contents('path/to/private_key')
@@ -127,7 +129,7 @@ describe Rundeck::Client do
   end
 
   describe '.create_private_key',
-           vcr: { cassette_name: 'create_private_key' } do
+           vcr: { cassette_name: 'key/create_private' } do
     before do
       @key = Rundeck.create_private_key('path/to/private_key2', private_key)
     end
@@ -144,7 +146,7 @@ describe Rundeck::Client do
   end
 
   describe '.update_private_key',
-           vcr: { cassette_name: 'update_private_key' } do
+           vcr: { cassette_name: 'key/update_private' } do
     before do
       @key = Rundeck.update_private_key('path/to/private_key2', private_key)
     end
@@ -162,7 +164,7 @@ describe Rundeck::Client do
   end
 
   describe '.create_public_key',
-           vcr: { cassette_name: 'create_public_key' } do
+           vcr: { cassette_name: 'key/create_public' } do
     before do
       @key = Rundeck.create_public_key('path/to/public_key2', public_key)
     end
@@ -179,7 +181,7 @@ describe Rundeck::Client do
   end
 
   describe '.update_public_key',
-           vcr: { cassette_name: 'update_public_key' } do
+           vcr: { cassette_name: 'key/update_public' } do
     before do
       @key = Rundeck.update_public_key('path/to/public_key2', public_key)
     end
@@ -204,7 +206,7 @@ describe Rundeck::Client do
       subject { @key }
 
       context 'public key path',
-              vcr: { cassette_name: 'delete_key_public' } do
+              vcr: { cassette_name: 'key/delete_public' } do
         let(:path) { 'path/to/public_key2' }
 
         it { is_expected.to be_nil }
@@ -214,7 +216,7 @@ describe Rundeck::Client do
       end
 
       context 'private key path',
-              vcr: { cassette_name: 'delete_key_private' } do
+              vcr: { cassette_name: 'key/delete_private' } do
         let(:path) { 'path/to/private_key2' }
 
         it { is_expected.to be_nil }
@@ -225,7 +227,7 @@ describe Rundeck::Client do
     end
 
     context 'with a bad path',
-            vcr: { cassette_name: 'delete_key_invalid' } do
+            vcr: { cassette_name: 'key/delete_error' } do
       specify do
         expect do
           Rundeck.delete_key('path/to/nowhere')

data/spec/rundeck/client/project_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Rundeck::Client do
-  describe '.projects', vcr: { cassette_name: 'projects' } do
+  describe '.projects', vcr: { cassette_name: 'project/projects' } do
     before do
+      prepare { Rundeck.create_project(project_anvils, 'json') }
       @projects = Rundeck.projects
     end
     subject { @projects }
@@ -28,7 +29,7 @@ describe Rundeck::Client do
       subject { @project }
 
       context 'create with json format',
-              vcr: { cassette_name: 'create_project_json' } do
+              vcr: { cassette_name: 'project/create_json' } do
         let(:content) { project_json }
         let(:format) { 'json' }
 
@@ -41,7 +42,7 @@ describe Rundeck::Client do
       end
 
       context 'create with xml format',
-              vcr: { cassette_name: 'create_project_xml' } do
+              vcr: { cassette_name: 'project/create_xml' } do
         let(:content) { project_xml }
         let(:format) { 'xml' }
 
@@ -55,7 +56,7 @@ describe Rundeck::Client do
     end
 
     context 'when project already exists',
-            vcr: { cassette_name: 'create_project_invalid' } do
+            vcr: { cassette_name: 'project/create_error' } do
       specify do
         expect do
           Rundeck.create_project(project_anvils, 'json')
@@ -67,7 +68,7 @@ describe Rundeck::Client do
 
   describe '.project' do
     context 'when the project exists',
-            vcr: { cassette_name: 'project_valid' } do
+            vcr: { cassette_name: 'project/project' } do
       before do
         @project = Rundeck.project('anvils')
       end
@@ -78,7 +79,7 @@ describe Rundeck::Client do
     end
 
     context 'when the project does not exist',
-            vcr: { cassette_name: 'project_invalid' } do
+            vcr: { cassette_name: 'project/project_error' } do
       specify do
         expect do
           Rundeck.project('nonexistent')
@@ -90,10 +91,12 @@ describe Rundeck::Client do
 
   describe '.delete_project' do
     context 'when a project exists',
-            vcr: { cassette_name: 'delete_project_valid' } do
+            vcr: { cassette_name: 'project/delete' } do
       before do
+        prepare { Rundeck.create_project(project_deleteme) }
         @project = Rundeck.delete_project(project)
       end
+
       let(:project) { 'anvils' }
       subject { @project }
 
@@ -105,10 +108,10 @@ describe Rundeck::Client do
     end
 
     context 'when a project does not exist',
-            vcr: { cassette_name: 'delete_project_invalid' } do
+            vcr: { cassette_name: 'project/delete_error' } do
       specify do
         expect do
-          Rundeck.delete_project('project1')
+          Rundeck.delete_project('nonexistent')
         end.to raise_error(Rundeck::Error::NotFound,
                            /Project does not exist/)
       end

data/spec/rundeck/client/token_spec.rb

@@ -11,7 +11,7 @@ describe Rundeck::Client do
       let(:user) { nil }
 
       context 'when a single token is returned',
-              vcr: { cassette_name: 'tokens_single' } do
+              vcr: { cassette_name: 'token/tokens_single' } do
         it { is_expected.to be_a Rundeck::ObjectifiedHash }
         its(:token) { is_expected.to be_a Rundeck::ObjectifiedHash }
         its(:allusers) { is_expected.to eq('true') }
@@ -22,44 +22,48 @@ describe Rundeck::Client do
       end
 
       context 'when multiple tokens are returned',
-              vcr: { cassette_name: 'tokens_multiple' } do
+              vcr: { cassette_name: 'token/tokens_multiple' } do
+        before { prepare { Rundeck.create_token('dev') } }
+
         it { is_expected.to be_a Rundeck::ObjectifiedHash }
         its(:token) { is_expected.to be_an Array }
         its(:allusers) { is_expected.to eq('true') }
       end
     end
 
-    context 'when user is specified', vcr: { cassette_name: 'tokens_user' } do
-      let(:user) { 'admin' }
+    context 'when user is specified',
+            vcr: { cassette_name: 'token/tokens_user' } do
+      before { prepare { Rundeck.create_token('dev') } }
+      let(:user) { 'dev' }
 
       it { is_expected.to be_a Rundeck::ObjectifiedHash }
-      its(:user) { is_expected.to eq('admin') }
+      its(:user) { is_expected.to eq(user) }
 
       describe '#token' do
-        subject { @tokens.token }
+        subject { @tokens.token.first }
 
         it_behaves_like 'a token'
-        its(:user) { is_expected.to eq('admin') }
+        its(:user) { is_expected.to eq(user) }
       end
     end
   end
 
   describe '.token' do
-    context 'when a token exists', vcr: { cassette_name: 'token' } do
+    context 'when a token exists', vcr: { cassette_name: 'token/token' } do
       before do
-        @token = Rundeck.token('cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd')
+        @token = Rundeck.token(Rundeck.api_token)
       end
       subject { @token }
 
       it_behaves_like 'a token'
 
       it 'expects a get to have been made' do
-        expect(a_get('/token/cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd')).to have_been_made
+        expect(a_get("/token/#{Rundeck.api_token}")).to have_been_made
       end
     end
 
     context 'when a token does not exist',
-            vcr: { cassette_name: 'token_invalid' } do
+            vcr: { cassette_name: 'token/token_error' } do
       specify do
         expect do
           Rundeck.token('123456')
@@ -70,24 +74,30 @@ describe Rundeck::Client do
   end
 
   describe '.create_token' do
-    context 'when the user exists', vcr: { cassette_name: 'create_token' } do
+    context 'when the user exists',
+            vcr: { cassette_name: 'token/token_create' } do
       before do
-        @token = Rundeck.create_token('admin')
+        @token = Rundeck.create_token('dev')
       end
       subject { @token }
 
       it_behaves_like 'a token'
 
       it 'expects a post to have been made' do
-        expect(a_post('/tokens/admin')).to have_been_made
+        expect(a_post('/tokens/dev')).to have_been_made
       end
     end
   end
 
   describe '.delete_token' do
-    context 'when a token exists', vcr: { cassette_name: 'delete_token' } do
+    context 'when a token exists',
+            vcr: { cassette_name: 'token/token_delete',
+                   match_requests_on: [:method] } do
       before do
-        @token = Rundeck.delete_token('cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd')
+        VCR.use_cassette('token/tokens_user') do
+          @dev_tokens = Rundeck.tokens('dev')
+        end
+        @token = Rundeck.delete_token(@dev_tokens.token.first.id)
       end
       subject { @token }
 
@@ -95,13 +105,13 @@ describe Rundeck::Client do
 
       it 'expects a delete to have been made' do
         expect(
-          a_delete('/token/cmJQYoy9EAsSd0905yNjKDNGs0ESIwEd')
+          a_delete("/token/#{@dev_tokens.token.first.id}")
         ).to have_been_made
       end
     end
 
     context 'when a token does not exist',
-            vcr: { cassette_name: 'delete_token_invalid' } do
+            vcr: { cassette_name: 'token/delete_error' } do
       specify do
         expect do
           Rundeck.delete_token('123456')