cwiid 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ab3d7f6da791942d6b8756c3881fdf0988c1997
+  data.tar.gz: 04c99b6c964449170edb726ec5b5ed5cb8a7f668
+SHA512:
+  metadata.gz: 6dcc63f0279e8cecdcd441fd3ddb9c3acd4f63cc32dccd4529cd94038b5370657058db49967d74ed9a2263c5fc61e2810f5c67ee57f41c0b430050148e22b599
+  data.tar.gz: 0c14e5090d3bb65f9310f27b5d387795862a893ca822967917319e2496895674abefe85c419042ec21f468d84fd4c7cc79acf8fffe44307443ec91068f532f73

data/Rakefile

@@ -5,32 +5,14 @@ require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/loaders/makefile'
 require 'rbconfig'
-
-PKG_NAME = 'cwiid'
-PKG_VERSION = '0.1.3'
-CFG = RbConfig::CONFIG
-CXX = ENV[ 'CXX' ] || 'g++'
-RB_FILES = FileList[ 'lib/**/*.rb' ]
-CC_FILES = FileList[ 'ext/*.cc' ]
-HH_FILES = FileList[ 'ext/*.hh' ] + FileList[ 'ext/*.tcc' ]
-TC_FILES = FileList[ 'test/tc_*.rb' ]
-TS_FILES = FileList[ 'test/ts_*.rb' ]
-SO_FILE = "ext/cwiid.#{CFG[ 'DLEXT' ]}"
-PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
-            RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
-BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
-            RB_FILES + TS_FILES + TC_FILES
-SUMMARY = %q{Using the Wii Remote with Ruby}
-DESCRIPTION = %q{This Ruby extension provides an inerface to access a Wii Remote using the libcwiid library.}
-AUTHOR = %q{Jan Wedekind}
-EMAIL = %q{jan@wedesoft.de}
-HOMEPAGE = %q{http://wedesoft.github.com/cwiid/}
+require_relative 'config'
 
 OBJ = CC_FILES.ext 'o'
 $CXXFLAGS = "-DNDEBUG #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
-if CFG[ 'rubyhdrdir' ]
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " + 
-              "-I#{CFG[ 'rubyhdrdir' ]}/#{CFG[ 'arch' ]}"
+if CFG['rubyarchhdrdir']
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG['rubyhdrdir']} -I#{CFG['rubyarchhdrdir']}"
+elsif CFG['rubyhdrdir']
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG['rubyhdrdir' ]} -I#{CFG['rubyhdrdir']}/#{CFG['arch']}"
 else
   $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'archdir' ]}"
 end
@@ -92,71 +74,6 @@ Rake::PackageTask.new PKG_NAME, PKG_VERSION do |p|
   p.package_files = PKG_FILES
 end
 
-begin
-  require 'rubygems'
-  require 'rubygems/builder'
-  $SPEC = Gem::Specification.new do |s|
-    s.name = PKG_NAME
-    s.version = PKG_VERSION
-    s.platform = Gem::Platform::RUBY
-    s.date = Date.today.to_s
-    s.summary = SUMMARY
-    s.description = DESCRIPTION
-    s.author = AUTHOR
-    s.email = EMAIL
-    s.homepage = HOMEPAGE
-    s.files = PKG_FILES
-    s.test_files = TC_FILES
-    s.require_paths = [ 'lib', 'ext' ]
-    s.extensions = %w{Rakefile}
-    s.has_rdoc = 'yard'
-    s.extra_rdoc_files = []
-    s.rdoc_options = %w{--no-private}
-    s.add_development_dependency %q{rake}
-  end
-  GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
-  $BINSPEC = Gem::Specification.new do |s|
-    s.name = PKG_NAME
-    s.version = PKG_VERSION
-    s.platform = Gem::Platform::CURRENT
-    s.date = Date.today.to_s
-    s.summary = SUMMARY
-    s.description = DESCRIPTION
-    s.author = AUTHOR
-    s.email = EMAIL
-    s.homepage = HOMEPAGE
-    s.files = BIN_FILES
-    s.test_files = TC_FILES
-    s.require_paths = [ 'lib', 'ext' ]
-    s.has_rdoc = 'yard'
-    s.extra_rdoc_files = []
-    s.rdoc_options = %w{--no-private}
-  end
-  GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
-  desc "Build the gem file #{GEM_SOURCE}"
-  task :gem => [ "pkg/#{GEM_SOURCE}" ]
-  file "pkg/#{GEM_SOURCE}" => [ 'pkg' ] + $SPEC.files do
-    when_writing 'Creating GEM' do
-      Gem::Builder.new( $SPEC ).build
-      verbose true do
-        FileUtils.mv GEM_SOURCE, "pkg/#{GEM_SOURCE}"
-      end
-    end
-  end
-  desc "Build the gem file #{GEM_BINARY}"
-  task :gem_binary => [ "pkg/#{GEM_BINARY}" ]
-  file "pkg/#{GEM_BINARY}" => [ 'pkg' ] + $BINSPEC.files do
-    when_writing 'Creating binary GEM' do
-      Gem::Builder.new( $BINSPEC ).build
-      verbose true do
-        FileUtils.mv GEM_BINARY, "pkg/#{GEM_BINARY}"
-      end
-    end
-  end
-rescue LoadError
-  STDERR.puts 'Please install \'rubygems\' if you want to create Gem packages'
-end
-
 rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end

data/config.rb

@@ -0,0 +1,23 @@
+require 'rake'
+
+PKG_NAME = 'cwiid'
+PKG_VERSION = '0.1.4'
+CFG = RbConfig::CONFIG
+CXX = ENV[ 'CXX' ] || 'g++'
+RB_FILES = ['config.rb'] + FileList[ 'lib/**/*.rb' ]
+CC_FILES = FileList[ 'ext/*.cc' ]
+HH_FILES = FileList[ 'ext/*.hh' ] + FileList[ 'ext/*.tcc' ]
+TC_FILES = FileList[ 'test/tc_*.rb' ]
+TS_FILES = FileList[ 'test/ts_*.rb' ]
+SO_FILE = "ext/cwiid.#{CFG[ 'DLEXT' ]}"
+PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
+            RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
+BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
+            RB_FILES + TS_FILES + TC_FILES
+SUMMARY = %q{Using the Wii Remote with Ruby}
+DESCRIPTION = %q{This Ruby extension provides an inerface to access a Wii Remote using the libcwiid library.}
+AUTHOR = %q{Jan Wedekind}
+EMAIL = %q{jan@wedesoft.de}
+HOMEPAGE = %q{http://wedesoft.github.com/cwiid/}
+
+

data/ext/wiimote.cc

@@ -53,13 +53,14 @@ void WiiMote::close(void)
   };
 }
 
-void WiiMote::requestStatus(void) throw (Error)
+int 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 );
+  int status = cwiid_request_status( m_wiimote );
   ERRORMACRO( !m_error, Error, , "Status request error: " << m_errorMsg );
+  return status;
 }
 
 void WiiMote::getState(void) throw (Error)
@@ -151,6 +152,11 @@ char WiiMote::getIRSize( int i )
   return m_state.ir_src[ i ].size;
 }
 
+unsigned short int WiiMote::getMotionPlus( int id )
+{
+  return m_state.ext.motionplus.angle_rate[ id ];
+}
+
 void WiiMote::err( const char *s, va_list ap )
 {
   char buffer[4096];
@@ -214,6 +220,8 @@ VALUE WiiMote::registerRubyClass(void)
                     RUBY_METHOD_FUNC( wrapGetAcc ), 0 );
   rb_define_method( cRubyClass, "ir",
                     RUBY_METHOD_FUNC( wrapGetIR ), 0 );
+  rb_define_method( cRubyClass, "motionplus",
+                    RUBY_METHOD_FUNC( wrapGetMotionPlus ), 0 );
   return cRubyClass;
 }
 
@@ -244,13 +252,14 @@ VALUE WiiMote::wrapClose( VALUE rbSelf )
 
 VALUE WiiMote::wrapRequestStatus( VALUE rbSelf )
 {
+  VALUE rbRetVal = Qnil;
   try {
     WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
-    (*self)->requestStatus();
+    rbRetVal = INT2NUM( (*self)->requestStatus() );
   } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
-  return rbSelf;
+  return rbRetVal;
 }
 
 VALUE WiiMote::wrapGetState( VALUE rbSelf )
@@ -349,3 +358,11 @@ VALUE WiiMote::wrapGetIR( VALUE rbSelf )
   return rbRetVal;
 }
 
+VALUE WiiMote::wrapGetMotionPlus( VALUE rbSelf )
+{
+  WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
+  return rb_ary_new3( 3, INT2NUM( (*self)->getMotionPlus( 0 ) ),
+                         INT2NUM( (*self)->getMotionPlus( 1 ) ),
+                         INT2NUM( (*self)->getMotionPlus( 2 ) ) );
+}  
+

data/ext/wiimote.hh

@@ -27,7 +27,7 @@ public:
   WiiMote(void) throw (Error);
   virtual ~WiiMote(void);
   void close(void);
-  void requestStatus(void) throw (Error);
+  int requestStatus(void) throw (Error);
   void getState(void) throw (Error);
   unsigned char getRptMode(void);
   void setRptMode( unsigned char mode ) throw (Error);
@@ -42,6 +42,7 @@ public:
   unsigned short int getIRX( int i );
   unsigned short int getIRY( int i );
   char getIRSize( int i );
+  unsigned short int getMotionPlus( int i );
   void err( const char *s, va_list ap );
   static VALUE cRubyClass;
   static VALUE registerRubyClass(void);
@@ -60,6 +61,7 @@ public:
   static VALUE wrapGetButtons( VALUE rbSelf );
   static VALUE wrapGetAcc( VALUE rbSelf );
   static VALUE wrapGetIR( VALUE rbSelf );
+  static VALUE wrapGetMotionPlus( VALUE rbSelf );
   static WiiMote *current;
 protected:
   cwiid_wiimote_t *m_wiimote;

metadata

@@ -1,86 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cwiid
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Jan Wedekind
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-23 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: This Ruby extension provides an inerface to access a Wii Remote using the libcwiid library.
+date: 2015-05-15 00:00:00.000000000 Z
+dependencies: []
+description: This Ruby extension provides an inerface to access a Wii Remote using
+  the libcwiid library.
 email: jan@wedesoft.de
 executables: []
-
-extensions: 
+extensions:
 - Rakefile
 extra_rdoc_files: []
-
-files: 
-- Rakefile
-- README.md
+files:
+- ".document"
 - COPYING
-- .document
-- lib/cwiid_ext.rb
-- ext/wiimote.cc
-- ext/init.cc
-- ext/wiimote.hh
+- README.md
+- Rakefile
+- config.rb
 - ext/error.hh
+- ext/init.cc
 - ext/rubyinc.hh
-has_rdoc: yard
+- ext/wiimote.cc
+- ext/wiimote.hh
+- lib/cwiid_ext.rb
 homepage: http://wedesoft.github.com/cwiid/
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --no-private
-require_paths: 
+rdoc_options:
+- "--no-private"
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Using the Wii Remote with Ruby
 test_files: []
-
+has_rdoc: yard