ruby2d 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b065d85656f0f67ae270a815252551c10985caf1
-  data.tar.gz: 6ed2d44d184eb36daabd4711e4ef7c74729d693c
+  metadata.gz: 52638279e5a91e2a8143e0a9485e0889d784757a
+  data.tar.gz: e3ed2e07e45e3a7ba53a7a8dae3ab625be09a444
 SHA512:
-  metadata.gz: 29b0dff61f4a04bbb2bed6904a5c2c10aa6e1cf43e8114f0fecae6d77b19700ee430b087dec6e193cc6dd4210d5d11379a72ee9bde8b1b52d2ef4102f1a66153
-  data.tar.gz: c08fda4f13944a3a3e8709a405f7c6f884596dc63d1be90d096614391468491b4b9d3a0d00aeb2d5617f9d3026d87f9dba382fc89cc99309ee4df94c6f90016b
+  metadata.gz: 00cf4e903c49e0cc3889a6cd8f6452d99773ba8b8af74c3d6d150c17bf552045745a96b0a477a1330c682f7bd3f9ce5c3bff7f179b0068f081a88f9a8a7d1fd9
+  data.tar.gz: f07cbe0a69a6c75209c24e1f4f514aa4d994ca678d3ac2371aae7fcfda08ebb529c4684abc55f85c9ea47d02c3b60043e787db08b3cc70138de79e50236cb169

data/ext/ruby2d/extconf.rb

@@ -1,84 +1,83 @@
 require 'mkmf'
 
+S2D_VERSION = '0.2.1'  # Minimum Simple 2D version required
+$errors = []
+
 class String
   def colorize(c); "\e[#{c}m#{self}\e[0m" end
-  def error; colorize('1;31') end
-  def bold; colorize('1') end
+  def bold; colorize('1')   end
+  def red; colorize('1;31') end
 end
 
-def print_errors(errors)
+def print_errors
   puts "
-#{"== Ruby 2D Installation Errors =============================".bold}
-  
-  #{"Ruby 2D found some problems and was not installed:".error}
-  
-  #{errors.join("\n  ")}
-  
-#{"============================================================".bold}"
+#{"== #{"Ruby 2D Installation Errors".red} =====================================\n"}
+  #{$errors.join("\n  ")}\n
+#{"===================================================================="}"
+end
+
+def check_s2d_version
+  unless Gem::Version.new(`simple2d --version`) >= Gem::Version.new(S2D_VERSION)
+    $errors << "Simple 2D needs to be updated for this version of Ruby 2D." <<
+               "Run the following, then try reinstalling this gem:\n" <<
+               "  simple2d update".bold
+    print_errors
+    exit
+  end
 end
 
-errors = []
 
 # Install Simple 2D on supported platforms
 
 # OS X
 if RUBY_PLATFORM =~ /darwin/
-  unless ARGV.include? "--no-brew"
-    # Simple 2D not installed
-    if `which simple2d`.empty?
-      # Homebrew not installed, print and quit
-      if `which brew`.empty?
-        errors << "Ruby 2D uses a library called Simple 2D." <<
-                  "On OS X, this can be installed using Homebrew." <<
-                  "Install Homebrew, then try installing this gem again.\n" <<
-                  "Learn more at http://brew.sh"
-        print_errors(errors)
-        exit
-      # Install Simple 2D using Homebrew
-      else
-        `brew tap simple2d/tap`
-        `brew install simple2d`
-      end
+  
+  # Simple 2D not installed
+  if `which simple2d`.empty?
+    
+    # Homebrew not installed
+    if `which brew`.empty?
+      $errors << "Ruby 2D uses a native library called Simple 2D." <<
+                 "On OS X, this can be installed using Homebrew.\n" <<
+                 "First, install #{"Homebrew".bold}. See instructions at #{"http://brew.sh".bold}" <<
+                 "Then, run the following:\n" <<
+                 "  brew tap simple2d/tap".bold <<
+                 "  brew install simple2d".bold
+      print_errors
+      exit
       
-    # Simple 2D installed, update to latest version
+    # Homebrew installed, instruct to install Simple 2D
     else
-      # Homebrew not installed
-      if `which brew`.empty?
-        # TODO: Check for latest version manually and update
-      # Homebrew installed, get latest version of Simple 2D
-      else
-        # An alternative, but slower and updates all formulas:
-        #   `brew update`
-        #   `brew upgrade simple2d`
-        
-        `brew untap simple2d/tap`
-        `brew tap simple2d/tap`
-        `brew upgrade simple2d`
-      end
+      $errors << "Ruby 2D uses a native library called Simple 2D." <<
+                 "Install with Homebrew using:\n" <<
+                 "  brew tap simple2d/tap".bold <<
+                 "  brew install simple2d".bold
+      print_errors
+      exit
     end
   end
   
 # Linux
 elsif RUBY_PLATFORM =~ /linux/
-  # If Simple 2D not installed
+  
+  # Simple 2D not installed
   if `which simple2d`.empty?
-    errors << "Ruby 2D uses a library called Simple 2D." <<
-              "There's a script to make installation easy on Linux.\n" <<
-              "Follow the instructions in the README to get started:" <<
-              "  https://github.com/simple2d/simple2d"
-    print_errors(errors)
+    $errors << "Ruby 2D uses a native library called Simple 2D.\n" <<
+               "To install Simple 2D on Linux, follow the instructions" <<
+               "in the README: #{"https://github.com/simple2d/simple2d".bold}"
+    print_errors
     exit
   end
   
-# Windows
-elsif RUBY_PLATFORM =~ /mingw/
-  puts "Ruby 2D doesn't support Windows yet :("
-  exit
+  $CFLAGS << ' -std=c99'
 end
 
+# Simple 2D installed, check version
+check_s2d_version
+
 # Configure Simple 2D and create Makefile
 
 $LDFLAGS << ' ' << `simple2d --libs`
-$LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they cause problems
+$LDFLAGS.gsub!(/\n/, ' ')  # Remove newlines in flags, they cause problems
 
 create_makefile('ruby2d/ruby2d')

data/ext/ruby2d/ruby2d.c

@@ -11,7 +11,7 @@
 VALUE self;
 
 // Simple 2D window
-Window *window;
+S2D_Window *window;
 
 // Ruby data types
 static VALUE ruby2d_module;
@@ -20,13 +20,13 @@ static VALUE c_data_klass;
 
 // Structures for Ruby 2D classes
 struct image_data {
-  Image img;
+  S2D_Image *img;
 };
 struct text_data {
-  Text txt;
+  S2D_Text *txt;
 };
 struct sound_data {
-  Sound snd;
+  S2D_Sound *snd;
 };
 
 
@@ -215,8 +215,8 @@ void render() {
         struct image_data *data;
         Data_Get_Struct(rb_iv_get(el, "@data"), struct image_data, data);
         
-        data->img.x = NUM2DBL(rb_iv_get(el, "@x"));
-        data->img.y = NUM2DBL(rb_iv_get(el, "@y"));
+        data->img->x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->img->y = NUM2DBL(rb_iv_get(el, "@y"));
         S2D_DrawImage(data->img);
       }
       break;
@@ -234,8 +234,8 @@ void render() {
         struct text_data *data;
         Data_Get_Struct(rb_iv_get(el, "@data"), struct text_data, data);
         
-        data->txt.x = NUM2DBL(rb_iv_get(el, "@x"));
-        data->txt.y = NUM2DBL(rb_iv_get(el, "@y"));
+        data->txt->x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->txt->y = NUM2DBL(rb_iv_get(el, "@y"));
         S2D_DrawText(data->txt);
       }
       break;
@@ -253,9 +253,10 @@ static VALUE ruby2d_show(VALUE s) {
   char *title = RSTRING_PTR(rb_iv_get(self, "@title"));
   int width   = NUM2INT(rb_iv_get(self, "@width"));
   int height  = NUM2INT(rb_iv_get(self, "@height"));
+  int flags   = 0;
   
   window = S2D_CreateWindow(
-    title, width, height, update, render, 0
+    title, width, height, update, render, flags
   );
   
   window->on_key = on_key;

data/lib/ruby2d/text.rb

@@ -5,20 +5,17 @@ module Ruby2D
     
     attr_accessor :x, :y, :size, :text
     
-    def initialize(x=0, y=0, size=20, text="Hello World!", font="Arial", c="white")
-      if font.include? '.'
-        unless File.exists? font
-          raise Error, "Cannot find font file!"
-        else
-          @font = font
-        end
+    def initialize(x=0, y=0, size=20, msg="Hello World!", font="Arial", c="white")
+      
+      if File.exists? font
+        @font = font
       else
         @font = resolve_path(font)
       end
       
       @type_id = 4
       @x, @y, @size = x, y, size
-      @text, @color = text, c
+      @text, @color = msg, c
       update_color(c)
       
       if defined? Ruby2D::DSL
@@ -44,14 +41,18 @@ module Ruby2D
     private
     
     def resolve_path(font)
-      # TODO: Consider CSS names, like 'serif', 'san-serif', 'monospace'
       if RUBY_PLATFORM =~ /darwin/
         font_path = "/Library/Fonts/#{font}.ttf"
-        unless File.exists? font_path
-          raise Error, "Cannot find system font!"
-        end
+      else
+        # Linux
+        font_path = "/usr/share/fonts/truetype/#{font}.ttf"
+      end
+      
+      unless File.exists? font_path
+        raise Error, "Cannot find system font"
+      else
+        font_path
       end
-      font_path
     end
     
     def update_color(c)

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # version.rb
 
 module Ruby2D
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/ruby2d/window.rb

@@ -38,16 +38,15 @@ module Ruby2D
     end
     
     def set(opts)
-      if opts.include? :title
-        @title = opts[:title]
-      end
-      
-      if opts.include? :width
-        @width = opts[:width]
-      end
-      
-      if opts.include? :height
-        @height = opts[:height]
+      valid_keys = [:title, :width, :height]
+      valid_opts = opts.reject { |k| !valid_keys.include?(k) }
+      if !valid_opts.empty?
+        @title = valid_opts[:title]
+        @width = valid_opts[:width]
+        @height = valid_opts[:height]
+        return true
+      else
+        return false
       end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,8 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Ruby 2D
 test_files: []
+has_rdoc: