From 355d3bd0ea8d879107e82c66d22e92fb0a6dcbad Mon Sep 17 00:00:00 2001
From: FURUHASHI Sadayuki <frsyuki@users.sourceforge.jp>
Date: Mon, 24 Oct 2011 09:12:18 +0900
Subject: [PATCH] use bundler instead of jeweler for packaging

---
 Gemfile                  |  3 ++
 Rakefile                 | 62 +++++---------------------------------
 VERSION                  |  2 +-
 fluent-plugin-s3.gemspec | 65 +++++++++++-----------------------------
 4 files changed, 30 insertions(+), 102 deletions(-)
 create mode 100644 Gemfile

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..c80ee369
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec
diff --git a/Rakefile b/Rakefile
index a7473c91..b9cd4293 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,60 +1,14 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/clean'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "fluent-plugin-s3"
-    gemspec.summary = "Amazon S3 output plugin for Fluent event collector"
-    gemspec.author = "Sadayuki Furuhashi"
-    gemspec.email = "frsyuki@gmail.com"
-    gemspec.homepage = "http://fluent.github.com/"
-    gemspec.has_rdoc = false
-    gemspec.require_paths = ["lib"]
-    gemspec.add_dependency "fluentd", "~> 0.10.0"
-    gemspec.add_dependency "aws-sdk", "~> 1.1.3"
-    gemspec.test_files = Dir["test/**/*.rb"]
-    gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
-      %w[VERSION AUTHORS Rakefile]
-    gemspec.executables = []
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir['test/*_test.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
-  t.ruby_opts << '-I.'
-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 <<EOF
-#module Fluent
-#
-#VERSION = '#{version}'
-#
-#end
-#EOF
-#  }
-#end
-#
-#task :default => [VERSION_FILE, :build]
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-task :default => [:build]
+require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.test_files = Dir["test/*.rb"].sort
-  t.verbose = true
-  #t.warning = true
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.test_files = FileList['test/*.rb']
+  test.verbose = true
 end
 
-task :default => [:build, :gemspec]
+task :default => [:build]
 
diff --git a/VERSION b/VERSION
index 0ea3a944..0c62199f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/fluent-plugin-s3.gemspec b/fluent-plugin-s3.gemspec
index 749fcac6..914138a4 100644
--- a/fluent-plugin-s3.gemspec
+++ b/fluent-plugin-s3.gemspec
@@ -1,50 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{fluent-plugin-s3}
-  s.version = "0.2.0"
+Gem::Specification.new do |gem|
+  gem.name        = "fluent-plugin-s3"
+  gem.description = "Amazon S3 output plugin for Fluent event collector"
+  gem.homepage    = "http://fluentd.org/"
+  gem.summary     = gem.description
+  gem.version     = File.read("VERSION").strip
+  gem.authors     = ["Sadayuki Furuhashi"]
+  gem.email       = "frsyuki@gmail.com"
+  gem.has_rdoc    = false
+  #gem.platform    = Gem::Platform::RUBY
+  gem.files       = `git ls-files`.split("\n")
+  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ['lib']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sadayuki Furuhashi"]
-  s.date = %q{2011-10-16}
-  s.email = %q{frsyuki@gmail.com}
-  s.extra_rdoc_files = [
-    "ChangeLog",
-     "README.rdoc"
-  ]
-  s.files = [
-    "AUTHORS",
-     "Rakefile",
-     "VERSION",
-     "lib/fluent/plugin/out_s3.rb",
-     "test/out_s3.rb"
-  ]
-  s.homepage = %q{http://fluent.github.com/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Amazon S3 output plugin for Fluent event collector}
-  s.test_files = [
-    "test/out_s3.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluentd>, ["~> 0.10.0"])
-      s.add_runtime_dependency(%q<aws-sdk>, ["~> 1.1.3"])
-    else
-      s.add_dependency(%q<fluentd>, ["~> 0.10.0"])
-      s.add_dependency(%q<aws-sdk>, ["~> 1.1.3"])
-    end
-  else
-    s.add_dependency(%q<fluentd>, ["~> 0.10.0"])
-    s.add_dependency(%q<aws-sdk>, ["~> 1.1.3"])
-  end
+  gem.add_dependency "fluentd", "~> 0.10.0"
+  gem.add_dependency "aws-sdk", "~> 1.1.3"
 end
-