From 6782491ad0e076cea69063ea21993802236c3103 Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Tue, 22 Nov 2011 14:18:04 +1300 Subject: [PATCH 1/4] ftools is depricated in ruby 1.9... and version detection in support.rb was broken --- lib/amp/dependencies/zip/zip.rb | 2 +- lib/amp/support/support.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/amp/dependencies/zip/zip.rb b/lib/amp/dependencies/zip/zip.rb index 7384c9a..6c850df 100755 --- a/lib/amp/dependencies/zip/zip.rb +++ b/lib/amp/dependencies/zip/zip.rb @@ -3,7 +3,7 @@ require 'delegate' require 'singleton' require 'tempfile' -require 'ftools' +require 'fileutils' require 'stringio' require 'zlib' diff --git a/lib/amp/support/support.rb b/lib/amp/support/support.rb index 73b6910..f0f0486 100644 --- a/lib/amp/support/support.rb +++ b/lib/amp/support/support.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- ################################################################## # Licensing Information # # # @@ -14,7 +15,7 @@ require 'digest' -if RUBY_VERSION < "1.9" || RUBY_VERSION >= "1.9.2" +if RUBY_VERSION < "1.9" require 'ftools' autoload :Etc, 'etc' From f207e578f27fe11894eb20a253244882819cef92 Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Tue, 22 Nov 2011 14:41:07 +1300 Subject: [PATCH 2/4] gemspec --- Gemfile | 2 ++ amp.gemspec | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Gemfile create mode 100644 amp.gemspec diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..5cf0755 --- /dev/null +++ b/Gemfile @@ -0,0 +1,2 @@ +source "http://rubygems.org " +gemspec diff --git a/amp.gemspec b/amp.gemspec new file mode 100644 index 0000000..f40ad28 --- /dev/null +++ b/amp.gemspec @@ -0,0 +1,43 @@ +# -*- encoding: utf-8 -*- +$:.push File.expand_path("../lib", __FILE__) +#require "ruby_speech/version" + +Gem::Specification.new do # |s| + name = "amp" + developer "Michael Edgar", "adgar@carboni.ca" + developer "Ari Brown", "seydar@carboni.ca" + self.url = "http://amp.carboni.ca/" + self.spec_extras = {:extensions => ["ext/amp/mercurial_patch/extconf.rb", + "ext/amp/priority_queue/extconf.rb", + "ext/amp/support/extconf.rb", + "ext/amp/bz2/extconf.rb"]} + self.need_rdoc = false + self.summary = "Version Control in Ruby. Mercurial Compatible. Big Ideas." + extra_dev_deps << ["rtfm", ">= 0.5.1"] << ["yard", ">= 0.4.0"] << ["minitest", ">= 1.5.0"] +end + +# # s.version = RubySpeech::VERSION +# s.authors = ["Ben Langfeld"] +# s.email = ["ben@langfeld.me"] +# s.homepage = "https://github.com/benlangfeld/ruby_speech" +# s.summary = %q{A ruby library for TTS & ASR document preparation} +# s.description = %q{Prepare SSML and GRXML documents with ease} + +# s.rubyforge_project = "ruby_speech" + +# s.files = `git ls-files`.split("\n") +# s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") +# s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } +# s.require_paths = ["lib"] + +# s.add_runtime_dependency %q, [">= 0.1.0"] +# s.add_runtime_dependency %q, [">= 3.0.7"] + +# s.add_development_dependency %q, ["~> 1.0.0"] +# s.add_development_dependency %q, [">= 2.7.0"] +# s.add_development_dependency %q, [">= 1.6.3"] +# s.add_development_dependency %q, ["~> 0.7.0"] +# s.add_development_dependency %q, [">= 0"] +# s.add_development_dependency %q, [">= 0"] +# s.add_development_dependency %q, [">= 0"] +# end From 1bcf58e36c69d4a32e9d24cc42077325893d0a0f Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Tue, 22 Nov 2011 14:42:43 +1300 Subject: [PATCH 3/4] gemspec syntax error --- amp.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/amp.gemspec b/amp.gemspec index f40ad28..58de708 100644 --- a/amp.gemspec +++ b/amp.gemspec @@ -2,10 +2,10 @@ $:.push File.expand_path("../lib", __FILE__) #require "ruby_speech/version" -Gem::Specification.new do # |s| - name = "amp" - developer "Michael Edgar", "adgar@carboni.ca" - developer "Ari Brown", "seydar@carboni.ca" +Gem::Specification.new do |s| + s.name = "amp" + s.developer "Michael Edgar", "adgar@carboni.ca" + s.developer "Ari Brown", "seydar@carboni.ca" self.url = "http://amp.carboni.ca/" self.spec_extras = {:extensions => ["ext/amp/mercurial_patch/extconf.rb", "ext/amp/priority_queue/extconf.rb", From 13c2e9c507b494ef2928df9623fc750abd8a7d66 Mon Sep 17 00:00:00 2001 From: Chris McClimans Date: Tue, 22 Nov 2011 14:53:09 +1300 Subject: [PATCH 4/4] gemspec builds --- amp.gemspec | 56 +++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/amp.gemspec b/amp.gemspec index 58de708..57b3b0c 100644 --- a/amp.gemspec +++ b/amp.gemspec @@ -1,43 +1,31 @@ # -*- encoding: utf-8 -*- $:.push File.expand_path("../lib", __FILE__) -#require "ruby_speech/version" + +#require "amp" Gem::Specification.new do |s| s.name = "amp" - s.developer "Michael Edgar", "adgar@carboni.ca" - s.developer "Ari Brown", "seydar@carboni.ca" - self.url = "http://amp.carboni.ca/" - self.spec_extras = {:extensions => ["ext/amp/mercurial_patch/extconf.rb", - "ext/amp/priority_queue/extconf.rb", - "ext/amp/support/extconf.rb", - "ext/amp/bz2/extconf.rb"]} - self.need_rdoc = false - self.summary = "Version Control in Ruby. Mercurial Compatible. Big Ideas." - extra_dev_deps << ["rtfm", ">= 0.5.1"] << ["yard", ">= 0.4.0"] << ["minitest", ">= 1.5.0"] -end + s.authors = ["Michael Edgar", "Ari Brown"] + s.email = ["adgar@carboni.ca", "seydar@carboni.ca"] + s.version = '0.5.3' #Amp::VERSION + s.homepage = "http://amp.carboni.ca/" + s.summary = "Version Control in Ruby. Mercurial Compatible. Big Ideas." + s.rubyforge_project = 'amp' -# # s.version = RubySpeech::VERSION -# s.authors = ["Ben Langfeld"] -# s.email = ["ben@langfeld.me"] -# s.homepage = "https://github.com/benlangfeld/ruby_speech" -# s.summary = %q{A ruby library for TTS & ASR document preparation} -# s.description = %q{Prepare SSML and GRXML documents with ease} + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + s.require_paths = ["lib"] -# s.rubyforge_project = "ruby_speech" + s.add_development_dependency %q, ["~> 1.0.0"] + s.add_development_dependency %q, ["~> 0.5.1"] + s.add_development_dependency %q, [">= 0.4.0"] + s.add_development_dependency %q, [">= 1.5.0"] -# s.files = `git ls-files`.split("\n") -# s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") -# s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } -# s.require_paths = ["lib"] + # self.spec_extras = {:extensions => ["ext/amp/mercurial_patch/extconf.rb", + # "ext/amp/priority_queue/extconf.rb", + # "ext/amp/support/extconf.rb", + # "ext/amp/bz2/extconf.rb"]} + # self.need_rdoc = false -# s.add_runtime_dependency %q, [">= 0.1.0"] -# s.add_runtime_dependency %q, [">= 3.0.7"] - -# s.add_development_dependency %q, ["~> 1.0.0"] -# s.add_development_dependency %q, [">= 2.7.0"] -# s.add_development_dependency %q, [">= 1.6.3"] -# s.add_development_dependency %q, ["~> 0.7.0"] -# s.add_development_dependency %q, [">= 0"] -# s.add_development_dependency %q, [">= 0"] -# s.add_development_dependency %q, [">= 0"] -# end +end