From 5bc6da93da362e1ecb65d6d4219bd8248ee6adbd Mon Sep 17 00:00:00 2001 From: Kenneth Kalmer Date: Thu, 11 Jun 2009 00:36:55 +0200 Subject: [PATCH] Re-organized rspec generators --- Manifest.txt | 12 ++++++------ .../daemon_kit/daemon_kit_generator.rb | 5 +---- .../daemon_kit/templates/script/generate | 2 +- bin/daemon_kit | 3 +-- .../rspec}/USAGE | 0 .../rspec/rspec_generator.rb | 16 +++++++--------- .../rspec}/templates/spec.rb | 0 .../rspec}/templates/spec/spec.opts | 0 .../rspec}/templates/spec/spec_helper.rb | 1 - .../rspec}/templates/tasks/rspec.rake | 0 10 files changed, 16 insertions(+), 23 deletions(-) rename {rubygems_generators/install_rspec => daemon_generators/rspec}/USAGE (100%) rename rubygems_generators/install_rspec/install_rspec_generator.rb => daemon_generators/rspec/rspec_generator.rb (91%) rename {rubygems_generators/install_rspec => daemon_generators/rspec}/templates/spec.rb (100%) rename {rubygems_generators/install_rspec => daemon_generators/rspec}/templates/spec/spec.opts (100%) rename {rubygems_generators/install_rspec => daemon_generators/rspec}/templates/spec/spec_helper.rb (94%) rename {rubygems_generators/install_rspec => daemon_generators/rspec}/templates/tasks/rspec.rake (100%) diff --git a/Manifest.txt b/Manifest.txt index 0271541..a659d52 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -53,6 +53,12 @@ daemon_generators/nanite_agent/templates/config/initializers/nanite_agent.rb daemon_generators/nanite_agent/templates/config/nanite.yml daemon_generators/nanite_agent/templates/lib/actors/sample.rb daemon_generators/nanite_agent/templates/libexec/daemon.rb +daemon_generators/rspec/USAGE +daemon_generators/rspec/rspec_generator.rb +daemon_generators/rspec/templates/spec.rb +daemon_generators/rspec/templates/spec/spec.opts +daemon_generators/rspec/templates/spec/spec_helper.rb +daemon_generators/rspec/templates/tasks/rspec.rake lib/daemon_kit.rb lib/daemon_kit/abstract_logger.rb lib/daemon_kit/amqp.rb @@ -80,12 +86,6 @@ lib/daemon_kit/tasks/framework.rake lib/daemon_kit/tasks/god.rake lib/daemon_kit/tasks/log.rake lib/daemon_kit/tasks/monit.rake -rubygems_generators/install_rspec/USAGE -rubygems_generators/install_rspec/install_rspec_generator.rb -rubygems_generators/install_rspec/templates/spec.rb -rubygems_generators/install_rspec/templates/spec/spec.opts -rubygems_generators/install_rspec/templates/spec/spec_helper.rb -rubygems_generators/install_rspec/templates/tasks/rspec.rake script/console script/destroy script/generate diff --git a/app_generators/daemon_kit/daemon_kit_generator.rb b/app_generators/daemon_kit/daemon_kit_generator.rb index d70fca3..e7df9a9 100644 --- a/app_generators/daemon_kit/daemon_kit_generator.rb +++ b/app_generators/daemon_kit/daemon_kit_generator.rb @@ -87,7 +87,7 @@ def manifest m.directory "tasks" # Tests - m.dependency "install_rspec", [daemon_name], :destination => destination_root, :collision => :force + m.dependency "rspec", [daemon_name], :destination => destination_root, :collision => :force # Deployers unless deployer == 'none' @@ -98,9 +98,6 @@ def manifest m.directory "log" m.directory "tmp" m.directory "vendor" - - m.dependency "install_rubigen_scripts", [destination_root, 'daemon_kit'], - :shebang => options[:shebang], :collision => :force end end diff --git a/app_generators/daemon_kit/templates/script/generate b/app_generators/daemon_kit/templates/script/generate index ba74ed8..0866e2a 100755 --- a/app_generators/daemon_kit/templates/script/generate +++ b/app_generators/daemon_kit/templates/script/generate @@ -10,5 +10,5 @@ end require 'rubigen/scripts/generate' ARGV.shift if ['--help', '-h'].include?(ARGV[0]) -RubiGen::Base.use_component_sources! [:daemon, :test_unit] +RubiGen::Base.use_component_sources! [:daemon] RubiGen::Scripts::Generate.new.run(ARGV) diff --git a/bin/daemon_kit b/bin/daemon_kit index 474673c..72faf8e 100755 --- a/bin/daemon_kit +++ b/bin/daemon_kit @@ -13,7 +13,6 @@ require 'rubigen/scripts/generate' RubiGen::Base.use_application_sources! :rubygems RubiGen::Base.prepend_sources(*[ RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "app_generators")), - RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "daemon_generators")), - RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "rubygems_generators")) + RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "daemon_generators")) ]) RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'daemon_kit') diff --git a/rubygems_generators/install_rspec/USAGE b/daemon_generators/rspec/USAGE similarity index 100% rename from rubygems_generators/install_rspec/USAGE rename to daemon_generators/rspec/USAGE diff --git a/rubygems_generators/install_rspec/install_rspec_generator.rb b/daemon_generators/rspec/rspec_generator.rb similarity index 91% rename from rubygems_generators/install_rspec/install_rspec_generator.rb rename to daemon_generators/rspec/rspec_generator.rb index 52a7bda..b5656a4 100644 --- a/rubygems_generators/install_rspec/install_rspec_generator.rb +++ b/daemon_generators/rspec/rspec_generator.rb @@ -1,10 +1,8 @@ -class InstallRspecGenerator < RubiGen::Base - - default_options :author => nil - +class RspecGenerator < RubiGen::Base + attr_reader :gem_name, :module_name - + def initialize(runtime_args, runtime_options = {}) super @destination_root = File.expand_path(destination_root) @@ -20,7 +18,7 @@ def manifest m.directory 'tasks' m.template 'spec.rb', "spec/#{gem_name}_spec.rb" - + m.template_copy_each %w( spec.opts spec_helper.rb ), 'spec' m.file_copy_each %w( rspec.rake ), 'tasks' end @@ -29,7 +27,7 @@ def manifest protected def banner <<-EOS -Install rspec BDD testing support. +Install rspec BDD testing support. Includes a rake task (tasks/rspec.rake) to be loaded by the root Rakefile, which provides a "spec" task. @@ -47,11 +45,11 @@ def add_options!(opts) # "Some comment about this option", # "Default: none") { |x| options[:author] = x } end - + def extract_options # for each option, extract it into a local variable (and create an "attr_reader :author" at the top) # Templates can access these value via the attr_reader-generated methods, but not the # raw instance variable value. # @author = options[:author] end -end \ No newline at end of file +end diff --git a/rubygems_generators/install_rspec/templates/spec.rb b/daemon_generators/rspec/templates/spec.rb similarity index 100% rename from rubygems_generators/install_rspec/templates/spec.rb rename to daemon_generators/rspec/templates/spec.rb diff --git a/rubygems_generators/install_rspec/templates/spec/spec.opts b/daemon_generators/rspec/templates/spec/spec.opts similarity index 100% rename from rubygems_generators/install_rspec/templates/spec/spec.opts rename to daemon_generators/rspec/templates/spec/spec.opts diff --git a/rubygems_generators/install_rspec/templates/spec/spec_helper.rb b/daemon_generators/rspec/templates/spec/spec_helper.rb similarity index 94% rename from rubygems_generators/install_rspec/templates/spec/spec_helper.rb rename to daemon_generators/rspec/templates/spec/spec_helper.rb index df06e85..4a6e3ca 100644 --- a/rubygems_generators/install_rspec/templates/spec/spec_helper.rb +++ b/daemon_generators/rspec/templates/spec/spec_helper.rb @@ -8,7 +8,6 @@ require File.dirname(__FILE__) + '/../config/environment' DaemonKit::Application.running! -require '<%= gem_name %>' Spec::Runner.configure do |config| # == Mock Framework diff --git a/rubygems_generators/install_rspec/templates/tasks/rspec.rake b/daemon_generators/rspec/templates/tasks/rspec.rake similarity index 100% rename from rubygems_generators/install_rspec/templates/tasks/rspec.rake rename to daemon_generators/rspec/templates/tasks/rspec.rake