Skip to content

Commit 0cfef76

Browse files
committed
removing legacy rails support, updating generators, locking gem at ruby version 1.8.7 because tests blew up at 2.0 (minitest/mocha incompatibility)
1 parent 3a74624 commit 0cfef76

File tree

8 files changed

+21
-22
lines changed

8 files changed

+21
-22
lines changed

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'rake'
22
require 'rake/testtask'
3-
require 'rake/rdoctask'
3+
require 'rdoc/task'
44

55
desc 'Default: run unit tests.'
66
task :default => :test
@@ -13,7 +13,7 @@ Rake::TestTask.new(:test) do |t|
1313
end
1414

1515
desc 'Generate documentation for the fetcher plugin.'
16-
Rake::RDocTask.new(:rdoc) do |rdoc|
16+
RDoc::Task.new do |rdoc|
1717
rdoc.rdoc_dir = 'rdoc'
1818
rdoc.title = 'Fetcher'
1919
rdoc.options << '--line-numbers' << '--inline-source'

fetcher.gemspec

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ Gem::Specification.new do |spec|
1414
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1515
spec.require_paths = ["lib"]
1616

17-
spec.add_development_dependency "bundler", "~> 1.3"
17+
spec.required_ruby_version = '~> 1.8.7'
18+
19+
spec.add_dependency "system_timer", "~> 1.2.4"
20+
21+
spec.add_development_dependency "bundler", "~> 1.3.0"
1822
spec.add_development_dependency "rake"
23+
spec.add_development_dependency "mocha"
24+
spec.add_development_dependency "rdoc", ">= 2.4.2"
1925
end

generators/fetcher_daemon/fetcher_daemon_generator.rb

-9
This file was deleted.

generators/fetcher_daemon/USAGE lib/generators/fetcher_daemon/USAGE

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Description:
22
Create a fetcher daemon with a given name
33

44
Example:
5-
./script/generate fetcher_daemon MailReader
5+
rails generate fetcher_daemon MailReader
66

77
This will create:
88
/config/mail_reader_fetcher.yml
99
/script/mail_reader_fetcher
10-
/lib/daemon.rb
10+
/lib/daemon.rb
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
require 'rails/generators'
22

3-
class FetcherDaemonGenerator < Rails::Generators::NamedBase
4-
source_root File.join(File.dirname(__FILE__), '../../../generators/fetcher_daemon', 'templates')
5-
6-
def create_fetcher_daemon
7-
copy_file('daemon.rb', "lib/daemon.rb")
8-
template('config.yml', File.join('config', "#{file_name}.yml"))
9-
template('daemon', File.join('script', "#{file_name}_fetcher"))
10-
chmod(File.join("script", "#{file_name}_fetcher"), 0755)
3+
module Fetcher
4+
class DaemonGenerator < Rails::Generators::NamedBase
5+
source_root File.expand_path('../templates', __FILE__)
6+
7+
def create_fetcher_daemon
8+
copy_file('daemon.rb', "lib/daemon.rb")
9+
template('config.yml', File.join('config', "#{file_name}.yml"))
10+
template('daemon', File.join('script', "#{file_name}_fetcher"))
11+
chmod(File.join("script", "#{file_name}_fetcher"), 0755)
12+
end
1113
end
1214
end
File renamed without changes.

0 commit comments

Comments
 (0)