gd2-ffij 0.0.6 → 0.0.7

data/.gitignore

@@ -5,6 +5,7 @@
 *tmp*
 pkg/
 doc/
+coverage/
 *.orig
 *.patch
 *.gem
@@ -13,3 +14,5 @@ doc/
 .config
 .yardoc
 Gemfile.lock
+Gemfile.local
+Guardfile.local

data/Gemfile

@@ -1,3 +1,20 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rdoc", "~> 3.12"
+gem "rake", "~> 10.0"
+gem "minitest"
+gem "minitest-reporters"
+gem "guard-minitest"
+gem "simplecov"
+
+if RbConfig::CONFIG['host_os'] =~ /^darwin/
+  gem "rb-fsevent"
+  gem "growl"
+end
+
+if File.exists?('Gemfile.local')
+  instance_eval File.read('Gemfile.local')
+end
+

data/Guardfile

@@ -0,0 +1,17 @@
+
+guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_tests.rb' do
+  watch(%r|^test/(.+)_tests\.rb|)
+
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$}) do |m|
+    "test/#{m[2]}_tests.rb"
+  end
+
+  watch(%r|^test/test_helper\.rb|) do
+    "test"
+  end
+end
+
+if File.exists?('Guardfile.local')
+  instance_eval File.read('Guardfile.local')
+end
+

data/Rakefile

@@ -1,23 +1,12 @@
 # -*- ruby -*-
 
 require 'rubygems'
-
-gem 'rdoc', '~> 3.12'
-
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
 require 'bundler/gem_tasks'
 
-if RUBY_VERSION >= '1.9'
-  begin
-    gem 'psych'
-  rescue Exception => e
-    # it's okay, fall back on the bundled psych
-  end
-end
-
-$:.push 'lib'
+$:.push File.expand_path(File.dirname(__FILE__), 'lib')
 
 version = GD2::VERSION
 

data/gd2-ffij.gemspec

@@ -21,7 +21,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("ffi", [">= 1.0.0"])
-  s.add_dependency("rdoc")
-  s.add_dependency("rake", ["~> 0.9"])
 end
 

data/lib/gd2/version.rb

@@ -1,6 +1,6 @@
 # encoding: ASCII-8BIT
 
 module GD2
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
 

data/lib/gd2-ffij.rb

@@ -36,7 +36,7 @@ module GD2
         paths = if ENV['GD2_LIBRARY_PATH']
           [ ENV['GD2_LIBRARY_PATH'] ]
         else
-          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/x86_64-linux-gnu' ]
+          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386}-linux-gnu' ]
         end
 
         lib = if [
@@ -55,7 +55,12 @@ module GD2
     end
 
     extend FFI::Library
-    ffi_lib(*gd_library_name)
+
+    begin
+      ffi_lib(*gd_library_name)
+    rescue LoadError, NoMethodError
+      raise LoadError.new("Couldn't load the gd2 library.")
+    end
 
     {
       :gdImageCreate                      => [ :pointer,  :int, :int ],

data/test/canvas_tests.rb

@@ -2,7 +2,7 @@
 
 require './test/test_helper'
 
-class CanvasTest < Test::Unit::TestCase
+class CanvasTest < MiniTest::Unit::TestCase
   include TestHelper
 
   def test_line

data/test/image_tests.rb

@@ -2,7 +2,7 @@
 
 require './test/test_helper'
 
-class ImageTest < Test::Unit::TestCase
+class ImageTest < MiniTest::Unit::TestCase
   include TestHelper
 
   def test_image_new_and_release

data/test/test_helper.rb

@@ -1,11 +1,26 @@
 # encoding: ASCII-8BIT
 
-require 'test/unit'
+if RUBY_VERSION >= '1.9'
+  require 'simplecov'
+
+  SimpleCov.command_name('Unit Tests')
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
+
 require 'tmpdir'
 
 require 'rubygems'
 require 'gd2-ffij'
+require 'minitest/autorun'
 
+if RUBY_VERSION >= '1.9'
+  require 'minitest/reporters'
+end
+
+puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
+puts "ffi version #{Gem.loaded_specs['ffi'].version}" if Gem.loaded_specs['ffi']
 puts "GD2 version: #{GD2::VERSION}"
 
 module TestHelper
@@ -20,3 +35,8 @@ module TestHelper
     GD2::Image.load(File.read(File.join(PATH_TO_IMAGES, file_name)))
   end
 end
+
+if RUBY_VERSION >= '1.9'
+  MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
+end
+

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: gd2-ffij
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    MC4wLjY=
   prerelease: 
+  version: !binary |-
+    MC4wLjc=
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -28,38 +28,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
 description: gd2-ffij is a refactoring of the Ruby/GD2 library implemented with FFI
 email: dark.panda@gmail.com
 executables: []
@@ -71,6 +39,7 @@ files:
 - COPYING
 - COPYRIGHT
 - Gemfile
+- Guardfile
 - README.rdoc
 - Rakefile
 - gd2-ffij.gemspec