artoo-joystick 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c85eb882b2e9308a8d8f3cdb26205510be784e
-  data.tar.gz: 58c51740b9f39ce8c228871298a02b6ad7550375
+  metadata.gz: 286793d7267dda24af042bd17b55ff0aeb5ca777
+  data.tar.gz: da69d24c572e50ebd37a0e39a33eff29428861e0
 SHA512:
-  metadata.gz: c8056e13185651b0d77f120b137146687eada40a9a5af15b70bb3fef25fa1abf9c4e25baf3f85aeb791dcb7d97780ea9b3b6ac64eeac9b994976639d70a416aa
-  data.tar.gz: 275aafc357b7bf5b7159d3622019aee166e5cd025d66bdfd8353424601499b53b600a9deba37a54ab11d18bd5eab032d26d5fcc3a000a6061bd56c235c3594f2
+  metadata.gz: d302f72134b42cc08cbb3f3adff65a93a5f3a1662124a37116503e631a834d8b1aacaf283af64ad7049c6b6275f2d17f078420519510a5fb62d1dda8e3973634
+  data.tar.gz: 6fecde154a335843c8e3dacfb29027f8b57c6e61e9daa24459f95d8b7780c874654ee44bb4b0f4d2e32d661fb7ea0e738c258ab2e1ecd584b0b7a85a986582cd

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-1.7.4
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: jruby-1.7.4

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    artoo-joystick (0.2.0)
-      artoo (>= 1.3.0)
+    artoo-joystick (0.3.0)
+      artoo (>= 1.4.0)
       hybridgroup-ruby-sdl-ffi
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artoo (1.3.0)
+    artoo (1.4.1)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
@@ -16,16 +16,18 @@ GEM
       rake
       reel (~> 0.4.0)
       thor (~> 0.18.1)
-    celluloid (0.15.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)
     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)
@@ -34,14 +36,20 @@ GEM
     minitest-happy (1.0.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     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)
       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)
     reel (0.4.0)
       celluloid (>= 0.15.1)
@@ -50,6 +58,8 @@ GEM
       http_parser.rb (>= 0.6.0.beta.2)
       websocket_parser (>= 0.1.4)
     slop (3.4.6)
+    spoon (0.0.4)
+      ffi
     thor (0.18.1)
     timers (1.1.0)
     websocket_parser (0.1.4)

data/artoo-joystick.gemspec

@@ -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.3.0'
+  s.add_runtime_dependency 'artoo', '>= 1.4.0'
   s.add_runtime_dependency 'hybridgroup-ruby-sdl-ffi'
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'minitest-happy'

data/examples/xbox_360_controller.rb

@@ -4,8 +4,11 @@ connection :joystick, :adaptor => :joystick
 device :controller, :driver => :xbox360, :connection => :joystick, :interval => 0.1
 
 work do
-  on controller, :joystick => proc { |*value|
-    puts "joystick #{value[1][:s]} x:#{value[1][:x]} y:#{value[1][:y]}"
+  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, :button_a => proc { |*value|
     puts "ayyyy!"

data/lib/artoo-joystick/version.rb

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

data/lib/artoo/adaptors/joystick.rb

@@ -5,15 +5,8 @@ module Artoo
     # Connect to a joystick device
     # @see device documentation for more information
     class Joystick < Adaptor
-      finalizer :finalize
       attr_reader :joystick
 
-      # Closes connection with device if connected
-      # @return [Boolean]
-      def finalize
-        disconnect if connected?
-      end
-
       # Creates a connection with device
       # @return [Boolean]
       def connect
@@ -22,7 +15,7 @@ module Artoo
         ::SDL.Init( ::SDL::INIT_JOYSTICK )
 
         raise "No SDL joystick available" if num_joysticks == 0
-        
+
         @joystick = ::SDL.JoystickOpen(0) # TODO: allow user to choose which joystick
 
         super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artoo-joystick
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ron Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hybridgroup-ruby-sdl-ffi
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE