Permalink
Browse files

remove blank lines, change example

  • Loading branch information...
1 parent e3ef205 commit 48d63c836ce39dcb6776b5c72f5a5d7df5b941f6 @shime committed Apr 3, 2012
Showing with 2 additions and 22 deletions.
  1. +2 −4 railties/lib/rails/generators/actions.rb
  2. +0 −18 railties/lib/rails/generators/base.rb
@@ -171,13 +171,13 @@ def lib(filename, data=nil, &block)
# <<-TASK
# namespace :#{project} do
# task :bootstrap do
- # puts "i like boots!"
+ # puts "I like boots!"
# end
# end
# TASK
# end
#
- # rakefile("seed.rake", "puts i'm plantin ur seedz'")
+ # rakefile("seed.rake", "puts 'I\'m planting your seeds'")
#
def rakefile(filename, data=nil, &block)
log :rakefile, filename
@@ -276,7 +276,6 @@ def readme(path)
# Define log for backwards compatibility. If just one argument is sent,
# invoke say, otherwise invoke say_status. Differently from say and
# similarly to say_status, this method respects the quiet? option given.
- #
def log(*args)
if args.size == 1
say args.first.to_s unless options.quiet?
@@ -287,7 +286,6 @@ def log(*args)
end
# Add an extension to the given name based on the platform.
- #
def extify(name)
if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
"#{name}.bat"
@@ -22,15 +22,13 @@ class Base < Thor::Group
add_runtime_options!
# Returns the source root for this generator using default_source_root as default.
- #
def self.source_root(path=nil)
@_source_root = path if path
@_source_root ||= default_source_root
end
# Tries to get the description from a USAGE file one folder above the source
# root otherwise uses a default description.
- #
def self.desc(description=nil)
return super if description
@@ -44,15 +42,13 @@ def self.desc(description=nil)
# Convenience method to get the namespace from the class name. It's the
# same as Thor default except that the Generator at the end of the class
# is removed.
- #
def self.namespace(name=nil)
return super if name
@namespace ||= super.sub(/_generator$/, '').sub(/:generators:/, ':')
end
# Convenience method to hide this generator from the available ones when
# running rails generator command.
- #
def self.hide!
Rails::Generators.hide_namespace self.namespace
end
@@ -204,7 +200,6 @@ def self.remove_hook_for(*names)
end
# Make class option aware of Rails::Generators.options and Rails::Generators.aliases.
- #
def self.class_option(name, options={}) #:nodoc:
options[:desc] = "Indicates when to generate #{name.to_s.humanize.downcase}" unless options.key?(:desc)
options[:aliases] = default_aliases_for_option(name, options)
@@ -215,7 +210,6 @@ def self.class_option(name, options={}) #:nodoc:
# Returns the default source root for a given generator. This is used internally
# by rails to set its generators source root. If you want to customize your source
# root, you should use source_root.
- #
def self.default_source_root
return unless base_name && generator_name
return unless default_generator_root
@@ -225,14 +219,12 @@ def self.default_source_root
# Returns the base root for a common set of generators. This is used to dynamically
# guess the default source root.
- #
def self.base_root
File.dirname(__FILE__)
end
# Cache source root and add lib/generators/base/generator/templates to
# source paths.
- #
def self.inherited(base) #:nodoc:
super
@@ -256,7 +248,6 @@ def self.inherited(base) #:nodoc:
# Check whether the given class names are already taken by user
# application or Ruby on Rails.
- #
def class_collisions(*class_names) #:nodoc:
return unless behavior == :invoke
@@ -283,13 +274,11 @@ def class_collisions(*class_names) #:nodoc:
end
# Use Rails default banner.
- #
def self.banner
"rails generate #{namespace.sub(/^rails:/,'')} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]".gsub(/\s+/, ' ')
end
# Sets the base_name taking into account the current class namespace.
- #
def self.base_name
@base_name ||= begin
if base = name.to_s.split('::').first
@@ -300,7 +289,6 @@ def self.base_name
# Removes the namespaces and get the generator name. For example,
# Rails::Generators::ModelGenerator will return "model" as generator name.
- #
def self.generator_name
@generator_name ||= begin
if generator = name.to_s.split('::').last
@@ -312,20 +300,17 @@ def self.generator_name
# Return the default value for the option name given doing a lookup in
# Rails::Generators.options.
- #
def self.default_value_for_option(name, options)
default_for_option(Rails::Generators.options, name, options, options[:default])
end
# Return default aliases for the option name given doing a lookup in
# Rails::Generators.aliases.
- #
def self.default_aliases_for_option(name, options)
default_for_option(Rails::Generators.aliases, name, options, options[:aliases])
end
# Return default for the option name given doing a lookup in config.
- #
def self.default_for_option(config, name, options, default)
if generator_name and c = config[generator_name.to_sym] and c.key?(name)
c[name]
@@ -339,14 +324,12 @@ def self.default_for_option(config, name, options, default)
end
# Keep hooks configuration that are used on prepare_for_invocation.
- #
def self.hooks #:nodoc:
@hooks ||= from_superclass(:hooks, {})
end
# Prepare class invocation to search on Rails namespace if a previous
# added hook is being used.
- #
def self.prepare_for_invocation(name, value) #:nodoc:
return super unless value.is_a?(String) || value.is_a?(Symbol)
@@ -362,7 +345,6 @@ def self.prepare_for_invocation(name, value) #:nodoc:
# Small macro to add ruby as an option to the generator with proper
# default value plus an instance helper method called shebang.
- #
def self.add_shebang_option!
class_option :ruby, :type => :string, :aliases => "-r", :default => Thor::Util.ruby_command,
:desc => "Path to the Ruby binary of your choice", :banner => "PATH"

0 comments on commit 48d63c8

Please sign in to comment.