onsengame 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adfa3bf9592cbeabb39c621dc8480623018279dd
-  data.tar.gz: dcd9f986f4a2ed588417ea49b28186e9d917572c
+  metadata.gz: 47f2a140809c4654db3a923b5c5170976b29a1d6
+  data.tar.gz: cc95e86c64de10576e942c24e2512fe3a21877c0
 SHA512:
-  metadata.gz: ca45aa43807676b0b6f899ef4ba58ce5f65d77dc7e8bc5c77fedc6aae48a30615ff49b1fe75e66abeef681fc27c689f596b8cc4abc7e8da299dff01bef4b7ccb
-  data.tar.gz: 15dd49f84fe189e29b71b6850391e52da18b84f25c5e6864dbb5f82c4bdecbfd2b4b849fa25659ef4e521a9e557eb45d5d3de1521c7d54965378c1915356321c
+  metadata.gz: a933198d5afd97bf003d631ecbb655b2fd28c1a736762e4786b3b6dc5b0e00cbfeb79619ba53766734e3b4b63dd04f824f72ab927db14c8baeec9c08d012acdd
+  data.tar.gz: 53b08bdb8d1621ebb7d84523768eb1e8a138494da907d5e4710d1fa5fbb658297009e39673a6d88666729b5e1e3365a4128a8fb03f76f1f6f3fa8ca099f9d41e

data/NEWS.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.0.3: 2015-05-09
+
+### Improvements
+
+* Added LICENSE.txt for "Press Start" font.
+* Moved a utility method `draw_rectangle` to Window class.
+* Added a utility method `draw_rectangle_outline`.
+* Added new generator using Thor and ERB.
+* Changed Onsengame's classes to super class.
+
 ## 0.0.2: 2015-05-06
 
 ### Improvements

data/README.md

@@ -19,8 +19,17 @@ A 2D game framework using Gosu with Ruby.
 
 ## License
 
+### Source Code
+
 MIT License. See LICENSE.txt for details.
 
+### Fonts
+
+#### Press Start 2P
+
+SIL Open Font License, Version 1.1.
+See data/fonts/licenses/PressStart2P/LICENSE.txt for details.
+
 ## Contributing
 
 1. Fork it

data/data/fonts/licenses/PressStart2P/FONTLOG.txt

@@ -0,0 +1,69 @@
+FONTLOG for the Press Start 2P fonts
+
+This file provides detailed information on the Press Start 2P Font Software.
+This information should be distributed along with the Press Start 2P fonts
+and any derivative works.
+
+
+Basic Font Information
+
+Press Start 2P is a bitmap font based on the font design from 1980s Namco
+arcade games. Although the design of uppercase letters and digits dates
+back to Atari's "Sprint" (1977), the specific glyph forms in this TrueType
+conversion are based on those from "Return of Ishtar" (1986), one of the
+first games to include and regularly use lowercase as well as uppercase
+letters in its screen font.
+
+Unlike the original font from the "Return of Ishtar" ROM, Press Start 2P
+includes a wide variety of non-ASCII Unicode characters for pan-European
+use, including Greek and Cyrillic.
+
+
+ChangeLog
+
+1 November 2012 (Cody Boisclair) Press Start 2P version 2.14
+- Add necessary flags for Windows to recognize as a valid Greek/Cyrillic font
+- Change line gap to zero to match version on Google Web Fonts
+
+15 June 2011 (Cody Boisclair) Press Start 2P version 2.13
+- Correct accent marks on U+00D9 Ù and U+00DA Ú
+
+13 June 2011 (Cody Boisclair) Press Start 2P version 2.12
+- Correct glyph for underscore _
+- Move glyphs for Greek iota one pixel to left
+- Fix 'notdef' glyph, whose encoding was broken during last update
+
+13 June 2011 (Cody Boisclair) Press Start 2P version 2.11
+- Retrace characters from bitmaps to fix glyph width bug
+- Add glyphs for Spacing Modifier Letters
+- Move U+201E „ one pixel to left, U+201A ‚ one pixel to right
+
+13 June 2011 (Cody Boisclair) Press Start 2P version 2.10
+- Add Greek and Cyrillic alphabets.
+- Redesign U+0138 ĸ to match shape of Greek kappa
+- Correct glyph shape for grave accent `
+- Move U+00B7 · down one row to appear more centered
+- Modify FONTLOG description to reflect Greek & Cyrillic addition
+
+13 June 2011 (Cody Boisclair) Press Start 2P version 2.01
+- Correct glyph for @; improve glyphs for © and ® based on original @.
+
+12 June 2011 (Cody Boisclair) Press Start 2P version 2.0
+- Initial public release.
+
+
+Acknowledgements
+
+If you make modifications be sure to add your name (N), email (E),
+web-address (if you have one) (W) and description (D).
+This list is in alphabetical order.
+
+N: Cody Boisclair ("CodeMan38")
+E: cody@zone38.net
+W: http://zone38.net/font/
+D: Conversion of glyphs to TrueType; creation of non-ASCII glyphs
+
+N: "QTQ"
+E: [unknown]
+W: http://www22.atpages.jp/nbgifan/namco.html
+D: Original extraction of glyph bitmaps

data/data/fonts/licenses/PressStart2P/LICENSE.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2011, Cody "CodeMan38" Boisclair (cody@zone38.net),
+with Reserved Font Name "Press Start".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

data/lib/onsengame/command.rb

@@ -1,10 +1,12 @@
-require "fileutils"
 require "thor"
+require "onsengame/generator"
 require "onsengame/version"
 require "onsengame/window"
 
 module Onsengame
   class Command < Thor
+    register(Generator::New, "new", "new NAME", "Generate new game")
+
     desc "version", "Show version"
     def version
       puts(VERSION)
@@ -16,26 +18,5 @@ module Onsengame
       @window = Window.new(options.dup)
       @window.show
     end
-
-    desc "generate NAME", "Generate project"
-    def generate(name)
-      raise "Error: File exists." if File.exist?(name)
-
-      onsengame_dir = File.expand_path("../../..", __FILE__)
-      paths = Dir.glob("#{onsengame_dir}/*")
-      paths << File.join(onsengame_dir, ".gitignore")
-      paths.each do |path_from|
-        FileUtils.mkdir_p(name)
-        path_to = File.join(name, File.basename(path_from))
-        FileUtils.cp_r(path_from, path_to)
-      end
-
-      FileUtils.cd(name) do
-        system("git", "init")
-        system("git", "add", ".")
-        system("git", "commit -m 'Initial commit'")
-        system("rename_project", "onsengame", name)
-      end
-    end
   end
 end

data/lib/onsengame/generator.rb

@@ -0,0 +1 @@
+require "onsengame/generator/new"

data/lib/onsengame/generator/new.rb

@@ -0,0 +1,65 @@
+require "thor"
+
+module Onsengame
+  module Generator
+    class New < Thor::Group
+      include Thor::Actions
+
+      argument :name
+
+      def self.source_root
+        File.join(File.dirname(__FILE__), "template", "new")
+      end
+
+      def create_lib_file
+        [
+          "NAME",
+          "NAME/command",
+          "NAME/object",
+          "NAME/object/base",
+          "NAME/scene",
+          "NAME/scene/base",
+          "NAME/scene/title",
+          "NAME/scene/main",
+          "NAME/version",
+          "NAME/window",
+          "NAME/z_order",
+        ].each do |path|
+          template("lib/#{path}.tt",
+                   "#{name}/lib/#{path.gsub("NAME", name)}.rb")
+        end
+      end
+
+      def create_bin_file
+        [
+          "NAME",
+        ].each do |path|
+          src = "bin/#{path}.tt"
+          dist = "#{name}/bin/#{path.gsub("NAME", name)}"
+          template(src, dist)
+          chmod(dist, 0755)
+        end
+      end
+
+      def create_root_file
+        config = {
+          name: `git config user.name`.chomp,
+          email: `git config user.email`.chomp
+        }
+
+        [
+          "NAME.gemspec",
+          ".gitignore",
+          "Gemfile",
+          "LICENSE.txt",
+          "Rakefile",
+          "README.md",
+        ].each do |path|
+          template("#{path}.tt",
+                   "#{name}/#{path.gsub("NAME", name)}",
+                   config)
+        end
+      end
+    end
+  end
+end

data/lib/onsengame/generator/template/new/.gitignore.tt

@@ -0,0 +1,3 @@
+/.bundle/
+/pkg/
+/tmp/

data/lib/onsengame/generator/template/new/Gemfile.tt

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in <%= name %>.gemspec
+gemspec

data/lib/onsengame/generator/template/new/LICENSE.txt.tt

@@ -0,0 +1,22 @@
+Copyright (c) <%= Time.now.year %> <%= config[:name] || 'YOUR NAME' %>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/onsengame/generator/template/new/NAME.gemspec.tt

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib_dir = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
+require "<%= name %>/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "<%= name %>"
+  spec.version       = <%= name.capitalize %>::VERSION
+  spec.authors       = ["<%= config[:name] || 'TODO: Write your name' %>"]
+  spec.email         = ["<%= config[:email] || 'TODO: Write your email address' %>"]
+  spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
+  spec.description   = %q{TODO: Write a longer description or delete this line.}
+  spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency("onsengame")
+
+  spec.add_development_dependency("bundler")
+  spec.add_development_dependency("rake")
+end

data/lib/onsengame/generator/template/new/README.md.tt

@@ -0,0 +1,21 @@
+# <%= name.capitalize %> [![Gem Version](https://badge.fury.io/rb/<%= name %>.svg)](http://badge.fury.io/rb/<%= name %>)
+
+TODO: Describe your game
+
+## Dependencies
+
+* [Gosu](https://www.libgosu.org/)
+
+## Usage
+
+### Production commands
+
+    $ bin/<%= name %>
+
+### Development commands
+
+    $ rake help
+
+## License
+
+MIT License. See LICENSE.txt for details.

data/lib/onsengame/generator/template/new/Rakefile.tt

@@ -0,0 +1,11 @@
+require "bundler/gem_tasks"
+
+task :demo do
+  sh("bin/<%= name %>", "demo")
+end
+
+task :help do
+  sh("rake", "-T")
+end
+
+task :default => :help

data/lib/onsengame/generator/template/new/bin/NAME.tt

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+base_dir = File.expand_path("../..", __FILE__)
+lib_dir = File.join(base_dir, "lib")
+$LOAD_PATH.unshift(lib_dir)
+
+require "<%= name %>/command"
+
+<%= name.capitalize %>::Command.start

data/lib/onsengame/generator/template/new/lib/NAME.tt

@@ -0,0 +1,5 @@
+require "<%= name %>/window"
+require "<%= name %>/object"
+require "<%= name %>/scene"
+require "<%= name %>/version"
+require "<%= name %>/z_order"

data/lib/onsengame/generator/template/new/lib/NAME/command.tt

@@ -0,0 +1,6 @@
+require "onsengame/command"
+
+module <%= name.capitalize %>
+  class Command < Onsengame::Command
+  end
+end

data/lib/onsengame/generator/template/new/lib/NAME/object.tt

@@ -0,0 +1 @@
+require "<%= name %>/object/base"

data/lib/onsengame/generator/template/new/lib/NAME/object/base.tt

@@ -0,0 +1,9 @@
+require "onsengame/object/base"
+
+module <%= name.capitalize %>
+  module Object
+    module Base
+      include Onsengame::Object::Base
+    end
+  end
+end

data/lib/onsengame/generator/template/new/lib/NAME/scene.tt

@@ -0,0 +1,3 @@
+require "<%= name %>/scene/base"
+require "<%= name %>/scene/title"
+require "<%= name %>/scene/main"

data/lib/onsengame/generator/template/new/lib/NAME/scene/base.tt

@@ -0,0 +1,9 @@
+require "onsengame/scene/base"
+
+module <%= name.capitalize %>
+  module Scene
+    module Base
+      include Onsengame::Scene::Base
+    end
+  end
+end

data/lib/onsengame/generator/template/new/lib/NAME/scene/main.tt

@@ -0,0 +1,9 @@
+require "onsengame/scene/main"
+require "<%= name %>/scene/base"
+
+module <%= name.capitalize %>
+  module Scene
+    class Main < Onsengame::Scene::Main
+    end
+  end
+end

data/lib/onsengame/generator/template/new/lib/NAME/scene/title.tt

@@ -0,0 +1,10 @@
+require "onsengame/scene/title"
+require "<%= name %>/scene/base"
+require "<%= name %>/scene/main"
+
+module <%= name.capitalize %>
+  module Scene
+    class Title < Onsengame::Scene::Title
+    end
+  end
+end

data/lib/onsengame/generator/template/new/lib/NAME/version.tt

@@ -0,0 +1,3 @@
+module <%= name.capitalize %>
+  VERSION = "0.0.1"
+end

data/lib/onsengame/generator/template/new/lib/NAME/window.tt

@@ -0,0 +1,7 @@
+require "onsengame/window"
+require "<%= name %>/scene"
+
+module <%= name.capitalize %>
+  class Window < Onsengame::Window
+  end
+end

data/lib/onsengame/generator/template/new/lib/NAME/z_order.tt

@@ -0,0 +1,11 @@
+module <%= name.capitalize %>
+  module ZOrder
+    [
+      :BACK,
+      :OBJECT,
+      :TEXT,
+    ].each_with_index do |type, i|
+      const_set(type, i)
+    end
+  end
+end

data/lib/onsengame/object/base.rb

@@ -25,14 +25,6 @@ module Onsengame
 
       def draw
       end
-
-      def draw_rectangle(x1, y1, x2, y2, color, z_order)
-        @window.draw_quad(x1, y1, color,
-                          x2, y1, color,
-                          x2, y2, color,
-                          x1, y2, color,
-                          z_order)
-      end
     end
   end
 end

data/lib/onsengame/version.rb

@@ -1,3 +1,3 @@
 module Onsengame
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/onsengame/window.rb

@@ -35,9 +35,31 @@ module Onsengame
       end
     end
 
-    private
     def current_scene
       @scenes[0]
     end
+
+    def draw_rectangle(x1, y1, x2, y2, color, z_order)
+      draw_quad(x1, y1, color,
+                x2, y1, color,
+                x2, y2, color,
+                x1, y2, color,
+                z_order)
+    end
+
+    def draw_rectangle_outline(x1, y1, x2, y2, color, z_order)
+      draw_line(x1, y1, color,
+                x2, y1, color,
+                z_order)
+      draw_line(x1, y1, color,
+                x1, y2, color,
+                z_order)
+      draw_line(x1, y2, color,
+                x2, y2, color,
+                z_order)
+      draw_line(x2, y1, color,
+                x2, y2, color,
+                z_order)
+    end
   end
 end

data/onsengame.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("gosu")
   spec.add_runtime_dependency("thor")
-  spec.add_runtime_dependency("rename_project")
 
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("bundler")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onsengame
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rename_project
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -110,8 +96,30 @@ files:
 - Rakefile
 - bin/onsengame
 - data/fonts/PressStart2P.ttf
+- data/fonts/licenses/PressStart2P/FONTLOG.txt
+- data/fonts/licenses/PressStart2P/LICENSE.txt
 - lib/onsengame.rb
 - lib/onsengame/command.rb
+- lib/onsengame/generator.rb
+- lib/onsengame/generator/new.rb
+- lib/onsengame/generator/template/new/.gitignore.tt
+- lib/onsengame/generator/template/new/Gemfile.tt
+- lib/onsengame/generator/template/new/LICENSE.txt.tt
+- lib/onsengame/generator/template/new/NAME.gemspec.tt
+- lib/onsengame/generator/template/new/README.md.tt
+- lib/onsengame/generator/template/new/Rakefile.tt
+- lib/onsengame/generator/template/new/bin/NAME.tt
+- lib/onsengame/generator/template/new/lib/NAME.tt
+- lib/onsengame/generator/template/new/lib/NAME/command.tt
+- lib/onsengame/generator/template/new/lib/NAME/object.tt
+- lib/onsengame/generator/template/new/lib/NAME/object/base.tt
+- lib/onsengame/generator/template/new/lib/NAME/scene.tt
+- lib/onsengame/generator/template/new/lib/NAME/scene/base.tt
+- lib/onsengame/generator/template/new/lib/NAME/scene/main.tt
+- lib/onsengame/generator/template/new/lib/NAME/scene/title.tt
+- lib/onsengame/generator/template/new/lib/NAME/version.tt
+- lib/onsengame/generator/template/new/lib/NAME/window.tt
+- lib/onsengame/generator/template/new/lib/NAME/z_order.tt
 - lib/onsengame/object.rb
 - lib/onsengame/object/base.rb
 - lib/onsengame/scene.rb