ruby2d 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b61e2fafeade49bbde64e9cf5f4ac9b547e993a6b93e33b6f6682987d9bdab
-  data.tar.gz: cb55b6a5b15697b2ab43957927dd25b14759342b9924eb9c355f080fc8d29790
+  metadata.gz: bc9cd5ced7c619c8e46e75f6d7995533cda2b25cdb664fada6164d7685ecd3bd
+  data.tar.gz: '068515dfd572e25f244ea194831e6b3ac89fa5ef02899615b5d75c1592f55d35'
 SHA512:
-  metadata.gz: 5132d8b96019444a50ac3b63de338069abf2179833d6a066658d8716fc6cfdd6e728c5185ed47aedcc9304f424b7c98c3f44fad7b7eb681c2db41376017ee42e
-  data.tar.gz: b073bad73e499447a94a21bc3e85218b741250d9b9f1d9798f2fdf202c1bab334740ff8bd479de46798deed8328ca07027dd55b8de39f1583551d6d276f32fbe
+  metadata.gz: 298106e209781cecfbad8c41e5d1076001b9ecaae45826553d8bddfd4569d228896794d1e3150ca1c788984091d504dcc49a2ba8b50bcd0b16a1154fb0654414
+  data.tar.gz: bcd3bf7df06bf2b6bbd424c008abb19abe978be5302ca2731b5badaf1d653c48f5619ca1abdf28538b53d5848d6f703d31173a34ed057c54122609af54c2b541

data/assets/README.md

@@ -21,3 +21,4 @@
 - From your local [Simple 2D](https://github.com/simple2d) project
   - Copy `simple2d.h` to `include/`
   - Copy the `libsimple2d.a` builds to their respective `macos/lib` and `mingw/lib` directories
+  - Copy `bin/simple2d.sh`, `include/`, `src/`, and `Makefile` to `linux/simple2d/`

data/assets/linux/simple2d/Makefile

@@ -26,6 +26,13 @@ ifeq ($(shell uname),Linux)
 	CFLAGS+=-fPIC
 endif
 
+# BSD
+ifneq (,$(findstring BSD,$(shell uname)))
+	CC=cc
+	INCLUDES=-I/usr/local/include/
+	CFLAGS+=-fPIC
+endif
+
 # MinGW
 ifneq (,$(findstring MINGW,$(shell uname -s)))
 	PLATFORM=mingw

data/assets/linux/simple2d/bin/simple2d.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # ------------------------------------------------------------------------------
 # The Simple 2D Command-Line Utility for Unix-like Systems
@@ -333,6 +333,32 @@ have_sdl_libs?() {
 }
 
 
+# Installs SDL on BSD
+install_sdl_bsd() {
+
+  echo "The following packages will be installed:"
+  echo "  sdl2"
+  echo "  sdl2_image"
+  echo "  sdl2_mixer"
+  echo "  sdl2_ttf"
+
+  prompt_to_continue "Install SDL now?"
+
+  print_task "Updating packages" "\n\n"
+  print_and_run "sudo pkg update"
+
+  echo; print_task "Installing packages" "\n\n"
+  print_and_run "sudo pkg install sdl2 sdl2_image sdl2_mixer sdl2_ttf"
+  echo
+
+  if ! have_sdl_libs?; then
+    echo; error_msg "SDL libraries did not install correctly"; exit 1
+  else
+    echo; info_msg "SDL was installed successfully"
+  fi
+}
+
+
 # Installs SDL on Linux
 install_sdl_linux() {
 
@@ -502,6 +528,8 @@ install_sdl_source() {
 install_sdl() {
   if [[ $platform == 'linux' ]]; then
     install_sdl_linux
+  elif [[ $platform == 'bsd' ]]; then
+    install_sdl_bsd
   elif [[ $platform == 'arm' ]]; then
     install_sdl_source
   fi
@@ -552,7 +580,7 @@ install_s2d() {
   fi
 
   echo; print_task "Unpacking" "\n\n"
-  print_and_run "unzip -q $tmp_dir/$f_name -d $tmp_dir"
+  print_and_run "unzip -q $tmp_dir/$f_name.zip -d $tmp_dir"
 
   # Check if archive was unpacked properly
   if [[ $? != 0 ]]; then
@@ -561,8 +589,13 @@ install_s2d() {
 
   print_and_run "cd $tmp_dir/simple2d-$1"
 
-  echo; print_and_run "make"
-  echo; print_and_run "sudo make install"
+  if [[ $platform == 'bsd' ]]; then
+    echo; print_and_run "gmake"
+    echo; print_and_run "sudo gmake install"
+  else
+    echo; print_and_run "make"
+    echo; print_and_run "sudo make install"
+  fi
 
   echo; print_task "Cleaning up" "\n"; echo
   print_and_run "rm -rf $tmp_dir"; echo
@@ -644,6 +677,29 @@ install() {
 # Uninstall ####################################################################
 
 
+# Uninstalls SDL on BSD
+uninstall_sdl_bsd() {
+
+  echo "The following packages will be removed:"
+  echo "  sdl2"
+  echo "  sdl2_image"
+  echo "  sdl2_mixer"
+  echo "  sdl2_ttf"
+
+  prompt_to_continue "Uninstall SDL now?"
+
+  echo; print_task "Uninstalling packages" "\n\n"
+  print_and_run "sudo pkg remove sdl2 sdl2_image sdl2_mixer sdl2_ttf"
+  echo
+
+  if have_sdl_libs?; then
+    echo; error_msg "SDL libraries did not uninstall correctly"
+  else
+    echo; info_msg "SDL was uninstalled successfully"
+  fi
+}
+
+
 # Uninstalls SDL on Linux
 uninstall_sdl_linux() {
 
@@ -757,6 +813,8 @@ uninstall_sdl() {
 
   if [[ $platform == 'linux' ]]; then
     uninstall_sdl_linux
+  elif [[ $platform == 'bsd' ]]; then
+    uninstall_sdl_bsd
   elif [[ $platform == 'arm' ]]; then
     uninstall_sdl_source
   fi
@@ -1090,6 +1148,11 @@ elif [[ $unamestr == 'Linux' ]]; then
 elif [[ $unamestr =~ 'MINGW' ]]; then
   platform_display='Windows / MinGW'
   platform='mingw'
+
+# BSD
+elif [[ $unamestr =~ 'BSD' ]]; then
+  platform_display='BSD'
+  platform='bsd'
 fi
 
 # Unsupported platform
@@ -1226,7 +1289,7 @@ case $1 in
   --libs)
     if [[ $platform == 'macos' ]]; then
       FLAGS='-Wl,-framework,OpenGL'
-    elif [[ $platform == 'linux' ]]; then
+    elif [[ $platform == 'linux' || $platform == 'bsd' ]]; then
       FLAGS='-lGL -lm'
     elif [[ $platform == 'arm' ]]; then
       FLAGS='-lm -I/opt/vc/include/ -L/opt/vc/lib'

data/bin/ruby2d

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'ruby2d/colorize'
+require 'ruby2d/cli/colorize'
 require 'ruby2d/version'
 
 # Debugging command-line flag

data/ext/ruby2d/extconf.rb

@@ -1,5 +1,5 @@
 require 'mkmf'
-require_relative '../../lib/ruby2d/colorize'
+require_relative '../../lib/ruby2d/cli/colorize'
 
 S2D_VERSION = '1.1.0'  # Simple 2D minimum version required
 $errors = []  # Holds errors

data/lib/ruby2d.rb

@@ -1,7 +1,7 @@
 # Ruby2D module and native extension loader, adds DSL
 
 unless RUBY_ENGINE == 'mruby'
-  require 'ruby2d/colorize'
+  require 'ruby2d/cli/colorize'
   require 'ruby2d/exceptions'
   require 'ruby2d/renderable'
   require 'ruby2d/color'

data/lib/ruby2d/cli/build.rb

@@ -7,7 +7,7 @@ require 'fileutils'
 
 # The Ruby 2D library files
 @lib_files = [
-  'colorize',
+  'cli/colorize',
   'exceptions',
   'renderable',
   'color',

data/lib/ruby2d/cli/colorize.rb

@@ -0,0 +1,10 @@
+# String#ruby2d_colorize
+
+# Extend `String` to include some fancy colors
+class String
+  def ruby2d_colorize(c); "\e[#{c}m#{self}\e[0m" end
+  def bold;  ruby2d_colorize('1')    end
+  def info;  ruby2d_colorize('1;34') end
+  def warn;  ruby2d_colorize('1;33') end
+  def error; ruby2d_colorize('1;31') end
+end

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # Ruby2D::VERSION
 
 module Ruby2D
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -281,11 +281,11 @@ files:
 - lib/ruby2d.rb
 - lib/ruby2d/circle.rb
 - lib/ruby2d/cli/build.rb
+- lib/ruby2d/cli/colorize.rb
 - lib/ruby2d/cli/console.rb
 - lib/ruby2d/cli/enable_console.rb
 - lib/ruby2d/cli/launch.rb
 - lib/ruby2d/color.rb
-- lib/ruby2d/colorize.rb
 - lib/ruby2d/dsl.rb
 - lib/ruby2d/exceptions.rb
 - lib/ruby2d/font.rb
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby 2D

data/lib/ruby2d/colorize.rb

@@ -1,10 +0,0 @@
-# String#colorize
-
-# Extend `String` to include some fancy colors
-class String
-  def colorize(c); "\e[#{c}m#{self}\e[0m" end
-  def bold;  colorize('1')    end
-  def info;  colorize('1;34') end
-  def warn;  colorize('1;33') end
-  def error; colorize('1;31') end
-end