From 976cf6a099ee38ac80975b64579816140f7139b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 13 Apr 2011 11:59:23 +0200 Subject: bugfix set USE_RAKE_COMPILER only if ext dir exists --- tasks/constants.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/constants.rb b/tasks/constants.rb index 6f37593..0e84d3a 100644 --- a/tasks/constants.rb +++ b/tasks/constants.rb @@ -20,8 +20,8 @@ end BUILD_DIR = "build" -USE_RAKE_COMPILER = ( (RUBY_PLATFORM =~ /java/) ? false : true ) or test ?d, 'ext' -if USE_RAKE_COMPILER# and test ?d, 'ext' +USE_RAKE_COMPILER = ( ( (RUBY_PLATFORM =~ /java/) ? false : true ) and test ?d, 'ext' ) +if USE_RAKE_COMPILER gem 'rake-compiler', '>=0.6.0' require 'rake/extensiontask' ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2' -- cgit v1.1-2-g2b99 From 7263be4df7ce32e305ce00d80eb66c232352c8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 25 May 2011 19:14:50 +0200 Subject: add +PROJ.gem.development_dependencies --- tasks/constants.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/constants.rb b/tasks/constants.rb index 0e84d3a..78a7625 100644 --- a/tasks/constants.rb +++ b/tasks/constants.rb @@ -104,6 +104,10 @@ end HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and system("svn --version 2>&1 > #{DEV_NULL}")) HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and system("git --version 2>&1 > #{DEV_NULL}")) +# Add rake as a development dependency +# +PROJ.gem.development_dependencies << ['rake', '>=0.8.7'] + # Add bones as a development dependency # if HAVE_BONES -- cgit v1.1-2-g2b99 From 2e47375c6772ce5ecb457792f7a33fd222b1c91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 25 May 2011 19:15:12 +0200 Subject: fix Gem.source_index.find_name deprecation --- tasks/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/helpers.rb b/tasks/helpers.rb index 96b3cc4..b43117a 100644 --- a/tasks/helpers.rb +++ b/tasks/helpers.rb @@ -39,7 +39,7 @@ end # will be used. # def depend_on( name, version = nil ) - spec = Gem.source_index.find_name(name).last + spec = Gem::Specification.find_by_name(name) version = spec.version.to_s if version.nil? and !spec.nil? PROJ.gem.dependencies << case version -- cgit v1.1-2-g2b99 From f88363c56b337a3aa29d71ee9f8bf11962e01207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 25 May 2011 19:15:32 +0200 Subject: fix has_rdoc deprecation --- tasks/gem.rake | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/gem.rake b/tasks/gem.rake index ea70d0d..a3e76f3 100644 --- a/tasks/gem.rake +++ b/tasks/gem.rake @@ -128,7 +128,6 @@ namespace :gem do end s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main] s.extra_rdoc_files = rdoc_files - s.has_rdoc = true if test ?f, PROJ.test.file s.test_file = PROJ.test.file -- cgit v1.1-2-g2b99 From 32138e365d849dedc5d93251445379d959eae6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 25 May 2011 19:16:05 +0200 Subject: use ENV[pattern] to drive spec execution --- tasks/spec.rake | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/tasks/spec.rake b/tasks/spec.rake index 6652bbf..7345f5c 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -6,24 +6,24 @@ require 'rspec/core/rake_task' namespace :spec do desc 'Run all specs with basic output' - RSpec::Core::RakeTask.new(:run) do |t| + RSpec::Core::RakeTask.new(:run) do |t,args| t.ruby_opts = PROJ.ruby_opts t.rspec_opts = PROJ.spec.opts -# t.libs += PROJ.libs + t.pattern = ENV['pattern'] if ENV['pattern'] end desc 'Run all specs with text output' RSpec::Core::RakeTask.new(:doc) do |t| t.ruby_opts = PROJ.ruby_opts t.rspec_opts = PROJ.spec.opts + ['-fs' ] -# t.libs += PROJ.libs + t.pattern = ENV['pattern'] if ENV['pattern'] end desc 'Run all specs with html output' RSpec::Core::RakeTask.new(:html) do |t| t.ruby_opts = PROJ.ruby_opts t.rspec_opts = PROJ.spec.opts + ['-fh' ] -# t.libs += PROJ.libs + t.pattern = ENV['pattern'] if ENV['pattern'] end if HAVE_RCOV @@ -31,20 +31,9 @@ namespace :spec do RSpec::Core::RakeTask.new(:rcov) do |t| t.ruby_opts = PROJ.ruby_opts t.rspec_opts = PROJ.spec.opts -# t.libs += PROJ.libs t.rcov = true -# t.rcov_path = PROJ.rcov.dir t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec'] end - -# RCov::VerifyTask.new(:verify) do |t| -# t.threshold = PROJ.rcov.threshold -# t.index_html = File.join(PROJ.rcov.dir, 'index.html') -# t.require_exact_threshold = PROJ.rcov.threshold_exact -# end - -# task :verify => :rcov -# remove_desc_for_task %w(spec:clobber_rcov) end end # namespace :spec @@ -52,8 +41,4 @@ end # namespace :spec desc 'Alias to spec:run' task :spec => 'spec:run' -#task :clobber => 'spec:clobber_rcov' if HAVE_RCOV - -#end # if HAVE_SPEC_RAKE_SPECTASK - # EOF -- cgit v1.1-2-g2b99 From cd7c334944d2989b25b24924d4c4716a406433bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 22 Jun 2011 08:58:58 +0200 Subject: use of 'rake/rdoctask' is deprecated, use 'rdoc/task' instead --- tasks/rdoc.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/rdoc.rake b/tasks/rdoc.rake index 71adf9a..cd47caa 100644 --- a/tasks/rdoc.rake +++ b/tasks/rdoc.rake @@ -1,6 +1,6 @@ # -*- coding: UTF-8 -*- # -require 'rake/rdoctask' +require 'rdoc/task' namespace :doc do desc 'Generate RDoc documentation' -- cgit v1.1-2-g2b99 From d9795a10412510cb13d0a81b5d8553e202195791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 22 Jun 2011 09:01:11 +0200 Subject: remove trailing spaces --- MIT-LICENSE | 6 +++--- README.rdoc | 2 -- tasks/gem.rake | 2 +- tasks/helpers.rb | 2 +- tasks/rdoc.rake | 6 +++--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/MIT-LICENSE b/MIT-LICENSE index 825c5e9..5c2a345 100644 --- a/MIT-LICENSE +++ b/MIT-LICENSE @@ -6,13 +6,13 @@ deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.rdoc b/README.rdoc index 4576a17..fab41e4 100644 --- a/README.rdoc +++ b/README.rdoc @@ -12,8 +12,6 @@ FIXME == SYNOPSIS: - require 'efl-eet' - # TODO For less minimalistic and more sane examples you may look at: diff --git a/tasks/gem.rake b/tasks/gem.rake index a3e76f3..e5e5d13 100644 --- a/tasks/gem.rake +++ b/tasks/gem.rake @@ -77,7 +77,7 @@ class GemPackageTask < Rake::PackageTask end end end - + def gem_file if @gem_spec.platform == Gem::Platform::RUBY "#{package_name}.gem" diff --git a/tasks/helpers.rb b/tasks/helpers.rb index b43117a..df5bd50 100644 --- a/tasks/helpers.rb +++ b/tasks/helpers.rb @@ -89,7 +89,7 @@ end # files = [] # exclude = PROJ.exclude.dup # comment = %r/^\s*#/ -# +# # # process the ignore file and add the items there to the exclude list # if test(?f, PROJ.ignore_file) # ary = [] diff --git a/tasks/rdoc.rake b/tasks/rdoc.rake index cd47caa..98ef3b8 100644 --- a/tasks/rdoc.rake +++ b/tasks/rdoc.rake @@ -8,7 +8,7 @@ namespace :doc do rdoc = PROJ.rdoc rd.main = rdoc.main rd.rdoc_dir = rdoc.dir - + incl = Regexp.new(rdoc.include.join('|')) excl = Regexp.new(rdoc.exclude.join('|')) files = PROJ.gem.files.find_all do |fn| @@ -24,12 +24,12 @@ namespace :doc do rd.options << "-t #{title}" rd.options.concat(rdoc.opts) end - + desc 'Generate ri locally for testing' task :ri => :clobber_ri do sh "#{RDOC} --ri -o ri ." end - + task :clobber_ri do rm_r 'ri' rescue nil end -- cgit v1.1-2-g2b99