phidgets 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e3fd7bef7f559dc77c93de80a317dd43f97da07f
+  data.tar.gz: 8a41b2c09ac0b90067b7f76d20aab7b2afb5bb1c
+SHA512:
+  metadata.gz: 4b4500f256c1e668defc86a8f26c4eabb06758516f6bd3041b490ae5d1e6d13b64d7f6d75bde00f4139a0e5786eb1129171e1fa98cb67409d2669cade1dfaf49
+  data.tar.gz: 3233b9dcb43665bdb02e0d8323c226de86965dd7a11484e19fa5c9e09162ccbb6bf187afe235025083e0d830d21af91322565d401914adc695d5c8cc0631998f

data/History.txt

@@ -1,3 +1,6 @@
+== 0.1.3 2015-11-10
+  * Fix undefined symbol error in ruby version 2.2
+
 == 0.1.2 2013-10-22
   * Rearranged the c code to make it easier for yard to parse and extract documentation
 

data/ext/phidgets/extconf.rb

@@ -8,6 +8,10 @@ have_framework('Phidget21') unless RUBY_VERSION < '1.9.0'
 have_library('phidget21') 
 dir_config("phidgets")
 
+have_header('ruby/thread.h')
+have_func('rb_thread_blocking_region')
+have_func('rb_thread_call_without_gvl')
+
 $CFLAGS += ' -DPH_CALLBACK' unless RUBY_VERSION < '1.9.0'
 
 create_makefile("phidgets")

data/ext/phidgets/phidgets.c

@@ -1,6 +1,9 @@
 
 #include "phidgets.h"
 
+#if defined(HAVE_RUBY_THREAD_H)
+#include <ruby/thread.h>
+#endif
 
 VALUE ph_errors[PHIDGET_ERROR_CODE_COUNT+1];
 
@@ -14,7 +17,6 @@ VALUE ph_log(VALUE self, VALUE level, VALUE msg_id, VALUE message);
 void Init_phidgets() {
   VALUE ph_module = rb_define_module("Phidgets");
   VALUE ph_error;
-  VALUE ph_common;
 
   rb_define_const(ph_module, "NOTATTACHED", INT2FIX(PHIDGET_NOTATTACHED));
   rb_define_const(ph_module, "ATTACHED", INT2FIX(PHIDGET_ATTACHED));
@@ -249,19 +251,23 @@ VALUE ph_log(VALUE self, VALUE level, VALUE msg_id, VALUE message) {
 #ifdef PH_CALLBACK
 void ph_callback_thread(ph_callback_data_t *callback_data) {
   while(! callback_data->exit) {
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+    rb_thread_call_without_gvl(wait_for_callback, (void *)callback_data, cancel_wait_for_callback, (void *)callback_data);
+#else
     rb_thread_blocking_region(wait_for_callback, (void *)callback_data, cancel_wait_for_callback, (void *)callback_data);
+#endif
     if(TYPE(callback_data->callback) != T_NIL) rb_funcall(callback_data->callback, rb_intern("call"), 1, callback_data->phidget);
     callback_data->called = false;
   };
 }
 
-VALUE wait_for_callback(void *arg) {
+ph_callback_return_t wait_for_callback(void *arg) {
   ph_callback_data_t *callback_data = (ph_callback_data_t *)arg;
   while(! callback_data->exit) {
     usleep(PH_CALLBACK_POLLING_INTERVAL);
-    if(callback_data->called) return Qnil;
+    if(callback_data->called) return (ph_callback_return_t)Qnil;
   };
-  return Qnil;
+  return (ph_callback_return_t)Qnil;
 }
 
 void cancel_wait_for_callback(void *arg) {

data/ext/phidgets/phidgets.h

@@ -24,7 +24,12 @@ typedef struct ph_callback_data {
 } ph_callback_data_t;
 
 void ph_callback_thread(ph_callback_data_t *callback_data);
-VALUE wait_for_callback(void *arg);
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+typedef void * ph_callback_return_t;
+#else
+typedef VALUE ph_callback_return_t;
+#endif
+ph_callback_return_t wait_for_callback(void *arg);
 void cancel_wait_for_callback(void *arg);
 #endif
 

data/lib/phidgets.rb

@@ -28,5 +28,5 @@ require File.dirname(__FILE__) + '/phidgets/text_led.rb'
 require File.dirname(__FILE__) + '/phidgets/weight_sensor.rb'
 
 module Phidgets
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/phidgets.gemspec

@@ -1,8 +1,12 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)  
+$:.unshift lib unless $:.include?(lib)
+
+require 'phidgets'
 
 Gem::Specification.new do |s|
   s.name = "phidgets"
-  s.version = "0.1.2"
+  s.version = Phidgets::VERSION
   s.authors = ["Craig DeHaan"]
   s.email = ["cdehaan2@cfl.rr.com"]
   s.homepage = "https://github.com/csdehaan/phidgets"

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: phidgets
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Craig DeHaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides a ruby interface to the phidgets library.
@@ -55,139 +50,138 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 files:
+- ".yardopts"
+- GNU_GPL.txt
+- History.txt
+- README.rdoc
+- Rakefile
 - bin/phidget
-- ext/phidgets/phidgets_servo.c
-- ext/phidgets/phidgets_accelerometer.c
-- ext/phidgets/phidgets_spatial.c
+- ext/phidgets/extconf.rb
 - ext/phidgets/phidgets.c
-- ext/phidgets/phidgets_text_lcd.c
-- ext/phidgets/phidgets_stepper.c
-- ext/phidgets/phidgets_motor_control.c
-- ext/phidgets/phidgets_temp_sensor.c
-- ext/phidgets/phidgets_rfid.c
+- ext/phidgets/phidgets.h
+- ext/phidgets/phidgets_accelerometer.c
+- ext/phidgets/phidgets_advanced_servo.c
 - ext/phidgets/phidgets_analog.c
-- ext/phidgets/phidgets_frequency_counter.c
-- ext/phidgets/phidgets_phsensor.c
 - ext/phidgets/phidgets_bridge.c
-- ext/phidgets/phidgets_text_led.c
-- ext/phidgets/phidgets_led.c
-- ext/phidgets/phidgets_advanced_servo.c
-- ext/phidgets/phidgets_manager.c
-- ext/phidgets/phidgets_weight_sensor.c
+- ext/phidgets/phidgets_common.c
 - ext/phidgets/phidgets_dictionary.c
-- ext/phidgets/phidgets_interface_kit.c
-- ext/phidgets/phidgets_gps.c
 - ext/phidgets/phidgets_encoder.c
-- ext/phidgets/phidgets_common.c
+- ext/phidgets/phidgets_frequency_counter.c
+- ext/phidgets/phidgets_gps.c
+- ext/phidgets/phidgets_interface_kit.c
 - ext/phidgets/phidgets_ir.c
-- ext/phidgets/phidgets.h
+- ext/phidgets/phidgets_led.c
+- ext/phidgets/phidgets_manager.c
+- ext/phidgets/phidgets_motor_control.c
+- ext/phidgets/phidgets_phsensor.c
+- ext/phidgets/phidgets_rfid.c
+- ext/phidgets/phidgets_servo.c
+- ext/phidgets/phidgets_spatial.c
+- ext/phidgets/phidgets_stepper.c
+- ext/phidgets/phidgets_temp_sensor.c
+- ext/phidgets/phidgets_text_lcd.c
+- ext/phidgets/phidgets_text_led.c
+- ext/phidgets/phidgets_weight_sensor.c
 - lib/phidgets.rb
-- lib/phidgets/servo.rb
-- lib/phidgets/interfacekit.rb
+- lib/phidgets/accelerometer.rb
 - lib/phidgets/advanced_servo.rb
-- lib/phidgets/frequency_counter.rb
-- lib/phidgets/spatial.rb
-- lib/phidgets/temperature_sensor.rb
+- lib/phidgets/analog.rb
+- lib/phidgets/bridge.rb
 - lib/phidgets/common.rb
+- lib/phidgets/dictionary.rb
 - lib/phidgets/encoder.rb
-- lib/phidgets/motor_control.rb
+- lib/phidgets/frequency_counter.rb
+- lib/phidgets/gps.rb
+- lib/phidgets/interfacekit.rb
 - lib/phidgets/ir.rb
-- lib/phidgets/rfid.rb
-- lib/phidgets/analog.rb
-- lib/phidgets/dictionary.rb
-- lib/phidgets/text_lcd.rb
-- lib/phidgets/manager.rb
-- lib/phidgets/stepper.rb
-- lib/phidgets/accelerometer.rb
 - lib/phidgets/led.rb
-- lib/phidgets/bridge.rb
-- lib/phidgets/gps.rb
-- lib/phidgets/weight_sensor.rb
+- lib/phidgets/manager.rb
+- lib/phidgets/motor_control.rb
 - lib/phidgets/ph_sensor.rb
+- lib/phidgets/rfid.rb
+- lib/phidgets/servo.rb
+- lib/phidgets/spatial.rb
+- lib/phidgets/stepper.rb
+- lib/phidgets/temperature_sensor.rb
+- lib/phidgets/text_lcd.rb
 - lib/phidgets/text_led.rb
-- test/test_encoder.rb
-- test/test_weight_sensor.rb
+- lib/phidgets/weight_sensor.rb
+- phidgets.gemspec
+- test/test_accelerometer.rb
+- test/test_advanced_servo.rb
+- test/test_analog.rb
+- test/test_bridge.rb
+- test/test_common.rb
 - test/test_dictionary.rb
-- test/test_text_lcd.rb
-- test/test_spatial.rb
-- test/test_rfid.rb
+- test/test_encoder.rb
+- test/test_frequency_counter.rb
+- test/test_gps.rb
+- test/test_helper.rb
 - test/test_interfacekit.rb
-- test/test_text_led.rb
+- test/test_ir.rb
+- test/test_led.rb
 - test/test_manager.rb
-- test/test_servo.rb
-- test/test_helper.rb
-- test/test_common.rb
 - test/test_motor_control.rb
-- test/test_advanced_servo.rb
-- test/test_bridge.rb
-- test/test_accelerometer.rb
+- test/test_phidgets.rb
 - test/test_phsensor.rb
+- test/test_rfid.rb
+- test/test_servo.rb
+- test/test_spatial.rb
 - test/test_stepper.rb
-- test/test_frequency_counter.rb
-- test/test_phidgets.rb
 - test/test_temp_sensor.rb
-- test/test_ir.rb
-- test/test_analog.rb
-- test/test_led.rb
-- test/test_gps.rb
-- Rakefile
-- GNU_GPL.txt
-- History.txt
-- README.rdoc
-- phidgets.gemspec
-- .yardopts
-- ext/phidgets/extconf.rb
+- test/test_text_lcd.rb
+- test/test_text_led.rb
+- test/test_weight_sensor.rb
 homepage: https://github.com/csdehaan/phidgets
 licenses: []
+metadata: {}
 post_install_message: For more information on phidgets, see http://www.phidgets.com/
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 - ext/phidgets
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 3
 summary: Phidgets are a set of "plug and play" building blocks for low cost USB sensing
   and control from your PC. This gem provides a ruby interface to the phidgets library.
 test_files:
-- test/test_encoder.rb
+- test/test_common.rb
+- test/test_text_led.rb
+- test/test_ir.rb
+- test/test_helper.rb
+- test/test_frequency_counter.rb
+- test/test_phidgets.rb
+- test/test_bridge.rb
 - test/test_weight_sensor.rb
-- test/test_dictionary.rb
-- test/test_text_lcd.rb
-- test/test_spatial.rb
-- test/test_rfid.rb
 - test/test_interfacekit.rb
-- test/test_text_led.rb
+- test/test_stepper.rb
+- test/test_accelerometer.rb
 - test/test_manager.rb
+- test/test_text_lcd.rb
 - test/test_servo.rb
-- test/test_helper.rb
-- test/test_common.rb
-- test/test_motor_control.rb
 - test/test_advanced_servo.rb
-- test/test_bridge.rb
-- test/test_accelerometer.rb
+- test/test_dictionary.rb
+- test/test_gps.rb
+- test/test_encoder.rb
 - test/test_phsensor.rb
-- test/test_stepper.rb
-- test/test_frequency_counter.rb
-- test/test_phidgets.rb
-- test/test_temp_sensor.rb
-- test/test_ir.rb
-- test/test_analog.rb
 - test/test_led.rb
-- test/test_gps.rb
+- test/test_analog.rb
+- test/test_temp_sensor.rb
+- test/test_spatial.rb
+- test/test_motor_control.rb
+- test/test_rfid.rb