frankly 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f8bd4c6d54dc267c2c76c3acda425e4d9e43e7278cdacd11e35c379723a0ce2
-  data.tar.gz: 9a214222eda89b2edd17e1650a1b2213fba965a337cc2fa09e7991250d5afa2b
+  metadata.gz: 256f2dbb88d9b111151d44696cb90572e4038079e48636bac595b987ba9cd6d5
+  data.tar.gz: 6b4901cee23b0c43d7ff1d7e7f719f6b38f71a1e000dce72ea4cec06429b2d8f
 SHA512:
-  metadata.gz: d9a73f8401b3064f1d5be7cbb23f6d006e1691e177aca6af482325beaaacdc9c0802dce722d32ba9a6d8083d448a3c114c8821a23c54703b407be9929f42753d
-  data.tar.gz: ed096de42c3d010a099dfd636897c313d4d47624a93a0549f9c3296dd6a393ee338b4c8963e4c06b63c4afe824251918fd83326179db9ba48b311c4109119d96
+  metadata.gz: 4d3fad1677f0a62c1d0405c92dcc95823413aa5ccbc77c4bac20e21a8feca788bc8c124705720fa8139ebf453eac7482ed82bae79a0278fd01f74262afb5172f
+  data.tar.gz: 26cb2665936482d1aef4088ef689344baa4b1f7ef3818da98fa2cd2f2d1e98ba4144d92c5fc3c6187e24c39257cd0ffec938cec9d7b96570010cbf53a59d54d8

data/README.md

@@ -1,35 +1,69 @@
 # Frankly
-![Build Status](https://travis-ci.org/kenrett/frankly.svg?branch=master)
 
-An opinionated sinatra app skeleton generator with Rake tasks, rspec, postgres, pry and more!
+`frankly` is a Sinatra starter generator.
+
+It creates a PostgreSQL + ActiveRecord app scaffold with a modern Sinatra setup.
+
+## Requirements
+
+- Ruby 3.1+
+- PostgreSQL
+- Bundler
 
 ## Installation
 
-Type this into the command line:
+```sh
+gem install frankly
+```
 
+## Usage
+
+Generate a new app:
+
+```sh
+frankly my_app
 ```
-gem install frankly
+
+### Options
+
+```sh
+frankly my_app --bundle
+frankly my_app --skip-git
 ```
 
-## Dependency
+- `--bundle`: runs `bundle install` in the generated app
+- `--skip-git`: skips `git init`
 
-Frankly is dependent on using postgres as your database. If you don't have it installed, please check out this great blogpost for [OSX](https://launchschool.com/blog/how-to-install-postgresql-on-a-mac) or [Linux](https://launchschool.com/blog/how-to-install-postgres-for-linux) from [LaunchSchool](https://launchschool.com/) on how to get set up!
+## Generated app quickstart
 
-## Usage
+```sh
+cd my_app
+bundle install
+bundle exec rackup
+```
 
-Simple type `frankly APP_NAME` and frankly will create a sinatra scaffold, git init, and bundle your application. Currently frankly does not support special characters or numbers in an `APP_NAME` but please feel free to make a Pull Request if you would like to contribute!
+Open http://localhost:9292.
 
-## Development
+## Development (this gem)
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```sh
+bin/setup
+bundle exec rspec
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Release
 
-## Contributing
+```sh
+bundle exec rake build
+bundle exec rake install
+bundle exec rake release
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/kenrett/frankly. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+## Contributing
 
+Issues and pull requests are welcome at:
+https://github.com/kenrett/frankly
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+MIT. See [LICENSE.txt](LICENSE.txt).

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup"
-require "frankly"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require_relative "../config/environment"
+
+begin
+  require "pry"
+  Pry.start
+rescue LoadError
+  require "irb"
+  IRB.start(__FILE__)
+end

data/frankly.gemspec

@@ -1,40 +1,33 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'frankly/version'
+require "frankly/version"
 
 Gem::Specification.new do |spec|
-  spec.name             = "frankly"
-  spec.version          = Frankly::VERSION
-  spec.authors          = ["Ken Rettberg"]
-  spec.email            = %q{kenrettberg@gmail.com}
-  spec.description      = %q{Setup a sinatra skeleton like a boss!}
-  spec.summary          = %q{An opinionated sinatra skeleton with Rake tasks, rspec, postgres, and more!}
-  spec.files            = `git ls-files`.split($/)
-  spec.homepage         = %q{https://github.com/kenrett/frankly}
-  spec.rubygems_version = %q{1.6.2}
-  spec.license          = "MIT"
-  spec.executables      = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files       = spec.files.grep(%r{^(spec)/})
-  spec.require_paths    = ["lib"]
+  spec.name = "frankly"
+  spec.version = Frankly::VERSION
+  spec.authors = ["Ken Rettberg"]
+  spec.email = ["kenrettberg@gmail.com"]
+
+  spec.summary = "Opinionated Sinatra app skeleton generator"
+  spec.description = "Generate a modern Sinatra + ActiveRecord starter app with sensible defaults."
+  spec.homepage = "https://github.com/kenrett/frankly"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.1"
 
-  spec.post_install_message = <<-PIC
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
 
-              .
-  .---------.'---.
-  '.       :    .'
-    '.  .:::  .' The Chairman
-      '.'::'.'    of the Board
-        '||'       has arrived.
-         ||
-         ||
-         ||
-     ---====---
-       PIC
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.start_with?("spec/") }
+  spec.bindir = "bin"
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-   spec.add_development_dependency "bundler", "~> 1.3"
-   spec.add_development_dependency "rake", "~> 10.0"
-   spec.add_development_dependency "rspec"
-   spec.add_development_dependency "pry-byebug", "~> 3.4"
+  spec.add_dependency "thor", "~> 1.3"
 
-   spec.add_runtime_dependency 'thor', '~> 0.19.1'
+  spec.add_development_dependency "bundler", ">= 2.4"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "pry-byebug", "~> 3.10"
 end

data/lib/frankly/cli.rb

@@ -1,66 +1,84 @@
-require 'pathname'
-require 'fileutils'
-require 'thor'
-require 'thor/group'
+# frozen_string_literal: true
+
+require "fileutils"
+require "pathname"
+require "thor"
+require "thor/group"
 
 module Frankly
   class CLI < Thor::Group
     include Thor::Actions
 
+    class_option :bundle, type: :boolean, default: false, desc: "Run bundle install after generation"
+    class_option :skip_git, type: :boolean, default: false, desc: "Skip git init"
+
+    desc "Creates a new Sinatra application"
+    argument :name, type: :string, desc: "The name of the new application"
+
     def self.source_root
-      File.expand_path('../../../templates', __FILE__)
+      File.expand_path("../../templates", __dir__)
     end
 
-    desc "Creates a new Sinatra application"
-    argument :name, :type => :string, :desc => "The name of the new application"
+    def self.exit_on_failure?
+      true
+    end
 
     def setup
-      @app_path = name.downcase.gsub(/[^a-z|\-|\_]/, '')
+      @app_path = sanitized_app_path
     end
 
     def create_app_scaffold
-      empty_directory "#{@app_path}/app"
-      create_file "#{@app_path}/app/models/.gitkeep"
+      raise Thor::Error, "Directory '#{@app_path}' already exists" if File.exist?(@app_path)
+
+      empty_directory @app_path
+      empty_directory "#{@app_path}/app/controllers"
+      empty_directory "#{@app_path}/app/helpers"
+      empty_directory "#{@app_path}/app/models"
+      empty_directory "#{@app_path}/db/migrate"
       create_file "#{@app_path}/app/controllers/.gitkeep"
-      create_file "#{@app_path}/app/views/.gitkeep"
       create_file "#{@app_path}/app/helpers/.gitkeep"
-      create_file "#{@app_path}/config/.gitkeep"
+      create_file "#{@app_path}/app/models/.gitkeep"
       create_file "#{@app_path}/db/migrate/.gitkeep"
-      create_file "#{@app_path}/public/css/.gitkeep"
-      create_file "#{@app_path}/public/js/.gitkeep"
     end
 
     def copy_templates
       copy_file "app/views/layout.erb", "#{@app_path}/app/views/layout.erb"
+      copy_file "app/views/index.erb", "#{@app_path}/app/views/index.erb"
+      copy_file "app.rb", "#{@app_path}/app.rb"
       copy_file "config.ru", "#{@app_path}/config.ru"
       copy_file "Rakefile", "#{@app_path}/Rakefile"
       copy_file "config/database.rb", "#{@app_path}/config/database.rb"
       copy_file "config/environment.rb", "#{@app_path}/config/environment.rb"
       copy_file "db/seeds.rb", "#{@app_path}/db/seeds.rb"
       copy_file "README.md", "#{@app_path}/README.md"
-      copy_file "Gemfile", "#{@app_path}/Gemfile"
+      template "Gemfile.tt", "#{@app_path}/Gemfile"
+      template "gitignore.tt", "#{@app_path}/.gitignore"
       copy_file "public/css/application.css", "#{@app_path}/public/css/application.css"
-      copy_file "public/css/normalize.css", "#{@app_path}/public/css/normalize.css"
       copy_file "public/js/application.js", "#{@app_path}/public/js/application.js"
       copy_file "public/favicon.ico", "#{@app_path}/public/favicon.ico"
     end
 
     def initialize_git_repo
-      puts "about to run git init"
-      inside(@app_path) do
-        run('git init .')
-      end
+      return if options[:skip_git]
+
+      inside(@app_path) { run("git init .") }
     end
 
     def install_dependencies
-      puts "installing dependencies"
-      inside(@app_path) do
-        run('bundle')
-      end
+      return unless options[:bundle]
+
+      inside(@app_path) { run("bundle install") }
+    end
+
+    private
+
+    def sanitized_app_path
+      cleaned = name.to_s.strip.downcase.gsub(/[^a-z0-9_-]/, "")
+      raise Thor::Error, "APP_NAME must include at least one letter or number" if cleaned.empty?
+
+      cleaned
     end
   end
 end
 
-if __FILE__ == $0
-  cli = Frankly::CLI.start
-end
+Frankly::CLI.start if $PROGRAM_NAME == __FILE__

data/lib/frankly/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Frankly
-  VERSION = "0.1.6"
+  VERSION = "0.2.1"
 end

data/templates/Gemfile.tt

@@ -1,28 +1,23 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# PostgreSQL driver
-gem 'pg'
+ruby ">= 3.1"
 
-# Sinatra driver
-gem 'sinatra', '~> 1.0'
-gem 'sinatra-contrib'
+gem "sinatra", "~> 3.1"
+gem "sinatra-activerecord", "~> 2.0"
+gem "sinatra-contrib", "~> 3.1"
+gem "ostruct"
+gem "pg", "~> 1.5"
+gem "puma", "~> 6.0"
+gem "rake", "~> 13.0"
 
-gem 'activesupport', '~>5.2'
-gem 'activerecord', '~>5.2'
-
-gem 'rake'
-
-gem 'shotgun', '~>0.9.1'
-
-group :test do
-  gem 'shoulda-matchers'
-  gem 'rack-test'
-  gem 'rspec', '~>3.0'
-  gem 'capybara'
+group :development do
+  gem "pry-byebug", "~> 3.10"
+  gem "rerun", "~> 0.14"
 end
 
-group :test, :development do
-  gem 'factory_girl'
-  gem 'faker'
-  gem 'pry-byebug'
+group :test do
+  gem "capybara", "~> 3.40"
+  gem "rack-test", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "shoulda-matchers", "~> 6.4"
 end

data/templates/README.md

@@ -1,30 +1,48 @@
-> **Note**: This branch (master) contains a skeleton without any app code, perfect for creating a _new_ application or challenge. If you're looking for an example app built with this skeleton, take a look at the [example](/../..//tree/example) branch which includes basic CRUD and RSpec tests.
+# Sinatra App
 
-### Purpose
-The Sinatra Skeleton:
+Generated by `frankly`.
 
-1. Provides a foundation for building challenges or creating a new Sinatra application.
-2. Demonstrates a reasonable set of practices around building Sinatra applications.
-3. Eases the transition to Rails for Dev Bootcamp students
+## Requirements
 
-### Quickstart
+- Ruby 3.1+
+- PostgreSQL
+- Bundler
 
-1.  `bundle install`
-2.  `shotgun config.ru`
-
-As needed, create models & migrations with the `rake` tasks:
+## Quickstart
 
+```sh
+bundle install
+bundle exec rackup
 ```
-rake generate:migration  # Create an empty migration in db/migrate, e.g., rake generate:migration NAME=create_tasks
-rake generate:model      # Create an empty model in app/models, e.g., rake generate:model NAME=User
+
+Open http://localhost:9292.
+
+## Development reload
+
+```sh
+bundle exec rerun -- rackup
 ```
 
-### Contributing
+## Database
+
+The template uses PostgreSQL via ActiveRecord.
 
-We would love for you to help make the skeleton more awesome, There are three ways to contribute:
+Environment variables:
 
-1. Ask for a bug fix or enhancement!
-2. Submit a pull request for a bug fix or enhancement!
-3. Code review an open pull request!
+- `RACK_ENV` (default: `development`)
+- `DATABASE_URL` (default: `postgres://localhost/<app_name>_<rack_env>`)
 
-Be prepared to give and receive specific, actionable, and kind feedback!
+Examples:
+
+```sh
+RACK_ENV=test bundle exec rake spec
+DATABASE_URL=postgres://localhost/my_app_development bundle exec rackup
+```
+
+## Common tasks
+
+```sh
+bundle exec rake spec
+bundle exec rake db:migrate
+bundle exec rake db:rollback
+```

data/templates/Rakefile

@@ -1,154 +1,190 @@
-require 'rake'
+# frozen_string_literal: true
 
-require ::File.expand_path('../config/environment', __FILE__)
+require "bundler/setup"
+require "fileutils"
+require "active_support/inflector"
 
-# Include all of ActiveSupport's core class extensions, e.g., String#camelize
-require 'active_support/core_ext'
+unless defined?(Rails)
+  module Rails
+    class AppConfig
+      def load_database_yaml
+        {}
+      end
 
-namespace :generate do
-  desc "Create an empty model in app/models, e.g., rake generate:model NAME=User"
-  task :model do
-    unless ENV.has_key?('NAME')
-      raise "Must specificy model name, e.g., rake generate:model NAME=User"
+      def paths
+        { "db" => ["db"] }
+      end
     end
 
-    model_name     = ENV['NAME'].camelize
-    model_filename = ENV['NAME'].underscore + '.rb'
-    model_path = APP_ROOT.join('app', 'models', model_filename)
+    class AppShim
+      def config
+        @config ||= AppConfig.new
+      end
 
-    if File.exist?(model_path)
-      raise "ERROR: Model file '#{model_path}' already exists"
-    end
+      def paths
+        { "db/migrate" => ["db/migrate"] }
+      end
 
-    puts "Creating #{model_path}"
-    File.open(model_path, 'w+') do |f|
-      f.write(<<-EOF.strip_heredoc)
-        class #{model_name} < ActiveRecord::Base
-          # Remember to create a migration!
-        end
-      EOF
+      def migration_railties
+        []
+      end
     end
-  end
 
-  desc "Create an empty migration in db/migrate, e.g., rake generate:migration NAME=create_tasks"
-  task :migration do
-    unless ENV.has_key?('NAME')
-      raise "Must specificy migration name, e.g., rake generate:migration NAME=create_tasks"
-    end
+    module_function
 
-    name     = ENV['NAME'].camelize
-    filename = "%s_%s.rb" % [Time.now.strftime('%Y%m%d%H%M%S'), ENV['NAME'].underscore]
-    path     = APP_ROOT.join('db', 'migrate', filename)
+    def env
+      ENV.fetch("RACK_ENV", "development")
+    end
 
-    if File.exist?(path)
-      raise "ERROR: File '#{path}' already exists"
+    def application
+      @application ||= AppShim.new
     end
 
-    puts "Creating #{path}"
-    File.open(path, 'w+') do |f|
-      f.write(<<-EOF.strip_heredoc)
-        class #{name} < ActiveRecord::Migration[5.2]
-          def change
-          end
-        end
-      EOF
+    def root
+      Dir.pwd
     end
   end
+end
 
-  desc "Create an empty model spec in spec, e.g., rake generate:spec NAME=user"
-  task :spec do
-    unless ENV.has_key?('NAME')
-      raise "Must specificy migration name, e.g., rake generate:spec NAME=user"
-    end
+require "sinatra/activerecord/rake"
+require_relative "app"
 
-    name     = ENV['NAME'].camelize
-    filename = "%s_spec.rb" % ENV['NAME'].underscore
-    path     = APP_ROOT.join('spec', filename)
+begin
+  require "rspec/core/rake_task"
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
 
-    if File.exist?(path)
-      raise "ERROR: File '#{path}' already exists"
-    end
+task default: :spec
 
-    puts "Creating #{path}"
-    File.open(path, 'w+') do |f|
-      f.write(<<-EOF.strip_heredoc)
-        require 'spec_helper'
-        describe #{name} do
-          pending "add some examples to (or delete) #{__FILE__}"
-        end
-      EOF
-    end
+if ARGV.first.to_s.start_with?("generate:")
+  ARGV[1..].to_a.each do |arg|
+    task(arg.to_sym) unless Rake::Task.task_defined?(arg)
   end
+end
 
+def positional_arg_for(task_name, index = 0)
+  tasks = Rake.application.top_level_tasks
+  position = tasks.index(task_name)
+  return nil unless position
+
+  tasks[position + 1 + index]
 end
 
-namespace :db do
-  desc "Drop, create, and migrate the database"
-  task :reset => [:drop, :create, :migrate]
+def positional_args_for(task_name, from_index: 0)
+  tasks = Rake.application.top_level_tasks
+  position = tasks.index(task_name)
+  return [] unless position
 
-  desc "Create the databases at #{DB_NAME}"
-  task :create do
-    puts "Creating development and test databases if they don't exist..."
-    system("createdb #{APP_NAME}_development && createdb #{APP_NAME}_test")
-  end
+  tasks[(position + 1 + from_index)..].to_a
+end
 
-  desc "Drop the database at #{DB_NAME}"
-  task :drop do
-    puts "Dropping development and test databases..."
-    system("dropdb #{APP_NAME}_development && dropdb #{APP_NAME}_test")
-  end
+namespace :generate do
+  desc "Generate a model Usage: rake generate:model User name:string age:integer"
+  task :model, [:name] do |_task, args|
+    model_name = args[:name].presence || positional_arg_for("generate:model")
+    model_name = model_name.to_s.strip
+    abort "Model name is required. Example: rake generate:model User" if model_name.empty?
 
-  desc "Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)."
-  task :migrate do
-    ActiveRecord::Migrator.migrations_paths << File.dirname(__FILE__) + 'db/migrate'
-    ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    if ActiveRecord.version.release() < Gem::Version.new('5.2.0')
-      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil) do |migration|
-        ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
-      end
+    class_name = model_name.camelize
+    file_name = model_name.underscore
+    model_path = File.join("app", "models", "#{file_name}.rb")
+
+    if File.exist?(model_path)
+      puts "Model exists: #{model_path}"
     else
-      ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrate
+      FileUtils.mkdir_p(File.dirname(model_path))
+      File.write(model_path, <<~RUBY)
+        # frozen_string_literal: true
+
+        class #{class_name} < ActiveRecord::Base
+        end
+      RUBY
+      puts "Created #{model_path}"
     end
-  end
 
-  desc "rollback your migration--use STEP=number to step back multiple times"
-  task :rollback do
-    step = (ENV['STEP'] || 1).to_i
-    ActiveRecord::Migrator.rollback('db/migrate', step)
-    Rake::Task['db:version'].invoke if Rake::Task['db:version']
-  end
+    attrs = positional_args_for("generate:model", from_index: 1).map(&:strip).reject(&:empty?)
+    next if attrs.empty?
+
+    migration_name = "create_#{class_name.tableize}"
+    migration_class = migration_name.camelize
+    timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
+    migration_path = File.join("db", "migrate", "#{timestamp}_#{migration_name}.rb")
+
+    columns = attrs.map do |attr|
+      column_name, column_type = attr.split(":", 2)
+      next if column_name.to_s.strip.empty? || column_type.to_s.strip.empty?
+      "      t.#{column_type} :#{column_name}"
+    end.compact
+
+    migration_version = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+    FileUtils.mkdir_p(File.dirname(migration_path))
+    File.write(migration_path, <<~RUBY)
+      class #{migration_class} < ActiveRecord::Migration[#{migration_version}]
+        def change
+          create_table :#{class_name.tableize} do |t|
+      #{columns.join("\n")}
+
+            t.timestamps
+          end
+        end
+      end
+    RUBY
 
-  desc "Populate the database with dummy data by running db/seeds.rb"
-  task :seed do
-    require APP_ROOT.join('db', 'seeds.rb')
+    puts "Created #{migration_path}"
   end
 
-  desc "Returns the current schema version number"
-  task :version do
-    puts "Current version: #{ActiveRecord::Migrator.current_version}"
-  end
+  desc "Generate a controller + index view Usage: rake generate:controller Users"
+  task :controller, [:name] do |_task, args|
+    controller_name = args[:name].presence || positional_arg_for("generate:controller")
+    controller_name = controller_name.to_s.strip
+    abort "Controller name is required. Example: rake generate:controller Users" if controller_name.empty?
 
-  namespace :test do
-    desc "Migrate test database"
-    task :prepare do
-      system "rake db:migrate RACK_ENV=test"
-    end
-  end
-end
+    base_name = controller_name.underscore
+    base_name = base_name.delete_suffix("_controller")
+    plural_name = base_name.pluralize
 
-desc 'Start PRY with application environment loaded'
-task "console" do
-  exec "pry -r./config/environment"
-end
+    controller_path = File.join("app", "controllers", "#{plural_name}_controller.rb")
+    view_dir = File.join("app", "views", plural_name)
+    view_path = File.join(view_dir, "index.erb")
 
+    if File.exist?(controller_path)
+      puts "Controller exists: #{controller_path}"
+    else
+      FileUtils.mkdir_p(File.dirname(controller_path))
+      File.write(controller_path, <<~RUBY)
+        # frozen_string_literal: true
 
-# In a production environment like Heroku, RSpec might not
-# be available.  To handle this, rescue the LoadError.
-# https://devcenter.heroku.com/articles/getting-started-with-ruby-o#runtime-dependencies-on-development-test-gems
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-end
+        class App < Sinatra::Base
+          get "/#{plural_name}" do
+            erb :\"#{plural_name}/index\"
+          end
+        end
+      RUBY
+      puts "Created #{controller_path}"
+    end
 
-task :default  => :spec
+    if File.exist?(view_path)
+      puts "View exists: #{view_path}"
+    else
+      FileUtils.mkdir_p(view_dir)
+      File.write(view_path, "<h1>#{plural_name.humanize}</h1>\n")
+      puts "Created #{view_path}"
+    end
+  end
+
+  desc "Generate model + controller Usage: rake generate:resource User name:string"
+  task :resource, [:name] do |_task, args|
+    resource_name = args[:name].presence || positional_arg_for("generate:resource")
+    resource_name = resource_name.to_s.strip
+    abort "Resource name is required. Example: rake generate:resource User" if resource_name.empty?
+
+    attrs = positional_args_for("generate:resource", from_index: 1).map(&:strip).reject(&:empty?)
+    original_tasks = Rake.application.top_level_tasks.dup
+    Rake.application.instance_variable_set(:@top_level_tasks, ["generate:model", resource_name, *attrs])
+    Rake::Task["generate:model"].invoke(resource_name)
+    Rake::Task["generate:controller"].invoke(resource_name.pluralize)
+  ensure
+    Rake.application.instance_variable_set(:@top_level_tasks, original_tasks) if defined?(original_tasks)
+  end
+end

data/templates/app/views/index.erb

@@ -0,0 +1,2 @@
+<h1>Frankly, it works.</h1>
+<p>Your Sinatra app "<strong><%= @app_name %></strong>" is up and running.</p>

data/templates/app/views/layout.erb

@@ -1,23 +1,15 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-  <!--
-    normalize.css removes cross-browser differences in defaults, e.g.,
-    differences in how form elements appear between Firefox and IE
-    See: http://necolas.github.com/normalize.css/
-  -->
-  <link rel="stylesheet" href="/css/normalize.css">
-  <!--
-    application.css is where you put your styles
-  -->
-  <link rel="stylesheet" href="/css/application.css">
-
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
-  <script src="/js/application.js"></script>
-
-  <title></title>
-</head>
-<body>
-  <%= yield %>
-</body>
+  <head>
+    <meta charset="utf-8">
+    <title><%= @app_name || "Sinatra App" %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="/css/application.css">
+  </head>
+  <body>
+    <main class="container">
+      <%= yield %>
+    </main>
+    <script src="/js/application.js"></script>
+  </body>
 </html>

data/templates/app.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "sinatra/base"
+require_relative "config/environment"
+
+class App < Sinatra::Base
+  configure do
+    set :root, APP_ROOT.to_s
+    set :public_folder, APP_ROOT.join("public").to_s
+    set :views, APP_ROOT.join("app", "views").to_s
+  end
+
+  configure :development do
+    register Sinatra::Reloader
+  end
+
+  get "/" do
+    @app_name = APP_NAME
+    erb :index
+  end
+
+  run! if app_file == $PROGRAM_NAME
+end

data/templates/config/database.rb

@@ -1,42 +1,32 @@
-# Log queries to STDOUT in development
-if Sinatra::Application.development?
-  ActiveRecord::Base.logger = Logger.new(STDOUT)
-end
+# frozen_string_literal: true
 
-# Automatically load every file in APP_ROOT/app/models/*.rb, e.g.,
-#   autoload "Person", 'app/models/person.rb'
-#
-# We have to do this in case we have models that inherit from each other.
-# If model Student inherits from model Person and app/models/student.rb is
-# required first, it will throw an error saying "Person" is undefined.
-#
-# With this lazy-loading technique, Ruby will try to load app/models/person.rb
-# the first time it sees "Person" and will only throw an exception if
-# that file doesn't define the Person class.
-#
-# See http://www.rubyinside.com/ruby-techniques-revealed-autoload-1652.html
-Dir[APP_ROOT.join('app', 'models', '*.rb')].each do |model_file|
-  filename = File.basename(model_file).gsub('.rb', '')
-  autoload ActiveSupport::Inflector.camelize(filename), model_file
-end
+require "logger"
+require "uri"
 
-# Heroku controls what database we connect to by setting the DATABASE_URL environment variable
-# We need to respect that if we want our Sinatra apps to run on Heroku without modification
-db = URI.parse(ENV['DATABASE_URL'] || "postgres://localhost/#{APP_NAME}_#{Sinatra::Application.environment}")
+rack_env = ENV.fetch("RACK_ENV", "development")
+ActiveRecord::Base.logger = Logger.new($stdout) if rack_env == "development"
 
-DB_NAME = db.path[1..-1]
+build_db_config = lambda do |env_name|
+  database_url = ENV.fetch("DATABASE_URL", "postgres://localhost/#{APP_NAME}_#{env_name}")
+  uri = URI.parse(database_url)
+  database_name = uri.path.sub(%r{^/}, "")
+  adapter = uri.scheme == "postgres" ? "postgresql" : uri.scheme
+
+  {
+    adapter: adapter,
+    host: uri.host,
+    port: uri.port,
+    username: uri.user,
+    password: uri.password,
+    database: database_name,
+    encoding: "utf8"
+  }.compact
+end
 
-# Note:
-#   Sinatra::Application.environment is set to the value of ENV['RACK_ENV']
-#   if ENV['RACK_ENV'] is set.  If ENV['RACK_ENV'] is not set, it defaults
-#   to :development
+ActiveRecord::Base.configurations = {
+  "development" => build_db_config.call("development"),
+  "test" => build_db_config.call("test"),
+  "production" => build_db_config.call("production")
+}
 
-ActiveRecord::Base.establish_connection(
-  :adapter  => db.scheme == 'postgres' ? 'postgresql' : db.scheme,
-  :host     => db.host,
-  :port     => db.port,
-  :username => db.user,
-  :password => db.password,
-  :database => DB_NAME,
-  :encoding => 'utf8'
-)
+ActiveRecord::Base.establish_connection(rack_env.to_sym)

data/templates/config/environment.rb

@@ -1,46 +1,19 @@
-# Set up gems listed in the Gemfile.
-# See: http://gembundler.com/bundler_setup.html
-#      http://stackoverflow.com/questions/7243486/why-do-you-need-require-bundler-setup
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# frozen_string_literal: true
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+require "bundler/setup"
 
-# Require gems we care about
-require 'rubygems'
+require "pathname"
 
-require 'uri'
-require 'pathname'
-
-require 'pg'
-require 'active_record'
-require 'logger'
-
-require 'sinatra'
-require "sinatra/reloader" if development?
-
-require 'erb'
-require 'pry-byebug'
-
-# Some helper constants for path-centric logic
-APP_ROOT = Pathname.new(File.expand_path('../../', __FILE__))
+require "active_record"
+require "erb"
+require "sinatra/reloader"
 
+APP_ROOT = Pathname.new(File.expand_path("..", __dir__))
 APP_NAME = APP_ROOT.basename.to_s
 
-configure do
-  # By default, Sinatra assumes that the root is the file that calls the configure block.
-  # Since this is not the case for us, we set it manually.
-  set :root, APP_ROOT.to_path
-  # See: http://www.sinatrarb.com/faq.html#sessions
-  enable :sessions
-  set :session_secret, ENV['SESSION_SECRET'] || 'this is a secret shhhhh'
-
-  # Set the views to
-  set :views, File.join(Sinatra::Application.root, "app", "views")
-end
-
-# Set up the controllers and helpers
-Dir[APP_ROOT.join('app', 'controllers', '*.rb')].each { |file| require file }
-Dir[APP_ROOT.join('app', 'helpers', '*.rb')].each { |file| require file }
+Dir[APP_ROOT.join("app", "helpers", "*.rb")].sort.each { |file| require file }
+Dir[APP_ROOT.join("app", "controllers", "*.rb")].sort.each { |file| require file }
+Dir[APP_ROOT.join("app", "models", "*.rb")].sort.each { |file| require file }
 
-# Set up the database and models
-require APP_ROOT.join('config', 'database')
+require APP_ROOT.join("config", "database")

data/templates/config.ru

@@ -1,6 +1,5 @@
-# Require config/environment.rb
-require ::File.expand_path('../config/environment',  __FILE__)
+# frozen_string_literal: true
 
-set :app_file, __FILE__
+require_relative "app"
 
-run Sinatra::Application
+run App

data/templates/gitignore.tt

@@ -0,0 +1,7 @@
+.bundle/
+.env
+*.log
+db/*.sqlite3
+db/*.sqlite3-journal
+tmp/
+vendor/bundle/

data/templates/public/css/application.css

@@ -0,0 +1,26 @@
+:root {
+  font-family: "IBM Plex Sans", "Avenir Next", "Segoe UI", sans-serif;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  color: #1f2937;
+  background: radial-gradient(circle at top, #f8fafc, #eef2ff 50%, #e5e7eb 100%);
+}
+
+.container {
+  max-width: 44rem;
+  margin: 3rem auto;
+  padding: 2.25rem;
+  border: 1px solid #d1d5db;
+  border-radius: 1rem;
+  background: rgba(255, 255, 255, 0.92);
+}
+
+h1 {
+  margin-top: 0;
+}

data/templates/public/js/application.js

@@ -1,7 +1 @@
-$(document).ready(function() {
-  // This is called after the document has loaded in its entirety
-  // This guarantees that any elements we bind to will exist on the page
-  // when we try to bind to them
-
-  // See: http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
-});
+console.log("Frankly generated app loaded.");

metadata

@@ -1,23 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: frankly
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Ken Rettberg
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,63 +24,64 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
-  type: :runtime
+        version: '3.10'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
-description: Setup a sinatra skeleton like a boss!
-email: kenrettberg@gmail.com
+        version: '3.10'
+description: Generate a modern Sinatra + ActiveRecord starter app with sensible defaults.
+email:
+- kenrettberg@gmail.com
 executables:
 - console
 - frankly
@@ -104,11 +104,10 @@ files:
 - lib/frankly.rb
 - lib/frankly/cli.rb
 - lib/frankly/version.rb
-- spec/frankly_spec.rb
-- spec/spec_helper.rb
 - templates/Gemfile.tt
 - templates/README.md
 - templates/Rakefile
+- templates/app.rb
 - templates/app/.DS_Store
 - templates/app/controllers/.gitkeep
 - templates/app/helpers/.gitkeep
@@ -116,12 +115,14 @@ files:
 - templates/app/models/.gitkeep
 - templates/app/models/README.md
 - templates/app/views/.gitkeep
+- templates/app/views/index.erb
 - templates/app/views/layout.erb
 - templates/config.ru
 - templates/config/database.rb
 - templates/config/environment.rb
 - templates/db/migrate/.gitkeep
 - templates/db/seeds.rb
+- templates/gitignore.tt
 - templates/public/.DS_Store
 - templates/public/css/application.css
 - templates/public/css/normalize.css
@@ -131,19 +132,9 @@ files:
 homepage: https://github.com/kenrett/frankly
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2
-
-                .
-    .---------.'---.
-    '.       :    .'
-      '.  .:::  .' The Chairman
-        '.'::'.'    of the Board
-          '||'       has arrived.
-           ||
-           ||
-           ||
-       ---====---
+metadata:
+  homepage_uri: https://github.com/kenrett/frankly
+  source_code_uri: https://github.com/kenrett/frankly
 rdoc_options: []
 require_paths:
 - lib
@@ -151,18 +142,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 4.0.7
 specification_version: 4
-summary: An opinionated sinatra skeleton with Rake tasks, rspec, postgres, and more!
-test_files:
-- spec/frankly_spec.rb
-- spec/spec_helper.rb
+summary: Opinionated Sinatra app skeleton generator
+test_files: []

data/spec/frankly_spec.rb

@@ -1,44 +0,0 @@
-require "spec_helper"
-require "tmpdir"
-require "logger"
-
-describe Frankly do
-  it "has a version number" do
-    expect(Frankly::VERSION).not_to be nil
-  end
-
-  context "when generating a new skeleton" do
-    before(:all) do
-      @templates_path = "#{File.dirname(__FILE__)}/../lib/sinatra_generator/templates"
-      @tmp_dir = Dir.mktmpdir
-      Dir.chdir @tmp_dir
-    end
-
-    it "creates a temporary directory" do
-      expect(@tmp_dir).to_not be nil
-    end
-
-    it "builds a new app" do
-      Frankly::CLI.start ["test_app"]
-
-      expect(File.directory?('test_app')).to be true
-
-      Dir.chdir 'test_app' do
-        expect(File.exist?('config.ru')).to be true
-        expect(File.exist?('Gemfile')).to be true
-        expect(File.exist?('Rakefile')).to be true
-        expect(File.exist?('README.md')).to be true
-        expect(File.directory?('app')).to be true
-        expect(File.directory?('config')).to be true
-        expect(File.directory?('db')).to be true
-        expect(File.directory?('public')).to be true
-      end
-    end
-
-    after(:all) do
-      Dir.chdir('..')
-      FileUtils.rm_rf @tmp_dir
-      expect(File.directory?(@tmp_dir)).to be false
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,32 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require "frankly"
-require "pry-byebug"
-
-#### TODO Figure out how to silence the rubygems (Or prevent it from
-# bundling at all) The solution below only silence the generating
-# files part
-#
-# Borrowed from https://gist.github.com/adamstegman/926858
-#
-# RSpec.configure do |config|
-#   config.before(:all) { silence_output }
-#   config.after(:all) { enable_output }
-# end
-#
-# # Redirects stderr and stdout to /dev/null.
-# def silence_output
-#   @orig_stderr = $stderr
-#   @orig_stdout = $stdout
-#
-#   # redirect stderr and stdout to /dev/null
-#   $stderr = File.new('/dev/null', 'w')
-#   $stdout = File.new('/dev/null', 'w')
-# end
-#
-# # Replace stdout and stderr so anything else is output correctly.
-# def enable_output
-#   $stderr = @orig_stderr
-#   $stdout = @orig_stdout
-#   @orig_stderr = nil
-#   @orig_stdout = nil
-# end