gosu_android 0.0.2 → 0.0.4

data/README.md

@@ -4,14 +4,25 @@ A Gosu implementation for Adroid devices.
 
 Installation
 -----------
-Sadly right now you need to manually copy every file to every ruboto proyect you want to use it.
 
-- Download the sources
-- Copy the `lib` folder and the `gosu.rb` to the `proyect_name/src/` folder inside your [ruboto](http://github.com/ruboto/ruboto) proyect.
-- Copy the `gosu.java.jar` in the `proyect_name/libs/` folder.
-- Place the `res` files in the `proyect_name/res` folder.
-- It is very important that you do not copy the `java` files in your proyect folder, they are included for developers only.
+### Easy way
 
+* Create a file named Gemfile.apk in your ruboto project and add the lines
+
+```ruby
+  source "http://rubygems.org"
+  gem 'gosu_android'
+```
+
+* Create a folder inside `res` folder call `drawable-nodpi` and copy this file https://github.com/neochuky/gosu-android/tree/master/res/drawable-nodpi/character_atlas8.png
+in it.
+
+### Not so easy way 
+`gem install gosu_android`
+
+As with ruboto, place yourself in the root directory of your app, then execute
+`gosu_android -a` or `gosu_android --add` to automatically copy every gosu_android file to your ruboto project. 
+It will also copy all the media files that are use in gosu_android examples.
 
 General Information
 -------------------
@@ -22,14 +33,5 @@ General Information
 
 Troubleshooting
 -------------------
-* If you're using Ruboto 0.10.4 or earlier, you may get an error when trying to require the gosu libraries: `(SystemStackError) stack level too deep` in `require 'gosu'`. If this happens:
-	* Replace `require 'gosu'` with  `with_large_stack { require 'gosu' }`. If it still doesn't work:
-	* Try `with_large_stack(256)
-		require 'gosu'
-	end`. If it still doesn't work, try again with `512` instead of `256`.
-	* Alternatively, update to the latest Ruboto (0.11 or better).
-	* Relevant Ruboto issues:
-		* https://github.com/ruboto/ruboto/issues/359
-		* https://github.com/ruboto/ruboto/issues/375
 * When using several audio files double check that all have the same codification or you could get: `E/MediaPlayer(16127): Unable to to create media player`
  	* http://forums.pragprog.com/forums/152/topics/9144

data/Rakefile

@@ -0,0 +1,26 @@
+CLASSES_DIR = 'pkg/classes'
+JAVA_SOURCES = 'java/*'
+
+unless ENV['ANDROID_HOME']
+  begin
+    adb_path = `which adb`
+    ENV['ANDROID_HOME'] = File.dirname(File.dirname(adb_path)) if $? == 0
+  rescue Errno::ENOENT
+    puts "Unable to detect adb location: #$!"
+  end
+end
+(puts 'You need to set the ANDROID_HOME environment variable.'; exit 1) unless ENV['ANDROID_HOME']
+
+directory CLASSES_DIR
+
+desc 'Generate the gosu.java.jar'
+task :jar => [CLASSES_DIR] + FileList[JAVA_SOURCES] do
+  sh "javac -source 1.6 -target 1.6 -bootclasspath #{ENV['ANDROID_HOME']}/platforms/android-10/android.jar -d #{CLASSES_DIR} #{JAVA_SOURCES}"
+  sh "jar cf lib/gosu.java.jar -C #{CLASSES_DIR} gosu"
+end
+
+desc 'Build the gem'
+task :gem => :jar do
+  sh 'gem build gosu_android.gemspec'
+  sh 'mv gosu_android-*.gem pkg/'
+end

data/examples/{arkanoid.rb → arkanoid_activity.rb}

@@ -1,4 +1,4 @@
-require 'gosu_android'
+require 'gosu'
 
 class GameWindow < Gosu::Window
   def initialize
@@ -88,7 +88,7 @@ class GameWindow < Gosu::Window
  
 end
 
-class GosuActivity
+class ArkanoidActivity
   def on_create(bundle)
     super(bundle)
     Gosu::AndroidInitializer.instance.start(self)

data/examples/pong_activity.rb

@@ -1,4 +1,4 @@
-require 'gosu_android'
+require 'gosu'
 
 class GameWindow < Gosu::Window
   def initialize
@@ -82,7 +82,7 @@ class GameWindow < Gosu::Window
  
 end
 
-class GosuActivity
+class PongActivity
   def on_create(bundle)
     super(bundle)
     Gosu::AndroidInitializer.instance.start(self)

data/examples/{test-game.rb → test_game_activity.rb}

@@ -1,4 +1,4 @@
-require 'gosu_android'
+require 'gosu'
 
 module ZOrder
   Background, Stars, Player, UI = *0..3

data/lib/gosu_android/commands/base.rb

@@ -1,4 +1,9 @@
 require 'rake'
+#gem root -> where the gem is located
+gem_root = File.expand_path(File.dirname(__FILE__))
+#Delete last occurence of /commands
+gem_root = gem_root.reverse.sub( "commands".reverse, '' ).reverse
+require gem_root + "version.rb"
 
 module Gosu
   module Commands
@@ -11,6 +16,7 @@ module Gosu
         puts ""
         puts " -a, --add adds the files to the project"
         puts " -d, --delete deletes the files from the project"
+        puts " -v, --version shows current version"
         puts " -h, --help display this help and exit"
         puts ""
         puts "The options -a and -d can not be given together."
@@ -60,8 +66,8 @@ module Gosu
         #Delete last occurence of /gosu_android
         gem_root = gem_root.reverse.sub( "/gosu_android".reverse, '' ).reverse
 
-        src = gem_root + "/gosu_android.rb"
-        dst = root + "/src/gosu_android.rb"
+        src = gem_root + "/gosu.rb"
+        dst = root + "/src/gosu.rb"
         FileUtils.cp(src, dst)  
         src = gem_root + "/gosu.java.jar"
         dst = root + "/libs/gosu.java.jar"
@@ -100,8 +106,8 @@ module Gosu
           $stderr.puts e.message
         end  
         
-        #Deleting gosu_android.rb file
-        to_delete = root + "/src/gosu_android.rb"
+        #Deleting gosu.rb file
+        to_delete = root + "/src/gosu.rb"
         begin    
           File.delete to_delete        
         rescue => e
@@ -148,6 +154,7 @@ module Gosu
        add = false
        delete = false
        help = false
+       version = false
         ARGV.each do|a|
           case a
           when "-a" 
@@ -162,14 +169,23 @@ module Gosu
             help = true
           when "--help"
             help = true
+          when "-v" 
+            version = true
+          when "--version"
+            version = true            
           end    
         end
         
-        if help or not add and not delete
+        if help or not add and not delete and not version
           show_help
           exit 0
         end
         
+        if version
+        	puts Gosu::VERSION
+        	exit 0
+        end
+        
         if add and delete
           $stderr.puts "Add and delete can not be perform at the same time\n"
           exit 1
@@ -189,4 +205,4 @@ module Gosu
     end
   end
 end
-          
+          

data/lib/gosu_android/input/buttons.rb

@@ -107,7 +107,7 @@ module Gosu
 
   #Load supported buttons on android above 4.0.0
   if android.os.Build::VERSION::SDK_INT >= 15
-    Game pad
+    # Game pad
     GpButton0 = JavaImports::KeyEvent::KEYCODE_BUTTON_1
     GpButton1 = JavaImports::KeyEvent::KEYCODE_BUTTON_2
     GpButton10 = JavaImports::KeyEvent::KEYCODE_BUTTON_11

data/lib/gosu_android/main-window.rb

@@ -11,6 +11,7 @@ require 'gosu_android/timing'
 require 'singleton'
 require 'ruboto/util/toast'
 
+
 module Gosu
 
   class AndroidInitializer
@@ -33,7 +34,7 @@ module Gosu
     end
   end
 
-  class GosuSurfaceView < android.opengl.GLSurfaceView
+  class GosuSurfaceView < JavaImports::GLSurfaceView
 
     def atributes(window, input)
       @window = window

data/lib/gosu_android/requires.rb

@@ -2,8 +2,12 @@ require 'ruboto/activity'
 
 module JavaImports
   #Opengl classes
-  java_import "android.opengl.GLSurfaceView"
-  
+  if android.os.Build::VERSION::SDK_INT <= 10
+    java_import "gosu.java.GLSurfaceView"
+  else
+    java_import "android.opengl.GLSurfaceView"
+  end
+
   java_import "javax.microedition.khronos.egl.EGL10"
   java_import "javax.microedition.khronos.egl.EGLConfig"
   java_import "javax.microedition.khronos.opengles.GL10"
@@ -37,4 +41,4 @@ module JavaImports
   java_import "android.media.SoundPool"
   java_import "android.media.AudioManager"  
   java_import "android.media.MediaPlayer"  
-end  
+end  

data/lib/gosu_android/version.rb

@@ -1,3 +1,3 @@
 module Gosu
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu_android
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Garoe Dorta
@@ -15,24 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruboto
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
-  type: :runtime
-  version_requirements: *id001
+date: 2013-04-06 00:00:00 Z
+dependencies: []
+
 description: |
   Gosu-Android is an implementation for Android devices of the multiplatform Gosu library.
 
@@ -46,12 +31,13 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - README.md
-- examples/arkanoid.rb
+- Rakefile
+- examples/arkanoid_activity.rb
 - examples/pong_activity.rb
-- examples/test-game.rb
+- examples/test_game_activity.rb
 - bin/gosu_android
 - lib/gosu.java.jar
-- lib/gosu_android.rb
+- lib/gosu.rb
 - lib/gosu_android/audio/audio.rb
 - lib/gosu_android/commands/base.rb
 - lib/gosu_android/description.rb
@@ -124,4 +110,3 @@ specification_version: 3
 summary: A Gosu implementation for Android.
 test_files: []
 
-has_rdoc: