wit 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b224113043d484906a84261fd22cca9abac165b1
-  data.tar.gz: 8c697b188ff6fcca0c9f62371238a6ca4b0e5ab8
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzY1NWI4ODFiMzhkMTNhMzA4NjEwYTQ3MDQwOGI4MjMwNWViYjE1Mw==
+  data.tar.gz: !binary |-
+    OTRjZTg4MGVhYWJkYzUzNTZkMTFhNDc0NzE3ZDA4ZGM1MjJlYmMyNw==
 SHA512:
-  metadata.gz: dd77147261f79371e9258587f41e552d7064915222aee67cab07a740ac77e1779e5af0e3e816d9f53df2d1a3933fc1b2ec3e3019cbc4a3f5a5d765992c1af8c4
-  data.tar.gz: ef6bc521dd4125843229557c791252378e16be510efd1d7b194bf81f21d0770d663016c7a67cbd41b38219514a20683c3feed0abf2671eeb056171ad0e52b53b
+  metadata.gz: !binary |-
+    NDQ3MjgwMjQ3YmViMGRlMTY4OGVlMTVmMmRkZTkwZTE1ODdjNDExYWIyMjkw
+    YTc5YzVjODc3NTk4MDNlMjkyM2IwN2QyNjk3ZDg3Y2M1ZWI0MjFhZDg3ZTUx
+    OWEyYTNiZmM0YzA0ODFiNTAzMDZlZDhmYmE4NjczYmE2MWJmYmM=
+  data.tar.gz: !binary |-
+    MWZkZGI0Y2Q4NjQ0OTZjOTZlZTNkMjg0YzYyYjgyYWU1Yzc2ODg1ZmIxMDVm
+    NGFlNDQxNzU1ZDI5OGY3MzkwMGYzNzVjYmQ0ZjExODA2ZWFlYmI0OTU3MTky
+    MzU5N2RlYTIwMDNhNGI2YjZiNGFjNDcyNjQzZjc3NzNiNGFiODY=

data/ext/wit/extconf.rb

@@ -1,38 +1,68 @@
 require "mkmf"
+require 'open-uri'
+require 'fileutils'
 
 PATH = File.expand_path(File.dirname(__FILE__))
 
 LIBDIR = RbConfig::CONFIG['libdir']
 INCLUDEDIR = RbConfig::CONFIG['includedir']
 HEADER_DIRS = [
-	PATH + '/libwit/include',
+	"#{PATH}/libwit/include",
 	INCLUDEDIR
 ]
 LIB_DIRS = [
-	PATH + '/libwit/lib',
+	"#{PATH}/libwit/lib",
 	LIBDIR
 ]
 
-if RUBY_PLATFORM.include? "arm"
-	LIBWIT_FILE = "libwit-armv6.a"
-elsif RUBY_PLATFORM.include? "64"
-	if RUBY_PLATFORM.include? "darwin"
-		LIBWIT_FILE = "libwit-64-darwin.a"
+if RUBY_PLATFORM.include? 'arm'
+	LIBWIT_FILE = 'libwit-armv6.a'
+elsif RUBY_PLATFORM.include? '64'
+	if RUBY_PLATFORM.include? 'darwin'
+		LIBWIT_FILE = 'libwit-64-darwin.a'
 	else
-		LIBWIT_FILE = "libwit-64-linux.a"
+		LIBWIT_FILE = 'libwit-64-linux.a'
 	end
 else
-	LIBWIT_FILE = "libwit-32-linux.a"
+	LIBWIT_FILE = 'libwit-32-linux.a'
 end
-abort "unable to retrieve libwit" unless system('curl -o libwit.a https://raw.githubusercontent.com/wit-ai/libwit/master/releases/' + LIBWIT_FILE, :chdir=> PATH + '/libwit/lib')
+LIBWIT_PATH = "#{PATH}/libwit/lib/libwit.a"
 
-$LOCAL_LIBS = '-lwit -lsox -lcurl'
+if !File.file?(LIBWIT_PATH)
+	puts "Fetching libwit..."
+	dir = File.dirname(LIBWIT_PATH)
+	unless File.directory?(dir)
+		FileUtils.mkdir_p(dir)
+	end
+	open(LIBWIT_PATH, 'wb') do |file|
+		total = nil
+		file << open("https://github.com/wit-ai/libwit/releases/download/1.1.2/#{LIBWIT_FILE}",
+		  :content_length_proc => lambda {|t|
+		  	total = t
+		  	print "0/#{total} bytes downloaded"
+		  	STDOUT.flush
+		  },
+		  :progress_proc => lambda {|s|
+		  	print "\r#{s}/#{total} bytes downloaded"
+		  	STDOUT.flush
+		  }).read
+	end
+	STDOUT.print(" done\n")
+end
+
+if RUBY_PLATFORM.include? 'darwin'
+	libs = ['wit', 'ssl', 'crypto', 'z', 'sox', 'System', 'pthread', 'c', 'm']
+else
+	libs = ['wit', 'rt', 'sox', 'ssl', 'crypto', 'dl', 'pthread', 'rt', 'gcc_s', 'pthread', 'c', 'm']
+end
+
+$LOCAL_LIBS = '-l' + libs.join(' -l')
 
 dir_config 'wit', HEADER_DIRS, LIB_DIRS
 
-abort "missing sox" unless have_library "sox"
-abort "missing curl" unless have_library "curl"
-abort "missing wit.h" unless have_header "wit.h"
-abort "missing libwit" unless have_library "wit"
+for lib in libs
+	abort "Error: missing #{lib}" unless have_library lib
+end
+abort 'Error: missing wit.h' unless have_header 'wit.h'
 
-create_makefile "wit"
+create_makefile 'wit'

data/ext/wit/extconf.rb_

@@ -0,0 +1,39 @@
+require "mkmf"
+
+PATH = File.expand_path(File.dirname(__FILE__))
+
+LIBDIR = RbConfig::CONFIG['libdir']
+INCLUDEDIR = RbConfig::CONFIG['includedir']
+HEADER_DIRS = [
+	PATH + '/libwit/include',
+	INCLUDEDIR
+]
+LIB_DIRS = [
+	PATH + '/libwit/lib',
+	LIBDIR
+]
+
+if RUBY_PLATFORM.include? "arm"
+	LIBWIT_FILE = "libwit-armv6.a"
+elsif RUBY_PLATFORM.include? "64"
+	if RUBY_PLATFORM.include? "darwin"
+		LIBWIT_FILE = "libwit-64-darwin.a"
+	else
+		LIBWIT_FILE = "libwit-64-linux.a"
+	end
+else
+	LIBWIT_FILE = "libwit-32-linux.a"
+end
+
+abort "unable to retrieve libwit" unless system('curl -Ss -L -o libwit.a https://github.com/wit-ai/libwit/releases/download/1.1.1/' + LIBWIT_FILE, :chdir=> PATH + '/libwit/lib')
+
+$LOCAL_LIBS = '-lwit -lsox -lcurl'
+
+dir_config 'wit', HEADER_DIRS, LIB_DIRS
+
+abort "missing sox" unless have_library "sox"
+abort "missing curl" unless have_library "curl"
+abort "missing wit.h" unless have_header "wit.h"
+abort "missing libwit" unless have_library "wit"
+
+create_makefile "wit"

data/ext/wit/wit.c

@@ -1,5 +1,4 @@
 #include <ruby.h>
-#include <ruby/thread.h>
 #include "wit.h"
 
 struct wit_context *context;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wit
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Julien Odent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies: []
 description: Ruby SDK for Wit.AI
 email: julien@wit.ai
@@ -18,12 +18,12 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/wit/extconf.rb
+- ext/wit/extconf.rb_
 - ext/wit/libwit/include/wit.h
-- ext/wit/libwit/lib/libwit.a
 - ext/wit/wit.c
 homepage: http://wit.ai
 licenses:
-- EPL-1.0
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -31,17 +31,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for Wit