gistfile1.sh

umbra:www.portionator.dev ted$ merb-gen app ./
Generating with app generator:
 [IDENTICAL]  spec
     [ADDED]  tasks/merb.thor
  [CONFLICT]  .gitignore
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
1
Skipped file
     [ADDED]  public/.htaccess
     [ADDED]  tasks/doc.thor
     [ADDED]  public/javascripts/jquery.js
     [ADDED]  doc/rdoc/generators/merb_generator.rb
     [ADDED]  doc/rdoc/generators/template/merb/api_grease.js
     [ADDED]  doc/rdoc/generators/template/merb/index.html.erb
     [ADDED]  doc/rdoc/generators/template/merb/merb.css
     [ADDED]  doc/rdoc/generators/template/merb/merb.rb
     [ADDED]  doc/rdoc/generators/template/merb/merb_doc_styles.css
     [ADDED]  doc/rdoc/generators/template/merb/prototype.js
     [ADDED]  public/favicon.ico
 [IDENTICAL]  public/images/merb.jpg
 [IDENTICAL]  public/merb.fcgi
     [ADDED]  public/robots.txt
 [IDENTICAL]  gems
  [CONFLICT]  Rakefile
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
 [IDENTICAL]  app/controllers/application.rb
 [IDENTICAL]  app/controllers/exceptions.rb
 [IDENTICAL]  app/helpers/global_helpers.rb
  [CONFLICT]  app/models/user.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
3
Rendering app/models/user.rb

   1:  # This is a default user class used to activate merb-auth.  Feel free to change from a User to 
   2:  # Some other class, or to remove it altogether.  If removed, merb-auth may not work by default.
   3:  #
   4:  # Don't forget that by default the salted_user mixin is used from merb-more
   5:  # You'll need to setup your db as per the salted_user mixin, and you'll need
   6:  # To use :password, and :password_confirmation when creating a user
   7:  #
   8:  # see config/merb-auth/setup.rb to see how to disable the salted_user mixin
   9:  # 
  10:  # You will need to setup your database and create a user.
  11:  class User
  12:    include DataMapper::Resource
  13:    
  14:    property :id,     Serial
  15:    property :login,  String
  16:    
  17:  end


1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
1
Skipped file
 [IDENTICAL]  app/views/exceptions/internal_server_error.html.erb
  [CONFLICT]  app/views/exceptions/not_acceptable.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  app/views/exceptions/not_found.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
 [IDENTICAL]  autotest/discover.rb
 [IDENTICAL]  autotest/merb.rb
 [IDENTICAL]  autotest/merb_rspec.rb
  [CONFLICT]  config/database.yml
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
1
Skipped file
     [ADDED]  config/dependencies.rb
  [CONFLICT]  config/environments/development.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  config/environments/production.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  config/environments/rake.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
     [ADDED]  config/environments/staging.rb
  [CONFLICT]  config/environments/test.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  config/init.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
 [IDENTICAL]  config/rack.rb
  [CONFLICT]  config/router.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
     [ADDED]  public/javascripts/application.js
 [IDENTICAL]  public/stylesheets/master.css
     [ADDED]  merb/merb-auth/setup.rb
     [ADDED]  merb/merb-auth/strategies.rb
     [ADDED]  merb/session/session.rb
  [CONFLICT]  app/views/layout/application.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
umbra:www.portionator.dev ted$