artoo-joystick 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286793d7267dda24af042bd17b55ff0aeb5ca777
-  data.tar.gz: da69d24c572e50ebd37a0e39a33eff29428861e0
+  metadata.gz: 60dac15d48edeac91173b1895a2145cea948ff77
+  data.tar.gz: e6f673680673e7d455ee7daf932290545f273d7c
 SHA512:
-  metadata.gz: d302f72134b42cc08cbb3f3adff65a93a5f3a1662124a37116503e631a834d8b1aacaf283af64ad7049c6b6275f2d17f078420519510a5fb62d1dda8e3973634
-  data.tar.gz: 6fecde154a335843c8e3dacfb29027f8b57c6e61e9daa24459f95d8b7780c874654ee44bb4b0f4d2e32d661fb7ea0e738c258ab2e1ecd584b0b7a85a986582cd
+  metadata.gz: 132cef0bc36aa67b3dd437cd5612781118baeaab22e83126f2b2bce47964d71936fe6d1df32e42afcd186d6c78080a697937a198977b7dcd158d8b74150b2c6e
+  data.tar.gz: 6691aa023487791f8284b66479323e3eebe092c4a2e73cbda070a170b202e8e1aa27a32f6b142511d5c8301516d5fb51220490a9a99d445142810bd25343182f

data/.gitignore

@@ -0,0 +1 @@
+.rvmrc

data/.travis.yml

@@ -1,9 +1,13 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
-  - jruby-1.7.4
-  - rbx-19mode
+  - jruby-1.7.9
+  - rbx-2.1.1
 matrix:
   allow_failures:
-    - rvm: jruby-1.7.4
+    - rvm: jruby-1.7.9
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq libsdl1.2-dev

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in artoo-sdl-joystick.gemspec
 gemspec

data/Gemfile.lock

@@ -1,72 +1,62 @@
 PATH
   remote: .
   specs:
-    artoo-joystick (0.3.0)
-      artoo (>= 1.4.0)
+    artoo-joystick (0.4.0)
+      artoo (>= 1.6.0)
       hybridgroup-ruby-sdl-ffi
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artoo (1.4.1)
+    artoo (1.6.0)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
       pry (~> 0.9)
       rake
       reel (~> 0.4.0)
+      robeaux (~> 0.0.3)
       thor (~> 0.18.1)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    coderay (1.0.9)
-    ffi (1.9.0)
-    ffi (1.9.0-java)
+    coderay (1.1.0)
+    ffi (1.9.3)
     http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.6.0.beta.2)
-    http_parser.rb (0.6.0.beta.2-java)
-    hybridgroup-ruby-sdl-ffi (0.4.1)
-      nice-ffi (>= 0.2)
-    metaclass (0.0.1)
+    http_parser.rb (0.6.0)
+    hybridgroup-ruby-sdl-ffi (0.4.2)
+      nice-ffi
+    metaclass (0.0.2)
     method_source (0.8.2)
-    minitest (5.0.8)
+    minitest (5.2.2)
     minitest-happy (1.0.0)
-    mocha (0.14.0)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     nice-ffi (0.4)
       ffi (>= 0.5.0)
-    nio4r (0.5.0)
-    nio4r (0.5.0-java)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    nio4r (1.0.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12.2-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (10.1.0)
+    rake (10.1.1)
     reel (0.4.0)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)
       http (>= 0.5.0)
       http_parser.rb (>= 0.6.0.beta.2)
       websocket_parser (>= 0.1.4)
-    slop (3.4.6)
-    spoon (0.0.4)
-      ffi
+    robeaux (0.0.3)
+    slop (3.4.7)
     thor (0.18.1)
     timers (1.1.0)
-    websocket_parser (0.1.4)
-      http
+    websocket_parser (0.1.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 The Hybrid Group
+Copyright (c) 2013-2014 The Hybrid Group
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,21 +1,35 @@
 # Artoo Adaptor For Joysticks & Game Controllers
 
-This repository contains the Artoo (http://artoo.io/) adaptor for the PS3 game controller, XBox360 game controller, or any other joysticks and game controllers that are compatible with Simple DirectMedia Layer (SDL) (http://www.libsdl.org/). 
+This repository contains the Artoo (http://artoo.io/) adaptor for the PS3 controller, Xbox 360 controller, or any other joysticks and game controllers that are compatible with Simple DirectMedia Layer (SDL) (http://www.libsdl.org/). 
 
 Artoo is a open source micro-framework for robotics using Ruby.
 
 For more information about Artoo, check out our repo at https://github.com/hybridgroup/artoo
 
-The artoo-joystick adaptor uses the rubysdl gem (http://www.kmc.gr.jp/~ohai/rubysdl.en.html).
+The artoo-joystick adaptor uses the ruby-sdl-ffi gem (https://github.com/hybridgroup/ruby-sdl-ffi).
 
 [![Code Climate](https://codeclimate.com/github/hybridgroup/artoo-joystick.png)](https://codeclimate.com/github/hybridgroup/artoo-joystick) [![Build Status](https://travis-ci.org/hybridgroup/artoo-joystick.png?branch=master)](https://travis-ci.org/hybridgroup/artoo-joystick)
 
 ## Installing
 
+### OSX
+
+```
+brew install sdl
+gem install artoo-joystick
+```
+
+Mac OS X does not provide native support for XBox 360 controllers. A third-party driver is available from http://tattiebogle.net/index.php/ProjectRoot/Xbox360Controller/OsxDriver
+
+
+### Ubuntu
+
 ```
+sudo apt-get install libsdl1.2-dev
 gem install artoo-joystick
 ```
 
+
 ## Using
 
 ```ruby
@@ -45,12 +59,49 @@ end
 
 ## Connecting to USB Joysticks and Game Controllers
 
-Plus your USB joystick or game controller into your USB port. If your device is supported by SDL, you are now ready.
+Plug your USB joystick or game controller into your USB port. If your device is supported by SDL, you are now ready.
+
+### Additional XBox 360 Controller Information
+
+Trigger button events are published to :trigger_lt and :trigger_rt for the XBox 360 controller.
+
+```ruby
+require 'artoo'
+
+connection :joystick, :adaptor => :joystick
+device :controller, :driver => :xbox360, :connection => :joystick, :interval => 0.1
+
+work do
+  on controller, :trigger_lt => proc { |*value|
+    puts "trigger lt: #{value[1]}"
+  }
+  on controller, :trigger_rt => proc { |*value|
+    puts "trigger rt: #{value[1]}"
+  }
+end
+```
+
+## Documentation
+
+Check out our [documentation](http://artoo.io/documentation/) for lots of information about how to use Artoo.
+
+## IRC
+
+Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+* All patches must be provided under the Apache 2.0 License
+* Please use the -s option in git to "sign off" that the commit is your work and you are providing it under the Apache 2.0 License
+* Submit a Github Pull Request to the appropriate branch and ideally discuss the changes with us in IRC.
+* We will look at the patch, test it out, and give you feedback.
+* Avoid doing minor whitespace changes, renamings, etc. along with merged content. These will be done by the maintainers from time to time but they can complicate merges and should be done seperately.
+* Take care to maintain the existing coding style.
+* Add unit tests for any new or changed functionality.
+* All pull requests should be "fast forward"
+  * If there are commits after yours use “git rebase -i <new_head_branch>”
+  * If you have local changes you may need to use “git stash”
+  * For git help see [progit](http://git-scm.com/book) which is an awesome (and free) book on git
+
+
+(c) 2012-2014 The Hybrid Group

data/artoo-joystick.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "artoo-joystick"
   s.version     = Artoo::Joystick::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ron Evans"]
+  s.authors     = ["Ron Evans", "Andrew Stewart"]
   s.email       = ["artoo@hybridgroup.com"]
   s.homepage    = "https://github.com/hybridgroup/artoo-joystick"
   s.summary     = %q{Artoo adaptor and driver for SDL joysticks and game controllers}
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'artoo', '>= 1.4.0'
+  s.add_runtime_dependency 'artoo', '>= 1.6.0'
   s.add_runtime_dependency 'hybridgroup-ruby-sdl-ffi'
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'minitest-happy'

data/docs/events_joystick.md

@@ -0,0 +1,9 @@
+# Events
+
+## joystick
+
+Get's triggered every "interval" amount of time if a joystick event occured, you can access values x, y, s.
+
+## button
+
+Get's triggered every "interval" amount of time if the button was pressed, you can access the value of the pressed button.

data/docs/events_ps3.md

@@ -0,0 +1,65 @@
+# Events
+
+## button_left_joystick
+
+Gets triggered every interval amount of time if a left joystick click event occured.
+
+## button_right_joystick
+
+Gets triggered every interval amount of time if a right joystick click event occured.
+
+## button_square
+
+Gets triggered every interval amount of time if the square button was pressed.
+
+## button_x
+
+Gets triggered every interval amount of time if the 'x' button was pressed.
+
+## button_circle
+
+Gets triggered every interval amount of time if the circle button was pressed.
+
+## button_triangle
+
+Gets triggered every interval amount of time if the triangle button was pressed.
+
+## button_l1
+
+Gets triggered every interval amount of time if the l1 button was pressed.
+
+## button_l2
+
+Gets triggered every interval amount of time if the l2 button was pressed.
+
+## button_r1
+
+Gets triggered every interval amount of time if the r1 button was pressed.
+
+## button_r2
+
+Gets triggered every interval amount of time if the r2 button was pressed.
+
+## button_start
+
+Gets triggered every interval amount of time if the start button was pressed.
+
+## button_select
+
+Gets triggered every interval amount of time if the select button was pressed.
+
+## button_home
+
+Gets triggered every interval amount of time if the home button was pressed.
+
+## joystick
+
+Gets triggered every interval amount of time if a joystick event occured, you can access values x, y, s(joystick number, 0 and 1 for left and right).
+
+## joystick_0
+
+Gets triggered every interval amount of time if a joystick_0 event occured, you can access values x, y.
+
+## joystick_1
+
+Gets triggered every interval amount of time if a joystick_1 event occured, you can access values x, y.

data/docs/events_xbox360.md

@@ -0,0 +1,45 @@
+# Events
+
+## button_a
+
+Gets triggered every interval amount of time if the a button is pressed.
+
+## button_b
+
+Gets triggered every interval amount of time if the b button is pressed.
+
+## button_x
+
+Gets triggered every interval amount of time if the x button is pressed.
+
+## button_y
+
+Gets triggered every interval amount of time if the y button is pressed.
+
+## button_lb
+
+Gets triggered every interval amount of time if the left bumper button is pressed.
+
+## button_rb
+
+Gets triggered every interval amount of time if the right bumper button is pressed.
+
+## button_start
+
+Gets triggered every interval amount of time if the start button is pressed.
+
+## button_back
+
+Gets triggered every interval amount of time if the back button is pressed.
+
+## joystick
+
+Gets triggered every interval amount of time if a joystick event occured, you can access values x, y, s(joystick number, 0 and 1 for left and right).
+
+## joystick_0
+
+Get's triggered every interval amount of time if a joystick_0 event occured, you can access values x, y.
+
+## joystick_1
+
+Gets triggered every interval amount of time if a joystick_1 event occured, you can access values x, y.

data/examples/xbox_360_osx.rb

@@ -0,0 +1,37 @@
+require 'artoo'
+
+connection :joystick, :adaptor => :joystick
+device :controller, :driver => :xbox360, :connection => :joystick, :interval => 0.1
+
+work do
+  on controller, :joystick_0 => proc { |*value|
+    puts "joystick 0 - x:#{value[1][:x]} y:#{value[1][:y]}"
+  }
+  on controller, :joystick_1 => proc { |*value|
+    puts "joystick 1 - x:#{value[1][:x]} y:#{value[1][:y]}"
+  }
+  on controller, :trigger_lt => proc { |*value|
+    puts "left trigger: #{value[1]}"
+  }
+  on controller, :trigger_rt => proc { |*value|
+    puts "right trigger: #{value[1]}"
+  }
+  on controller, :button_a => proc { |*value|
+    puts "ayyyy!"
+  }
+  on controller, :button_b => proc { |*value|
+    puts "bee!"
+  }
+  on controller, :button_x => proc { |*value|
+    puts "exxx!"
+  }
+  on controller, :button_y => proc { |*value|
+    puts "why!"
+  }
+  on controller, :button_rb => proc { |*value|
+    puts "Right Button down"
+  }
+  on controller, :button_up_rb => proc { |*value|
+    puts "Right Button up"
+  }
+end

data/lib/artoo-joystick/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Joystick
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/artoo/drivers/joystick.rb

@@ -4,10 +4,24 @@ module Artoo
   module Drivers
     # The sdl-joystick driver behaviors
     class Joystick < Driver
+      include Artoo::Utility
+
+      COMMANDS = [:currently_pressed?].freeze
+
       attr_reader :button_values
 
       # Start driver and any required connections
       def start_driver
+        puts os
+        case os
+        when :linux
+          require 'artoo/drivers/linux_binding_map'
+        when :macosx
+          require 'artoo/drivers/macosx_binding_map'
+        else
+          # raise error ?
+        end
+
         @button_values = {}
 
         begin
@@ -23,6 +37,10 @@ module Artoo
         end
       end
 
+      def currently_pressed?(b)
+        button_values[b]
+      end
+
       def handle_message_events
         connection.poll
         handle_joystick
@@ -36,7 +54,7 @@ module Artoo
         number_sticks.times {|s|
           x = connection.axis(s * 2)
           y = connection.axis(s * 2 + 1)
-        
+
           publish_joystick(s, x, y)
         }
       end
@@ -44,7 +62,7 @@ module Artoo
       def handle_trackball
         if connection.num_balls == 1
           x, y = connection.ball(0)
-        
+
           publish(event_topic_name("update"), "trackball", {:x => x, :y => y})
           publish(event_topic_name("trackball"), {:x => x, :y => y})
         end
@@ -55,9 +73,7 @@ module Artoo
           currently_pressed = connection.button(b)
           if button_values[b] != currently_pressed
             button_values[b] = currently_pressed
-            if currently_pressed == 1
-              publish_button(b)
-            end
+            publish_button(b)
           end
         }
       end
@@ -69,9 +85,11 @@ module Artoo
       end
 
       def publish_button(b)
-        publish(event_topic_name("update"), "button", b)
-        publish(event_topic_name("button"), b)
-        publish(event_topic_name("button_#{b}"))
+        if button_values[b] == 1
+          publish(event_topic_name("update"), "button", b)
+          publish(event_topic_name("button"), b)
+          publish(event_topic_name("button_#{b}"))
+        end
       end
     end
   end

data/lib/artoo/drivers/linux_binding_map.rb

@@ -0,0 +1,43 @@
+BINDING_MAP = {
+  :ps3 => {
+    :button_map => {
+      0 => :square,
+      1 => :x,
+      2 => :circle,
+      3 => :triangle,
+      4 => :l1,
+      5 => :r1,
+      6 => :l2,
+      7 => :r2,
+      8 => :select,
+      9 => :start,
+      10 => :left_joystick,
+      11 => :right_joystick,
+      12 => :home
+    },
+    :axis_map => {
+      :j0_x => 0,
+      :j0_y => 1,
+      :j1_x => 2,
+      :j1_y => 3
+    }
+  },
+  :xbox360 => {
+    :button_map => {
+      0 => :a,
+      1 => :b,
+      2 => :x,
+      3 => :y,
+      4 => :lb,
+      5 => :rb,
+      6 => :back,
+      7 => :start
+    },
+    :axis_map => {
+      :j0_x => 0,
+      :j0_y => 1,
+      :j1_x => 3,
+      :j1_y => 4
+    }
+  }
+}

data/lib/artoo/drivers/macosx_binding_map.rb

@@ -0,0 +1,56 @@
+BINDING_MAP = {
+  :ps3 => {
+    :button_map => {
+      0 => :select,
+      1 => :j0,
+      2 => :j1,
+      3 => :start,
+      4 => :dpad_up,
+      5 => :dpad_right,
+      6 => :dpad_down,
+      7 => :dpad_left,
+      8 => :l2,
+      9 => :r2,
+      10 => :l1,
+      11 => :r1,
+      12 => :triangle,
+      13 => :circle,
+      14 => :x,
+      15 => :square,
+      16 => :ps3
+    },
+    :axis_map => {
+      :j0_x => 0,
+      :j0_y => 1,
+      :j1_x => 2,
+      :j1_y => 3
+    }
+  },
+  :xbox360 => {
+    :button_map => {
+      0 => :dpad_up,
+      1 => :dpad_down,
+      2 => :dpad_left,
+      3 => :dpad_right,
+      4 => :start,
+      5 => :back,
+      6 => :j0,
+      7 => :j1,
+      8 => :lb,
+      9 => :rb,
+      10 => :xbox,
+      11 => :a,
+      12 => :b,
+      13 => :x,
+      14 => :y
+    },
+    :axis_map => {
+      :j0_x => 0,
+      :j0_y => 1,
+      :j1_x => 2,
+      :j1_y => 3,
+      :lt => 4,
+      :rt => 5
+    }
+  }
+}

data/lib/artoo/drivers/ps3.rb

@@ -4,40 +4,42 @@ module Artoo
   module Drivers
     # The Ps3 controller driver behaviors
     class Ps3 < Artoo::Drivers::Joystick
-      BUTTON_MAP = {
-        0 => 'square',
-        1 => 'x',
-        2 => 'circle',
-        3 => 'triangle',
-        4 => 'l1',
-        5 => 'r1',
-        6 => 'l2',
-        7 => 'r2',
-        8 => 'select',
-        9 => 'start',
-        10 => 'left_joystick',
-        11 => 'right_joystick',
-        12 => 'home'
-      }
+
+      def currently_pressed?(b)
+        if button_map.has_value?(b)
+          button_values[button_map.key(b)]
+        else
+          super b
+        end
+      end
 
       def handle_joystick
-        x0 = connection.axis(0)
-        y0 = connection.axis(1)
+        x0 = connection.axis(axis_map[:j0_x])
+        y0 = connection.axis(axis_map[:j0_y])
         publish_joystick(0, x0, y0)
 
-        x1 = connection.axis(2)
-        y1 = connection.axis(3)
+        x1 = connection.axis(axis_map[:j1_x])
+        y1 = connection.axis(axis_map[:j1_y])
         publish_joystick(1, x1, y1)        
       end
 
       def publish_button(b)
-        publish(event_topic_name("button_#{button_letter(b)}"))
+        if button_values[b] == 1
+          publish(event_topic_name("button_#{button_map[b]}"))
+        else
+          publish(event_topic_name("button_up_#{button_map[b]}"))
+        end
         super
       end
 
-      def button_letter(b)
-        BUTTON_MAP[b]
+      def button_map
+        BINDING_MAP[:ps3][:button_map]
       end
+
+      def axis_map
+        BINDING_MAP[:ps3][:axis_map]
+      end
+
     end
   end
 end

data/lib/artoo/drivers/xbox360.rb

@@ -4,35 +4,58 @@ module Artoo
   module Drivers
     # The Xbox360 controller driver behaviors
     class Xbox360 < Artoo::Drivers::Joystick
-      BUTTON_MAP = {
-        0 => 'a',
-        1 => 'b',
-        2 => 'x',
-        3 => 'y',
-        4 => 'lb',
-        5 => 'rb',
-        6 => 'back',
-        7 => 'start'
-      }
+
+      def currently_pressed?(b)
+        if button_map.has_value?(b)
+          button_values[button_map.key(b)]
+        else
+          super b
+        end
+      end
 
       def handle_joystick
-        x0 = connection.axis(0)
-        y0 = connection.axis(1)
+        x0 = connection.axis(axis_map[:j0_x])
+        y0 = connection.axis(axis_map[:j0_y])
         publish_joystick(0, x0, y0)
 
-        x1 = connection.axis(3)
-        y1 = connection.axis(4)
-        publish_joystick(1, x1, y1)        
+        x1 = connection.axis(axis_map[:j1_x])
+        y1 = connection.axis(axis_map[:j1_y])
+        publish_joystick(1, x1, y1)
+
+        handle_trigger
+      end
+
+      def handle_trigger
+        unless axis_map[:lt].nil?
+          publish_trigger(:lt, connection.axis(axis_map[:lt]))
+        end
+
+        unless axis_map[:rt].nil?
+          publish_trigger(:rt, connection.axis(axis_map[:rt]))
+        end
+      end
+
+      def publish_trigger(t, v)
+        publish(event_topic_name("trigger_#{t}"), v)
       end
 
       def publish_button(b)
-        publish(event_topic_name("button_#{button_letter(b)}"))
+        if button_values[b] == 1
+          publish(event_topic_name("button_#{button_map[b]}"))
+        else
+          publish(event_topic_name("button_up_#{button_map[b]}"))
+        end
         super
       end
 
-      def button_letter(b)
-        BUTTON_MAP[b]
+      def button_map
+        BINDING_MAP[:xbox360][:button_map]
       end
+
+      def axis_map
+        BINDING_MAP[:xbox360][:axis_map]
+      end
+
     end
   end
 end

metadata

@@ -1,83 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: artoo-joystick
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ron Evans
+- Andrew Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: hybridgroup-ruby-sdl-ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-happy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 description: Artoo adaptor and driver for SDL joysticks and game controllers
@@ -87,20 +88,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - artoo-joystick.gemspec
+- docs/events_joystick.md
+- docs/events_ps3.md
+- docs/events_xbox360.md
 - examples/controller.rb
 - examples/ps3_controller.rb
 - examples/xbox_360_controller.rb
+- examples/xbox_360_osx.rb
 - lib/artoo-joystick.rb
 - lib/artoo-joystick/version.rb
 - lib/artoo/adaptors/joystick.rb
 - lib/artoo/drivers/joystick.rb
+- lib/artoo/drivers/linux_binding_map.rb
+- lib/artoo/drivers/macosx_binding_map.rb
 - lib/artoo/drivers/ps3.rb
 - lib/artoo/drivers/xbox360.rb
 - test/adaptors/joystick_adaptor_test.rb
@@ -118,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: artoo-joystick
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for SDL joysticks and game controllers