Skip to content

Commit

Permalink
Make rubigen a development dependency (closes #7)
Browse files Browse the repository at this point in the history
  • Loading branch information
kennethkalmer committed Jan 5, 2010
1 parent 68931c5 commit d9b985d
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 6 deletions.
11 changes: 10 additions & 1 deletion README.rdoc
Expand Up @@ -66,10 +66,17 @@ The ruote[http://openwfe.rubyforge.org] remote participant generator speeds up t

== Requirements

* Ruby 1.8.6
* Ruby 1.8.6 or later (developed on 1.9.1)
* rubigen[http://gemcutter.org/gems/rubigen] (only on your development machine)
* eventmachine-0.12.8[http://rubyeventmachine.com]
* rspec (for writing/running your specs)

=== Rubigen ===

Rubigen requires ActiveSupport 2.2.2 or later, which makes it impossible to use daemon-kit in older Rails projects. You need to install rubigen on your development machine to use the generators provided by daemon-kit.

Rubigen is not required for the regular running of a daemon and is thus a development dependency.

== Generator Requirements

Depending on the generator you choose for your daemon, it might require additional gems to run.
Expand All @@ -92,6 +99,8 @@ Stable versions, when released are available directly from Gemcutter:

$ gem install daemon-kit

Please see the notes Rubigen earlier in this document.

== Further reading

* Configuration.txt
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -16,7 +16,7 @@ begin
gemspec.extra_rdoc_files.include '*.txt'

gemspec.add_dependency 'eventmachine', '>=0.12.8'
gemspec.add_dependency 'rubigen', '>=1.5.2'
gemspec.add_development_dependency 'rubigen', '>=1.5.2'
gemspec.add_development_dependency 'rspec'
gemspec.add_development_dependency 'cucumber'
end
Expand Down
16 changes: 14 additions & 2 deletions app_generators/daemon_kit/templates/script/generate
Expand Up @@ -4,8 +4,20 @@ APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
begin
require 'rubigen'
rescue LoadError
require 'rubygems'
require 'rubigen'
begin
require 'rubygems'
require 'rubigen'
rescue LoadError
$stderr.puts <<EOF
The daemon-kit generators requires the 'rubigen' gem to be installed. Please run
`gem install rubigen` first and then try again.
Thank you for choosing daemon-kit !
EOF
exit 1
end
end
require 'rubigen/scripts/generate'

Expand Down
15 changes: 14 additions & 1 deletion bin/daemon-kit
@@ -1,7 +1,20 @@
#!/usr/bin/env ruby

require 'rubygems'
require 'rubigen'

begin
require 'rubigen'
rescue LoadError
$stderr.puts <<EOF
The daemon-kit generator requires the 'rubigen' gem to be installed. Please run
`gem install rubigen` first and then try again.
Thank you for choosing daemon-kit !
EOF
exit 1
end

if %w(-v --version).include? ARGV.first
require 'daemon_kit'
Expand Down
2 changes: 1 addition & 1 deletion lib/daemon_kit.rb
Expand Up @@ -13,7 +13,7 @@
$:.include?( File.dirname(__FILE__).to_absolute_path )

module DaemonKit
VERSION = '0.1.7.12'
VERSION = '0.1.8pre'

autoload :Initializer, 'daemon_kit/initializer'
autoload :Application, 'daemon_kit/application'
Expand Down

0 comments on commit d9b985d

Please sign in to comment.