Commit graph

9181 commits

Author SHA1 Message Date
Dominik Richter
b1ec95e343 Merge pull request #293 from chef/sr/json-config
read config from file/stdin
2015-12-08 11:32:26 +01:00
Dominik Richter
ef487e3753 handle json parser errors 2015-12-07 16:11:53 +01:00
Stephan Renatus
ae4420a736 add --json-config= and --diagnose flags to inspect configurations
Because of the way per-command arguments are handled, this is a little
different from the way e.g. kitchen handles it: any inspec command can
take the flag `--diagnose` to have it dump configuration first.

This add support for a JSON configuration file, where both

  inspec detect --json-config=config.json

and

  inspec detect --json-config=- <config.json

allow for reading the JSON config. There is no validation of its keys
in place.
2015-12-07 16:10:15 +01:00
Stephan Renatus
bf15c05f7f Merge pull request #299 from chef/chris-rock/os-resource
support string and symbol for os resource
2015-12-07 12:22:58 +01:00
Christoph Hartmann
d20b96ae40 Merge pull request #283 from chef/sr/shell-help
Minor `inspec shell` improvements
2015-12-07 11:50:07 +01:00
Stephan Renatus
33f2fe3dde hide summary output when running interactively (inspec shell) 2015-12-07 11:12:41 +01:00
Stephan Renatus
17a80d32a9 remove second welcome 2015-12-07 11:12:41 +01:00
Stephan Renatus
c6fd8c5880 mention help [resource] 2015-12-07 11:12:41 +01:00
Christoph Hartmann
dcb09802d3 support string and symbol for os resource 2015-12-07 11:11:55 +01:00
Christoph Hartmann
34d75180b1 Merge pull request #298 from chef/sr/apache_conf_tests
[resources/apache_conf]: add tests, fix bug
2015-12-07 11:09:26 +01:00
Stephan Renatus
79f48afa6c [resources/apache_conf]: add tests, fix bug
before, the resource would throw an exception when include_files
returned nil (i.e., [].flatten!)

added basic unit tests capturing the include_files behaviour
2015-12-07 10:50:48 +01:00
Stephan Renatus
a97ae08abd Merge pull request #287 from chris-rock/single-resource-test
Doc: add doc for single unit test
2015-12-07 08:51:26 +01:00
Christoph Hartmann
640eba852b add doc for single unit test 2015-12-07 08:48:07 +01:00
Christoph Hartmann
0907419e8d Merge pull request #294 from chef/jcd/minor-readme-repair
fix small grammar error
2015-12-04 18:37:40 +01:00
Julian C. Dunn
73a3c90998 fix small grammar error 2015-12-04 11:29:48 -05:00
Christoph Hartmann
7c393a1891 Merge pull request #291 from chef/sr/fix-find_files
revert to old find_files interface
2015-12-04 14:41:36 +01:00
Stephan Renatus
324ba14a6b fix optional type argument handling 2015-12-04 14:27:32 +01:00
Stephan Renatus
390e0fcca7 restore old find_files interface
- fixes #276
- basic test for find_files
2015-12-04 14:15:45 +01:00
Christoph Hartmann
fb2d6d25dc Merge pull request #289 from chef/adamleff/wrl-support
Adding support for Wind River Linux
2015-12-04 12:21:16 +01:00
Adam Leff
e0c356dae7 Adding support for Wind River Linux
WRL is used as the OS on Cisco Nexus devices and acts like a Red
Hat variant. These changes add support for WRL.
2015-12-03 17:41:11 -05:00
Christoph Hartmann
e2774dcb66 Merge pull request #286 from chef/sr/gem-workaround
travis workarounds
2015-12-03 16:11:28 +01:00
Stephan Renatus
5e44ac0396 using travis-ci's services:docker 2015-12-03 15:48:08 +01:00
Stephan Renatus
cac222090e workaround travis-ci's gem version 2015-12-03 15:45:19 +01:00
Christoph Hartmann
fd2d84a9ed Merge pull request #281 from artem-sidorenko/mint-vagrant-box
Support mint in the integration tests
2015-12-02 08:39:30 +01:00
Artem Sidorenko
46f60f05af Support mint in the integration tests 2015-12-02 06:33:07 +01:00
Dominik Richter
67fc932b3a Merge pull request #278 from chef/chris-rock/optimize-cli-help
align cli documentation with cli
2015-12-01 21:22:19 +01:00
Christoph Hartmann
cca75c5e8c align cli documentation with cli 2015-12-01 11:19:04 +01:00
Dominik Richter
3d0a1b81d8 Merge pull request #269 from chef/chris-rock/shell-help
Feature: Add shell `help resource` command
2015-12-01 11:13:49 +01:00
Christoph Hartmann
766fe47b87 add inline documentation 2015-12-01 10:56:47 +01:00
Christoph Hartmann
6a6cff1526 feature: add help command for resources 2015-12-01 10:56:47 +01:00
Dominik Richter
d42529f309 Merge pull request #270 from chef/chris-rock/etc-group-centos
improvement: add etc_group support for centos and add integration test
2015-12-01 10:55:27 +01:00
Christoph Hartmann
2c8a8ccb25 improvement: add etc_group support for centos and add integration test 2015-12-01 10:40:12 +01:00
Dominik Richter
63a868ea42 Merge pull request #277 from chef/chris-rock-patch-extension
Remove description of custom resource
2015-12-01 10:38:47 +01:00
Christoph Hartmann
c4dcd17f82 Remove description of custom resource
- will be superseded by compliance profiles
2015-11-30 19:49:54 +01:00
Dominik Richter
bf0ab1b7cd Merge pull request #272 from chef/chris-rock/docs
remove json doc for windows_feature
2015-11-30 15:35:04 +01:00
Christoph Hartmann
5018e1e03e remove json doc for windows_feature 2015-11-30 15:18:26 +01:00
Christoph Hartmann
5cb8458799 Merge pull request #275 from chef/alexpop/add_ansible_example
add kitchen-ansible inspec example
2015-11-30 15:15:38 +01:00
Christoph Hartmann
d6e6999b94 remove git references from Gemfile 2015-11-30 15:03:19 +01:00
Alex Pop
3d1473ee8b add kitchen-ansible inspec example 2015-11-30 14:56:33 +01:00
Christoph Hartmann
d091a391b9 Merge pull request #273 from chef/alexpop/add_puppet_example
add kitchen-puppet example with inspec testing
2015-11-30 14:55:42 +01:00
Christoph Hartmann
491fdd0e3a remove git references from Gemfile 2015-11-30 14:12:17 +01:00
Alex Pop
ba584f13fa switch from solo to zero 2015-11-28 08:11:21 +00:00
Alex Pop
ec24f86fb2 berkshelf not needed in Gemfile 2015-11-27 17:25:09 +01:00
Alex Pop
9e12095bd8 add kitchen-puppet example module 2015-11-27 17:20:41 +01:00
Christoph Hartmann
5a3acfe03e Merge pull request #265 from chef/rake-release
add rake tasks for showing and bumping the version of inspec
2015-11-26 22:33:19 +01:00
Dominik Richter
f738bcb57b add rake tasks for showing and bumping the version of inspec 2015-11-26 19:22:37 +01:00
Christoph Hartmann
185c46ad41 Merge pull request #264 from chef/0.9.5
0.9.5
2015-11-25 16:01:44 +01:00
Dominik Richter
762562b967 0.9.5 2015-11-25 15:43:31 +01:00
Dominik Richter
63f7e7de9c Merge pull request #263 from chef/amanly/add_ssh_port_option_flag
Add -p alias for --port like ssh
2015-11-25 15:40:21 +01:00
alexmanly
c114d2bcd2 Add -p alias for --port like ssh 2015-11-25 14:55:06 +01:00