Commit graph

144 commits

Author SHA1 Message Date
Ryan Davis
7082fbef3d Add support for Gemfile.local
Let me use _my_ tooling!

Signed-off-by: Ryan Davis <zenspider@chef.io>
2019-05-18 13:19:56 -07:00
Tim Smith
96ed4988e3 Temporarily set TK to 1.x
Until we figure out the licensing issues

Signed-off-by: Tim Smith <tsmith@chef.io>
2019-05-15 14:50:54 -07:00
Miah Johnson
11b8da3283
Merge branch 'master' into mj/encoding 2019-05-08 12:59:55 -07:00
Miah Johnson
20bafdc4b2
Merge pull request #3988 from inspec/mj/coveralls
Add Coveralls.io support to InSpec
2019-05-08 12:58:00 -07:00
Miah Johnson
659b4b373a Remove # encoding: utf8 magic comments
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-05-07 16:06:23 -07:00
Clinton Wolfe
60ec509788 Comment regarding inspec-bin in Gemfile
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-04-29 19:37:55 -04:00
tyler-ball
9fc9466d40 Need 1 Gemfile.lock with all deps (inspec and inspec-bin)
Signed-off-by: tyler-ball <tball@chef.io>
2019-04-29 15:47:33 -06:00
Clinton Wolfe
32950a05b9 Do not depend on inspec-bin from Gemfile
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-04-29 15:47:26 -06:00
Clinton Wolfe
e404bafd7a bundle exec works
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-04-29 13:27:09 -06:00
Miah Johnson
b1d5091670 Add Coveralls.io support to InSpec
Tie coveralls into simplecov formatters
Add coveralls badge to README

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-04-26 13:37:55 -07:00
Tim Smith
c2c6b59568 Add ed25519 gems in the omnibus group
We want to have these installed in our omnibus package, but we can't
make them direct deps in train because then a gem install of inspec
would need compilers to install these gems.

Signed-off-by: Tim Smith <tsmith@chef.io>
2019-04-22 17:34:32 -07:00
Tim Smith
6c3abc36ef Use the upstream unf_ext again
The new version was released that includes our Solaris patch as well as Ruby 2.6 support.

Signed-off-by: Tim Smith <tsmith@chef.io>
2019-04-19 20:18:11 -07:00
Tim Smith
00ce6c02df Require Ruby 2.4 or later
Ruby 2.3 is no longer supported. Drop this release from InSpec and
instead support the 3 latest Ruby releases.

Signed-off-by: Tim Smith <tsmith@chef.io>
2019-04-16 21:19:40 -07:00
Tim Smith
501a39018e Attempt to switch to new webmock that supports Ruby 2.6+
Signed-off-by: Tim Smith <tsmith@chef.io>
2019-04-11 14:27:24 -07:00
Clinton Wolfe
ccdd1cfffb Drop aws-sdk 2, move to train 2, add train-aws 0.1
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-04-08 14:24:46 -04:00
Clinton Wolfe
08aea07c71 Re-add a bespoke unf_ext to our omnibus build
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
2019-03-22 00:22:06 -04:00
Lamont Granquist
e16206f1d0 Move all gem installation to Gemfile/bundle install
Do not use omnibus-software gem definitions for installing gems,
and use the Gemfile in the inspec project as the source of truth.

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
2019-03-01 17:45:37 -08:00
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
Dominik Richter
aed68f9a29 update dependencies and loosen molinillo
This prevents gecode from being pulled in as a gem dependency
2016-08-15 07:30:57 -07:00
Christoph Hartmann
da3d6f0f2d require train 0.16
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2016-08-08 13:19:28 +02:00
Steven Danna
57d7275857
Update inspec for os[:family] change in Train
Signed-off-by: Steven Danna <steve@chef.io>
2016-08-04 13:32:35 +01:00
Dominik Richter
fde8454a2b pin gem version for ffi due to appveyor failures
See https://ci.appveyor.com/project/chef/inspec/build/1.0.889/job/19sdqmtmie1wgece
2016-07-06 02:43:43 +02:00
Christoph Hartmann
ba95e461d3 run integration tests in docker 2016-05-16 18:25:17 +02:00
Alex Pop
e24772e4b7 releasing 0.20.1 2016-04-30 02:02:29 +01:00
Dominik Richter
890ce1921f release via travis + test via rubygems 2016-04-18 10:46:12 -04:00
Stephan Renatus
d297b3dc6f travis/Gemfile: use train from github 2016-04-18 11:53:30 +02:00
Christoph Hartmann
0b582d2085 update dependencies for windows 2016-03-18 12:30:40 +01:00
Stephan Renatus
bcee367104 dedup Gemfiles 2016-02-08 14:34:35 +01:00
Christoph Hartmann
76b1d662ca add winrm transport for test-kitchen, since train does not use it anymore 2016-01-29 14:30:51 +01:00
Dominik Richter
c37e326bd7 pin rubocop to 0.36
to avoid further MR errors that are unexpected when sb. adds an MR
2016-01-15 04:09:03 +01:00
Christoph Hartmann
7856f1dd38 add kitchen-ec2 as test dependency 2016-01-04 03:45:58 +01:00
Dominik Richter
311fdb342b add github changelog generator 2015-11-20 22:23:25 +01:00
tyler-ball
d9555505c9 Updating Gemfile grouped dependencies to match what is already in the ChefDK 2015-11-04 16:01:09 -07:00
Dominik Richter
7fe379c654 update gemspec for push 2015-11-03 09:58:26 +01:00
Christoph Hartmann
af613a14da do not load maintenance gems during testing 2015-10-30 17:30:44 +01:00
Christoph Hartmann
c71e454259 add gems for maintainer generation 2015-10-30 17:02:18 +01:00
Christoph Hartmann
8738687a89 update to new kitchen-inspect 2015-10-26 19:33:53 +01:00
Dominik Richter
f2f265a01a temporarily remove kitchen inspec until it is moved 2015-10-26 12:48:09 +01:00
Dominik Richter
b3cbf21ebd move concurrent ruby gem to test group 2015-10-25 23:14:19 +01:00
Christoph Hartmann
f38b278b50 setup test-kitchen workflow 2015-10-23 12:14:00 +02:00
Dominik Richter
4099dd92c0 add train to gemfile (for now) 2015-10-15 00:43:02 +02:00
Dominik Richter
184f72e1e9 move remaining dev dependencies to gemfile
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2015-09-22 02:27:02 +02:00
Christoph Hartmann
e0458dd4a0 move integration dependencies to Gemfile, add kitchen-vagrant as dependency 2015-09-22 02:27:02 +02:00
Dominik Richter
c6b000a587 add license_finder to dev gems
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2015-06-19 15:06:13 +02:00
Dominik Richter
86b85801a1 add gemfile
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2015-06-18 23:54:02 +02:00