revdev 0.1.3 → 0.2.0

data/.gitignore

@@ -4,20 +4,21 @@
 *.so
 *.dll
 *~
-.bundle
-.config
-.yardoc
-Gemfile.lock
+/.bundle
+/.config
+/.yardoc
+/Gemfile.lock
 InstalledFiles
 Makefile
 _yardoc
 core
 coverage
-doc/
-lib/bundler/man
+/doc/
+/lib/bundler/man
 pkg
 rdoc
 spec/reports
-test/tmp
-test/version_tmp
+/test/tmp
+/test/version_tmp
 tmp
+.ruby-version

data/README.md

@@ -1,8 +1,10 @@
-# Revdev
+Revdev
+=================
 
 revdev is a ruby binding to handling event devices.
 
-## Installation
+Installation
+--------------
 
 Add this line to your application's Gemfile:
 
@@ -22,14 +24,24 @@ Or install it yourself as:
 $ gem install revdev
 ```
 
-## Usage
 
-TODO: Write usage instructions here
+Example Usage
+----------------------
 
-## Contributing
+In terminal:
+
+```sh
+ruby -Ilib sample/device_name /dev/input/event*
+ruby -Ilib sample/key_dump /dev/input/event4
+...
+```
+
+Contributing
+-------------------------
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
+	* Please check with `test` to execute `$ rake`
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request

data/ext/revdev/extconf.rb

@@ -1,3 +1,18 @@
 require "mkmf"
 
+# version => micro
+map = {
+  '1.8.' => 'RUBY_1_8',
+  '1.9.' => 'RUBY_1_9',
+}
+version, micro = map.find do |v, m|
+  RUBY_VERSION.start_with? v
+end
+
+if micro.nil?
+  abort "Not supported ruby-version: #{RUBY_VERSION}"
+else
+  $defs << "-D#{micro}"
+end
+
 create_makefile "revdev/revdev"

data/ext/revdev/revdev.c

@@ -5,7 +5,12 @@
 #include <linux/input.h>
 
 #include <ruby.h>
+#ifdef RUBY_1_8
 #include <rubyio.h>
+#endif
+#ifdef RUBY_1_9
+#include <ruby/io.h>
+#endif
 
 #define NAME "Revdev"
 #define BUFF_SIZE 255
@@ -38,7 +43,7 @@ VALUE input_event_raw_initialize(VALUE self, VALUE byte)
   struct input_event *ie;
   struct timeval t;
 
-  ie = RSTRING(byte)->ptr;
+  ie = RSTRING_PTR(byte);
   t = ie->time;
 
   rb_iv_set(self, "@time", rb_time_new(t.tv_sec, t.tv_usec));
@@ -52,10 +57,14 @@ VALUE input_event_raw_initialize(VALUE self, VALUE byte)
 VALUE input_event_to_byte_string(VALUE self)
 {
   struct input_event ie;
+#ifdef RUBY_1_8
   struct timeval *t;
-
   Data_Get_Struct(rb_iv_get(self, "@time"), struct time_object, t);
   ie.time = *t;
+#endif
+#ifdef RUBY_1_9
+  ie.time = rb_time_timeval(rb_iv_get(self, "@time"));
+#endif
 
   ie.type = FIX2UINT(rb_iv_get(self, "@type"));
   ie.code = FIX2UINT(rb_iv_get(self, "@code"));
@@ -67,7 +76,7 @@ VALUE input_event_to_byte_string(VALUE self)
 VALUE input_id_raw_initialize(VALUE self, VALUE byte)
 {
   struct input_id *ii;
-  ii = RSTRING(byte)->ptr;
+  ii = RSTRING_PTR(byte);
 
   rb_iv_set(self, "@bustype", INT2FIX(ii->bustype));
   rb_iv_set(self, "@vendor", INT2FIX(ii->vendor));

data/lib/revdev/version.rb

@@ -1,3 +1,3 @@
 module Revdev
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/test_event_device.rb

@@ -74,7 +74,9 @@ class EventDeviceTest < Test::Unit::TestCase
     evdev = EventDevice.new file
     assert_nothing_raised do
       iee = evdev.read_input_event
-      assert_equal ie, iee
+      assert_equal ie.code, iee.code
+      assert_equal ie.type, iee.type
+      assert_equal ie.value, iee.value
     end
   end
 

data/test/test_input_event.rb

@@ -27,8 +27,15 @@ class InputEventTest < Test::Unit::TestCase
       ieee = InputEvent.new ie.to_byte_string
       p ieee
     end
-    assert_equal ie, iee
-    assert_equal ie, ieee
+
+    assert_equal ie.code, iee.code
+    assert_equal ie.type, iee.type
+    assert_equal ie.time, iee.time
+    assert_equal ie.value, iee.value
+
+    assert_equal ie.code, ieee.code
+    assert_equal ie.type, ieee.type
+    assert_equal ie.value, ieee.value
   end
 
   def test_hr_blar
@@ -54,7 +61,10 @@ class InputEventTest < Test::Unit::TestCase
     assert_nothing_raised do
       iee = InputEvent.new ie.to_byte_string
     end
-    assert_equal ie, iee
+
+    assert_equal ie.code, iee.code
+    assert_equal ie.type, iee.type
+    assert_equal ie.value, iee.value
   end
 
 end

metadata

@@ -1,60 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: revdev
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Keiichiro Ui
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: revdev is a ruby binding to handling event devices.
-email: 
+email:
 - keiichiro.ui@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/revdev/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -79,38 +75,29 @@ files:
 - test/test_revdev.rb
 homepage: https://rubygems.org/gems/revdev
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ruby binding to handling event devices.
-test_files: 
+test_files:
 - test/test_event_device.rb
 - test/test_input_event.rb
 - test/test_input_id.rb