Commit graph

3035 commits

Author SHA1 Message Date
Christoph Hartmann
cbe28b8295 Merge pull request #1042 from davidcpell/support-absolute-paths-in-apache_conf
In ApacheConf#include_files, check for abs paths
2016-09-20 16:03:12 +02:00
David Pell
155995adfd In ApacheConf#include_files, check for abs paths
If the path is absolute, just use what was passed, otherwise build an
absolute path using `@conf_dir`.

Fixes #1013
2016-09-20 09:11:09 -04:00
Christoph Hartmann
407ab9cb2e Merge pull request #1104 from chef/dr/docs
docs task and rst/md formatter separation
2016-09-20 14:08:33 +02:00
Dominik Richter
31da5881ec add metadata to markdown 2016-09-20 13:58:20 +02:00
Dominik Richter
59673f5069 added markdown to docs generation 2016-09-20 13:33:24 +02:00
Dominik Richter
305ca04f65 separate docs RST formatter 2016-09-20 13:18:20 +02:00
Christoph Hartmann
e16a7e8ab4 Merge pull request #1096 from chef/ap/fix-fail-message
Include code description in the output of failed controls
2016-09-20 11:24:07 +02:00
Alex Pop
e1faebd527 Include code description in the output of failed controls 2016-09-20 10:10:08 +01:00
Christoph Hartmann
370a4c75b5 Merge pull request #1094 from chef/vj/fix-demo-instructions
fix demo instructions
2016-09-20 09:58:38 +02:00
Victoria Jeffrey
895954f1f5 fix counting on instructions 2016-09-20 00:15:55 +02:00
Christoph Hartmann
47527ef4e5 Merge pull request #1095 from chef/ap/fix-password-login
Update the username and password login method
2016-09-20 00:10:32 +02:00
Alex Pop
624849d418 removed unsupported legacy login and replaced it with the current username/password login option. a bit of refactoring around error checking and error/success output content 2016-09-19 23:08:42 +02:00
Christoph Hartmann
b2dfeaeffd Merge pull request #1099 from chef/yzl/fix_omnibus_build
Build with master of omnibus
2016-09-19 21:48:37 +02:00
Yvonne Lam
df56fced00 Build with master of omnibus to enable package builds on linux and OS X. 2016-09-19 21:39:18 +02:00
Christoph Hartmann
6219598208 Merge pull request #1080 from chef/ssd/resource-namespace
Allow users to reference resources from dependencies
2016-09-19 21:04:33 +02:00
Steven Danna
b2146d8758 Allow users to reference resources from dependencies
All resources from deps are added into the control_eval_context used by
the current profile. However, if there is a name conflict, the last
loaded resource wins. The new `require_resource` dsl method allows the
user to do the following:

    require_resource(profile: 'profile_name',
                     resource: 'other',
                    as: 'renamed')

    describe renamed do
      ...
    end

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-19 19:08:43 +02:00
Christoph Hartmann
31967fa4b2 Merge pull request #1098 from chef/chris-rock/fix-metadata-unit-tests
use Gem::Version instead of a regular expression for a test version bump
2016-09-19 19:07:31 +02:00
Christoph Hartmann
17ce99df7f use Gem::Version instead of a regular expression for a test version bump 2016-09-19 18:58:30 +02:00
Christoph Hartmann
1796b91846 1.0.0-beta1 2016-09-19 17:51:25 +02:00
Christoph Hartmann
8564e2db1f Merge pull request #811 from chef/dr/json-arrays
Static keys in all json
2016-09-19 16:57:51 +02:00
Dominik Richter
6792550f8c adopt new json formatting 2016-09-19 13:45:03 +02:00
Dominik Richter
38f2680cf4 static keys in all json 2016-09-19 12:00:14 +02:00
Dominik Richter
303cb08d93 Merge pull request #1083 from chef/vj/update-json-summary
print profile summary and test summary
2016-09-19 11:52:13 +02:00
Christoph Hartmann
cecc29d6f6 Merge pull request #1081 from chef/dr/minify-demo
uglify wepack content, kudos @chris-rock
2016-09-19 08:27:35 +01:00
Dominik Richter
b3fd0c046b uglify wepack content, kudos @chris-rock 2016-09-19 08:14:36 +01:00
Christoph Hartmann
0622c2fd6e Merge pull request #1082 from Dispader/fix_typo
Fix minor typo in documentation
2016-09-19 08:08:50 +01:00
Victoria Jeffrey
ecac8ae9cb print profile summary and test summary 2016-09-18 21:53:16 -04:00
Dominik Richter
f09797875c Merge pull request #1087 from chef/vj/update-resp
update responses
2016-09-16 20:13:12 +02:00
Dominik Richter
f4452c6995 Merge pull request #1090 from chef/vj/fix-demo-inspec-shell
fix inspec shell handling
2016-09-16 20:12:39 +02:00
Victoria Jeffrey
f7de1f6862 fix inspec shell handling 2016-09-16 12:44:14 -04:00
Victoria Jeffrey
72db9675fe update responses 2016-09-16 10:01:39 -04:00
Christoph Hartmann
83488cfa9a Merge pull request #1078 from chef/chris-rock/inspec-simulator
optimize command simulator auto-generation
2016-09-16 14:41:24 +02:00
Christoph Hartmann
f54fa7bbdf optimize command simulator auto-generation 2016-09-16 14:27:16 +02:00
Dominik Richter
6234e9c1eb Merge pull request #1084 from chef/ap/ssl-hostname
ssl resource to use inspec.backend.hostname and require train 0.19.1
2016-09-16 14:05:28 +02:00
Christoph Hartmann
b4a3debeec 0.35.0 2016-09-16 12:00:07 +02:00
Alex Pop
8a470c16f1 ssl resource to use inspec.backend.hostname and require train 0.19.1 2016-09-16 10:41:22 +01:00
Jake Gage
6de1c47b72 Fix minor typo in documentation 2016-09-15 15:27:44 -05:00
Christoph Hartmann
913a8fdc40 Merge pull request #1079 from chef/ssd/regression-trans-deps
Process transitive dependencies from lock file
2016-09-15 09:47:31 +02:00
Steven Danna
be1a61f2e5 Process transitive dependencies from lock file
This is a regression introduced by the changes from string to symbol
keys in v0.34.0. It seems that our test cookbook that had a nested
dependency example wasn't actually wired up to run.

This adds a basic functional test and corrects the typo.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-15 09:41:40 +02:00
Dominik Richter
650e025a7a Merge pull request #1075 from chef/dr/build-demo
add gulp build pipeline to online demo
2016-09-14 19:24:06 +02:00
Christoph Hartmann
8899c75f87 Merge pull request #1073 from chef/chris-rock/inspec-simulator
inspec simulator
2016-09-14 18:10:42 +02:00
Christoph Hartmann
d8d3375f9b add mocked inspec 2016-09-14 17:58:10 +02:00
Christoph Hartmann
7d6eb38d4c move tutorial ignores to its own gitignore 2016-09-14 17:58:10 +02:00
Christoph Hartmann
5088795ffc Merge pull request #1077 from chef/ssd/no-gpg-for-you
Don't gpg-sign commits during tests
2016-09-14 17:57:35 +02:00
Steven Danna
7fbb768fc7 Don't gpg-sign commits during tests
If you have gpg singing globally enabled, the tests would ask you for
your gpg pin.  This is not fun.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-14 17:50:37 +02:00
Christoph Hartmann
178156499f Merge pull request #1076 from chef/ssd/issue-1074
Ensure resources are visible inside its blocks
2016-09-14 17:48:26 +02:00
Steven Danna
8024eea8b7
Ensure resources are visible inside its blocks
The recent changes to provide isolated views of the available resources
was not extended to Rspec::ExampleGroups. This ensures that
ExampleGroups have access to the same resources as the enclosing
Inspec::Rule.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-14 16:27:59 +01:00
Dominik Richter
74ed7be3eb add gulp build pipeline to online demo 2016-09-14 15:37:36 +02:00
Christoph Hartmann
23e1772894 Merge pull request #1072 from chef/ssd/issue-1049
Skip controls from profiles that don't support the current platform
2016-09-14 12:16:22 +02:00
Steven Danna
f2e587f6d5
Skip controls from profile's that don't support the current platform
Any controls included from profiles that don't support our current
platform are now marked as skipped.

Fixes #1049
2016-09-14 09:57:53 +01:00