From 0b8cc0d54d7cfe3d13eb0e39336079653e27bdaa Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 3 Jul 2018 14:37:00 -0700 Subject: fixes for latest chefstyle rules Signed-off-by: Lamont Granquist --- Gemfile | 2 +- ext/ffi_yajl/ext/encoder/extconf.rb | 4 ++-- ext/ffi_yajl/ext/parser/extconf.rb | 4 ++-- lib/ffi_yajl/version.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 49447a0..eb1dc6c 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ group :development do end group :development_extras do - gem "chefstyle" + gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master" end instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] diff --git a/ext/ffi_yajl/ext/encoder/extconf.rb b/ext/ffi_yajl/ext/encoder/extconf.rb index e13c0a1..8f7d14b 100644 --- a/ext/ffi_yajl/ext/encoder/extconf.rb +++ b/ext/ffi_yajl/ext/encoder/extconf.rb @@ -42,14 +42,14 @@ if !windows? && !find_header("yajl/yajl_tree.h") "/usr/local/include", # /usr/local RbConfig::CONFIG["includedir"], # Ruby "/usr/include", # (default) - ] + ].freeze LIB_DIRS = [ "/opt/local/lib", # MacPorts "/usr/local/lib", # /usr/local + Homebrew RbConfig::CONFIG["libdir"], # Ruby "/usr/lib", # (default) - ] + ].freeze # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib dir_config("yajl", HEADER_DIRS, LIB_DIRS) diff --git a/ext/ffi_yajl/ext/parser/extconf.rb b/ext/ffi_yajl/ext/parser/extconf.rb index 86ee50f..5611934 100644 --- a/ext/ffi_yajl/ext/parser/extconf.rb +++ b/ext/ffi_yajl/ext/parser/extconf.rb @@ -42,14 +42,14 @@ if !windows? && !find_header("yajl/yajl_tree.h") "/usr/local/include", # /usr/local RbConfig::CONFIG["includedir"], # Ruby "/usr/include", # (default) - ] + ].freeze LIB_DIRS = [ "/opt/local/lib", # MacPorts "/usr/local/lib", # /usr/local + Homebrew RbConfig::CONFIG["libdir"], # Ruby "/usr/lib", # (default) - ] + ].freeze # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib dir_config("yajl", HEADER_DIRS, LIB_DIRS) diff --git a/lib/ffi_yajl/version.rb b/lib/ffi_yajl/version.rb index e5d669f..6be178d 100644 --- a/lib/ffi_yajl/version.rb +++ b/lib/ffi_yajl/version.rb @@ -21,5 +21,5 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. module FFI_Yajl - VERSION = "2.3.1" + VERSION = "2.3.1".freeze end -- cgit v1.2.1