metro 0.2.2 → 0.2.3

data/changelog.md

@@ -1,5 +1,13 @@
 # Metro
 
+## 0.2.3 / 2012-11-11
+
+* FIX metro generators and templates generating out-of-date formats
+* FIX YAML views wil now return an empty hash instead of false on empty files
+* Added first scene and model to template.
+* FIX better error message when a directory is specified
+* Added the `g` generator shortcut: `metro g scene NAME`
+
 ## 0.2.2 / 2012-11-10
 
 * Song support added (scene methods and model properties)

data/lib/commands/thor.rb

@@ -48,19 +48,25 @@ module Metro
 
     end
 
-    desc "new [GAMENAME]",
-      "Create a new game within the directory using with the [GAMENAME] given."
+    desc "new GAMENAME",
+      "Create a new game within the directory using with the GAMENAME given."
     def new(game_name)
       Metro::GenerateGame.start [ game_name ]
     end
 
-    desc "generate",
-      "Create a new game model, view, or scene"
+    desc "generate TYPE NAME",
+      "Create a new type: model, view, or scene."
     def generate(type,name)
       gen = generator(type)
       gen.start [ name ]
     end
-
+    
+    desc "g TYPE NAME",
+      "Create a new type: model, view, or scene."
+    def g(type,name)
+      generate(type,name)
+    end
+    
     desc "help", "This commoand"
     def help
       say banner

data/lib/locale/en.yml

@@ -8,6 +8,14 @@ en:
       actions:
       - "Ensure you have specified the correct file"
       - "Ensure that the file exists at that location"
+      - "Did you mean to generate a new game, scene, or model? Try: `metro help`"
+    specified_directory:
+      title: "Path specified is a directory"
+      message: "The specified path is a `%{directory}` and not a valid Metro game file."
+      actions:
+      - "Ensure you have specified the correct file"
+      - "Specify the path to the metro game file with the directory included."
+      - "Did you mean to generate a new game, scene, or model? Try: `metro help`"
     reserved_control_name:
       title: "Unable to define control: %{name}"
       message: "The specified control name `%{name}` is RESERVED or ALREADY DEFINED."

data/lib/metro.rb

@@ -159,9 +159,8 @@ module Metro
 
 
   def game_file_exists?(file)
-    unless File.exists? file
-      error! "error.missing_metro_file", file: file
-    end
+    error!("error.missing_metro_file",file: file) unless File.exists?(file)
+    error!("error.specified_directory",directory: file) if File.directory?(file)
   end
 
 end

data/lib/metro/missing_scene.rb

@@ -7,15 +7,15 @@ module Metro
     end
 
     draw :title, text: "Missing Scene!",
-      x: 20, y: 20, z_order: 1,
-      x_factor: 3, y_factor: 3,
-      color: 0xffffffff,
+      position: "20,20,1",
+      color: "rgb(255,0,0)",
+      font: {size: 80},
       model: "metro::models::label"
-
+    
     draw :message, text: 'The scene `#{self.class.missing_scene}` was requested, but is missing!',
-      x: 20, y: 100, z_order: 1,
-      color: 0xffffffff,
+      position: "20,100,1",
+      color: "rgb(255,255,255)",
       model: "metro::models::label"
 
   end
-end
+end

data/lib/metro/models/properties/song_property.rb

@@ -69,7 +69,7 @@ module Metro
       #   a default value the the default song is the missing song found in Metro.
       #
       def default_song_name
-        options[:path] || metro_asset_path('missing.mp3')
+        options[:path] || metro_asset_path('missing.ogg')
       end
 
       #

data/lib/metro/scenes.rb

@@ -114,18 +114,6 @@ module Metro
       @scenes_hash ||= hash_with_missing_scene_default
     end
 
-    #
-    # Generate a map from the scene or scenes to include all the sub-classes of
-    # these scenes.
-    #
-    # @param [Scene,Array<Scene>] scenes a scene or scene subclass or an array of
-    #   scene subclasses.
-    #
-    # @see #scenes_hash
-    #
-    def build_map_of_scenes(scenes)
-    end
-
     #
     # Create a hash that will return a setup missing scene by default.
     #

data/lib/metro/version.rb

@@ -1,5 +1,5 @@
 module Metro
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
   WEBSITE = "https://github.com/burtlo/metro"
   CONTACT_EMAILS = ["franklin.webber@gmail.com"]
   

data/lib/metro/views/yaml_view.rb

@@ -22,7 +22,7 @@ module Metro
       # @return a Hash that contains the contents of the view.
       #
       def self.parse(view_path)
-        YAML.load File.read yaml_view_path(view_path)
+        YAML.load(File.read(yaml_view_path(view_path))) or { }
       end
 
       #

data/lib/templates/game/models/hero.rb

@@ -0,0 +1,20 @@
+class Hero < Metro::Model
+
+  property :image, path: "hero.png"
+
+  property :position
+  property :angle
+  property :move_amount, default: 1.5
+
+  event :on_hold, KbLeft, GpLeft do
+    self.position -= move_amount
+  end
+
+  event :on_hold, KbRight, GpRight do
+    self.angle += move_amount
+  end
+
+  def draw
+    image.draw_rot(x,y,z_order,angle.to_f)
+  end
+end

data/lib/templates/game/scenes/first_scene.rb

@@ -0,0 +1,11 @@
+class FirstScene < GameScene
+
+  draw :hero, position: Game.center
+
+  draws :first_instruction, :second_instruction
+
+  def update
+    hero.position = Point.new (hero.x % Game.width), (hero.y % Game.height)
+  end
+
+end

data/lib/templates/game/scenes/game_scene.rb

@@ -20,11 +20,11 @@ class GameScene < Metro::Scene
   # @example Setting up the ability for all subclassed scenes
   #   to be edited with the 'Ctrl+E' event
   #
-  event :on_up, KbR do |event|
+  event :on_up, KbE do |event|
     if event.control?
-      transition_to scene_name, with: edit
+      transition_to scene_name, with: :edit
     end
   end
 
 
-end
+end

data/lib/templates/game/views/brand.yaml

@@ -1,5 +1,4 @@
 brand:
   model: metro::models::image
-  path: brand.jpg
-  x: 320
-  y: 240
+  image: brand.jpg
+  position: "320,240,1"

data/lib/templates/game/views/brand_to_title.yaml

@@ -1,7 +1,7 @@
 title:
   model: metro::models::label
   text: "#{Game.name}"
-  font_size: 40
-  y: 100
+  font:
+    size: 40
+  position: "320,100,1"
   color: rgba(255,255,255,0.0)
-  

data/lib/templates/game/views/first.yaml

@@ -0,0 +1,14 @@
+instruction: &instruction
+  model: metro::models::label
+  font:
+    name: Arial
+    size: 40
+  color: "rgba(255,255,0)"
+first_instruction:
+  <<: *instruction
+  text: "<- to move left |"
+  position: "60,300,1"
+second_instruction:
+  <<: *instruction
+  text: "| to move right ->"
+  position: "320,300,1"

data/lib/templates/game/views/title.yaml

@@ -1,12 +1,10 @@
 title:
   model: metro::models::label
   text: "#{Game.name}"
-  font_size: 40
-  y: 100
+  font:
+    size: 40
+  position: "320,100,1"
   color: rgba(255,255,255,1.0)
 menu:
   model: metro::models::menu
-  x: 260
-  y: 200
-  color: rgb(127,127,127)
-  highlight-color: rgb(255,255,255)
+  position: "260,200,1"

data/lib/templates/model.rb.tt

@@ -34,6 +34,8 @@ class <%= model_name %> < GameModel
   #
   # @see Metro::Model::AnimationProperty
   # @see Metro::Model::ImageProperty
+  # @see Metro::Model::SongProperty
+  # @see Metro::Model::SampleProperty
   # @see Metro::Model::NumericProperty
   # @see Metro::Model::ScaleProperty
   # @see Metro::Model::TextProperty
@@ -89,6 +91,17 @@ class <%= model_name %> < GameModel
   #
   def after_initialize ; end
 
+  #
+  # This method is called right after the model has been added to the scene and added
+  # to the window.
+  #
+  def show ; end
+
+  #
+  # This is called every update interval while the window is being shown.
+  #
+  def update ; end
+  
   #
   # This is called after every {#update} and when the OS wants the window to
   # repaint itself.

data/lib/templates/scene.rb.tt

@@ -3,16 +3,18 @@ class <%= scene_class_name %> < GameScene
   # but that can be overriden with the scene_name class method
   # scene_name "credits"
 
+  draw :title
+
   #
   # DRAWING and ACTORS
   #
   # @example Explicitly drawing a text label in the scene
   #
-  # draw :title, 'text' => 'Title Screen',
-  #   'x' => 20, 'y' => 20, 'z-order' => 0,
-  #   'size' => 40,
-  #   'color' => 'rgb(255,255,255)',
-  #   'model' => 'metro::models::label'
+  # draw :title, text: 'Title Screen',
+  #   position: '20,20,0',
+  #   font: { size: 60 },
+  #   color: 'rgb(255,255,255)',
+  #   model: 'metro::models::label'
   #
   # The draw method can be simplier for models that have content defined
   # for them in the view or the models themselves define the appropriate
@@ -21,7 +23,7 @@ class <%= scene_class_name %> < GameScene
   # @example defining multiple things to draw; their visual data would be
   #   stored within the respective view file
   #
-  # draws :menu, :hero, :enemy
+  # draws :title, :hero, :enemy
   #
 
   #
@@ -114,4 +116,4 @@ class <%= scene_class_name %> < GameScene
   def prepare_transition_from(old_scene) ; end
 
 
-end
+end

data/lib/templates/view.yaml.tt

@@ -1,6 +1,9 @@
-# title:
-#   model: metro::models::label
-#   x: 30
-#   y: 50
-#   z-order: 4
-#   color: "rgba(255,255,0,0.0)"
+# http://www.yaml.org/YAML_for_ruby.html
+---
+title:
+  model: "metro::models::label"
+  text: "Your Scene"
+  position: "190,200,4"
+  font:
+    size: 60
+  color: "rgba(255,255,0,1.0)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -110,7 +110,7 @@ files:
 - Rakefile
 - bin/metro
 - changelog.md
-- lib/assets/missing.mp3
+- lib/assets/missing.ogg
 - lib/assets/missing.png
 - lib/assets/missing.wav
 - lib/assets/missing_animation.png
@@ -199,14 +199,17 @@ files:
 - lib/metro/window.rb
 - lib/templates/game/README.md.tt
 - lib/templates/game/assets/brand.jpg
+- lib/templates/game/assets/hero.png
 - lib/templates/game/metro.tt
-- lib/templates/game/models/game_model.rb
+- lib/templates/game/models/hero.rb
 - lib/templates/game/scenes/brand_scene.rb
 - lib/templates/game/scenes/brand_to_title_scene.rb
+- lib/templates/game/scenes/first_scene.rb
 - lib/templates/game/scenes/game_scene.rb
 - lib/templates/game/scenes/title_scene.rb
 - lib/templates/game/views/brand.yaml
 - lib/templates/game/views/brand_to_title.yaml
+- lib/templates/game/views/first.yaml
 - lib/templates/game/views/title.yaml
 - lib/templates/message.erb
 - lib/templates/model.rb.tt
@@ -234,12 +237,12 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.2.2 / 2012-11-10.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * Song support added (scene methods and model properties)\n
-  \ * Sample support added (model properties)\n  * Added a missing sample/song\n  *
-  Implicit Animation easings can now be more easily created and registered.\n  * Properties
-  can now be defined with a block\n  * FIX Dimensions parse creation called wrong
-  method\n  * Removed support for specifying a color in animation\n  \n\n  ---------------------------------------------------------------------\n"
+  metro 0.2.3 / 2012-11-11.\n  ---------------------------------------------------------------------\n
+  \ Changes:\n    \n  * FIX metro generators and templates generating out-of-date
+  formats\n  * FIX YAML views wil now return an empty hash instead of false on empty
+  files\n  * Added first scene and model to template.\n  * FIX better error message
+  when a directory is specified\n  * Added the `g` generator shortcut: `metro g scene
+  NAME`\n  \n\n  ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib

data/lib/templates/game/models/game_model.rb

@@ -1,3 +0,0 @@
-class GameModel < Metro::Model
-
-end