summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--ISSUE_TEMPLATE.md18
-rw-r--r--appveyor.yml2
-rw-r--r--lib/ohai/loader.rb2
-rw-r--r--ohai.gemspec2
5 files changed, 24 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 2fc976ce..f33b7d17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,10 @@ before_install:
- bundle --version
- gem --version
rvm:
+ - 2.0
- 2.1
- 2.2
+ - 2.3.0
script:
- bundle exec chefstyle
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..c1d43ea5
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,18 @@
+## Description
+
+Briefly describe the issue
+
+## Ohai Version
+
+Tell us which version of Ohai you are using.
+
+## Platform Version
+
+Tell us which Operating System distribution and version Ohai is running on.
+
+## Ohai Output
+
+If relevant please include your complete Ohai output or link to a gist. Make sure to change any values that may be sensitive.
+
+The debug output (ohai -l debug) may be useful, but please link to a gist, or truncate it.
+
diff --git a/appveyor.yml b/appveyor.yml
index 83e19722..5b4410bf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,6 +7,8 @@ platform:
environment:
matrix:
- ruby_version: "200"
+ - ruby_version: "21"
+ - ruby_version: "22"
clone_folder: c:\projects\ohai
clone_depth: 1
diff --git a/lib/ohai/loader.rb b/lib/ohai/loader.rb
index 6680be90..0328b59e 100644
--- a/lib/ohai/loader.rb
+++ b/lib/ohai/loader.rb
@@ -39,7 +39,7 @@ module Ohai
# Finds all the *.rb files under the configured paths in :plugin_path
def self.find_all_in(plugin_dir)
- Dir[File.join(ChefConfig::PathHelper.escape_glob(plugin_dir), "**", "*.rb")].map do |file|
+ Dir[File.join(ChefConfig::PathHelper.escape_glob_dir(plugin_dir), "**", "*.rb")].map do |file|
new(file, plugin_dir)
end
end
diff --git a/ohai.gemspec b/ohai.gemspec
index 832d017f..1676cfa8 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "rspec-mocks", "~> 3.0"
s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
s.add_development_dependency "rspec_junit_formatter"
- s.add_development_dependency "github_changelog_generator"
+ s.add_development_dependency "github_changelog_generator", "1.11.3"
s.bindir = "bin"
s.executables = %w{ohai}