Commit graph

102 commits

Author SHA1 Message Date
Ryan Davis
a5309ea392 blindly applied chefstyle -a
Signed-off-by: Ryan Davis <zenspider@chef.io>
2019-06-11 18:52:03 -07:00
Ryan Davis
52423e8a0c Switched dependency to chefstyle.
Signed-off-by: Ryan Davis <zenspider@chef.io>
2019-06-11 15:07:34 -07:00
Miah Johnson
1a448f6264 We need berkshelf for test-kitchen, but we need chef 14 to support ruby
2.4

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-06-06 13:46:22 -07:00
Miah Johnson
c28430a47b test-kitchen currently requires berkshelf
I also discussed with Jerry if we can replace Berks with policyfile for
our testing and it seems unlikely at this point. Will re-evaluate in the
future.

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-06-06 13:46:22 -07:00
Miah Johnson
a794506380 berkshelf is making dependency fun. bye.
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-06-06 13:46:22 -07:00
Miah Johnson
906f700e75 Open up restrictions on these gems as they were.. out of date.
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-06-06 13:46:22 -07:00
Miah Johnson
e405dd0c80 Put pry with test tools, remove useless group
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-06-06 13:45:39 -07:00
Miah Johnson
23245df6d1 Replace jsonschema with json-schema.
Also just use json, its packaged with ruby already.

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-06-01 22:04:36 -07:00
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