[COOK-4287] - Updating test harness. Disabling old format chefspecs

.gitignore

@@ -12,3 +12,4 @@ Gemfile.lock
 .kitchen
 bin
 .kitchen.local.yml
+.coverage

.kitchen.cloud.yml

@@ -0,0 +1,91 @@
+---
+driver_config:
+  digitalocean_client_id: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %>
+  digitalocean_api_key: <%= ENV['DIGITAL_OCEAN_API_KEY'] %>
+
+provisioner:
+  name: chef_zero
+  require_chef_omnibus: latest
+
+platforms:
+- name: debian-70
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 308287
+    flavor_id: 63
+    region_id: 4
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+  run_list:
+  - recipe[apt]
+
+- name: ubuntu-1004
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 14097
+    flavor_id: 63
+    region_id: 4
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+  run_list:
+  - recipe[apt]
+
+- name: ubuntu-1204
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 1505447
+    flavor_id: 63
+    region_id: 4
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+  run_list:
+  - recipe[apt]
+
+- name: ubuntu-1304
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 350076
+    flavor_id: 63
+    region_id: 4
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+  run_list:
+  - recipe[apt]
+
+- name: ubuntu-1310
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 1505699
+    flavor_id: 63
+    region_id: 4
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+  run_list:
+  - recipe[apt]
+
+suites:
+  - name: default
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test]
+
+  - name: cacher-client
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::cacher-client]
+
+  - name: cacher-ng
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::cacher-ng]
+
+  - name: cacher-ng-client
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::cacher-ng-client]
+    attributes:
+      apt:
+        cacher_dir: '/tmp/apt-cacher'
+        cacher_port: '9876'
+        cacher_interface: 'eth0'
+        compiletime: true
+
+  - name: lwrps
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::lwrps]

.kitchen.yml

@@ -1,101 +1,46 @@
----
-driver_plugin: vagrant
-driver_plugin: digitalocean
-driver_config:
-  digitalocean_client_id: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %>
-  digitalocean_api_key: <%= ENV['DIGITAL_OCEAN_API_KEY'] %>
-  aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %> 
-  aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
-  aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
-  ssh_key: <%= ENV['AWS_PRIVATE_KEY_PATH'] %>
-  rackspace_username: <%= ENV['RACKSPACE_USERNAME'] %>
-  rackspace_api_key: <%= ENV['RACKSPACE_API_KEY'] %>
-  require_chef_omnibus: latest
-  sudo: false
+driver:
+  name: vagrant
 
 platforms:
-- name: debian-70
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 308287
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-1004
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 14097
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-1204
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 1505447
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-1304
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 350076
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-1310
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 1505699
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-  run_list:
-  - recipe[apt]
+  - name: debian-7.2.0
+    run_list: apt::default
+  - name: ubuntu-10.04
+    run_list: apt::default
+  - name: ubuntu-12.04
+    run_list: apt::default
+  - name: ubuntu-13.04
+    run_list: apt::default
+  - name: ubuntu-13.10
+    run_list: apt::default
 
 suites:
-- name: default
-  run_list:
-  - recipe[minitest-handler]
-  - recipe[apt_test]
-  attributes: {}
-
-- name: cacher-client
-  run_list:
-  - recipe[minitest-handler]
-  - recipe[apt_test::cacher-client]
-  attributes: {}
-
-- name: cacher-ng
-  run_list:
-  - recipe[minitest-handler]
-  - recipe[apt_test::cacher-ng]
-  attributes: {}
-
-- name: cacher-ng-client
-  run_list:
-  - recipe[minitest-handler]
-  - recipe[apt_test::cacher-ng-client]
-  attributes:
-    apt:
-      cacher_dir: '/tmp/apt-cacher'
-      cacher_port: '9876'
-      cacher_interface: 'eth0'
-      compiletime: true
-
-- name: lwrps
-  run_list:
-  - recipe[minitest-handler]
-  - recipe[apt_test::lwrps]
-  attributes: {}
+  - name: default
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test]
+
+  - name: cacher-client
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::cacher-client]
+
+  - name: cacher-ng
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::cacher-ng]
+
+  - name: cacher-ng-client
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::cacher-ng-client]
+    attributes:
+      apt:
+        cacher_dir: '/tmp/apt-cacher'
+        cacher_port: '9876'
+        cacher_interface: 'eth0'
+        compiletime: true
+
+  - name: lwrps
+    run_list:
+      - recipe[minitest-handler]
+      - recipe[apt_test::lwrps]

.rubocop.yml

@@ -1,20 +1,25 @@
-AlignParameters:
-  Enabled: false
+AllCops:
+  Excludes:
+    - vendor/**
 
+ClassLength:
+  Enabled: false
+CyclomaticComplexity:
+  Max: 15
+Documentation:
+  Enabled: false
 Encoding:
   Enabled: false
-
-LineLength:
-  Max: 200
-
 HashSyntax:
-  EnforcedStyle: hash_rockets
-
+  Enabled: false
+LineLength:
+  Enabled: false
 MethodLength:
-  Max: 25
-
-CyclomaticComplexity:
-  Max: 7
+  Enabled: false
+TrailingComma:
+  Enabled: false
 
+AssignmentInCondition:
+  Enabled: false
 ParameterLists:
-  Enabled: false
+  Enabled: false

.travis.yml

@@ -0,0 +1,42 @@
+language: ruby
+bundler_args: --without kitchen_vagrant
+rvm:
+- 2.1.0
+before_install:
+- echo -n $DO_KEY_CHUNK_{0..30} >> ~/.ssh/id_do.base64
+- cat ~/.ssh/id_do.base64 | tr -d ' ' | base64 --decode > ~/.ssh/id_do.pem
+script:
+- bundle exec rake travis
+after_script:
+- bundle exec kitchen destroy
+env:
+  global:
+  - secure: C/3kUqOQ2esfugszO5wz6ASeOxWvvu3JUtYH2fknXipobavo18/jV9RVG687eZQUBB+3VYkeqUaUjAzvlUjVj4NGS3hVPhlDCoBb0cskEg6ZyQTnV+RmN1gwsM4cQu3JNw4po0kWfXUZkxzI4uBnQ1VyQkO0+05X5Q96v5Z5NgE=
+  - secure: dbXLqVt9CnO8pg/DYXNN++YRShSQ8S2MDZCfwx6e/18CZYLKapy8XaXfg6jdmZGrSw3JlTU+5CB4EGSt5e9pfmrmPgmKEsttaZVzjF7NASFmQWrcZk6fs86F/gIsD5N1po6YFdJLeSdJmByFrww8cjsadHTtdN6vp8tdxFR4Dzs=
+  - secure: KG9EnqYfS1UUqs4E+OmVca/raO0DhxGXU8befob8jSTy6Pd+JDLbozHKSlgdvSlgpRC7hLOIP49UM3pT7D+pIas/qjBT79QYYSqN34KtLRg3QXmBTKIFDuRh4mivpG7mQHgqZGk46xf1EiX5OQ+HzfKvS3eqMuCaEMuKtQlMmxo=
+  - secure: I4yrrr/ZhKtJBQSM8nwdxLkFatUJFbo30Q5dMI0oUV6sis3n0F14dSPtOk/98Gx5jo4CA5eXE0sgCaqctum2HPpBEmvvWEKQ0UX7V8QWXoCK7l2smT51j1Vk7Oo74c2OQDnpyWB++iZQSBwDI/2/lu8QVlhJzV+LcijOhJ7tKv8=
+  - secure: ceUgsjG+zr9QanT1QO6Rncr2rB45C9d0jObVoLcRp9X8hGdubBXvNNm5ekD/5PY6jmpb7gxqzXNlmLoSP/SHLWPNmRnt8PDtvNUPOZ7tAbUMx8iZlxL2UfeVryWsVBYfCHU0DjiSU8w184aVe1jNSPnX3VtXPO7UePiw9TxGVss=
+  - secure: C6ILzLYQWckWYoGpXQIyppTIaP0XEOobLteCnhBdUpCCwai6ALR1ZRjvRz3M+557IFUEwLWTtjFx0Xz9UmQItLLzuWZGBCb6n+Z0tN0vu1eC2MYDkYT6wo0/DuH0TiytbYnfMQOktmzPiLav0bLixnfQau3SMogCiXyaZWsPv4Y=
+  - secure: EopuZFj2V2+Vg9mc5qdD3fe3MaIADzb4YMY9TVrYM3HP6BJpwa9/qV5RYNxRNfYTdh5kc+Y758HUkvxRk71SXXEFyBzC1NSlXULzvUgzrnHSMN3hbDW9LV4PAuprZRFMcG0+c8s0F3ABArs3EVoVx0VtwAgpeQ24unAifwkOdak=
+  - secure: Ps3aELF8bTXWvRG4c6fppvwh4V4OZa6Zov2RdnEfb+/I0rhAgodyzOFevCzcJLTo6/JfnyvgMRNzzj3ixrZtgfWHaiK3eKgd4XbWUC587CQEXid5aMa0r1RjlVTnVX6MCiPEWt2rjcXOcsR+5VNf7JcT92i/0G4X9aK/HUAICRQ=
+  - secure: EJsyHA5mKNDq3qq5svtE1fmMvv0+JimHZPmGo+If6KSup5dh6pAZhZan8IOxSONx5aJWepTTOPxvBtd8jkDZ28synLDo5MbgHL6MjT+VBSoJAH5JHbD1yCZPbRnE0vf+bwUEas+8SW22wqhNX6RBXenvR/JjOQyrlTJITu7mFKM=
+  - secure: ILZFz+Kj7GUlUPpta09j+l6d/LMSBKFZPxl5R4eF+aw6O8PBhdpx4NJDWZfo15e1gf/Mzf/lMo4V2tRxfX7K9jJ6JkRy/PVA6Qtbzy2yAZ4fGom3TRka3z3v3u4iCMhxOka/HHlvb/z+XdZqkCT/cN77JVUwafX3/WZOt9TgjkE=
+  - secure: erk5BAqlMIfUw8zatUBKFO1jC7k/LKaTfDtGdQi9aW2Fn1Em/5P96u1xIp5dTKo74Mn0QLrxaPRHjjnwBDHJoS9B9DLqKiRDmu69eLWs8IhR2dgLy4VMF9KIds7XFW4qjzhhdFlEYzPbTOWZi40N0ryhu8zx2ZMGFcx2omMPhiQ=
+  - secure: Pts5HYq2tDV05if3QzA8iyf6VXGJ4bwTvydIEXskORVLuf59bGlaDvfyoHoXh93dcws0HXQHE0sdxEISY2H2LiKft60KJOE+yQblDs0/iMBTrQ+Ng52lzdBsxdIb7JTZI8qDpJZJ66dL0EeNik85vhfiT/1Ev6pXVo5wpqvu1sY=
+  - secure: N5yC9dlDw35ByvcP99MYFmLkFwHeyG5zguqrUZ/uA/sx7F4+tgxfEOhOOAYjRkWEE018gsLmUzHWhYJ2J3/v1HfFvXyqxSpb5ou4aYjRcGjg+JxPnWHqlF1jWyK+lrXDZO8akIl48RtxYpHP6bIqU2/o58iZJIKTKR7csHNsoJ0=
+  - secure: IL6QUyWRJbS/XYofiFRt0uRMtNZHxn2nhtfV3n4743OnLxDipkkYid7s/SebMXiqPzgtSYgjhraqguCQsSltzWGZjM+rBjDuSGQtpRWQZA7XhpltB/8TAM8hC+ZNrr3/Y50LbR4r5DKZOWfLCgIaHQcfOM1u7UKqX7MfGVmOD6Y=
+  - secure: JmD6Uvtawd1M3K2ynepnZeJVOGXdwNnsGoY/EiIqnGGfJexkQJ5TVAmz60f7t9PtkQbhY4PRkVeCK/3HFH3IpISzsVdVyCymwajYI8LTu33p3I63uJiqy3qtgogx6NrPExv5szUJRoI5Qxlxb8yPWfQz+iThOEwBh0h5N9b5unc=
+  - secure: TyiQ+1L6qq62YmmZ0RcbCjUaD/aHYf/9yCtDze9pKh2AvTI7+DQ/cBLvbcsfYSK30ze+lQzNUzgg9Il+KnJzC8nkkRd1C739SsS18n+DqrnTSl6fsno5dQOKHbRD4+ffI9lEl12V39VxSdRFpl8VHSOZoKWtWfLjBrJV06ssMLM=
+  - secure: JQLQbFQZJJhiQHH+UBlVet1LIrpC1SkJc+bybuDzD8K3Lxg0SSFV0qfDzApgEeUaD8Zn8/g1d7be5uQkTMdVGg+Dh2h2dNIzGid1BrVkQNBUc2PqgOlZ3AK/AF5jOzdwXx9E2Kr10hSpF09vg96Inz73EUk9Ii4EbB78GyrOt/4=
+  - secure: DXTOi1zZp7VxA7f75FCGYDN1rYhTf6O6v2FMBrtUh5ow/oQ7MB8965v5e4q4sTLfcamW/fWj5SS7Hsa3a1zdywiA+7RiaVrNEmZ2nQmyWf1OkbMU5MPySrCU2wHeSvAlzObvLxbRz7YDq/1XtxJCyh21DJp8WuV7eDPvpYAwql4=
+  - secure: Lb44CQBymgyBNLMmcxtifSQLthm3e2I29uL46IPLOjFOiAZf3Jg79/95pM9jSp96YoLEzZOt4Ugo9Z7UfS39OVe+h0LS7cR219J/QxjnGAoQZDJTUIuACh6tLwZPqp5hw6g+EjLjwc7jCdpx9CDO4JwC34mQ8spX7yZq4mbAia4=
+  - secure: DKVV85UO3g49lJqjn5VBAuCg+Iasnr9YZQim4oeb6hC3+k1Vyl3t6KGnVtX2Hcr7rw/7rro1Mcon9uAkZaBQgHfWBwYW35OCjVr0b0LQ/aJB4p329PxY4OnL6w0tNDfgwwy75Jb7jAP3DoX/Cibdz4uM5/t/6NYWDNAhdoIatCM=
+  - secure: NOyvGu0gWl8LFns+h7K9EgIsOR0ogDQ2ulOFVgDKcpHJsh+boT1FM6mS9z0Fz23fHCBva9y1jRyyh88sKA0IBK2PL3BB72pkwtQ9SmwhH3y5mx8HVQI8dkZ4OkPA0KlxgtYPhUpgXcB6O/81PGOpdfAmiWrhJQdI3pMTk6bo2AU=
+  - secure: IZl7l+n1HYtuApXvExqAm0YIqmKg0UoFRm+Xlp5YaGHmzZij+gPu0H8HMkkvqA+uPeRufNybAUmB/YZpUOnb1QXsZdygg2ij+QdTcgps7r/Sw7NgH20tm4M+OrGK7ej5W9vY4TFZ7kb1+31pHnxzbkHhow0JxBBaoQMP5FZGDbM=
+  - secure: YGPWV5x0bT78t09z9Bh1ar4J5QNE9+RNookqo3WXICwyDfH/7m7I7gIug+EXLl3P1y/CUBEB5y0Sh3q+0WzW4kQ3WYDsl2AHTUW+WYo5b/GBmJjc8kGV9oDExh81IS5bDvNDyy4rOLhpdLZjxt1coFLnw/4vH3gsb9tAaTlk9wE=
+  - secure: VXrR2TF4aMdYBYfXVgXl4eff94TTc6gv46g0ovyAf5AK+GTvaxNyG1kSAjNO+VDDMwmEwQn8l8prDgRzdy3bGqr0eLljgyewN6QLjwwtHTE9sUCDkvTeG6kq2ikKDAgt9V0sw7Z4BWcxBQw5ih5rR/ncSW3M48VWQEjVwluvJo0=
+  - secure: IL87w+BSo1dbScJrtLGRul6KkkvNGnaWAzNppHQGDlGmT0vtNLbHD/awXKAgNOtIUdI1u/+007+ruspDS8pafmYtrI4rcdl+Gh1KcJn2WeLs55R5XWF7wZJns/G89xRhWOKLU/VaHinzJ+qqmPlRq0MxGgqQr3IxfrZgdlleDZc=
+  - secure: NzxTgxqW8KSuvNYRTqa6MstBuShyCD/kW5xM+7r0BOLSN32nNR3+SfBlFC8mQpVSu5C0Y8qIvvaEJ91/JwtBLD5+oyt2rTeJ0hTRWi0/X+3vE2R52K8wKfF92lXVqcetCtUWy/q5QkorTjboWvXdK6RHw6rArTPpa9hUM74Qs4w=
+  - secure: foOl9CJjHgv45H+SzD+I1zhigrvJc2VqTeeFTdTUOIzW4oiEFRi9/zhfX3SkHdwPhPPbDr0OI9w1hOU/E1N7etWb5yN4qMNr8+WG4u5AyUutSgKq1efIaTyM9m/UwijRqyx8YdejuEUWP7Kxsp6tq23jrlQXjy/ugE0U7Kv+ym8=
+  - secure: IKSXOPAS1xyor4ADxdCDVigZT7Gq4IbhGyDSR4yEFxzLOd/ei+ElIgEawxenWU1uk+4Qd/GWlGgstkAgJgqC6aTURBcfmx1SD5x+/dDX91MAjKoIzNrQDnY8pFaIlLf6CpWdoCXLZmQkmUzHap3t34u/L57w2fmd8QISPMdHjJ0=
+  - secure: Kc+4bq103e+CmIgV5pca9HacoRW1JVTrHNh6f6jCTOh/z+RThMXpiCXDOC2UkCZR9Knt3udbql+mHThyQ/gcAsGHLowGh3Gn+gXhH57cUw+nHDpQcEU+Zuc+XyvNgReHE/Y9BC6h9/RIUnvybhpGkdFYOdafVlcMXSg2nrPn1C8=

Gemfile

@@ -1,13 +1,37 @@
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 2.0'
-gem 'chefspec',   '~> 3.0'
-gem 'foodcritic', '~> 3.0'
-gem 'rubocop'
+group :lint do
+  gem 'foodcritic', '~> 3.0'
+  gem 'rubocop', '~> 0.18'
+  gem 'rainbow', '< 2.0'
+end
+
+group :unit do
+  gem 'berkshelf',  '~> 3.0.0.beta6'
+  gem 'chefspec',   '~> 3.1'
+end
+
+group :kitchen_common do
+  gem 'test-kitchen', '~> 1.2'
+end
 
-group :integration do
-  gem 'test-kitchen', '~> 1.0'
+group :kitchen_vagrant do
   gem 'kitchen-vagrant', '~> 0.11'
+end
+
+group :kitchen_cloud do
   gem 'kitchen-digitalocean'
   gem 'kitchen-ec2'
 end
+
+group :development do
+  gem 'ruby_gntp'
+  gem 'growl'
+  gem 'rb-fsevent'
+  gem 'guard', '~> 2.4'
+  gem 'guard-kitchen'
+  gem 'guard-foodcritic'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'rake'
+end