summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-06-06 19:00:10 -0700
committerGitHub <noreply@github.com>2019-06-06 19:00:10 -0700
commit3dd253f860a78452e195e2f0937cf6a8b24f2117 (patch)
tree2a1a5aef67feea46c90d7310d53892476dc8fe2b
parent00e6fee1941229ff03d0cab7e088742c2ee0c09f (diff)
parent6c55f32dfbe5d5f1d327341756c9821dfa08894b (diff)
downloadmixlib-shellout-3dd253f860a78452e195e2f0937cf6a8b24f2117.tar.gz
Merge pull request #185 from chef/bk
Add the actual BK pipeline config
-rw-r--r--.expeditor/config.yml2
-rw-r--r--.expeditor/verify.pipeline.yml31
-rw-r--r--.github/CODEOWNERS2
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md15
-rw-r--r--.travis.yml27
-rw-r--r--Gemfile16
-rw-r--r--README.md10
-rw-r--r--Rakefile21
-rw-r--r--spec/support/platform_helpers.rb2
9 files changed, 69 insertions, 57 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 75e5e3c..7032e6c 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -12,8 +12,6 @@ rubygems:
github:
# This deletes the GitHub PR branch after successfully merged into the release branch
delete_branch_on_merge: true
- # The tag format to use (e.g. v1.0.0)
- version_tag_format: "v{{version}}"
# allow bumping the minor release via label
minor_bump_labels:
- "Expeditor: Bump Version Minor"
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
new file mode 100644
index 0000000..e55244b
--- /dev/null
+++ b/.expeditor/verify.pipeline.yml
@@ -0,0 +1,31 @@
+steps:
+
+- label: run-lint-and-specs-ruby-2.4
+ command:
+ - asdf local ruby 2.4.5
+ - export USER="root"
+ - bundle install --jobs=7 --retry=3
+ - bundle exec rake
+ expeditor:
+ executor:
+ docker:
+
+- label: run-lint-and-specs-ruby-2.5
+ command:
+ - asdf local ruby 2.5.5
+ - bundle install --jobs=7 --retry=3
+ - export USER="root"
+ - bundle exec rake
+ expeditor:
+ executor:
+ docker:
+
+- label: run-lint-and-specs-ruby-2.6
+ command:
+ - asdf local ruby 2.6.3
+ - export USER="root"
+ - bundle install --jobs=7 --retry=3
+ - bundle exec rake
+ expeditor:
+ executor:
+ docker:
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9dbcc7b..f1217b3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
# Order is important. The last matching pattern has the most precedence.
-* @chef/chef-infra-reviewers
+* @chef/chef-foundation-reviewers
.expeditor/** @chef/jex-team
*.md @chef/docs-team
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 0df03f8..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### Description
-
-[Please describe what this change achieves]
-
-### Issues Resolved
-
-[List any existing issues this PR resolves, or any Discourse or
-StackOverflow discussions that are relevant]
-
-### Check List
-
-- [ ] New functionality includes tests
-- [ ] All tests pass
-- [ ] All commits have been signed-off for the Developer Certificate of Origin. See <https://github.com/chef/chef/blob/master/CONTRIBUTING.md#developer-certification-of-origin-dco>
-- [ ] PR title is a worthy inclusion in the CHANGELOG \ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bd71bb3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: ruby
-cache: bundler
-dist: xenial
-
-before_install:
- - gem install bundler || true
- - bundle --version
- - gem update --system
- - gem --version
-
-matrix:
- include:
- - rvm: 2.3.8
- - rvm: 2.4.5
- - rvm: 2.5.5
- - rvm: 2.6.2
- - rvm: ruby-head
- allow_failures:
- - rvm: ruby-head
-
-branches:
- only:
- - master
-
-bundler_args: --jobs 7 --without development
-
-script: bundle exec rake
diff --git a/Gemfile b/Gemfile
index 5aaba73..1e5f5f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,16 +2,28 @@ source "https://rubygems.org"
gemspec name: "mixlib-shellout"
-group(:test) do
+group :docs do
+ gem "yard"
+ gem "redcarpet"
+ gem "github-markup"
+end
+
+group :test do
gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
gem "rspec_junit_formatter"
gem "rspec", "~> 3.0"
gem "rake"
end
-group(:development) do
+group :development do
gem "pry"
gem "pry-byebug"
gem "pry-stack_explorer"
gem "rb-readline"
end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")
diff --git a/README.md b/README.md
index ffdc112..82cb0a3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
# Mixlib::ShellOut
-[![Build Status Master](https://travis-ci.org/chef/mixlib-shellout.svg?branch=master)](https://travis-ci.org/chef/mixlib-shellout) [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/mixlib-shellout?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/mixlib-shellout/branch/master) [![Gem Version](https://badge.fury.io/rb/mixlib-shellout.svg)](https://badge.fury.io/rb/mixlib-shellout)
+[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/mixlib-shellout?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/mixlib-shellout/branch/master) [![Build Status](https://badge.buildkite.com/7051b7b35cc19076c35a6e6a9e996807b0c14475ca3f3acd86.svg)](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [![Gem Version](https://badge.fury.io/rb/mixlib-shellout.svg)](https://badge.fury.io/rb/mixlib-shellout)
+
+**Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md)
+
+**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active)
+
+**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+
+**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
Provides a simplified interface to shelling out while still collecting both standard out and standard error and providing full control over environment, working directory, uid, gid, etc.
diff --git a/Rakefile b/Rakefile
index 40ab182..c2be547 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,28 @@
require "bundler"
-require "rspec/core/rake_task"
Bundler::GemHelper.install_tasks name: "mixlib-shellout"
-task default: [:spec, :style]
-
-desc "Run specs"
-RSpec::Core::RakeTask.new(:spec) do |spec|
- spec.pattern = "spec/**/*_spec.rb"
+begin
+ require "rspec/core/rake_task"
+ RSpec::Core::RakeTask.new do |t|
+ t.pattern = "spec/**/*_spec.rb"
+ end
+rescue LoadError
+ desc "rspec is not installed, this task is disabled"
+ task :spec do
+ abort "rspec is not installed. bundle install first to make sure all dependencies are installed."
+ end
end
begin
require "chefstyle"
require "rubocop/rake_task"
+ desc "Run Chefstyle tests"
RuboCop::RakeTask.new(:style) do |task|
task.options += ["--display-cop-names", "--no-color"]
end
rescue LoadError
- puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
+ puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
end
begin
@@ -34,3 +39,5 @@ task :console do
ARGV.clear
IRB.start
end
+
+task default: [:spec, :style]
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index 25e17f1..a03a0e0 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -2,8 +2,6 @@ def windows?
!!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
end
-# def jruby?
-
def unix?
!windows?
end