@@ -126,6 +126,21 @@ module SproutCore @args.first || default_base_class_name end + # Checks whether the proper file structure exists to generate files + def file_structure_exists? + has_path_and_filename? && target_directory_exists? + end + + # Checks whether the target directory for a generated file exists + def target_directory_exists? + File.exists?("#{Dir.pwd}/clients/#{File.dirname(args[0])}") + end + + # Checks that file generation was in the format client_name/file_name + def has_path_and_filename? + !(File.dirname(args[0]) == '.') + end + ################### # Borrowed from Rails NamedBase lib/sproutcore/generator_helper.rb @@ -10,7 +10,7 @@ class ControllerGenerator < RubiGen::Base def initialize(runtime_args, runtime_options = {}) super - usage if args.empty? + usage if args.empty? || !file_structure_exists? @name = args.shift extract_options assign_names!(@name) sc_generators/controller/controller_generator.rb @@ -10,7 +10,7 @@ class ModelGenerator < RubiGen::Base def initialize(runtime_args, runtime_options = {}) super - usage if args.empty? + usage if args.empty? || !file_structure_exists? @name = args.shift extract_options assign_names!(@name) sc_generators/model/model_generator.rb @@ -10,7 +10,7 @@ class TestGenerator < RubiGen::Base def initialize(runtime_args, runtime_options = {}) super - usage if args.empty? + usage if args.empty? || !file_structure_exists? @name = args.shift extract_options assign_names!(@name) sc_generators/test/test_generator.rb @@ -10,7 +10,7 @@ class ViewGenerator < RubiGen::Base def initialize(runtime_args, runtime_options = {}) super - usage if args.empty? + usage if args.empty? || !file_structure_exists? @name = args.shift extract_options assign_names!(@name) sc_generators/view/view_generator.rb 2175b7598d89bc67a5350d5764e946a6df39d968 Trek Glowacki trek.glowacki@gmail.com http://github.com/sproutit/sproutcore-buildtools/commit/06deaf93482b2ea6f3acaa45cc09c6a9a4b70e02 06deaf93482b2ea6f3acaa45cc09c6a9a4b70e02 2008-09-30T04:35:09-07:00 2008-08-15T14:03:54-07:00 Print USAGE file when sc-gen is used for model, controller, test, or view and the desired file isn't in the format client_name/file_name. E.g. sc-gen model foo # prints usage file sc-gen model todos/foo # generates file if client "todos" exists 7eb7e97592897fb13768ac5731defb3bebb34074 Erich Ocean erich@atlasocean.com