Merge pull request #13 from tenderlove/bundler

Use Bundler task and fix broken tests

Author: hsbt

.gitignore

@@ -1,3 +1,4 @@
 lib/syck.bundle
 pkg
 tmp
+/Gemfile.lock

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

Manifest.txt

@@ -1,31 +1,14 @@
-# -*- ruby -*-
+require 'bundler/gem_tasks'
+require 'rake/extensiontask'
+require 'rake/testtask'
 
-require 'rubygems'
-require 'hoe'
+CLEAN = Rake::FileList["lib/syck.bundle", "tmp"]
 
-Hoe.plugins.delete :rubyforge
-Hoe.plugin :gemspec # `gem install hoe-gemspec`
-Hoe.plugin :git     # `gem install hoe-git`
-
-gem 'rake-compiler', '>= 0.4.1'
-require "rake/extensiontask"
-
-Hoe.spec 'syck' do
-  developer('Aaron Patterson', 'aaron@tenderlovemaking.com')
-  self.readme_file   = 'README.rdoc'
-  self.history_file  = 'CHANGELOG.rdoc'
-  self.extra_rdoc_files  = FileList['*.rdoc']
-
-  extra_dev_deps << ['rake-compiler', '>= 0.4.1']
-
-  self.spec_extras = {
-    :extensions            => ["ext/syck/extconf.rb"],
-    :required_ruby_version => '>= 2.0.0'
-  }
-
-  Rake::ExtensionTask.new "syck", spec do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-  end
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/test_*.rb']
 end
+Rake::ExtensionTask.new('syck')
 
-# vim: syntax=ruby
+task :default => [:compile, :test]

Rakefile

@@ -37,7 +37,7 @@ def yaml_initialize( tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
             out.map( taguri, to_yaml_style ) do |map|
                 each do |k, v|
@@ -86,7 +86,7 @@ def self.yaml_new( klass, tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
 			#
 			# Basic struct is passed as a YAML map
@@ -108,7 +108,7 @@ class Array
     yaml_as "tag:yaml.org,2002:seq"
     def yaml_initialize( tag, val ); concat( val.to_a ); end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
             out.seq( taguri, to_yaml_style ) do |seq|
                 each do |x|
@@ -130,7 +130,7 @@ def Exception.yaml_new( klass, tag, val )
         o
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
             out.map( taguri, to_yaml_style ) do |map|
                 map.add( 'message', message )
@@ -168,7 +168,7 @@ def String.yaml_new( klass, tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( is_complex_yaml? ? self : nil, opts ) do |out|
             if is_binary_data?
                 out.scalar( "tag:yaml.org,2002:binary", [self].pack("m"), :literal )
@@ -198,7 +198,7 @@ def Symbol.yaml_new( klass, tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             out.scalar( "tag:yaml.org,2002:str", self.inspect, :plain )
         end
@@ -236,7 +236,7 @@ def Range.yaml_new( klass, tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
             # if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or
             #   self.end.is_complex_yaml? or self.end.respond_to? :to_str or
@@ -287,7 +287,7 @@ def Regexp.yaml_new( klass, tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             if to_yaml_properties.empty?
                 out.scalar( taguri, self.inspect, :plain )
@@ -322,7 +322,7 @@ def Time.yaml_new( klass, tag, val )
         end
     end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
             tz = "Z"
             # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
@@ -360,7 +360,7 @@ def to_yaml( opts = {} )
 class Date
     yaml_as "tag:yaml.org,2002:timestamp#ymd"
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
             out.scalar( "tag:yaml.org,2002:timestamp", self.to_s, :plain )
         end
@@ -370,7 +370,7 @@ def to_yaml( opts = {} )
 class Integer
     yaml_as "tag:yaml.org,2002:int"
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
         end
@@ -380,7 +380,7 @@ def to_yaml( opts = {} )
 class Float
     yaml_as "tag:yaml.org,2002:float"
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             str = self.to_s
             if str == "Infinity"
@@ -405,7 +405,7 @@ def Rational.yaml_new( klass, tag, val )
 		end
 	end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
 			out.map( taguri, nil ) do |map|
 				map.add( 'denominator', denominator )
@@ -425,7 +425,7 @@ def Complex.yaml_new( klass, tag, val )
 		end
 	end
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( self, opts ) do |out|
 			out.map( taguri, nil ) do |map|
 				map.add( 'image', imaginary )
@@ -438,7 +438,7 @@ def to_yaml( opts = {} )
 class TrueClass
     yaml_as "tag:yaml.org,2002:bool#yes"
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             out.scalar( taguri, "true", :plain )
         end
@@ -448,7 +448,7 @@ def to_yaml( opts = {} )
 class FalseClass
     yaml_as "tag:yaml.org,2002:bool#no"
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             out.scalar( taguri, "false", :plain )
         end
@@ -458,10 +458,9 @@ def to_yaml( opts = {} )
 class NilClass
     yaml_as "tag:yaml.org,2002:null"
 	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
+        return super unless YAML == Syck
 		Syck::quick_emit( nil, opts ) do |out|
             out.scalar( taguri, "", :plain )
         end
 	end
 end
-

lib/syck/rubytypes.rb

@@ -1,38 +1,26 @@
 # -*- encoding: utf-8 -*-
 
-require 'time'
 Gem::Specification.new do |s|
   s.name = "syck"
   s.version = "1.0.5"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Patterson", "Mat Brown"]
+  s.summary = "A gemified version of Syck from Ruby's stdlib"
   s.description = "A gemified version of Syck from Ruby's stdlib.  Syck has been removed from\nRuby's stdlib, and this gem is meant to bridge the gap for people that haven't\nupdated their YAML yet."
-  s.email = ["aaron@tenderlovemaking.com"]
+  s.authors = ["Hiroshi SHIBATA", "Aaron Patterson", "Mat Brown"]
+  s.email = ["hsbt@ruby-lang.org", "aaron@tenderlovemaking.com"]
+  s.homepage = "https://github.com/tenderlove/syck"
+  s.require_paths = ["lib"]
   s.extensions = ["ext/syck/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc", "CHANGELOG.rdoc", "README.rdoc"]
   s.files = Dir["[A-Z]*", "ext/**/*", "lib/**/*.rb", "test/**/*.rb"]
-  s.homepage = "https://github.com/RapGenius/syck"
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc", "CHANGELOG.rdoc", "README.rdoc"]
+  s.test_files = Dir["test/**/*.rb"]
   s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0.0")
-  s.rubyforge_project = "syck"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = "2.0.3"
-  s.summary = "A gemified version of Syck from Ruby's stdlib"
-  s.test_files = Dir["test/**/*.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<rake-compiler>, [">= 0.4.1"])
-    else
-      s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<rake-compiler>, [">= 0.4.1"])
-    end
-  else
-    s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<rake-compiler>, [">= 0.4.1"])
-  end
+  s.add_development_dependency(%q<bundler>, ["~> 1.11"])
+  s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
+  s.add_development_dependency(%q<test-unit>, ["~> 3.1"])
+  s.add_development_dependency(%q<rake-compiler>, [">= 0.4.1"])
 end

syck.gemspec

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 # -*- mode: ruby; ruby-indent-level: 4; tab-width: 4; indent-tabs-mode: t -*-
 #												vim:sw=4:ts=4
 # $Id$