joybox 1.0.0 → 1.1.0

data/command/joybox_generate_command.rb

@@ -1,114 +1,68 @@
-class String
-
-  def underscore
-    gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
-  end
-
-  def titleize
-    gsub(/([A-Z])/, '_\1').split(/_/).map(&:capitalize).join
-  end
-
-end
-
-
-module Motion; module Project
-  class JoyboxGenerateCommand < Command
-
-    self.name = 'joybox:generate'
-    self.help = 'Joybox: Class Generator'
-
-    attr_reader :name
-
-    def run(args)
-
-      if args.empty? or args.size != 2 
-        show_help
+require 'optparse'
+require File.expand_path('../command/string.rb', File.readlink(__FILE__))
+require File.expand_path('../command/template.rb', File.readlink(__FILE__))
+
+module Motion
+  module Project
+    class JoyboxGenerateCommand < Command
+
+      self.name = 'joybox:generate'
+      self.help = 'Joybox: Class Generator'
+
+      @@description = <<-EOF
+    Generates a new class according to the class type and name, those 
+    parameters can be sended either CamelCased or snake_cased. Also a 
+    test class will be generated and placed inside the spec folder.
+
+    Supported Classes: Sprite, Layer, Scene
+      EOF
+
+      @@example = <<-EOF
+    'motion jb:generate layer game'
+
+    This will generate a Layer class named 'GameLayer' with the 
+    following files:
+        class:  'app/layers/game_layer.rb'
+        spec:   'spec/layers/game_layer_spec.rb'
+      
+    The list of posible paths according to the class type:
+        Sprite: app/sprites/ - spec/sprites/
+        Layer:  app/layers/ - spec/layers/
+        Scene:  app/scenes/ - spec/scenes/
+      EOF
+
+      def run(args)
+        opt_parser = OptionParser.new do |opt|
+          opt.banner = "Usage:"
+          opt.separator "    motion joybox:generate <class-type> <file-name>"
+          opt.separator ""
+          opt.separator "Options:"
+
+          opt.on('-h', '--help', 'Shows this screen')
+
+          opt.separator ""
+          opt.separator "Description:"
+          opt.separator @@description
+          opt.separator ""
+          opt.separator "Example:"
+          opt.separator @@example
+        end
+
+        opt_parser.parse!
+        return puts opt_parser if args.size != 2
+
+        klass = args[0]
+        name = args[1]
+
+        case klass
+        when /(\bsprite\b|\blayer\b|\bscene\b)/i
+          template = Joybox::Command::Template.new(name, klass)
+          template.save
+        else
+          puts opt_parser
+        end
       end
 
-      klass = args[0]
-      name = args[1]
-
-      template_class_file = File.expand_path("../joybox/templates/#{klass}.erb", __FILE__)
-      template_spec_file = File.expand_path("../joybox/templates/#{klass}_spec.erb", __FILE__)
-
-      unless File.exists?(template_class_file)
-        show_help
-      end
-
-      begin
-        app_directory = find_app_directory
-        spec_directory = find_spec_directory
-      rescue
-        die 'The command needs to run inside of a RubyMotion project'
-      end
-
-      class_file = File.join(app_directory, "#{klass}s/#{name.underscore}_#{klass}.rb")
-      test_file = File.join(spec_directory, "#{klass}s/#{name.underscore}_#{klass}_spec.rb")
-
-      if File.exists?(class_file) or File.exists?(test_file)
-        App.log 'Duplicate', "#{class_file} exists" if File.exists?(class_file)
-        App.log 'Duplicate', "#{test_file} exists" if File.exists?(test_file)
-        exit 1
-      end
-
-      create_directory(File.dirname(class_file))
-      create_directory(File.dirname(test_file))
-
-      @name = name.titleize
-      create_file(class_file, template_class_file)
-      create_file(test_file, template_spec_file)
     end
-
-
-    def find_app_directory(directory = 'app')
-
-      finded_directories = Dir.glob(directory)
-
-      if finded_directories.size != 1
-
-        find_app_directory(File.join('..', directory))
-      else
-
-        finded_directories[0]
-      end 
-    end
-
-
-    def find_spec_directory(directory = 'spec')
-
-      finded_directories = Dir.glob(directory)
-
-      if finded_directories.size != 1
-
-        find_app_directory(File.join('..', directory))
-      else
-
-        finded_directories[0]
-      end 
-    end
-
-
-    def create_directory(directory)
-      FileUtils.mkdir_p(directory) unless File.directory?(directory)
-    end
-
-
-    def create_file(file_path, template_path)
-      File.open(file_path, "w") { |io|
-        io.print ERB.new(File.read(template_path)).result(binding)
-      }
-      App.log 'Create', "#{file_path}"
-    end
-
-
-    def show_help
-      usage_file = File.expand_path("../joybox/USAGE", __FILE__)
-      die File.read(usage_file)
-    end
-
   end
-end; end
+end

data/command/joybox_retina_command.rb

@@ -0,0 +1,87 @@
+require 'optparse'
+require File.expand_path('../command/tmx.rb', File.readlink(__FILE__))
+require File.expand_path('../command/image.rb', File.readlink(__FILE__))
+
+module Motion
+  module Project
+    class JoyboxRetinaCommand < Command
+
+      include Joybox::Command
+      
+      RetinaSuffix = '-hd'
+      RetinaScaleFactor = 2.0
+
+      self.name = 'joybox:retina'
+      self.help = 'Joybox: Retina Generator'
+
+      @@description = <<-EOF
+    Generates a retina version for a image or tmx files
+
+    For images it will scale the original image and save it with the suffix
+    -hd. Please note that is only for testing purposes it will not increase
+    the image quality.
+
+    For TMX files it will scale the Map, Tileset and Object information to
+    2x and save it with the -hd suffix. Also if the Tileset is found it will
+    be scaled and saved with the same suffix.
+      EOF
+
+      @@example = <<-EOF
+    motion jb:retina tile_map.tmx
+
+    This will create a new file named tile_map-hd.tmx, update its Map, Tileset 
+    and Object properties and create the according retina images with the -hd
+    suffix.
+    EOF
+
+      def run(args)
+        options = Hash.new
+
+        opt_parser = OptionParser.new do |opt|
+          opt.banner = "Usage:"
+          opt.separator "    motion joybox:retina <file-name>"
+          opt.separator ""
+          opt.separator "Options:"
+
+          opt.on('-s', '--suffix <suffix>', 'Retina suffix (default: -hd)') do |suffix|
+            options[:suffix] = suffix
+          end
+          opt.on('-%', '--scale <scale>', Float, 'Retina scale (default: 2.0)') do |scale_factor|
+            options[:scale_factor] = scale_factor
+          end
+          opt.on('-h', '--help', 'Shows this screen')
+
+          opt.separator ""
+          opt.separator "Description:"
+          opt.separator @@description
+          opt.separator ""
+          opt.separator "Example:"
+          opt.separator @@example
+        end
+
+        opt_parser.parse!(args)
+
+        file_path = args[0]
+        suffix = options[:suffix] || RetinaSuffix
+        scale_factor = options[:scale_factor] || RetinaScaleFactor
+
+        unless file_path.nil? or File.exists? file_path
+          App.log 'Error', "#{file_path} does not exist"
+          return
+        end
+
+        case file_path
+        when /\w+.tmx/i
+          document = TMX.new(file_path, suffix)
+          document.scale(scale_factor)
+        when /([^\s]+(\.(?i)(jpg|jpeg|png|gif|bmp))$)/i
+          image = Image.new(file_path, suffix)
+          image.scale(scale_factor)
+        else
+          puts opt_parser
+        end
+      end
+
+    end
+  end
+end

data/ext/extconf.rb

@@ -0,0 +1,34 @@
+require 'fileutils'
+
+ruby_motion_directory = File.expand_path('~/Library/RubyMotion')
+command_directory = File.join(ruby_motion_directory, 'command')
+template_directory = File.join(ruby_motion_directory, 'template')
+
+joybox_command_directory = File.expand_path('../../command', __FILE__)
+joybox_template_directory = File.expand_path('../../template/', __FILE__)
+
+# Previous version clean up
+FileUtils.rm_rf File.join(command_directory, 'joybox')
+FileUtils.rm_f File.join(command_directory, 'joybox_generate_command.rb')
+FileUtils.rm_rf File.join(template_directory, 'joybox-ios')
+FileUtils.rm_rf File.join(template_directory, 'joybox-ios-example-repl')
+FileUtils.rm_rf File.join(template_directory, 'joybox-osx')
+FileUtils.rm_rf File.join(template_directory, 'joybox-osx-example-repl')
+
+FileUtils.mkdir_p(command_directory) unless File.directory?(command_directory)
+FileUtils.mkdir_p(template_directory) unless File.directory?(template_directory)
+
+Dir.glob(File.join(joybox_command_directory, '*.rb')).each do |source_file|
+  destination_file = File.join(command_directory, File.basename(source_file))
+  FileUtils.rm_f destination_file
+  FileUtils.ln_s source_file, destination_file
+end
+
+Dir.glob(File.join(joybox_template_directory, '**')).each do |source_directory|
+  destination_directory = File.join(template_directory, File.basename(source_directory))
+  FileUtils.rm_f destination_directory
+  FileUtils.ln_s source_directory, destination_directory
+end
+
+require 'mkmf'
+create_makefile('')

data/joybox.gemspec

@@ -2,67 +2,120 @@
 require File.expand_path('../lib/joybox/version.rb', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = 'joybox'
-  gem.version       = Joybox::VERSION
-
-  gem.authors  = ['Juan José Karam']
+  gem.name = 'joybox'
+  gem.version = Joybox::VERSION
+  gem.authors = ['Juan José Karam', 'Gabriel Sosa', 'Contributors']
   gem.email = 'juanjokaram@gmail.com'
   
-  gem.description = <<-DESC
-    A Cocos2D & Box2D DSL for RubyMotion
-  DESC
+  gem.description = 'A Cocos2D & Box2D Wrapper for creating video games using RubyMotion'
+  gem.summary = 'A Cocos2D & Box2D Wrapper for RubyMotion'
 
-  gem.summary = 'A Cocos2D & Box2D DSL for RubyMotion'
   gem.homepage = 'http://joybox.io'
   gem.license = 'MIT'
 
-  gem.files       = `git ls-files`.split($\)
-  gem.require_paths = ['lib']
-  gem.test_files  = gem.files.grep(%r{^spec/})
+  gem.files = `git ls-files`.split($\)
+  gem.require_paths = ['lib', 'motion', 'vendor', 'command', 'template']
+  gem.test_files = gem.files.grep(%r{^spec/})
 
   gem.add_dependency 'rake'
   gem.add_development_dependency 'rspec'
 
-  gem.executables   = ["joybox"]
+  gem.extensions = ['ext/extconf.rb'] 
 
   gem.post_install_message = <<-MESSAGE
-  ** Joybox 1.0.0 **
-
-    * Added REPL Support for iOS and OSX :D
-      * NOTE: If the iOS simulator starts on landscape orientation, please rotate and return it.
-              (cmd + => and cmd + <=)
-    * Added REPL Example Template. Use 'motion create --template=joybox-ios-example-repl <name>' or
-      'motion create --template=joybox-osx-example-repl <name>'
-    * IMPORTANT: Typo fix in World class (Joybox, Box2D and Website), changing to continuous_physics the configuration, thank you David Czarnecki!
-    * IMPORTANT: Typo fix in Macros, changing jbpLenght to jpbLength, thank you David Czarnecki!
-    * Added: Clear extra lines in iOS Template. Thank you Willrax!
-    * Added: Examples iPhone 5 support
-    * Added: iOS Template iPhone 5 support
-    * Joybox is stopping the madness! Thanks all for your support!
-
-                        0
-                       101
-                      01010
-                     1010101
-                    010101010
-                   10101010101
-                  0101010101010
-                 101010101010101
-                01010101010101010
-               1010101010101010101
-              010101010101010101010
-             1                     1
-            010                   010
-           10101                 10101
-          0101010               0101010
-         101010101             101010101
-        01010101010           01010101010
-       1010101010101         1010101010101
-      010101010101010       010101010101010
-     10101010101010101     10101010101010101
-    0101010101010101010   0101010101010101010
-   1010101010101010101011101010101010101010101
+  = Joybox 1.1.0 =
 
-  MESSAGE
+  Contributors
+  * Kenichi Yonekawa, yonekawa
+  * Earl St Sauver, estsauver
+  * Denis Laprise, nside
+  * Franklin Webber, burtlo
+  * Andrew Currie, AndrewCurrie
+  * Jamon Holmgren, jamonholmgren
+  * Christopher David Yudichak, TheOddLinguist
+  * Donald Hutchison, rkachowski
+  * Didier Prophete, dprophete 
+  * Severin Schoepke, severin
+  * awdogsgo2heaven
+  * Juha Litola, jlitola
+  * David Padilla, dabit 
+  * PanPan, ippan
+  * Keyvan Fatehi, keyvanfatehi
+  * n-studio
+
+  Physics
+  * Support for all Shapes and Listeners.
+
+  * Filters, AABB computations, Queries and Ray Casts.
+
+  * Collision support for Physics Sprites.
+
+  * Experimental support for actions on Physics Sprites.
+
+  * Physics Debug Draw.
+
+  Effects and Background Music
+  * AudioEffect and BackgroundAudio to playback background music and special effects.
+
+  Tile Maps Support
+  * Support for TMX Maps using the TileMap class.
+
+  Actions
+  * Complete actions
+
+  Gestures
+  * Support the default gestures on OSX.
+
+  Commands
+  * Adds joybox:retina command to create a Retina version of a TMX Map. 
+
+  Sprites
+  * Support for custom options on the Sprite initialization.
 
-end
+  Source Code
+  * The commands and templates now install automatically.
+
+  * Added 218 specifications and 617 requirements.
+
+  Critical Changes
+  * Node: The method add_childs is now add_children.
+
+  * SpriteFrameCache: The method where now starts from 1 instead of 0.
+
+  * Animation: The delay method is now delay_units, and total_delay is now delay_per_unit.
+
+  * Menu: The method align_items_in_columns now receive an array for defining how many columns and 
+          how many items in which of them.
+
+  * Physics: Now every object returns their values in pixel coordinates and degrees, if you still 
+             need to use the metric values you can access them with the prefix metric_. 
+             For example: metric_position.
+
+  * World: The Method continuos_physics is now deprecated.
+
+  * Physics Collisions: Now for use when_collide method of the World instance, you need to pass an 
+                        instance of a PhysicsSprite and it will return in the block the colliding 
+                        physics sprite if available, or the body that is colliding.
+
+  * Point: The methods to and from pixel coordinates are now inverted, there was an incorrect naming.
+
+  00000000000000111111111111110000000000000000000000000000000000
+  00000000000000000111111111111111111111100000000000000000000000
+  00000000000000000011111111111111111111111111111110000000000000
+  00000000000000111111111111111111111111111111111111111000000000
+  00000000000001111111111111111111111111111111111111111111000000
+  00000001100001111111111110000000111111111111111111111111000000
+  00000011111001111111111100000000011111111111111111111110000000
+  00000011111111111111111000000000001111111111111111111000000000
+  00000011111111111111111000000000011111111111111111100000000000
+  00000001111111111111111110000000111111111111111110000000000000
+  00000001111110011111111111111111111111111111100000000000000000
+  00000001111100011111111111111111111111111000000000000000000000
+  00000000011000001111111111111111111110000000000000000000000000
+  00000000000000000111111111111111110000000000000000000000000000
+  00000000000000000000000111111111000000000000000000000000000000
+  00000000000000000000011111111000000000000000000000000000000000
+  00000000000000000001111100000000000000000000000000000000000000
+
+  MESSAGE
+end