jruby-slick 1.1b → 1.1.0

data/.gitignore

@@ -1,3 +1,3 @@
-slick/*
+vendor/*
 .DS_Store
-*.gem
+*.gem

data/bin/jruby-slick.rb

@@ -3,8 +3,36 @@ require 'rubygems'
 require 'rake'
 
 gem_dir = Gem::Specification.find_by_name("jruby-slick").gem_dir
-
 Rake.application.rake_require "jruby-slick", ["#{gem_dir}/jruby-slick/tasks"]
-Rake::Task['download_slick'].invoke
-Rake::Task['setup_natives'].invoke
-Rake::Task['build_example'].invoke
+
+args = ARGV
+nothing_run = true
+
+if args.include? "install"
+  Rake::Task['download_slick'].invoke
+  Rake::Task['setup_natives'].invoke
+  Rake::Task['build_example'].invoke
+  nothing_run = false
+end
+
+if args.include? "gamestate"
+  idx = args.index "gamestate"
+  filename = "example_game_state.rb"
+  classname = "ExampleGameState"
+  unless args[idx+1].nil?
+    filename = "#{args[idx+1]}_game_state.rb"
+    classname = "#{args[idx+1]}_game_state".gsub(/\_[a-z]/) do |m|
+      m.upcase.gsub("_","")
+    end.capitalize
+  end
+
+  Rake::Task[:generate_game_state].invoke(filename, classname)
+  nothing_run = false
+end
+
+if nothing_run || args.include?("-h") || args.include?("--help")
+  puts "\njruby slick commands:\n"
+  puts "    install            - downloads the slick.jar, lwjgl natives, and gives an example file."
+  puts "    gamestate [name]   - generates a base gamestate file for you in lib/. Optional name will change class & filename. Example: `jruby-slick.rb gamestate=awesome` would create awesome.rb"
+  puts "    -h | --help        - shows this menu"
+end

data/jruby-slick/tasks/jruby-slick.rake

@@ -1,58 +1,96 @@
 require 'net/http'
+require 'open-uri'
 require 'fileutils'
 require 'rubygems'
 require 'zip/zipfilesystem'
 require 'rbconfig'
-desc 'Download Slick Distribution'
 
+desc 'Download Slick Distribution'
 task :download_slick do
-
-  FileUtils.rm_rf "vendor/slick"
   FileUtils.mkdir_p "vendor/slick"
 
-  res = Net::HTTP.get_response(URI("http://slick.cokeandcode.com/downloads/slick.zip"))
-  File.open("temp.zip", "w+") do |f|
+  res = Net::HTTP.get_response(URI("http://www.slick2d.org/downloads/slick.jar"))
+  File.open("vendor/slick/slick.jar", "w+") do |f|
     f.write(res.body)
   end
-  Zip::ZipFile.open("temp.zip") do |zipfile|
-    zipfile.each do |entry|
-      if entry.file? && /^lib\// =~ entry.name
-        entry.extract entry.to_s.gsub(/^lib/, "vendor/slick")
-      end
-    end
-  end
-  File.delete("temp.zip")
+  puts "slick.jar downloaded into vendor/slick directory"
 end
 
+desc 'Setup lwjgl natives'
 task :setup_natives do
   FileUtils.mkdir_p "bin" unless File.exists? "bin"
   target = RbConfig::CONFIG['target_os'].downcase
-  platform = ''
+  platform = []
   if target.index('mswin')
-    platform = 'mingw'
+    platform << 'windows'
+    valid = false
+    puts "Since you are using windows, please specify whether you are using 32 or 64 bit (32/64)"
+    bit = ''
+    until valid
+      bit = gets.chomp
+      valid = /^(32|64)$/ =~ bit
+      puts "Please enter 32 or 64" if !valid
+    end
+    platform << bit
   elsif target.index('darwin')
-    platform = 'mac'
+    platform << 'macosx'
+    puts "Determined you are on OS X"
   elsif target.index('linux')
-    platform = 'linux'
+    platform << 'linux'
+    puts "Determined you are on Linux"
+  end
+
+  puts "Downloading LWJGL"
+  open("lwjgl.zip", "wb") do |f|
+    f.print open("http://downloads.sourceforge.net/project/java-game-lib/Official%20Releases/LWJGL%202.8.5/lwjgl-2.8.5.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fjava-game-lib%2Ffiles%2FOfficial%2520Releases%2FLWJGL%25202.8.5%2F&ts=1354580536&use_mirror=iweb").read
   end
 
-  Dir['vendor/slick/*.jar'].each do |jar_file|
-    if jar_file.index('natives-') && jar_file.gsub('vendor/slick/natives-', '').gsub('.jar', '') == platform
-      Zip::ZipFile.open(jar_file) do |natives|
-        natives.each do |f|
-          path = "bin/#{f.to_s}"
-          File.delete path if File.exists? path
-          f.extract "bin/#{f.to_s}"
+  puts "Finished downloading LWJGL"
+
+  Zip::ZipFile.open("lwjgl.zip") do |natives|
+    natives.each do |entry|
+      if entry.file? && /^lwjgl-2.8.5\/native\/#{platform[0]}/ =~ entry.name
+        target = "bin/#{entry.name.split('/')[-1]}"
+        unless File.exists? target
+          entry.extract target
+          puts "wrote file: #{target}"
+        end
+      elsif entry.file? && entry.name == "lwjgl-2.8.5/jar/lwjgl.jar" || entry.name == "lwjgl-2.8.5/jar/jinput.jar"
+        target = "vendor/slick/#{entry.name.split('/')[-1]}"
+        unless File.exists? target
+          entry.extract target
+          puts "wrote file: #{target}"
         end
       end
     end
   end
+
+  puts "removed lwjgl.zip"
+  FileUtils.rm "lwjgl.zip"
 end
 
+desc 'Build base example file'
 task :build_example do
   gem_dir = Gem::Specification.find_by_name("jruby-slick").gem_dir
 
   unless File.exists? "bin/example.rb"
     FileUtils.cp "#{gem_dir}/jruby-slick/template/example.rb", "bin/example.rb"
   end
+end
+
+desc 'generate a default gamestate file'
+task :generate_game_state, :file_name, :class_name do |t, args|
+  gem_dir = Gem::Specification.find_by_name("jruby-slick").gem_dir
+  file_name = args[:file_name]
+  class_name = args[:class_name]
+
+  FileUtils.mkdir_p "lib"
+  if File.exists? "lib/#{file_name}"
+    puts "File lib/#{file_name} already exists, will not overwrite. Delete it and run the command again if you wish to replace."
+  else
+    FileUtils.cp "#{gem_dir}/jruby-slick/template/example_game_state.rb", "lib/#{file_name}"
+    text = IO.read("lib/#{file_name}")
+    IO.write("lib/#{file_name}", text.gsub("ExampleGameState", class_name))
+    puts "Created file lib/#{file_name}"
+  end
 end

data/jruby-slick/template/example.rb

@@ -22,5 +22,5 @@ class ExampleGame < StateBasedGame
 end
 
 app = AppGameContainer.new(ExampleGame.new)
-app.setDisplayMode(GunzABlazin.width, GunzABlazin.height, false)
+app.setDisplayMode(800, 600, false)
 app.start()

data/jruby-slick/template/example_game_state.rb

@@ -0,0 +1,116 @@
+java_import org.lwjgl.input.Keyboard
+java_import org.lwjgl.opengl.Display
+java_import org.lwjgl.opengl.GL11
+java_import org.newdawn.slick.GameContainer
+java_import org.newdawn.slick.Graphics
+java_import org.newdawn.slick.Image
+java_import org.newdawn.slick.Input
+java_import org.newdawn.slick.SlickException
+java_import org.newdawn.slick.state.GameState
+java_import org.newdawn.slick.state.StateBasedGame
+
+class ExampleGameState
+  include GameState
+  
+  def enter(gc, sbg)
+  end
+
+  def getID
+    # should return a unique number for each state you have in your game
+    0
+  end
+
+  def initialize()
+  end
+
+  def init(gc, sbg)
+    
+  end
+
+  def render(gc, sbg, g)
+    
+  end
+
+  def update(gc, sbg, delta)
+
+  end
+
+  def isAcceptingInput
+    false
+  end
+
+  def leave(gc, sbg)
+    
+  end
+
+  def inputEnded
+    
+  end
+
+  def setInput(arg)
+    
+  end
+
+  def keyPressed(keyval, keyChar)
+    
+  end
+
+  def keyReleased(keyval, keyChar)
+    
+  end
+
+  def isRenderPaused
+    
+  end
+
+  def isUpdatePaused
+    
+  end
+
+
+  def controllerButtonPressed(arg0, arg1)
+  end
+
+  def controllerButtonReleased(arg0, arg1)
+  end
+
+  def controllerDownPressed(arg0)
+  end
+
+  def controllerDownReleased(arg0)
+  end
+
+  def controllerLeftPressed(arg0)
+  end
+
+  def controllerLeftReleased(arg0)
+  end
+
+  def controllerRightPressed(arg0)
+  end
+
+  def controllerRightReleased(arg0)
+  end
+
+  def controllerUpPressed(arg0)
+  end
+
+  def controllerUpReleased(arg0)
+  end
+
+  def mouseClicked(arg0, arg1, arg2, arg3)
+  end
+
+  def mouseMoved(arg0, arg1, arg2, arg3)
+  end
+
+  def mousePressed(arg0, arg1, arg2, arg3)
+  end
+
+  def mouseReleased(arg0, arg1, arg2, arg3)
+  end
+
+  def mouseWheelMoved(arg0)
+  end
+
+end

metadata

@@ -1,32 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: jruby-slick
 version: !ruby/object:Gem::Version
-  version: 1.1b
-  prerelease: 3
+  prerelease:
+  version: 1.1.0
 platform: ruby
 authors:
 - Aaron McLeod
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  name: rubyzip
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 description: ''
 email:
 - aaron.g.mcleod@gmail.com
@@ -35,34 +55,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- jruby-slick/tasks/jruby-slick.rake
-- jruby-slick/template/example.rb
-- bin/jruby-slick.rb
+- !binary |-
+  anJ1Ynktc2xpY2svdGFza3MvanJ1Ynktc2xpY2sucmFrZQ==
+- !binary |-
+  anJ1Ynktc2xpY2svdGVtcGxhdGUvZXhhbXBsZS5yYg==
+- !binary |-
+  anJ1Ynktc2xpY2svdGVtcGxhdGUvZXhhbXBsZV9nYW1lX3N0YXRlLnJi
+- !binary |-
+  YmluL2pydWJ5LXNsaWNrLnJi
 - .gitignore
 - Rakefile
 homepage: http://github.com/agmcleod/jruby-slick
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - .
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
-summary: A command line tool for downloading and unzipping all the basic jar files
-  of the slick2d library.
+summary: A command line tool for downloading and unzipping all the basic jar files of the slick2d library.
 test_files: []