Merge pull request sous-chefs#1 from community-cookbooks/v210

Update to version 2.1.0

.codeclimate.yml

@@ -0,0 +1,9 @@
+---
+engines:
+  foodcritic:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+    - "**.rb"

.foodcritic

@@ -1 +1 @@
---tags ~FC001
+-t ~FC001 -t ~FC054

.gitattributes

@@ -1,3 +1,8 @@
+Gemfile export-ignore
+Berksfile export-ignore
+Vagrantfile export-ignore
+Thorfile export-ignore
+Guardfile export-ignore
+.gitattributes export-ignore
 .gitignore export-ignore
 .gitmodules export-ignore
-.gitattributes export-ignore

.gitignore

@@ -1,22 +1,55 @@
+# Ignore docs files
+_gh_pages
+_site
+.ruby-version
+.node-version
+Gemfile.lock
+
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.zip
+*.vi
 *~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-pkg/
 
-# Berkshelf
-.vagrant
-/cookbooks
-Berksfile.lock
+# OS or Editor folders
+.DS_Store
+._*
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
+.idea
 
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
+# Komodo
+*.komodoproject
+.komodotools
+
+# grunt-html-validation
+validation-status.json
+validation-report.json
 
-.kitchen/
-.kitchen.local.yml
+# Folders to ignore
+bin
+node_modules
+tmp
+vendor
+.bundle
 
+# Chef specifics to ignore
+.chef
+.chefdk
+.kitchen
+.vagrant
+Berksfile.lock
 coverage/

.kitchen.yml

@@ -7,58 +7,81 @@ provisioner:
 
 platforms:
   - name: ubuntu-14.04
+    run_list:
+      - recipe[apt::default]
   - name: ubuntu-12.04
-  - name: centos-7.0
-  - name: centos-6.5
+    run_list:
+      - recipe[apt::default]
+  - name: debian-8.2
+    run_list:
+      - recipe[apt::default]
+  - name: debian-7.9
+    run_list:
+      - recipe[apt::default]
+  - name: centos-7.2
+    run_list:
+      - recipe[yum::default]
+  - name: centos-6.7
+    run_list:
+      - recipe[yum::default]
+  - name: centos-5.11
+    run_list:
+      - recipe[yum::default]
+  - name: freebsd-10.2
+    run_list:
+      - recipe[freebsd::default]
+  - name: windows-2012r2
+    run_list:
+      - recipe[windows::default]
 
 suites:
   - name: default
     run_list:
       - recipe[consul::default]
     attributes:
       consul:
-        datacenter: FortMeade
-        bind_interface: eth0
-        advertise_interface: eth0
-        encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
-  - name: source
+        config: &default-config
+          bootstrap: true
+          server: true
+          datacenter: FortMeade
+          encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
+  - name: git
     run_list:
       - recipe[consul::default]
     attributes:
       consul:
-        install_method: source
-  - name: packages
-    run_list:
-      - recipe[consul::default]
-    attributes:
-      consul:
-        datacenter: FortMeade
-        bind_interface: eth0
-        advertise_interface: eth0
-        encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
-        install_method: packages
+        config: *default-config
+        installation:
+          provider: git
     excludes:
-      - centos-7.0
-      - centos-6.5
-  - name: runit
+      - windows-2012r2
+  - name: webui
     run_list:
       - recipe[consul::default]
     attributes:
       consul:
-        datacenter: FortMeade
-        init_style: runit
-  - name: ui
+        config:
+          bootstrap: true
+          server: true
+          ui: true
+          datacenter: FortMeade
+          encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
+  - name: acl
     run_list:
       - recipe[consul::default]
-      - recipe[consul::ui]
+      - recipe[consul::client_gem]
+      - recipe[consul_spec::acl]
     attributes:
       consul:
-        serve_ui: true
-        client_interface: eth0
-  - name: cluster
-    run_list:
-      - recipe[consul::default]
-    attributes:
-      consul:
-        service_mode: cluster
-        bootstrap_expect: 1
+        config:
+          bootstrap: true
+          server: true
+          datacenter: fortmeade
+          acl_master_token: doublesecret
+          acl_datacenter: fortmeade
+          acl_default_policy: deny
+    excludes:
+      - windows-2012r2
+      - centos-7.2
+      - centos-6.7
+      - centos-5.11

.rspec

@@ -1,2 +1,2 @@
 --color
---require spec_helper
+--default-path test/spec

.rubocop.yml

@@ -1,9 +1,46 @@
 ---
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   Exclude:
-    - 'bin/**/*'
-    - 'vendor/**/*'
+    - 'Guardfile'
+    - 'Rakefile'
+    - 'Vagrantfile'
+    - 'Policyfile.rb'
+    - 'Berksfile'
+    - 'Thorfile'
+    - 'Gemfile'
+    - 'metadata.rb'
     - 'test/**/*'
-    - 'spec/**/*'
+    - 'bin/**'
+    - 'vendor/**/*'
+AlignParameters:
+  Enabled: false
+ClassLength:
+  Enabled: false
+CyclomaticComplexity:
+  Enabled: false
+Documentation:
+  Enabled: false
+Encoding:
+  Enabled: false
+Style/FileName:
+  Enabled: false
+LineLength:
+  Enabled: false
+MethodLength:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+PerceivedComplexity:
+  Enabled: false
+Style/SpaceBeforeFirstArg:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/FileName:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false
+Style/PercentLiteralDelimiters:
+  Enabled: false
+Style/ModuleFunction:
+  Enabled: false

.travis.yml

@@ -1,19 +1,14 @@
 ---
 language: ruby
-script: bin/rspec
+cache: bundler
+sudo: false
+notifications:
+  slack: bloomberg-rnd:BvYmxrV9xj902XWTRNrkLNkR
+script: bundle exec rake travis
 rvm:
-  - 2.1
+  - 2.2
 branches:
   only:
     - master
-builder_args: --jobs 7
-notifications:
-  irc:
-    channels:
-      - 'chat.freenode.net#bloomberg'
-    use_notice: true
-    skip_join: true
-    template:
-      - "%{message} (%{author}): %{build_url}"
 matrix:
   fast_finish: true

Berksfile

@@ -1,7 +1,10 @@
-source 'https://supermarket.getchef.com'
-
+source 'https://supermarket.chef.io'
 metadata
 
-group :test do
-  cookbook "consul_spec", path: "spec/fixtures/cookbooks/consul_spec"
+group :test, :integration do
+  cookbook 'consul_spec', path: 'test/cookbooks/consul_spec'
+  cookbook 'apt'
+  cookbook 'freebsd'
+  cookbook 'windows'
+  cookbook 'yum'
 end