lib/padrino-gen/generators/app.rb in padrino-gen-0.10.7 vs lib/padrino-gen/generators/app.rb in padrino-gen-0.11.0

@@ -17,42 +17,42 @@
       # Include related modules
       include Thor::Actions
       include Padrino::Generators::Actions
 
       desc "Description:\n\n\tpadrino-gen app generates a new Padrino application"
+      argument     :name,      :desc => 'The name of your padrino application'
+      class_option :root,      :desc => 'The root destination',                   :aliases => '-r', :default => '.',   :type => :string
+      class_option :destroy,                                                      :aliases => '-d', :default => false, :type => :boolean
+      class_option :tiny,      :desc => 'Generate tiny app skeleton',             :aliases => '-i', :default => false, :type => :boolean
+      class_option :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',    :type => :string
 
-      argument :name, :desc => "The name of your padrino application"
-
-      class_option :root,    :desc => "The root destination",       :aliases => '-r', :default => ".",   :type => :string
-      class_option :destroy,                                        :aliases => '-d', :default => false, :type => :boolean
-      class_option :tiny,    :desc => "Generate tiny app skeleton", :aliases => '-i', :default => false, :type => :boolean
-
       # Show help if no argv given
       require_arguments!
 
       # Copies over the Padrino base admin application
       #
       # @api private
       def create_app
         self.destination_root = options[:root]
-        @app_name = name.gsub(/\W/, "_").underscore.camelize
+        @app_folder = name.gsub(/\W/, '_').underscore
+        @app_name   = name.gsub(/\W/, '_').underscore.camelize
         if in_app_root?
+          @project_name = options[:namespace].underscore.camelize
+          @project_name = fetch_project_name(@app_folder) if @project_name.empty?
           self.behavior = :revoke if options[:destroy]
-          app_skeleton(@app_name.downcase, options[:tiny])
-          empty_directory destination_root("public/#{@app_name.downcase}")
-          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"#{@app_name}\").to(\"/#{@app_name.downcase}\")"
+          app_skeleton(@app_folder.downcase, options[:tiny])
+          empty_directory destination_root("public/#{@app_folder.downcase}")
+          append_file destination_root('config/apps.rb'), "\nPadrino.mount('#{@project_name}::#{@app_name}', :app_file => Padrino.root('#{@app_folder.downcase}/app.rb')).to('/#{@app_folder.downcase}')"
 
           return if self.behavior == :revoke
           say
-          say "="*65, :green
+          say '=' * 65, :green
           say "Your #{@app_name} application has been installed."
-          say "="*65, :green
+          say '='*65, :green
           say "This application has been mounted to /#{@app_name.downcase}"
-          say "You can configure a different path by editing 'config/apps.rb"
-          say "="*65, :green
-          say
+          say "You can configure a different path by editing 'config/apps.rb'"
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end # App
   end # Generators
 end # Padrino