libyajl2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 5dbedf1028114881a28ab6fc7b925d207690d7073eca4d73357844584ad9a76af5697ab06a505c5ae89d138ca53660bdc2cc40392f9df50ed9c2825a53c512e6
-  data.tar.gz: 1fbcf514126955bd725b0d5b75c115218d742794decfe3a24b4075ccb7d14c95840eacbf3c7bd03c5706b0029fff8577e1aec00f4dc0db13e72f753d92f8366b
-SHA1: 
-  metadata.gz: d7f4f98a8b1c0f6a2d8cf44edd8ece0cabd35dc0
-  data.tar.gz: 3f63bf8fa8e558b4efa3141e7ec834934d5e413c
+---
+SHA1:
+  metadata.gz: b20f419f27c045bd88357a6a08a40d6d1be8700f
+  data.tar.gz: a7da02a958918fa084a1fb39513cf1e3bfd1be6e
+SHA512:
+  metadata.gz: 6661966c7d6ac9884dca7bb0262c1f91db71180e9112033c4a4e55a6a8caf7075b29f13158d8e8e0fcc22a0de40909fed1810d854f7d1cb9ceffffa6a729ef96
+  data.tar.gz: 4c9afd6f51c00697135b59240b1e77372de0d0992a14a8ccac3492d85471366a1f1fd74170cdb5ec3b9038f5fc56fba41155843084935eb11ca59b27319d11fb

data/ext/libyajl2/extconf.rb

@@ -23,20 +23,25 @@ module Libyajl2Build
   end
 
   def self.setup_env
+    if config['CC'] =~ /gcc/ || config['CC'] =~ /clang/
+      config['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"
+    end
   end
 
   # for mkmf.rb compat
-  CONFIG = RbConfig::MAKEFILE_CONFIG
+  def self.config
+    @config ||= RbConfig::MAKEFILE_CONFIG.dup
+  end
 
   def self.mkintpath(path)
-    case CONFIG['build_os']
+    case config['build_os']
     when 'mingw32'
       path = path.dup
       path.tr!('\\', '/')
       path.sub!(/\A([A-Za-z]):(?=\/)/, '/\1')
       path
     when 'cygwin'
-      if CONFIG['target_os'] != 'cygwin'
+      if config['target_os'] != 'cygwin'
         IO.popen(["cygpath", "-u", path], &:read).chomp
       else
         path
@@ -90,7 +95,7 @@ ECHO = $(ECHO1:0=@echo)
 #### Start of system configuration section. ####
 
 srcdir = .
-prefix = #{mkintpath(CONFIG['prefix'])}
+prefix = #{mkintpath(config['prefix'])}
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
 sitearchdir = $(sitelibdir)/$(sitearch)
@@ -98,36 +103,36 @@ sitelibdir = $(sitedir)/$(ruby_version)
 sitedir = $(rubylibprefix)/site_ruby
 libdir = $(exec_prefix)/lib
 
-CC = #{CONFIG['CC']}
+CC = #{config['CC']}
 COUTFLAG = '-o'
 
-cflags   = #{CONFIG['cflags']}
-optflags = #{CONFIG['optflags']}
-debugflags = #{CONFIG['debugflags']}
-warnflags = #{CONFIG['warnflags']}
-CCDLFLAGS = #{CONFIG['CCDLFLAGS']}
-CFLAGS   = $(CCDLFLAGS) -I#{libyajl2_vendor_dir}/src/api -I. #{CONFIG['CFLAGS']} $(ARCH_FLAG)
+cflags   = #{config['cflags']}
+optflags = #{config['optflags']}
+debugflags = #{config['debugflags']}
+warnflags = #{config['warnflags']}
+CCDLFLAGS = #{config['CCDLFLAGS']}
+CFLAGS   = $(CCDLFLAGS) -I#{libyajl2_vendor_dir}/src/api -I. #{config['CFLAGS']} $(ARCH_FLAG)
 INCFLAGS = -I. -I$(srcdir)
-DEFS     = #{CONFIG['DEFS']}
-CPPFLAGS = #{CONFIG['CPPFLAGS']} $(cppflags)
-ldflags  = #{CONFIG['LDFLAGS']}
+DEFS     = #{config['DEFS']}
+CPPFLAGS = #{config['CPPFLAGS']} $(cppflags)
+ldflags  = #{config['LDFLAGS']}
 #dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress
-dldflags = #{CONFIG['DLDFLAGS']} #{CONFIG['EXTDLDFLAGS']}
-ARCH_FLAG = #{CONFIG['ARCH_FLAG']}
+dldflags = #{config['DLDFLAGS']} #{config['EXTDLDFLAGS']}
+ARCH_FLAG = #{config['ARCH_FLAG']}
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = #{CONFIG['LDSHARED']}
+LDSHARED = #{config['LDSHARED']}
 
-RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
-RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
-RUBYW_INSTALL_NAME = #{CONFIG['RUBYW_INSTALL_NAME']}
-RUBY_VERSION_NAME = #{CONFIG['RUBY_VERSION_NAME']}
-RUBYW_BASE_NAME = #{CONFIG['RUBYW_BASE_NAME']}
-RUBY_BASE_NAME = #{CONFIG['RUBY_BASE_NAME']}
+RUBY_INSTALL_NAME = #{config['RUBY_INSTALL_NAME']}
+RUBY_SO_NAME = #{config['RUBY_SO_NAME']}
+RUBYW_INSTALL_NAME = #{config['RUBYW_INSTALL_NAME']}
+RUBY_VERSION_NAME = #{config['RUBY_VERSION_NAME']}
+RUBYW_BASE_NAME = #{config['RUBYW_BASE_NAME']}
+RUBY_BASE_NAME = #{config['RUBY_BASE_NAME']}
 
-arch = #{CONFIG['arch']}
-sitearch = #{CONFIG['sitearch']}
+arch = #{config['arch']}
+sitearch = #{config['sitearch']}
 ruby_version = #{RbConfig::CONFIG['ruby_version']}
-ruby = #{File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"])}
+ruby = #{File.join(RbConfig::CONFIG["bindir"], config["ruby_install_name"])}
 RUBY = $(ruby)
 
 RM = $(RUBY) -run -e rm -- -f
@@ -144,13 +149,13 @@ LIBPATH = -L. -L$(libdir)
 CLEANFILES = mkmf.log
 
 target_prefix =
-LIBS =  #{CONFIG['LIBS']} #{CONFIG['DLDLIBS']}
+LIBS =  #{config['LIBS']} #{config['DLDLIBS']}
 ORIG_SRCS = yajl.c yajl_alloc.c yajl_buf.c yajl_encode.c yajl_gen.c yajl_lex.c yajl_parser.c yajl_tree.c yajl_version.c
 SRCS = $(ORIG_SRCS)
 OBJS = yajl.o yajl_alloc.o yajl_buf.o yajl_encode.o yajl_gen.o yajl_lex.o yajl_parser.o yajl_tree.o yajl_version.o
 HDRS = yajl_alloc.h yajl_buf.h yajl_bytestack.h yajl_encode.h yajl_lex.h yajl_parser.h
 TARGET = libyajl
-DLLIB = $(TARGET).#{CONFIG['DLEXT']}
+DLLIB = $(TARGET).#{config['DLEXT']}
 
 TIMESTAMP_DIR = .
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
@@ -203,7 +208,7 @@ EOF
     File.open("Makefile", "w+") do |f|
       f.write <<EOF
 TARGET = libyajl
-DLLIB = $(TARGET).#{CONFIG['DLEXT']}
+DLLIB = $(TARGET).#{config['DLEXT']}
 all:
 \tcd #{libyajl2_vendor_dir}/src && make
 \tcp #{libyajl2_vendor_dir}/src/$(DLLIB) .

data/lib/libyajl2/version.rb

@@ -1,3 +1,3 @@
 module Libyajl2
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,91 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: libyajl2
-version: !ruby/object:Gem::Version 
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version_requirements: *id001
-  prerelease: false
-  type: :development
+date: 2014-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
-  version_requirements: *id003
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rake
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
-  version_requirements: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rake-compiler
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.16"
-  version_requirements: *id005
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: mime-types
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.14"
-  version_requirements: *id006
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :development
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.9"
-  version_requirements: *id007
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
   name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: Installs a vendored copy of libyajl2 for distributions which lack it
-email: 
+email:
 - lamont@scriptkiddie.org
 executables: []
-
-extensions: 
+extensions:
 - ext/libyajl2/extconf.rb
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .gitmodules
-- .kitchen.cloud.yml
-- .kitchen.yml
-- .reek.yml
-- .rspec
-- .rubocop.yml
-- .travis.yml
+files:
+- ".gitignore"
+- ".gitmodules"
+- ".kitchen.cloud.yml"
+- ".kitchen.yml"
+- ".reek.yml"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -94,13 +118,6 @@ files:
 - bootstrap.sh
 - ext/libyajl2/Makefile
 - ext/libyajl2/extconf.rb
-- lib/libyajl2.rb
-- lib/libyajl2/vendored-libyajl2/.gitkeep
-- lib/libyajl2/version.rb
-- libyajl2.gemspec
-- spec/ffi_spec.rb
-- spec/path_spec.rb
-- spec/spec_helper.rb
 - ext/libyajl2/vendor/yajl/.gitignore
 - ext/libyajl2/vendor/yajl/BUILDING
 - ext/libyajl2/vendor/yajl/BUILDING.win32
@@ -270,30 +287,38 @@ files:
 - ext/libyajl2/vendor/yajl/test/parsing/yajl_test.c
 - ext/libyajl2/vendor/yajl/verify/CMakeLists.txt
 - ext/libyajl2/vendor/yajl/verify/json_verify.c
+- lib/libyajl2.rb
+- lib/libyajl2/vendored-libyajl2/.gitkeep
+- lib/libyajl2/version.rb
+- libyajl2.gemspec
+- spec/ffi_spec.rb
+- spec/path_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/lamont-granquist/libyajl2-gem
-licenses: 
+licenses:
 - Apache 2.0
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.12
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Installs a vendored copy of libyajl2 for distributions which lack it
-test_files: 
+test_files:
 - spec/ffi_spec.rb
 - spec/path_spec.rb
 - spec/spec_helper.rb