libyajl2 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 29b90bdd01eb66658fee66165cb6c6ec171b8238
-  data.tar.gz: c97658670399d81a46813ba29dbe7cedd3015ead
+SHA256:
+  metadata.gz: ddb9c78dfc2cbd1c0407790c2e277d7d6486757a40810536ab7c2af5c4e4f188
+  data.tar.gz: b7c6dcfed6dc83b0dd1df72db292310f2c1167ffb2fc9f4d14122fec90aaf1b5
 SHA512:
-  metadata.gz: 2d8a44e91e9bc48eedc4b43e6ef3ba91a08426f67a6a93c3e08632d611c566d681c9c920287b448b626292e18de78eea0f151546bb96c1c500c9e643ec520d63
-  data.tar.gz: b35c206f313b2f84cfa3eb4a00dd7ea172d94773cde7a85487b1cb6c327bd737582d1e1bb05573566d6d376f215e8b3b1a4c80a380b1a2025e92456292674094
+  metadata.gz: bd7b7148fbe25958d9679be8defc46132d0b00eb90270f4071e6af2f206967bd386ec9104d73393427a15cd2fa1f7ba9c31e8ce7b67d65c63e21f214eaba9901
+  data.tar.gz: 2b984199978f692e3c5401020f7d17dd2f25de212eddc848c178c0ef3a29bad0e4a7f6eb37551af2f7b181a4078b992808f51218fd3f229ca65783574a95fb1a

data/Gemfile

@@ -1,18 +1,18 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :development_extras do
-  gem 'rubocop', '= 0.21.0'
-  gem 'reek', '= 1.3.7'
-  gem 'test-kitchen', '~> 1.2'
-  gem 'kitchen-digitalocean'
-  gem 'kitchen-ec2'
-  gem 'kitchen-vagrant'
+  gem "chefstyle"
+  gem "reek"
+  gem "test-kitchen", "~> 1.2"
+  gem "kitchen-digitalocean"
+  gem "kitchen-ec2"
+  gem "kitchen-vagrant"
 end
 
 platforms :rbx do
-  gem 'racc'
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
 end

data/Rakefile

@@ -1,15 +1,15 @@
 $: << File.expand_path(File.join(File.dirname( __FILE__ ), "lib"))
 
-require 'rubygems'
-require 'rake'
+require "rubygems"
+require "rake"
 
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-require 'rake/extensiontask'
+require "rubygems/package_task"
+require "rspec/core/rake_task"
+require "rake/extensiontask"
 
 GEM_NAME = "libyajl2"
 
-gemspec = eval(File.read('libyajl2.gemspec'))
+gemspec = eval(File.read("libyajl2.gemspec")) # rubocop:disable Security/Eval
 
 Gem::PackageTask.new(gemspec) do |pkg|
   pkg.need_tar = true
@@ -41,9 +41,9 @@ task :clean do
   sh "git clean -fdx"
 end
 
-Rake::ExtensionTask.new('libyajl', gemspec) do |ext|
-  ext.lib_dir = 'lib/libyajl2/vendored-libyajl2/lib'
-  ext.ext_dir = 'ext/libyajl2'
+Rake::ExtensionTask.new("libyajl", gemspec) do |ext|
+  ext.lib_dir = "lib/libyajl2/vendored-libyajl2/lib"
+  ext.ext_dir = "ext/libyajl2"
 end
 
 # hack to generate yajl_version.h without using cmake
@@ -53,17 +53,17 @@ def generate_yajl_version
 
   yajl_major = yajl_minor = yajl_micro = nil
   File.open("#{vendor_path}/CMakeLists.txt").each do |line|
-    if m = line.match(/YAJL_MAJOR (\d+)/)
+    if (m = line.match(/YAJL_MAJOR (\d+)/))
       yajl_major = m[1]
     end
-    if m = line.match(/YAJL_MINOR (\d+)/)
+    if (m = line.match(/YAJL_MINOR (\d+)/))
       yajl_minor = m[1]
     end
-    if m = line.match(/YAJL_MICRO (\d+)/)
+    if (m = line.match(/YAJL_MICRO (\d+)/))
       yajl_micro = m[1]
     end
   end
-  File.open("#{build_path}/api/yajl_version.h", "w+") do |out|  # FIXME: relative path
+  File.open("#{build_path}/api/yajl_version.h", "w+") do |out| # FIXME: relative path
     File.open("#{vendor_path}/src/api/yajl_version.h.cmake").each do |line|
       line.gsub!(/\$\{YAJL_MAJOR\}/, yajl_major)
       line.gsub!(/\$\{YAJL_MINOR\}/, yajl_minor)
@@ -136,7 +136,7 @@ RSpec::Core::RakeTask.new(:spec)
 if RUBY_VERSION.to_f >= 1.9
   namespace :integration do
     begin
-      require 'kitchen'
+      require "kitchen"
     rescue LoadError
       task :vagrant do
         puts "test-kitchen gem is not installed"
@@ -145,7 +145,7 @@ if RUBY_VERSION.to_f >= 1.9
         puts "test-kitchen gem is not installed"
       end
     else
-      desc 'Run Test Kitchen with Vagrant'
+      desc "Run Test Kitchen with Vagrant"
       task :vagrant do
         Kitchen.logger = Kitchen.default_file_logger
         Kitchen::Config.new.instances.each do |instance|
@@ -153,32 +153,33 @@ if RUBY_VERSION.to_f >= 1.9
         end
       end
 
-      desc 'Run Test Kitchen with cloud plugins'
+      desc "Run Test Kitchen with cloud plugins"
       task :cloud do
-        if ENV['TRAVIS_PULL_REQUEST'] != 'true'
-          ENV['KITCHEN_YAML'] = '.kitchen.cloud.yml'
+        if ENV["TRAVIS_PULL_REQUEST"] != "true"
+          ENV["KITCHEN_YAML"] = ".kitchen.cloud.yml"
           sh "kitchen test --concurrency 4"
         end
       end
     end
   end
   namespace :style do
-    desc 'Run Ruby style checks'
+    desc "Run Ruby style checks"
     begin
-      require 'rubocop/rake_task'
+      require "chefstyle"
+      require "rubocop/rake_task"
     rescue LoadError
       task :rubocop do
         puts "rubocop gem is not installed"
       end
     else
-      Rubocop::RakeTask.new(:rubocop) do |t|
+      RuboCop::RakeTask.new(:rubocop) do |t|
         t.fail_on_error = false
       end
     end
 
-    desc 'Run Ruby smell checks'
+    desc "Run Ruby smell checks"
     begin
-      require 'reek/rake/task'
+      require "reek/rake/task"
     rescue LoadError
       task :reek do
         puts "reek gem is not installed"
@@ -186,7 +187,7 @@ if RUBY_VERSION.to_f >= 1.9
     else
       Reek::Rake::Task.new(:reek) do |t|
         t.fail_on_error = false
-        t.config_files = '.reek.yml'
+        t.config_file = ".reek.yml"
       end
     end
   end
@@ -209,14 +210,13 @@ else
   end
 end
 
+desc "Run all style checks"
+task :style => ["style:rubocop", "style:reek"]
 
-desc 'Run all style checks'
-task :style => ['style:rubocop', 'style:reek']
+desc "Run style + spec tests by default on travis"
+task :travis => %w{spec style}
 
-desc 'Run style + spec tests by default on travis'
-task :travis => ['spec', 'style']
+desc "Run style, spec and test kichen on travis"
+task :travis_all => ["spec", "integration:cloud", "style"]
 
-desc 'Run style, spec and test kichen on travis'
-task :travis_all => ['spec', 'integration:cloud', 'style']
-
-task :default => ['spec', 'integration:vagrant', 'style']
+task :default => ["spec", "integration:vagrant", "style"]

data/ext/libyajl2/extconf.rb

@@ -1,6 +1,7 @@
 
-require 'rbconfig'
-require 'fileutils'
+require "rbconfig"
+require "fileutils"
+require "shellwords"
 
 if ENV["USE_SYSTEM_LIBYAJL2"]
   File.open("Makefile", "w+") do |f|
@@ -32,21 +33,21 @@ module Libyajl2Build
   end
 
   def self.prefix
-    PREFIX
+    PREFIX.shellescape
   end
 
   def self.deps
-    require 'mkmf'
+    require "mkmf"
   end
 
   def self.setup_env
-    RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+    RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
 
     # set some sane defaults
-    if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
+    if RbConfig::MAKEFILE_CONFIG["CC"] =~ /gcc|clang/
       # magic flags copied from upstream yajl build system (-std=c99 is necessary for older gcc)
       $CFLAGS << " -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra  -Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes"
-      $CFLAGS << " -O2"  # match what the upstream uses for optimization
+      $CFLAGS << " -O2" # match what the upstream uses for optimization
 
       # create the implib on windows
       if windows?
@@ -95,8 +96,8 @@ EOF
       # i could not figure out how to tell mkmf.rb to stop being so helpful, so instead will just patch it here.
       if windows?
         makefile = IO.read("Makefile")
-        makefile.gsub!(/\$\(DEFFILE\)/, '')
-        File.open("Makefile", 'w+') {|f| f.write(makefile) }
+        makefile.gsub!(/\$\(DEFFILE\)/, "")
+        File.open("Makefile", "w+") { |f| f.write(makefile) }
       end
 
       system("pwd")

data/lib/libyajl2/version.rb

@@ -1,3 +1,3 @@
 module Libyajl2
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/libyajl2.gemspec

@@ -1,21 +1,20 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'libyajl2/version'
+require "libyajl2/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "libyajl2"
   spec.version       = Libyajl2::VERSION
   spec.authors       = ["lamont-granquist"]
-  spec.email         = ["lamont@getchef.com"]
+  spec.email         = ["lamont@chef.io"]
   spec.summary       = %q{Installs a vendored copy of libyajl2 for distributions which lack it}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/opscode/libyajl2-gem"
-  spec.licenses       = ["Apache 2.0"]
+  spec.homepage      = "https://github.com/chef/libyajl2-gem"
+  spec.licenses      = ["Apache-2.0"]
 
   spec.files         = Dir.glob("{ext,lib,spec}/**/*") +
-    %w{Gemfile Rakefile CONTRIBUTING.md README.md libyajl2.gemspec bootstrap.sh LICENSE}
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    %w{Gemfile Rakefile libyajl2.gemspec bootstrap.sh LICENSE}
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
@@ -25,9 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   # rake-compiler 0.9.2 is required for rbx compiles, and in turn requires rubygems >= 1.8.25
-  spec.add_development_dependency "rake-compiler", "~> 0.9"
-  # pin mime-types in order to work on ruby 1.8.7
-  spec.add_development_dependency "mime-types", "~> 1.16"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "ffi", "~> 1.9"
 end

data/spec/ffi_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'ffi'
+require "ffi"
 
 module LibyajlTestFFI
   extend ::FFI::Library

data/spec/path_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe "when testing path helpers" do
   it "should define Libyajl2::VENDORED_LIBYAJL2_DIR" do
@@ -15,7 +15,7 @@ describe "when testing path helpers" do
 
   %w{yajl_common.h yajl_gen.h yajl_parse.h yajl_tree.h yajl_version.h}.each do |hdr|
     it "should copy the #{hdr} header file to the gem path" do
-      expect(File.exist?(File.join(Libyajl2.include_path, "yajl", hdr))).to be_true
+      expect(File.exist?(File.join(Libyajl2.include_path, "yajl", hdr))).to be_truthy
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 $LOAD_PATH << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
 
-require 'libyajl2'
+require "libyajl2"
 
 RSpec.configure do |c|
 
-  c.order = 'random'
+  c.order = "random"
 
   c.expect_with :rspec do |c2|
     c2.syntax = :expect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libyajl2
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,44 +42,30 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -96,16 +82,14 @@ dependencies:
         version: '1.9'
 description: Installs a vendored copy of libyajl2 for distributions which lack it
 email:
-- lamont@getchef.com
+- lamont@chef.io
 executables: []
 extensions:
 - ext/libyajl2/extconf.rb
 extra_rdoc_files: []
 files:
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE
-- README.md
 - Rakefile
 - bootstrap.sh
 - ext/libyajl2/api/yajl_common.h
@@ -304,14 +288,15 @@ files:
 - ext/libyajl2/yajl_tree.c
 - ext/libyajl2/yajl_version.c
 - lib/libyajl2.rb
+- lib/libyajl2/vendored-libyajl2/lib/libyajl.bundle
 - lib/libyajl2/version.rb
 - libyajl2.gemspec
 - spec/ffi_spec.rb
 - spec/path_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/opscode/libyajl2-gem
+homepage: https://github.com/chef/libyajl2-gem
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -329,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Installs a vendored copy of libyajl2 for distributions which lack it

data/CONTRIBUTING.md

@@ -1,4 +0,0 @@
-# Contributing
-
-No contributions from outside of Chef Software, Inc. for now.
-

data/README.md

@@ -1,9 +0,0 @@
-libyajl2-gem
-============
-
-[![Build Status](https://secure.travis-ci.org/opscode/libyajl2-gem.svg?branch=master)](http://travis-ci.org/opscode/libyajl2-gem)
-[![Dependency Status](https://gemnasium.com/opscode/libyajl2-gem.svg)](https://gemnasium.com/opscode/libyajl2-gem)
-[![Code Climate](https://codeclimate.com/github/opscode/libyajl2-gem.png)](https://codeclimate.com/github/opscode/libyajl2-gem)
-[![Gem Version](https://badge.fury.io/rb/libyajl2.svg)](http://badge.fury.io/rb/libyajl2)
-
-gem to install the libyajl2 c-library for distributions which do not have it