libyajl2 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 017c1b5f4904371c834db6209a7e4daed099667f
-  data.tar.gz: be09fb9c58b8baec900cb8aafe6beb6da272c6e0
-SHA512:
-  metadata.gz: 2c7890ae2e41777f261bb10c23117455288e7b211a0486d906a618b81dd764aae341a38c9857a8a76506e7d37494cc176fba043c95691cecc2c682ab32d05036
-  data.tar.gz: 5caf8ed901a79a00d981734a9aec96f2d711a0a7c9e372c0f902665748598037139f738e51cd1c31da8c3a8eda1b24895a195d1b24d6b73eda4e53f50ff8bd3e
+--- 
+SHA512: 
+  metadata.gz: 5dbedf1028114881a28ab6fc7b925d207690d7073eca4d73357844584ad9a76af5697ab06a505c5ae89d138ca53660bdc2cc40392f9df50ed9c2825a53c512e6
+  data.tar.gz: 1fbcf514126955bd725b0d5b75c115218d742794decfe3a24b4075ccb7d14c95840eacbf3c7bd03c5706b0029fff8577e1aec00f4dc0db13e72f753d92f8366b
+SHA1: 
+  metadata.gz: d7f4f98a8b1c0f6a2d8cf44edd8ece0cabd35dc0
+  data.tar.gz: 3f63bf8fa8e558b4efa3141e7ec834934d5e413c

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.1
+bundler_args: --without development_extras
 script:
 - bundle exec rake travis --trace

data/Rakefile

@@ -5,6 +5,7 @@ require 'rake'
 
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
+require 'rake/extensiontask'
 
 GEM_NAME = "libyajl2"
 
@@ -18,27 +19,32 @@ end
 # build tasks
 #
 
-desc "repackage and install #{GEM_NAME}-#{Libyajl2::VERSION}.gem"
-task :install => :repackage do
-  sh %{gem install pkg/#{GEM_NAME}-#{Libyajl2::VERSION}.gem --no-rdoc --no-ri}
-end
-
-desc "uninstall #{GEM_NAME}-#{Libyajl2::VERSION}.gem"
-task :uninstall do
-  sh %{gem uninstall #{GEM_NAME} -x -v #{Libyajl2::VERSION} }
-end
-
-desc "compile native gem"
-task :compile do
-  cd "ext/libyajl2"
-  ruby "extconf.rb"
-end
-
-desc "clean the git repo"
-task :clean do
-  sh "git clean -fdx"
-  cd "ext/libyajl2/vendor/yajl"
-  sh "git clean -fdx"
+#desc "repackage and install #{GEM_NAME}-#{Libyajl2::VERSION}.gem"
+#task :install => :repackage do
+#  sh %{gem install pkg/#{GEM_NAME}-#{Libyajl2::VERSION}.gem --no-rdoc --no-ri}
+#end
+#
+#desc "uninstall #{GEM_NAME}-#{Libyajl2::VERSION}.gem"
+#task :uninstall do
+#  sh %{gem uninstall #{GEM_NAME} -x -v #{Libyajl2::VERSION} }
+#end
+#
+#desc "compile native gem"
+#task :compile do
+#  cd "ext/libyajl2"
+#  ruby "extconf.rb"
+#end
+#
+#desc "clean the git repo"
+#task :clean do
+#  sh "git clean -fdx"
+#  cd "ext/libyajl2/vendor/yajl"
+#  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'
 end
 
 # FIXME: need a rake task to update the git submodule and need to do that before shipping
@@ -138,9 +144,9 @@ desc 'Run all style checks'
 task :style => ['style:rubocop', 'style:reek']
 
 desc 'Run style + spec tests by default on travis'
-task :travis => ['style', 'spec']
+task :travis => ['compile', 'spec', 'style']
 
 desc 'Run style, spec and test kichen on travis'
-task :travis_all => ['style', 'spec', 'integration:cloud']
+task :travis_all => ['compile', 'spec', 'integration:cloud', 'style']
 
-task :default => ['style', 'spec', 'integration:vagrant']
+task :default => ['compile', 'spec', 'integration:vagrant', 'style']

data/ext/libyajl2/Makefile

@@ -1,7 +1,9 @@
-# We do all the work in extconf.rb, so we just have a dummy makefile here to
-# make rubygems happy.
-
+TARGET = libyajl
+DLLIB = $(TARGET).bundle
 all:
-
+	cd /Users/lamont/git/libyajl2-gem/ext/libyajl2/vendor/yajl/src && make
+	cp /Users/lamont/git/libyajl2-gem/ext/libyajl2/vendor/yajl/src/$(DLLIB) .
 install:
-
+	cp $(DLLIB) /Users/lamont/git/libyajl2-gem/lib/libyajl2/vendored-libyajl2
+clean:
+	cd /Users/lamont/git/libyajl2-gem/ext/libyajl2/vendor/yajl/src && make clean

data/ext/libyajl2/extconf.rb

@@ -1,5 +1,6 @@
 exit(0) if ENV["USE_SYSTEM_LIBYAJL2"]
 
+require 'rbconfig'
 require 'pp'
 
 module Libyajl2Build
@@ -17,31 +18,31 @@ module Libyajl2Build
     LIBYAJL2_VENDOR_DIR
   end
 
-  def self.configure
-    File.join(LIBYAJL2_VENDOR_DIR, "configure")
-  end
-
   def self.prefix
     PREFIX
   end
 
-  def self.configure_cmd
-    # NB: this is not a gnu configure command
-    %W[
-      sh
-      #{configure}
-      -p
-      #{prefix}
-    ]
+  def self.setup_env
   end
 
-  def self.setup_env
-    if windows?
-      ENV['PATH']      ||= 'C:\Ruby\DevKit\bin;C:\Ruby\DevKit\mingw\bin;' + ENV['PATH']
-      ENV['RI_DEVKIT'] ||= 'C:\Ruby\DevKit'
-      ENV['CC']        ||= 'gcc'
-      ENV['CPP']       ||= 'cpp'
-      ENV['CXX']       ||= 'g++'
+  # for mkmf.rb compat
+  CONFIG = RbConfig::MAKEFILE_CONFIG
+
+  def self.mkintpath(path)
+    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'
+        IO.popen(["cygpath", "-u", path], &:read).chomp
+      else
+        path
+      end
+    else
+      path
     end
   end
 
@@ -50,20 +51,170 @@ module Libyajl2Build
     super(*args)
   end
 
-  def self.run_build_commands
-    setup_env
-    puts `pwd`
-    puts `env`
-    puts configure_cmd
-    system(*configure_cmd) &&
-      system("make", "-j", "5", "install")
+  # since we're not using cmake we have to mangle up yajl_version.h ourselves
+  def self.generate_yajl_version
+    yajl_major = yajl_minor = yajl_micro = nil
+    File.open("#{libyajl2_vendor_dir}/CMakeLists.txt").each do |line|
+      if m = line.match(/YAJL_MAJOR (\d+)/)
+        yajl_major = m[1]
+      end
+      if m = line.match(/YAJL_MINOR (\d+)/)
+        yajl_minor = m[1]
+      end
+      if m = line.match(/YAJL_MICRO (\d+)/)
+        yajl_micro = m[1]
+      end
+    end
+    File.open("#{libyajl2_vendor_dir}/src/api/yajl_version.h", "w+") do |out|
+      File.open("#{libyajl2_vendor_dir}/src/api/yajl_version.h.cmake").each do |line|
+        line.gsub!(/\$\{YAJL_MAJOR\}/, yajl_major)
+        line.gsub!(/\$\{YAJL_MINOR\}/, yajl_minor)
+        line.gsub!(/\$\{YAJL_MICRO\}/, yajl_micro)
+        out.write(line)
+      end
+    end
   end
 
-  def self.run
-    Dir.chdir(libyajl2_vendor_dir) do
-      run_build_commands or raise BuildError, "Failed to build libyajl2 library."
+  def self.yajl_makefile
+    File.open("Makefile", "w+") do |f|
+      f.write <<EOF
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@:)
+ECHO = $(ECHO1:0=@echo)
+
+#### Start of system configuration section. ####
+
+srcdir = .
+prefix = #{mkintpath(CONFIG['prefix'])}
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+sitearchdir = $(sitelibdir)/$(sitearch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitedir = $(rubylibprefix)/site_ruby
+libdir = $(exec_prefix)/lib
+
+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)
+INCFLAGS = -I. -I$(srcdir)
+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 = $(ldflags) $(dldflags) $(ARCH_FLAG)
+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']}
+
+arch = #{CONFIG['arch']}
+sitearch = #{CONFIG['sitearch']}
+ruby_version = #{RbConfig::CONFIG['ruby_version']}
+ruby = #{File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"])}
+RUBY = $(ruby)
+
+RM = $(RUBY) -run -e rm -- -f
+MAKEDIRS = $(RUBY) -run -e mkdir -- -p
+INSTALL = $(RUBY) -run -e install -- -vp
+INSTALL_PROG = $(INSTALL) -m 0755
+TOUCH = exit >
+
+#### End of system configuration section. ####
+
+libpath = . $(libdir)
+LIBPATH = -L. -L$(libdir)
+
+CLEANFILES = mkmf.log
+
+target_prefix =
+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']}
+
+TIMESTAMP_DIR = .
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+CLEANLIBS     = $(TARGET).bundle
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+
+clean:
+\t-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
+
+install: install-so install-rb
+
+install-so: $(DLLIB) $(TIMESTAMP_DIR)/.RUBYARCHDIR.time
+\t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+
+install-rb:
+\t$(ECHO) installing default libyajl libraries
+$(TIMESTAMP_DIR)/.RUBYARCHDIR.time:
+\t$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
+\t$(Q) $(TOUCH) $@
+
+.SUFFIXES: .c .o
+
+.c.o:
+\t$(ECHO) compiling $(<)
+\t$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+\t$(ECHO) linking shared-object $(DLLIB)
+\t-$(Q)$(RM) $(@)
+\t$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LIBS)
+\t$(Q) $(POSTLINK)
+
+$(OBJS): $(HDRS)
+EOF
+    end
+  end
+
+  def self.makemakefiles
+    setup_env
+    generate_yajl_version
+    Dir.chdir("#{libyajl2_vendor_dir}/src") do
+      # hack to make includes work
+      system("rm -f api/yajl")
+      system("ln -s . api/yajl")
+      yajl_makefile
+    end
+    File.open("Makefile", "w+") do |f|
+      f.write <<EOF
+TARGET = libyajl
+DLLIB = $(TARGET).#{CONFIG['DLEXT']}
+all:
+\tcd #{libyajl2_vendor_dir}/src && make
+\tcp #{libyajl2_vendor_dir}/src/$(DLLIB) .
+install:
+\tcp $(DLLIB) #{prefix}
+clean:
+\tcd #{libyajl2_vendor_dir}/src && make clean
+EOF
     end
   end
 end
 
-Libyajl2Build.run
+Libyajl2Build.makemakefiles
+

data/lib/libyajl2/version.rb

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

data/libyajl2.gemspec

@@ -24,6 +24,9 @@ Gem::Specification.new do |spec|
   # required for 'rake spec'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+  # 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 "ffi", "~> 1.9"
 end

metadata

@@ -1,87 +1,91 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: libyajl2
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+
+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
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  version_requirements: *id004
+  prerelease: false
   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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
   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: '2.14'
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
   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.9'
+  type: :development
+  name: ffi
 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
@@ -90,6 +94,13 @@ 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
@@ -259,38 +270,30 @@ 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:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.12
 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