[DRE-commits] [SCM] ruby-unf-ext.git branch, master, updated. debian/0.0.5-2-7-g29b6014

Youhei SASAKI uwabami at gfd-dennou.org
Sat Jun 1 18:47:59 UTC 2013


The following commit has been merged in the master branch:
commit 0e94963b23adc53144ff39fc2eb35f429a572771
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Jun 2 03:17:01 2013 +0900

    Imported Upstream version 0.0.6

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bffaafc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+*.so
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+ext/*/Makefile
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
diff --git a/Gemfile b/Gemfile
index 8a0808f..82609cf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'https://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.1.3"
-  gem "jeweler", "~> 1.6.4"
-#  gem "rcov", ">= 0"
-  gem "rake-compiler", ">= 0.7.9"
-end
+# Specify your gem's dependencies in ruby-unf_ext.gemspec
+gemspec
diff --git a/LICENSE.txt b/LICENSE.txt
index 884f236..dd29ee5 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 The MIT License
 
 Copyright (c) 2010 Takeru Ohta <phjgt308 at gmail.com>
-Copyright (c) 2011 Akinori MUSHA <knu at idaemons.org> (extended Ruby support)
+Copyright (c) 2011, 2012, 2013 Akinori MUSHA <knu at idaemons.org> (extended Ruby support)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 0c696dc..ac288f0 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ License
 -------
 
 Copyright (c) 2010 Takeru Ohta
-Copyright (c) 2011 Akinori MUSHA
+Copyright (c) 2011, 2012, 2013 Akinori MUSHA
 
 Licensed under the MIT license.
 See `LICENSE` for details.
diff --git a/Rakefile b/Rakefile
index 2c138b8..b8b4354 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,65 +1,19 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
+require 'bundler/gem_tasks'
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "unf_ext"
-  gem.homepage = "http://github.com/knu/ruby-unf_ext"
-  gem.license = "MIT"
-  gem.summary = %Q{Unicode Normalization Form support library for CRuby}
-  gem.description = %Q{Unicode Normalization Form support library for CRuby}
-  gem.email = "knu at idaemons.org"
-  gem.authors = ["Takeru Ohta", "Akinori MUSHA"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-def generated_gemspec
-  eval(File.read(Rake.application.jeweler.gemspec_helper.path))
-rescue
-  nil
-end
+gemspec = Bundler::GemHelper.gemspec
 
 require 'rake/extensiontask'
-Rake::ExtensionTask.new('unf_ext', generated_gemspec) do |ext|
+Rake::ExtensionTask.new('unf_ext', gemspec) do |ext|
     ext.cross_compile = true
     ext.cross_platform = 'x86-mingw32'
 end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = FileList['test/**/test_*.rb']
+  test.libs << 'test'
+  test.test_files = gemspec.test_files
   test.verbose = true
 end
 
-#require 'rcov/rcovtask'
-#Rcov::RcovTask.new do |test|
-#  test.libs << 'test'
-#  test.pattern = FileList['test/**/test_*.rb']
-#  test.verbose = true
-#  test.rcov_opts << '--exclude "gems/*"'
-#end
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "unf_ext #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff --git a/VERSION b/VERSION
deleted file mode 100644
index fa3de58..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.0.5
\ No newline at end of file
diff --git a/ext/unf_ext/extconf.rb b/ext/unf_ext/extconf.rb
index 7dca3cd..f686a4a 100644
--- a/ext/unf_ext/extconf.rb
+++ b/ext/unf_ext/extconf.rb
@@ -1,17 +1,13 @@
 require 'mkmf'
-CONFIG.delete('CC')
-CONFIG['CC'] = "g++"
-unless have_library('stdc++')
-  $LIBS = "-lstdc++ " + $LIBS
-end
+have_library('stdc++')
 have_header('ruby/encoding.h')
 create_makefile 'unf_ext'
 
 unless CONFIG['CXX']
   case CONFIG['CC']
-  when %r{((?:.*[-/])?)gcc([-0-9.]*)\s*?$}
+  when %r{((?:.*[-/])?)gcc([-0-9.]*)$}
     cxx = $1 + 'g++' + $2
-  when %r{((?:.*[-/])?)clang([-0-9.]*)\s*?$}
+  when %r{((?:.*[-/])?)clang([-0-9.]*)$}
     cxx = $1 + 'clang++' + $2
   else
     cxx = CONFIG['CC']
diff --git a/lib/unf_ext/version.rb b/lib/unf_ext/version.rb
new file mode 100644
index 0000000..30c595f
--- /dev/null
+++ b/lib/unf_ext/version.rb
@@ -0,0 +1,5 @@
+module UNF
+  class Normalizer
+    VERSION = "0.0.6"
+  end
+end
diff --git a/metadata.yml b/metadata.yml
index 6adbefe..708c5f4 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,101 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: unf_ext
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Takeru Ohta
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2013-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 2.4.2
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  version_requirements: *id002
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id003
-  name: jeweler
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.9
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 7
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.9
-  version_requirements: *id004
-  name: rake-compiler
 description: Unicode Normalization Form support library for CRuby
-email: knu at idaemons.org
+email:
+- knu at idaemons.org
 executables: []
-
-extensions: 
+extensions:
 - ext/unf_ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - ext/unf_ext/extconf.rb
 - ext/unf_ext/unf.cc
 - ext/unf_ext/unf/normalizer.hh
@@ -105,42 +101,35 @@ files:
 - ext/unf_ext/unf/trie/searcher.hh
 - ext/unf_ext/unf/util.hh
 - lib/unf_ext.rb
+- lib/unf_ext/version.rb
 - test/helper.rb
 - test/normalization-test.txt
 - test/test_unf_ext.rb
 - unf_ext.gemspec
-homepage: http://github.com/knu/ruby-unf_ext
-licenses: 
+homepage: https://github.com/knu/ruby-unf_ext
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Unicode Normalization Form support library for CRuby
-test_files: []
-
+test_files:
+- test/test_unf_ext.rb
diff --git a/test/helper.rb b/test/helper.rb
index 20e0abd..f9d75cb 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,6 +1,18 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'test/unit'
 require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'unf_ext'
 
 class Test::Unit::TestCase
diff --git a/unf_ext.gemspec b/unf_ext.gemspec
index 79fb840..9ecdde1 100644
--- a/unf_ext.gemspec
+++ b/unf_ext.gemspec
@@ -1,68 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'unf_ext/version'
 
-Gem::Specification.new do |s|
-  s.name = "unf_ext"
-  s.version = "0.0.5"
+Gem::Specification.new do |gem|
+  gem.name          = "unf_ext"
+  gem.version       = UNF::Normalizer::VERSION
+  gem.authors       = ["Takeru Ohta", "Akinori MUSHA"]
+  gem.email         = ["knu at idaemons.org"]
+  gem.description   = %q{Unicode Normalization Form support library for CRuby}
+  gem.summary       = %q{Unicode Normalization Form support library for CRuby}
+  gem.homepage      = "https://github.com/knu/ruby-unf_ext"
+  gem.licenses      = ["MIT"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Takeru Ohta", "Akinori MUSHA"]
-  s.date = "2012-05-30"
-  s.description = "Unicode Normalization Form support library for CRuby"
-  s.email = "knu at idaemons.org"
-  s.extensions = ["ext/unf_ext/extconf.rb"]
-  s.extra_rdoc_files = [
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/}).grep(%r{/test_[^/]+\.rb$})
+  gem.require_paths = ["lib"]
+  gem.extensions    = ["ext/unf_ext/extconf.rb"]
+
+  gem.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "ext/unf_ext/extconf.rb",
-    "ext/unf_ext/unf.cc",
-    "ext/unf_ext/unf/normalizer.hh",
-    "ext/unf_ext/unf/table.hh",
-    "ext/unf_ext/unf/trie/char_stream.hh",
-    "ext/unf_ext/unf/trie/node.hh",
-    "ext/unf_ext/unf/trie/searcher.hh",
-    "ext/unf_ext/unf/util.hh",
-    "lib/unf_ext.rb",
-    "test/helper.rb",
-    "test/normalization-test.txt",
-    "test/test_unf_ext.rb",
-    "unf_ext.gemspec"
-  ]
-  s.homepage = "http://github.com/knu/ruby-unf_ext"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Unicode Normalization Form support library for CRuby"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.add_development_dependency("shoulda", [">= 0"])
+  gem.add_development_dependency("rdoc", ["> 2.4.2"])
+  gem.add_development_dependency("bundler", [">= 1.2"])
+  gem.add_development_dependency("rake-compiler", [">= 0.7.9"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rake-compiler>, [">= 0.7.9"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rake-compiler>, [">= 0.7.9"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rake-compiler>, [">= 0.7.9"])
-  end
 end
-

-- 
ruby-unf-ext.git



More information about the Pkg-ruby-extras-commits mailing list