Skip to content

Remove type mismatched default value from generator options #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/generators/ember/adapter_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ class AdapterGenerator < ::Rails::Generators::NamedBase
source_root File.expand_path("../../templates", __FILE__)

desc "Creates a new Ember.js adapter"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_adapter_files
file_path = File.join(ember_path, 'adapters', class_path, "#{file_name}.#{engine_extension}")
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/bootstrap_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class BootstrapGenerator < ::Rails::Generators::Base

desc "Creates a default Ember.js folder layout in app/assets/javascripts"

class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :skip_git, :type => :boolean, :aliases => "-g", :default => false, :desc => "Skip Git keeps"
class_option :javascript_engine, :desc => "Engine for JavaScripts (js for JavaScript, coffee for CoffeeScript, etc)"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def inject_ember
begin
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/component_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ComponentGenerator < ::Rails::Generators::NamedBase
desc "Creates a new Ember.js component and component template\nCustom Ember Components require at least two descriptive names separated by a dash. Use CamelCase or dash-case to name your component.\n\nExample,\n\trails generate ember:component PostChart [options]\n\trails generate ember:component post-chart [options]"

class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_component_files
dashed_file_name = file_name.dasherize
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/controller_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class ControllerGenerator < ::Rails::Generators::NamedBase

class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :object, :type => :boolean, :default => false, :desc => "Create an Ember.Controller to represent a single object"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"


def create_controller_files
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/initializer_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class InitializerGenerator < ::Rails::Generators::NamedBase
desc "Creates a new Ember.js initializer"

class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_initializer_files
file_path = File.join(ember_path, 'initializers', class_path, "#{file_name.dasherize}.#{engine_extension}")
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/instance_initializer_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class InstanceInitializerGenerator < ::Rails::Generators::NamedBase
desc "Creates a new Ember.js instance initializer"

class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_instance_initializer_files
file_path = File.join(ember_path, 'instance-initializers', class_path, "#{file_name.dasherize}.#{engine_extension}")
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/model_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class ModelGenerator < ::Rails::Generators::NamedBase
desc "creates a new ember.js model"
argument :attributes, :type => :array, :default => [], :banner => "field[:type] field[:type] ..."
class_option :javascript_engine, :desc => "engine for javascripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_model_files
file_path = File.join(ember_path, 'models', class_path, "#{file_name.dasherize}.#{engine_extension}")
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/ember/resource_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ResourceGenerator < ::Rails::Generators::NamedBase
class_option :skip_route, :type => :boolean, :default => false, :desc => "Don't create route"
class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
class_option :object, :type => :boolean, :default => false, :desc => "Create an Ember.Controller to represent a single object"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"


def create_resource_files
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/resource_override.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ module Generators
ResourceGenerator.class_eval do

class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :with_template, :type => :boolean, :default => false, :desc => "Create template for this view"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def add_ember
say_status :invoke, "ember:model", :white
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/route_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ class RouteGenerator < ::Rails::Generators::NamedBase
source_root File.expand_path("../../templates", __FILE__)

desc "Creates a new Ember.js route"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_route_files
file_path = File.join(ember_path, 'routes', class_path, "#{file_name.dasherize}.#{engine_extension}")
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/service_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ServiceGenerator < ::Rails::Generators::NamedBase
desc "Creates a new Ember.js service"

class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_service_files
file_path = File.join(ember_path, 'services', class_path, "#{file_name.dasherize}.#{engine_extension}")
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/ember/template_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class TemplateGenerator < ::Rails::Generators::NamedBase

desc "Creates a new Ember.js template"
class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"

def create_template_files
file_path = File.join(ember_path, 'templates', class_path, "#{file_name.dasherize}.hbs")
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/ember/view_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class ViewGenerator < ::Rails::Generators::NamedBase

desc "Creates a new Ember.js view and associated Handlebars template"
class_option :javascript_engine, :desc => "Engine for JavaScripts"
class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
class_option :ember_path, :type => :string, :aliases => "-d", :desc => "Custom ember app path"
class_option :with_template, :type => :boolean, :default => false, :desc => "Create template for this view"
class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
class_option :app_name, :type => :string, :aliases => "-n", :desc => "Custom ember app name"

def create_view_files
file_path = File.join(ember_path, 'views', class_path, "#{file_name.dasherize}.#{engine_extension}")
Expand Down