Commit graph

3189 commits

Author SHA1 Message Date
Christoph Hartmann
f7b39d79d7 Merge pull request #1391 from Wing924/master
Yum.repo should show correct name
2017-01-04 10:38:58 +01:00
Wei, He
370269c2dd Yum.repo should show correct name
https://github.com/chef/inspec/issues/1390

Signed-off-by: Wei, He <weihe924stephen@gmail.com>
2017-01-04 11:10:38 +09:00
Wei He
7bee9713ad Merge pull request #1 from chef/master
sync
2017-01-04 10:56:28 +09:00
Christoph Hartmann
409f854318 Merge pull request #826 from chef/dr/postgres_conf
bugfix: expose postgres_conf parameters via `its`
2017-01-03 16:27:51 +01:00
Dominik Richter
a15749f328 bugfix: expose postgres_conf parameters via its
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-01-03 16:17:36 +01:00
Dominik Richter
e07cbdbb7c Merge pull request #1389 from chef/chris-rock/fix-brew-package
fixes brew json parsing
2017-01-03 16:00:58 +01:00
Christoph Hartmann
08e182843b fixes brew json parsing
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-01-03 12:24:57 +01:00
Dominik Richter
74ed60ce5f Merge pull request #1387 from jvrplmlmn/package-brew-unit-test
Unit test the 'package' resource for OSX (with brew)
2017-01-03 12:24:46 +01:00
Dominik Richter
823b140dd7 Merge pull request #1365 from chef/chris-rock/outdated
display if inspec version is outdated
2017-01-03 12:21:28 +01:00
Christoph Hartmann
f0cdad800f display if inspec version is outdated
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-01-03 12:10:43 +01:00
Dominik Richter
c193a38f69 Merge pull request #1369 from chef/chris-rock/integration-ssh-test
call ssh cookbook from prepare cookbook
2017-01-03 12:01:47 +01:00
Christoph Hartmann
07ee8ecd66 call ssh cookbook from prepare cookbook
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-01-03 11:40:09 +01:00
Dominik Richter
7d88476ede Merge pull request #1384 from chef/chris-rock/drop-193
drop ruby 1.9.3
2017-01-03 11:36:56 +01:00
Christoph Hartmann
ab097ef8d1 update functional tests
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-01-03 11:06:05 +01:00
Christoph Hartmann
efc8542320 drop ruby 1.9.3
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-01-03 11:06:01 +01:00
Christoph Hartmann
0dd6aa3e36 Merge pull request #1388 from jvrplmlmn/fix-description-test-unit-resource-package-solaris
Fix wrong description for the Solaris cases in the unit tests of the 'package' resource
2017-01-03 10:04:48 +01:00
Javier Palomo Almena
07b41eb9df Fix wrong description for the Solaris cases in the unit tests of the 'package' resource
Obvious fix.

Signed-off-by: Javier Palomo Almena <javier.palomo.almena@gmail.com>
2017-01-02 18:06:59 +01:00
Javier Palomo Almena
8ab8fcdda5 Unit test the package resource for Darwin
Signed-off-by: Javier Palomo Almena <javier.palomo.almena@gmail.com>
2017-01-02 17:57:41 +01:00
Javier Palomo Almena
3f1986eb6f Mock 'brew info --json=v1 curl' to facilitate unit testing the package resource for the darwin platform
Signed-off-by: Javier Palomo Almena <javier.palomo.almena@gmail.com>
2017-01-02 17:57:20 +01:00
Christoph Hartmann
8f72b92e93 Merge pull request #1381 from makotots/mn/json-resource-stacktrace
Make "permission denied" condition match that of Train
2017-01-02 12:44:23 +01:00
Makoto Nozaki
9834e3f8f9 Make "permission denied" condition match that of Train
Signed-off-by: Makoto Nozaki <makoto.nozaki@twosigma.com>
2016-12-28 22:20:40 -05:00
Dominik Richter
3d73b272a5 Clarify instructions on releasing inspec.io 2016-12-22 13:52:50 +01:00
Dominik Richter
4c8518990e Merge pull request #1380 from chef/ap/inspec-vendor-docs
mention inspec vendor for compliance dependency
2016-12-22 13:32:57 +01:00
Alex Pop
607de99f75 mention inspec vendor for compliance dependency
Signed-off-by: Alex Pop <apop@chef.io>
2016-12-22 12:11:46 +00:00
Dominik Richter
dad96a0311 Merge pull request #1376 from chef/chris-rock/supermarket-cli
print name for supermarket profiles
2016-12-22 09:54:57 +01:00
Christoph Hartmann
fc6ab8d6f9 print name for supermarket profiles 2016-12-22 09:48:53 +01:00
Dominik Richter
f5c7b34c5d Merge pull request #1368 from chef/chris-rock/serverspec-migration
add guidance for Serverspec migration
2016-12-21 16:30:14 +01:00
Christoph Hartmann
0732902944 Merge pull request #1372 from chef/tp/fix-tutorial-link-2
Fix Learn Chef tutorial link
2016-12-16 22:56:15 +01:00
tpetchel
a6f082db16 Fix Learn Chef tutorial link
Signed-off-by: tpetchel <tpetchel@gmail.com>
2016-12-16 16:27:35 -05:00
Christoph Hartmann
10bb08b691 1.8.0 2016-12-16 17:49:51 +01:00
Christoph Hartmann
fd2e29da38 add guidance for Serverspec migration
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2016-12-15 18:14:05 +01:00
Christoph Hartmann
f192267272 Merge pull request #1367 from chef/chris-rock/iis-serverspec
add fallback syntax for serverspec tests
2016-12-15 17:27:11 +01:00
Christoph Hartmann
7a0b0803bd add fallback syntax for serverspec tests
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2016-12-15 16:16:17 +01:00
Christoph Hartmann
6e2b21e1f8 Merge pull request #1366 from makotots/mn/json-variable-name-fix
JSON resource's error message is missing filename when file is not found
2016-12-15 15:17:28 +01:00
Makoto Nozaki
42cffeea61 Fix variable name. Add test.
Signed-off-by: Makoto Nozaki <makoto.nozaki@twosigma.com>
2016-12-15 08:00:56 -05:00
Christoph Hartmann
783c05e4ed Merge pull request #1364 from jeremymv2/jeremymv2/version_cmp
extending cmp to support better version ops
2016-12-15 10:24:34 +01:00
Jeremy J. Miller
6481f00454 cmp better support for version ops
Signed-off-by: Jeremy J. Miller <jm@chef.io>
2016-12-14 23:45:38 -05:00
Dominik Richter
fd76a72c12 Merge pull request #1331 from burtlo/burtlo/cleaner_cli_formatter
burtlo/cleaner cli formatter
2016-12-15 01:32:01 +01:00
Franklin Webber
ad82ac48c8 Removes profiles reader and replaces with ivar
The profiles method was never public and the @profiles is clearer.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
0a0431ac29 Privatizes more methods within the Formatter
Based on some feedback from @arlimus there were some methods that
were not part of the public inteface that I moved to private.

I changed the examples collection from a delete from the output_hash
to retrieve the controls.

Created a helper for the all_unique_controls which was used in two helper
methods.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
eb495e9675 Fixes to address Rubocop issues and privacy
The class size is too big and Rubocop is right. There are a few
more classes in there that could be extracted but I am going to
ignore it. The other issues that it presented were fair.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
d8c7347ee9 Updates the Formatter's Control summary calcuation
* Moved things around for better understanding of the class
* Used `private` to denote what was on the public interface
* Solved the ugly TODO which was calculating the state of the control's
  summary
* Used `#examples` instead of `res = control[:results]` throughout the
  #summary and #title methods

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
4695c9e7be Fixes for functional tests and better displaying dep. profiles
* Fixes an issue when specifying no profile
* Fixes an issue when displaying a profile that has included/required profiels
* Fixes an issue when specifying profiles with only metadata
* Fixes formatting for spacing to ensure it adheres to previous alignment
* Fixes issue with the Control object and the rolling up of failed
  and skipped examples.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
fa45c3993d Updates RSpec CLI Formater to print profiles correctly
The profiles will display  the controls with their results and
then display the examples not associated with any control but
within the profile.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
914c8384c0 Adds CurrentControl class to Cli RSpecJSONFormatter
A lot of the work in #flush_current_control is acting on the control.
I am starting the flip of the control and bringing those messages being
sent originating from a control class itself.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
7627add552 Refactors JSON / CLI formatter
Cleans up the #stop action on the JSON formatter by creating more
methods that memoize values or provide values through a method
interface.

There is still more that can be done with the whole mapping
examples to controls through profiles.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:53 -06:00
Franklin Webber
a8a949d996 Removes start stage from Json Formatter
The full JSON formatter was using the start step to setup the profiles_info.
I moved that to a memozied method so that the first time it is called it will
be created.

Signed-off-by: Franklin Webber <franklin@chef.io>
2016-12-14 13:34:52 -06:00
Victoria Jeffrey
b30a5dc165 add in some comments, etc 2016-12-14 13:34:52 -06:00
Victoria Jeffrey
37e60e929d wip: remove some global variable usage 2016-12-14 13:34:52 -06:00
Christoph Hartmann
d9186f30f2 Merge pull request #1351 from jaxxstorm/archive_versioning
Add profile version to archive
2016-12-14 17:49:40 +01:00