diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 index f5fb89e491..d52580fae0 --- a/Rakefile +++ b/Rakefile @@ -1,52 +1,9 @@ -require 'rake' +#!/usr/bin/env rake +require "bundler/gem_tasks" + require 'rake/testtask' require 'rake/clean' -begin - require 'jeweler' - Jeweler::Tasks.new do |gemspec| - gemspec.name = "fluentd" - gemspec.summary = "Fluent event collector" - gemspec.author = "Sadayuki Furuhashi" - gemspec.email = "frsyuki@gmail.com" - gemspec.homepage = "http://fluentd.org/" - gemspec.has_rdoc = false - gemspec.require_paths = ["lib"] - gemspec.add_dependency "msgpack", ">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.6.0" - gemspec.add_dependency "json", ">= 1.4.3" - gemspec.add_dependency "yajl-ruby", "~> 1.0" - gemspec.add_dependency "cool.io", "~> 1.1.0" - gemspec.add_dependency "http_parser.rb", "~> 0.5.1" - gemspec.add_development_dependency "rake", ">= 0.9.2" - gemspec.add_development_dependency "rr", ">= 1.0.0" - gemspec.add_development_dependency "timecop", ">= 0.3.0" - gemspec.add_development_dependency "jeweler", ">= 1.0.0" - gemspec.test_files = Dir["test/**/*.rb"] - gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] + - %w[fluent.conf VERSION AUTHORS Rakefile COPYING fluentd.gemspec Gemfile] - gemspec.executables = ['fluentd', 'fluent-cat', 'fluent-gem', 'fluent-debug'] - gemspec.required_ruby_version = '>= 1.9.2' - end - Jeweler::GemcutterTasks.new -rescue LoadError - puts "Jeweler not available. Install it with: gem install jeweler" -end - -VERSION_FILE = "lib/fluent/version.rb" - -file VERSION_FILE => ["VERSION"] do |t| - version = File.read("VERSION").strip - File.open(VERSION_FILE, "w") {|f| - f.write < [:base_test] Rake::TestTask.new(:base_test) do |t| @@ -56,15 +13,4 @@ Rake::TestTask.new(:base_test) do |t| #t.warning = true end -# workaround for fluentd >= 0 dependency -task :mv_gemfile do - File.rename "Gemfile", "Gemfile.bak" rescue nil -end - -# workaround for fluentd >= 0 dependency -task :revert_gemfile do - File.rename "Gemfile.bak", "Gemfile" rescue nil -end - -task :default => [VERSION_FILE, :mv_gemfile, :build, :revert_gemfile] - +task :default => [:test, :build] diff --git a/fluentd.gemspec b/fluentd.gemspec index 5af39e1133..0e08c45c39 100644 --- a/fluentd.gemspec +++ b/fluentd.gemspec @@ -1,160 +1,30 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' -# -*- encoding: utf-8 -*- +require File.expand_path('../lib/fluent/version', __FILE__) -Gem::Specification.new do |s| - s.name = "fluentd" - s.version = "0.10.14" +Gem::Specification.new do |gem| + gem.name = "fluentd" + gem.version = Fluent::VERSION # see lib/fluent/version.rb - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Sadayuki Furuhashi"] - s.date = "2012-03-07" - s.email = "frsyuki@gmail.com" - s.executables = ["fluentd", "fluent-cat", "fluent-gem"] - s.extra_rdoc_files = [ - "ChangeLog", - "README", - "README.rdoc" - ] - s.files = [ - "AUTHORS", - "COPYING", - "Gemfile", - "Rakefile", - "VERSION", - "bin/fluent-cat", - "bin/fluent-gem", - "bin/fluentd", - "fluent.conf", - "fluentd.gemspec", - "lib/fluent/buffer.rb", - "lib/fluent/command/cat.rb", - "lib/fluent/command/fluentd.rb", - "lib/fluent/config.rb", - "lib/fluent/engine.rb", - "lib/fluent/env.rb", - "lib/fluent/event.rb", - "lib/fluent/input.rb", - "lib/fluent/load.rb", - "lib/fluent/log.rb", - "lib/fluent/match.rb", - "lib/fluent/mixin.rb", - "lib/fluent/output.rb", - "lib/fluent/parser.rb", - "lib/fluent/plugin.rb", - "lib/fluent/plugin/buf_file.rb", - "lib/fluent/plugin/buf_memory.rb", - "lib/fluent/plugin/buf_zfile.rb", - "lib/fluent/plugin/in_exec.rb", - "lib/fluent/plugin/in_forward.rb", - "lib/fluent/plugin/in_http.rb", - "lib/fluent/plugin/in_status.rb", - "lib/fluent/plugin/in_stream.rb", - "lib/fluent/plugin/in_syslog.rb", - "lib/fluent/plugin/in_tail.rb", - "lib/fluent/plugin/out_copy.rb", - "lib/fluent/plugin/out_exec.rb", - "lib/fluent/plugin/out_exec_filter.rb", - "lib/fluent/plugin/out_file.rb", - "lib/fluent/plugin/out_forward.rb", - "lib/fluent/plugin/out_null.rb", - "lib/fluent/plugin/out_roundrobin.rb", - "lib/fluent/plugin/out_stdout.rb", - "lib/fluent/plugin/out_stream.rb", - "lib/fluent/plugin/out_test.rb", - "lib/fluent/process.rb", - "lib/fluent/status.rb", - "lib/fluent/supervisor.rb", - "lib/fluent/test.rb", - "lib/fluent/test/base.rb", - "lib/fluent/test/input_test.rb", - "lib/fluent/test/output_test.rb", - "lib/fluent/version.rb", - "test/config.rb", - "test/helper.rb", - "test/match.rb", - "test/mixin.rb", - "test/plugin/in_exec.rb", - "test/plugin/in_forward.rb", - "test/plugin/in_http.rb", - "test/plugin/in_stream.rb", - "test/plugin/out_copy.rb", - "test/plugin/out_exec.rb", - "test/plugin/out_exec_filter.rb", - "test/plugin/out_file.rb", - "test/plugin/out_forward.rb", - "test/plugin/out_roundrobin.rb", - "test/plugin/out_stream.rb" - ] - s.homepage = "http://fluentd.org/" - s.require_paths = ["lib"] - s.required_ruby_version = Gem::Requirement.new("~> 1.9.2") - s.rubygems_version = "1.8.12" - s.summary = "Fluent event collector" - s.test_files = ["test/config.rb", "test/helper.rb", "test/match.rb", "test/mixin.rb", "test/plugin/in_exec.rb", "test/plugin/in_forward.rb", "test/plugin/in_http.rb", "test/plugin/in_stream.rb", "test/plugin/out_copy.rb", "test/plugin/out_exec.rb", "test/plugin/out_exec_filter.rb", "test/plugin/out_file.rb", "test/plugin/out_forward.rb", "test/plugin/out_roundrobin.rb", "test/plugin/out_stream.rb"] + gem.authors = ["Sadayuki Furuhashi"] + gem.email = ["frsyuki@gmail.com"] + gem.description = %q{Fluentd is an event collector system. It is a generalized version of syslogd, which handles JSON objects for its log messages} + gem.summary = %q{Fluent event collector} + gem.homepage = "http://fluentd.org/" - if s.respond_to? :specification_version then - s.specification_version = 3 + 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)/}) + gem.require_paths = ["lib"] + gem.has_rdoc = false - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0.9.2"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0.3.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0.9.2"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0.3.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_runtime_dependency(%q, ["~> 0.4.4"]) - s.add_runtime_dependency(%q, [">= 1.4.3"]) - s.add_runtime_dependency(%q, ["~> 1.0"]) - s.add_runtime_dependency(%q, ["~> 1.1.0"]) - s.add_runtime_dependency(%q, ["~> 0.5.1"]) - s.add_development_dependency(%q, [">= 0.9.2"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0.3.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0.9.2"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.9.2"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, ["~> 0.4.4"]) - s.add_dependency(%q, [">= 1.4.3"]) - s.add_dependency(%q, ["~> 1.0"]) - s.add_dependency(%q, ["~> 1.1.0"]) - s.add_dependency(%q, ["~> 0.5.1"]) - s.add_dependency(%q, [">= 0.9.2"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0.9.2"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.9.2"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, ["~> 0.4.4"]) - s.add_dependency(%q, [">= 1.4.3"]) - s.add_dependency(%q, ["~> 1.0"]) - s.add_dependency(%q, ["~> 1.1.0"]) - s.add_dependency(%q, ["~> 0.5.1"]) - s.add_dependency(%q, [">= 0.9.2"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - end -end + gem.required_ruby_version = '>= 1.9.2' + + gem.add_runtime_dependency(%q, [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.6.0"]) + gem.add_runtime_dependency(%q, [">= 1.4.3"]) + gem.add_runtime_dependency(%q, ["~> 1.0"]) + gem.add_runtime_dependency(%q, ["~> 1.1.0"]) + gem.add_runtime_dependency(%q, ["~> 0.5.1"]) + gem.add_development_dependency(%q, [">= 0.9.2"]) + gem.add_development_dependency(%q, [">= 1.0.0"]) + gem.add_development_dependency(%q, [">= 0.3.0"]) +end