Commit graph

77 commits

Author SHA1 Message Date
Tim Smith
074288cdf2 Add comment on the ruby version check in the gemfile
Nuke it next year.

Signed-off-by: Tim Smith <tsmith@chef.io>
2019-02-14 14:03:05 -08:00
Tim Smith
2fe299c4f8 Work around strange bundler failures on Ruby 2.3
We should be excluding the integration group but it's trying to install berkshelf no matter what. 🤷

Signed-off-by: Tim Smith <tsmith@chef.io>
2019-02-13 22:59:18 -08:00
Tim Smith
687fb989ca Pin berkshelf to a sane version
Signed-off-by: Tim Smith <tsmith@chef.io>
2019-02-13 19:47:57 -08:00
Clinton Wolfe
cbd0dacd39 Remove temporary reliance on Train branch
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-02-01 14:27:49 -05:00
Clinton Wolfe
2e0af3575f TEMPORARY - point to train from a github branch
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-02-01 14:24:26 -05:00
Clinton Wolfe
83cdff22e2 Alright, let bundler float
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-01-25 12:04:22 -05:00
Clinton Wolfe
ecf0ab640f
Merge branch 'master' into cw/bundler-v2 2019-01-25 11:57:45 -05:00
Clinton Wolfe
a523e881da Force bundler to 2+ so system ruby on Jenkins can resolve
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-01-25 11:54:43 -05:00
Clinton Wolfe
038c9cf0d9 Rollback berkshelf to get ruby 2.3.8 to pass
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-01-25 00:17:42 -05:00
Lamont Granquist
088f922948 berkshelf 6.x is required for ruby 2.3 testing
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
2019-01-25 00:17:42 -05:00
Lamont Granquist
7f453bdca7 allow bundler 2.x and bump integration gems
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
2019-01-25 00:17:42 -05:00
Jerry Aldrich
06800e83cc Fix GitHub alert for rack dependency (#3644)
After digging I see that PR #975 fixed `bundle install` on 2.1.9 about
two years ago. The minimum required version of Ruby for InSpec is 2.2.
This updates our Gemfile to remove any logic for Ruby `< 2.2.2`.

The Gemfile should only be used for development...but I could be wrong
here. Let me know if you think there will be any issues.

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
2018-12-06 10:16:33 -05:00
Clinton Wolfe
fa0a6c9794 Ability to render contrib resource pack docs on main website (#3184)
* Sketch out contrib doc fetcher
* Read contrib config file
* Fetch contrib resource packs from git
* Copy in resource pack docs from contrib
* Task to cleanup copied-in files
* Attach contrib resource pack docs fetching to main website doc generation
* Refactor - rename vars in resource overview task for clarity
* Generate resource overview page using info from contrib
* Fix issue in which AWS and Azure resources were ending up under OS
* Trigger contrib doc cleanup after doc build
* Comment out the contrib.yaml for now
* Disable contrib tasks if git is not available
* Rubocop issues
* Allow .md as doc file ending
* Fix for files ending in md having a relative link
* Omit 'resources' from section labels to save width
* Rubocoooooooooooppppp

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2018-08-02 11:43:46 -04:00
Jared Quick
40e7c1b23f
Add train GCP transport. (#3046)
Signed-off-by: Jared Quick <jquick@chef.io>
2018-05-16 15:04:23 -04:00
Miah Johnson
67bbbb6ecf Split inspec into a core gem. (#3008)
* Split inspec into a core gem.
* Include inspec-core.gemspec, not inspec.gemspec.
* Only load aws and azure when the gems are installed.

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2018-05-03 10:30:01 -04:00
Miah Johnson
d7fe3694c9 Add pry-byebug to our Gemfile. We all install this anyway, lets make it a (#2889)
bit easier to develop inspec =)

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2018-03-28 11:23:06 -04:00
Jared Quick
ecb6d5b428 Pin inspec to train 1.1.x
Signed-off-by: Jared Quick <jquick@chef.io>
2018-02-14 17:37:31 -05:00
Clinton Wolfe
dfc73a52f0 Merge branch 'release-2.0' into aws-merge-release-merge-try
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2018-02-08 10:44:11 -05:00
Clinton Wolfe
b46bd350ed Modify train integration to support aws:// targeting in core
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2018-02-07 23:21:28 -05:00
Jared Quick
42779e91a7 Setup azure resources into inspec.
Signed-off-by: Jared Quick <jquick@chef.io>
2018-02-07 16:05:58 -05:00
Clinton Wolfe
f7a11ee2df Merge branch 'aws-merge-prep' into aws-merge
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2018-02-07 09:53:21 -05:00
Clinton Wolfe
b6788d80d5
Remove highline and nokogiri, and group test gems in Gemfile (#203)
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2018-01-23 10:17:16 -05:00
Adam Leff
5be9739ec1 Remove rainbow dependency, fix duplicate rake gem (#2374)
The version of Rainbow brought in as a direct dependency also depends
directly on Rake, and our pin of Rake was inaccurate. This was causing
Omnibus to build packages that contained two rake gems which would emit
"Unresolved specs during Gem::Specification.reset" warnings when
running InSpec.

Signed-off-by: Adam Leff <adam@leff.co>
2017-12-07 13:50:53 +01:00
Clinton Wolfe
9a44db15f7 Update rubocop 0.44.0 -> 0.51.0 (#127)
* Update rubocop to latest

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

* Code tweaks for rubocop

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2017-12-05 17:55:55 +01:00
Adam Leff
4b9acb4800 Bump Rubocop to 0.49.1 (#2323)
* Bump Rubocop to 0.49.1

This change bumps Rubocop to 0.49.1. There have been a lot of changes
since 0.39.0 and this PR is hopefully a nice compromise of turning off
certain cops and updating our codebase to take advantage of new Ruby
2.3 methods and operators.

Signed-off-by: Adam Leff <adam@leff.co>

* Set end-of-line format to line-feed only, avoid Windows-related CRLF issues

Signed-off-by: Adam Leff <adam@leff.co>
2017-11-21 08:49:41 +01:00
Chris Redekop
c8d4244ef4 Add has_roles to aws_ec2_instance (#90)
* Rename EC2-instance resources

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Add interim updates

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* testing for issue 82

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* completed integration for EC2 roles

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* adding in the beginning of the unit test for issue 82

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* Fix unit tests

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Add has_roles? examples

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Remove redundant gsub

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* corrected OpenStruct format

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* setting up variable for InstanceProfile

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* Updated the unit test so all variables are at the top

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* Fixed Rubocop issues that were detected

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* Updating README.md to include changes to aws_ec2

Signed-off-by: Simon Varlow <simon.varlow@d2l.com>

* Add failing IT for has_roles?

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Add negative IT and fix uncovered issue

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Fix Rubocop issue

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Fix integration test

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Fix Rubocop issues and unit tests

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>

* Pin AWS dependency to '~> 2'

Signed-off-by: Chris Redekop <chris.redekop@d2l.com>
2017-10-26 15:56:32 -04:00
Adam Leff
1ee22a7c4e Remove changelog generator stuff (#2048)
Version bumping and changelog generation has been moved to
Chef's expeditor tool. The github_changelog_generator bits
and the Rake tasks that use them are no longer necessary.

Also, the old historical changelog has been merged back into
the main CHANGELOG.md file since Expeditor does not alter
any existing changelog content like github_changelog_generator
does, so it's safe to bring this stuff back.

Signed-off-by: Adam Leff <adam@leff.co>
2017-08-03 22:53:24 +02:00
Adam Leff
04c43c6834
Make the --no-color flag work for inspec exec
The CLI formatter is not currently honoring the --no-color flag
when outputting CLI output. This change cleans up how we format
with color and properly support the flag for use cases where
color-encoding characters make the output difficult to use
(i.e. when someone redirects CLI output to a text file for
sharing with others).

Signed-off-by: Adam Leff <adam@leff.co>
2017-05-02 09:52:01 -05:00
Dominik Richter
738bae0db8 add inspec json schema validation to functional tests
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-03-22 09:42:36 +01:00
Adam Leff
199cb160ea Move simulator gems to www
The simulator gems are not necessary for building InSpec, only the website.
This is currently causing issues in the Jenkins infrastructure due to
a downstream dependency of github-markup.

Signed-off-by: Adam Leff <adam@leff.co>
2017-03-21 16:11:56 -04:00
Adam Leff
66095722c8 release 1.17.0
Signed-off-by: Adam Leff <adam@leff.co>
2017-03-21 15:00:26 -04:00
John Kerry
dd9ec61199 moving the nokogiri reference into the gemspec file
Signed-off-by: John Kerry <john@kerryhouse.net>
2017-03-19 21:56:14 -04:00
John Kerry
1f92268aa2 Converting the junit reporter to use nokogiri on top of the json reporter output hash 2017-02-25 00:44:23 -05:00
Chris Redekop
5d00aac059 Add unit test skeleton with Minitest dependency
Signed-off-by: Chris Redekop <chris.redekop@d2l.com>
2017-02-14 18:38:06 +01:00
Tom Duffield
c5ad7b5d4a Relax constraint on rubocop
cookstyle requires = 0.39.0

Signed-off-by: Tom Duffield <tom@chef.io>
2017-02-08 16:48:30 -06:00
Guilhem Lettron
51ca98c468 Add an http test method
Signed-off-by: Guilhem Lettron <g.lettron@criteo.com>
2017-01-26 12:02:54 +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
46b65ba490 initial commit 2016-12-15 09:53:01 +01:00
jkerry
e5038e1e5d adding a shell extension class of the rspec_junit_formatter gem formatter and including it in the formatters list with key 'junit'
Signed-off-by: jkerry <john@kerryhouse.net>
2016-11-20 00:18:34 -05:00
Victoria Jeffrey
4baf1ae99c move inquirer to deploy 2016-09-27 14:23:32 -04:00
Alex Pop
48bc82e754 needed when converting profiles with inspec-scap 2016-09-23 07:47:21 +01:00
Dominik Richter
d842771b68 add build tasks for www 2016-09-22 23:51:30 +02:00
Dominik Richter
f9248033c3 render resource docs 2016-09-22 16:47:58 +02:00
Christoph Hartmann
f54fa7bbdf optimize command simulator auto-generation 2016-09-16 14:27:16 +02:00
Christoph Hartmann
2dbcbb6cb1 update train and kitchen-inspec version to support winrm v2 2016-09-05 13:36:48 +02:00
Christoph Hartmann
49603256ed suport for ruby 2.2.2 2016-08-26 10:57:03 +02:00
Kartik Null Cating-Subramanian
6983fe434a Upgrade FFI to Ruby 2.3 issues on windows 2016-08-25 14:04:09 -04:00
John Keiser
2b37bd6586 Fix bundle install on Ruby 2.1.9 2016-08-25 14:16:16 +02:00
Christoph Hartmann
fb23e53b3d fix json 1.8 version for ruby 1.9 & 2.1 2016-08-24 11:16:43 +02:00
Dominik Richter
161bd637f3 move mocha to test group in Gemfile
group test gems together.
2016-08-16 06:20:42 -07:00