pantograph/lib/pantograph/new_action.rb in pantograph-0.1.17 vs pantograph/lib/pantograph/new_action.rb in pantograph-0.1.19

- old
+ new

@@ -6,26 +6,31 @@ generate_action(name) end def self.fetch_name puts("Must be lower case, and use a '_' between words. Do not use '.'".green) - puts("examples: 'testflight', 'upload_to_s3'".green) - name = UI.input("Name of your action: ") + puts("examples: 'gradle', 'upload_to_s3'".green) + name = UI.input('Name of your action: ') until name_valid?(name) - puts("Name is invalid. Please ensure the name is all lowercase, free of spaces and without special characters! Try again.") - name = UI.input("Name of your action: ") + puts('Name is invalid. Please ensure the name is all lowercase, free of spaces and without special characters! Try again.') + name = UI.input('Name of your action: ') end name end def self.generate_action(name) template = File.read("#{Pantograph::ROOT}/lib/assets/custom_action_template.rb") template.gsub!('[[NAME]]', name) template.gsub!('[[NAME_UP]]', name.upcase) template.gsub!('[[NAME_CLASS]]', name.pantograph_class + 'Action') - actions_path = File.join((PantographCore::PantographFolder.path || Dir.pwd), 'actions') + actions_path = if Dir.exist?('pantograph/lib/pantograph/actions') + File.join(Dir.pwd, 'pantograph/lib/pantograph/actions') + else + File.join((PantographCore::PantographFolder.path || Dir.pwd), 'actions') + end + FileUtils.mkdir_p(actions_path) unless File.directory?(actions_path) path = File.join(actions_path, "#{name}.rb") File.write(path, template) UI.success("Created new action file '#{path}'. Edit it to implement your custom action.") @@ -33,10 +38,10 @@ def self.check_action_name_from_args(new_action_name) if name_valid?(new_action_name) new_action_name else - puts("Name is invalid. Please ensure the name is all lowercase, free of spaces and without special characters! Try again.") + puts('Name is invalid. Please ensure the name is all lowercase, free of spaces and without special characters! Try again.') end end def self.name_valid?(name) name =~ /^[a-z0-9_]+$/