cwiid 0.1.2 → 0.1.3

data/README.md

@@ -34,6 +34,7 @@ Here's a small example displaying the state of the accelerometer:
     require 'rubygems'
     require 'opengl'
     require 'cwiid'
+    puts 'Put Wiimote in discoverable mode now (press 1+2)...'
     wiimote = WiiMote.new
     wiimote.rpt_mode = WiiMote::RPT_BTN | WiiMote::RPT_ACC
     $list = nil

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'cwiid'
-PKG_VERSION = '0.1.2'
+PKG_VERSION = '0.1.3'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -81,8 +81,7 @@ end
 begin
   require 'yard'
   YARD::Rake::YardocTask.new :yard do |y|
-    y.options << '--no-private'
-    y.files << FileList[ 'lib/**/*.rb' ]
+    y.files << RB_FILES
   end
 rescue LoadError
   STDERR.puts 'Please install \'yard\' if you want to generate documentation'

data/ext/wiimote.cc

@@ -55,6 +55,8 @@ void WiiMote::close(void)
 
 void WiiMote::requestStatus(void) throw (Error)
 {
+  ERRORMACRO( m_wiimote != NULL, Error, , "Wii Remote is closed. "
+              "Did you call \"close\" before?" );
   m_error = false;
   cwiid_request_status( m_wiimote );
   ERRORMACRO( !m_error, Error, , "Status request error: " << m_errorMsg );
@@ -62,6 +64,8 @@ void WiiMote::requestStatus(void) throw (Error)
 
 void WiiMote::getState(void) throw (Error)
 {
+  ERRORMACRO( m_wiimote != NULL, Error, , "Wii Remote is closed. "
+              "Did you call \"close\" before?" );
   m_error = false;
   cwiid_get_state( m_wiimote, &m_state );
   ERRORMACRO( !m_error, Error, , "Error getting state: " << m_errorMsg );
@@ -74,6 +78,8 @@ unsigned char WiiMote::getRptMode(void)
 
 void WiiMote::setRptMode( unsigned char mode ) throw (Error)
 {
+  ERRORMACRO( m_wiimote != NULL, Error, , "Wii Remote is closed. "
+              "Did you call \"close\" before?" );
   m_error = false;
   cwiid_set_rpt_mode( m_wiimote, mode );
   ERRORMACRO( !m_error, Error, , "Error setting RPT mode: " << m_errorMsg );
@@ -92,6 +98,8 @@ unsigned char WiiMote::getLED(void)
 
 void WiiMote::setLED( unsigned char state ) throw (Error)
 {
+  ERRORMACRO( m_wiimote != NULL, Error, , "Wii Remote is closed. "
+              "Did you call \"close\" before?" );
   m_error = false;
   cwiid_set_led( m_wiimote, state );
   ERRORMACRO( !m_error, Error, , "Error setting LED state: " << m_errorMsg );
@@ -105,6 +113,8 @@ bool WiiMote::getRumble(void)
 
 void WiiMote::setRumble( bool state ) throw( Error )
 {
+  ERRORMACRO( m_wiimote != NULL, Error, , "Wii Remote is closed. "
+              "Did you call \"close\" before?" );
   m_error = false;
   cwiid_set_rumble( m_wiimote, state ? 1 : 0 );
   ERRORMACRO( !m_error, Error, , "Error setting rumble state: " << m_errorMsg );
@@ -234,15 +244,23 @@ VALUE WiiMote::wrapClose( VALUE rbSelf )
 
 VALUE WiiMote::wrapRequestStatus( VALUE rbSelf )
 {
-  WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
-  (*self)->requestStatus();
+  try {
+    WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
+    (*self)->requestStatus();
+  } catch ( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
   return rbSelf;
 }
 
 VALUE WiiMote::wrapGetState( VALUE rbSelf )
 {
-  WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
-  (*self)->getState();
+  try {
+    WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
+    (*self)->getState();
+  } catch ( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
   return rbSelf;
 }
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,11 +44,11 @@ files:
 - COPYING
 - .document
 - lib/cwiid_ext.rb
-- ext/init.cc
 - ext/wiimote.cc
+- ext/init.cc
 - ext/wiimote.hh
-- ext/rubyinc.hh
 - ext/error.hh
+- ext/rubyinc.hh
 has_rdoc: yard
 homepage: http://wedesoft.github.com/cwiid/
 licenses: []