rundoc 0.0.1 → 1.1.1

data/lib/rundoc/version.rb

@@ -1,3 +1,3 @@
 module Rundoc
-  VERSION = "0.0.1"
-end
+  VERSION = "1.1.1"
+end

data/rundoc.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Rundoc::VERSION
   gem.authors       = ["Richard Schneeman"]
   gem.email         = ["richard.schneeman+rubygems@gmail.com"]
-  gem.description   = %q{rundoc turns docs to runable code}
-  gem.summary       = %q{rundoc generates runable code from docs}
+  gem.description   = %q{RunDOC turns docs to runable code}
+  gem.summary       = %q{RunDOC generates runable code from docs}
   gem.homepage      = "https://github.com/schneems/rundoc"
   gem.license       = "MIT"
 
@@ -18,11 +18,17 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-
   gem.add_dependency "thor"
   gem.add_dependency "repl_runner"
+  gem.add_dependency 'parslet', '~> 1'
+  gem.add_dependency 'capybara', '~> 3'
+  gem.add_dependency 'selenium-webdriver', '~> 3'
+
+  gem.add_dependency 'aws-sdk-s3', '~> 1'
+  gem.add_dependency 'dotenv'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency "minitest"
 end
 

data/test/fixtures/build_logs/rundoc.md

@@ -0,0 +1,56 @@
+Logs produced while building your application (deploying) are separated from your [runtime logs](https://devcenter.heroku.com/articles/logging#log-retrieval). The build logs for failed and successful deploys are available via the dashboard of the application.
+
+```
+:::-- $ touch Gemfile
+:::-- $ bundle _1.15.2_ install
+:::-- $ git init && git add . && git commit -m first
+:::-- $ heroku create
+:::-- $ git push heroku master
+```
+
+To view your build logs, first visit the dashboard for the application (`https://dashboard.heroku.com/apps/<app-name>`):
+
+```
+:::>> website.visit(name: "dashboard", url: "https://dashboard.heroku.com", visible: true)
+
+while current_url != "https://dashboard.heroku.com/apps"
+  puts "waiting for successful login: #{current_url}"
+  sleep 1
+end
+
+git_url = `git config --get remote.heroku.url`.chomp
+app_name = git_url.split("/").last.gsub(".git", "")
+session.visit "https://dashboard.heroku.com/apps/#{app_name}"
+sleep 2
+
+email = ENV['HEROKU_EMAIL'] || `heroku auth:whoami`
+session.execute_script %Q{$("span:contains(#{email}").html('developer@example.com')}
+
+:::>> website.screenshot(name: "dashboard", upload: "s3")
+```
+
+Next click on the "Activity" tab:
+
+```
+:::>> website.nav(name: "dashboard")
+session.first(:link, "Activity").click
+sleep 2
+
+email = ENV['HEROKU_EMAIL'] || `heroku auth:whoami`
+session.execute_script %Q{$("span:contains(#{email}").html('developer@example.com')}
+
+:::>> website.screenshot(name: "dashboard", upload: "s3")
+```
+
+From here you can click on "View build log" to see your most recent build:
+
+```
+:::>> website.nav(name: "dashboard")
+session.first(:link, "View build log").click
+sleep 2
+
+email = ENV['HEROKU_EMAIL'] || `heroku auth:whoami`
+session.execute_script %Q{$("span:contains(#{email}").html('developer@example.com')}
+
+:::>> website.screenshot(name: "dashboard", upload: "s3")
+```

data/test/fixtures/depend_on/dependency/rundoc.md

@@ -0,0 +1,5 @@
+```
+:::>> $ mkdir foo
+:::>> $ cd foo
+:::>> $ echo "hello" >> hello.txt
+```

data/test/fixtures/depend_on/main/rundoc.md

@@ -0,0 +1,10 @@
+# Hello
+
+```
+:::-- rundoc.depend_on "../dependency/rundoc.md"
+```
+
+```
+:::>> $ ruby -e "raise 'nope' unless File.read('hello.txt').chomp == 'hello'"
+```
+

data/test/fixtures/java/rundoc.md

@@ -0,0 +1,9 @@
+
+Hello
+
+```
+:::>- $ git clone https://github.com/heroku/java-getting-started
+:::>- $ cd java-getting-started
+```
+
+world

data/test/fixtures/rails_4/rundoc.md

@@ -4,11 +4,18 @@ email = ENV['HEROKU_EMAIL'] || `heroku auth:whoami`
 
 Rundoc.configure do |config|
   config.project_root = "myapp"
-  config.filter_sensitive(email, "developer@example.com")
+  config.filter_sensitive(email => "developer@example.com")
 end
 ```
+<!--
+  rundoc src:
+  https://github.com/schneems/rundoc/blob/master/test/fixtures/rails_4/rundoc.md
+-->
 
-Ruby on Rails is a popular web framework written in [Ruby](http://www.ruby-lang.org/). This guide covers using Rails 4 on Heroku, running previous versions of Rails on Heroku see [Getting Started with Rails 3.x on Heroku](https://devcenter.heroku.com/articles/rails3).
+> warning
+> The latest version of Rails available is [Rails 5](https://devcenter.heroku.com/articles/getting-started-with-rails5). If you are starting a new application we recommend you use the most recently released version.
+
+Ruby on Rails is a popular web framework written in [Ruby](http://www.ruby-lang.org/). This guide covers using Rails 4 on Heroku. For information about running previous versions of Rails on Heroku, see [Getting Started with Rails 3.x on Heroku](getting-started-with-rails3).
 
 > callout If you are already familiar with Heroku and Rails, reference the [simplifed Rails 4 on Heroku guide](https://devcenter.heroku.com/articles/rails4) instead. For general information on how to develop and architect apps for use on Heroku, see [Architecting Applications for Heroku](https://devcenter.heroku.com/articles/architecting-apps).
 
@@ -17,18 +24,18 @@ For this guide you will need:
 - Basic Ruby/Rails knowledge
 - Locally installed version of Ruby 2.0.0+, Rubygems, Bundler, and Rails 4+
 - Basic Git knowledge
-- A Heroku user account: [Signup is free and instant](https://api.heroku.com/signup/devcenter)
+- A Heroku user account: [Signup is free and instant](https://signup.heroku.com/devcenter)
 
 ## Local Workstation Setup
 
-Install the [Heroku Toolbelt](https://toolbelt.heroku.com/) on your local workstation. This ensures that you have access to the [Heroku command-line client](/categories/command-line), Foreman, and the Git revision control system. You will also need [Ruby and Rails installed](http://guides.railsgirls.com/install/).
+Install the [Heroku Toolbelt](https://toolbelt.heroku.com/) on your local workstation. This ensures that you have access to the [Heroku command-line client](/categories/command-line), Foreman, and the Git revision control system. You will also need [Ruby and Rails installed](http://guides.railsgirls.com/install).
 
 Once installed, you'll have access to the `$ heroku` command from your command shell. Log in using the email address and password you used when creating your Heroku account:
 
 
 > callout Note that `$` symbol before commands indicates they should be run on the command line, prompt, or terminal with appropriate permissions. Do not copy the `$` symbol.
 
-```sh
+```term
 $ heroku login
 Enter your Heroku credentials.
 Email: schneems@example.com
@@ -48,34 +55,80 @@ Press enter at the prompt to upload your existing `ssh` key or create a new one,
 
 You may be starting from an existing app, if so [upgrade to Rails 4](http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-3-2-to-rails-4-0) before continuing. If not, a vanilla Rails 4 app will serve as a suitable sample app. To build a new app make sure that you're using the Rails 4.x using `$ rails -v`. You can get the new version of rails by running,
 
-```sh
-:::= $ gem install rails --no-ri --no-rdoc
+```term
+:::>> $ gem install rails -v 4.2.9 --no-document
 ```
 
+Note: There may be a [more recent version of Rails](https://rubygems.org/gems/rails/versions) available, we recommend always running the latest. You may want to [run Rails 5 on Heroku](https://devcenter.heroku.com/articles/getting-started-with-rails5).
+
 Then create a new app:
 
-```sh
-::: $ rails new myapp --database=postgresql
+<!--
+ You may run into this bug when tring to use a
+ specific version of rails:
+
+ https://github.com/rubygems/rubygems/issues/1932#issuecomment-304133990
+-->
+
+```term
+$ rails new myapp --database=postgresql
+:::- $ rails _4.2.9_ new myapp --database=postgresql
 ```
 
-Once finished change your directory to the newly created Rails app
+Then move into your application directory.
 
-```sh
-::: $ cd myapp
+```term
+:::> $ cd myapp
 ```
 
 > callout If you experience problems or get stuck with this tutorial, your questions may be answered in a later part of this document. Once you experience a problem try reading through the entire document and then going back to your issue. It can also be useful to review your previous steps to ensure they all executed correctly.
 
+If already have an app that was created without specifying `--database=postgresql` you will need to add the `pg` gem to your Rails project. Edit your `Gemfile` and change this line:
+
+```ruby
+gem 'sqlite3'
+```
+
+To this:
+
+```ruby
+gem 'pg'
+```
+
+> callout We highly recommend using PostgreSQL during development. Maintaining [parity between your development](http://www.12factor.net/dev-prod-parity) and deployment environments prevents subtle bugs from being introduced because of differences between your environments. [Install Postgres locally](https://devcenter.heroku.com/articles/heroku-postgresql#local-setup) now if it is not allready on your system.
+
+Now re-install your dependencies (to generate a new `Gemfile.lock`):
+
+```ruby
+$ bundle install
+```
+
+You can get more information on why this change is needed and how to configure your app to run postgres locally see [why you cannot use Sqlite3 on Heroku](https://devcenter.heroku.com/articles/sqlite3).
+
+In addition to using the `pg` gem, you'll also need to ensure the `config/database.yml` is using the `postgresql` adapter.
+
+The development section of your `config/database.yml` file should look something like this:
+
+```term
+:::>  $ cat config/database.yml
+:::>> | $ head -n 23
+```
+
+Be careful here, if you omit the `sql` at the end of `postgresql` in the `adapter` section your application will not work.
+
+## Welcome page
+
 Rails 4 no longer has a static index page in production. When you're using a new app, there will not be a root page in production, so we need to create one. We will first create a controller called `welcome` for our home page to live:
 
-```sh
-::: $ rails generate controller welcome
+
+```term
+:::> $ rails generate controller welcome
 ```
 
 Next we'll add an index page.
 
-```sh
-:::= file.write app/views/welcome/index.html.erb
+```html
+:::>> file.write app/views/welcome/index.html.erb
 <h2>Hello World</h2>
 <p>
   The time is now: <%= Time.now %>
@@ -85,87 +138,42 @@ Next we'll add an index page.
 Now we need to have Rails route to this action. We'll edit `config/routes.rb` to set the index page to our new method:
 
 ```ruby
-:::= file.append config/routes.rb#2
+:::>> file.append config/routes.rb#2
   root 'welcome#index'
 ```
 
 You can verify that the page is there by running your server:
 
-```sh
+```term
 $ rails server
 ```
 
-And visiting [http://localhost:3000](http://localhost:3000) in your browser. If you do not see the page, use the logs that are output to your server to debug.
+And visiting [http://localhost:3000](http://localhost:3000) in your browser. If you do not see the page, [use the logs](#view-the-logs) that are output to your server to debug.
 
 ## Heroku gems
 
 Heroku integration has previously relied on using the Rails plugin system, which has been removed from Rails 4. To enable features such as static asset serving and logging on Heroku please add `rails_12factor` gem to your `Gemfile`.
 
 ```ruby
-:::= file.append Gemfile
+:::>> file.append Gemfile
 gem 'rails_12factor', group: :production
 ```
 
 Then run:
 
-```sh
-::: $ bundle install
+```term
+:::> $ bundle install
 ```
 
 We talk more about Rails integration on our [Ruby Support page](https://devcenter.heroku.com/articles/ruby-support#injected-plugins).
 
-## Use Postgres
-
-> callout We highly recommend using PostgreSQL during development. Maintaining [parity between your development](http://www.12factor.net/dev-prod-parity) and deployment environments prevents subtle bugs from being introduced because of differences between your environments. [Install Postgres locally](https://devcenter.heroku.com/articles/heroku-postgresql#local-setup) now if it is not allready on your system.
-
-If you did not specify `postgresql` while creating your app (using `--database=postgresql`) you will need to add the `pg` gem to your Rails project. Edit your `Gemfile` and change this line:
-
-```ruby
-gem 'sqlite3'
-```
-
-To this:
-
-```ruby
-gem 'pg'
-```
-
-You can get more information on why this change is needed and how to configure your app to run postgres locally see [why you cannot use Sqlite3 on Heroku](https://devcenter.heroku.com/articles/sqlite3).
-
-In addition to using the `pg` gem, you'll also need to ensure the `config/database.yml` is using the `postgresql` adapter.
-
-You will also need to remove the `username` field in your `database.yml` if there is one so:
-
-```
-:::= file.remove config/database.yml
-username: myapp
-```
-
-This line tells rails that the database `myapp_development` should be run under a role of `myapp`. Since you likely don't have this role in your database we will remove it. With the line remove Rails will try to access the database as user who is currently logged into the computer.
-
-The development section of your `config/database.yml` file should look something like this:
-
-```sh
-:::  $ cat config/database.yml
-:::= | $ head -n 23
-```
-
-Be careful here, if you omit the `sql` at the end of `postgresql` your application will not work.
-
-Now re-install your dependencies (to generate a new `Gemfile.lock`):
-
-```ruby
-$ bundle install
-```
-
 ## Specify Ruby version in app
 
-
-Rails 4 requires Ruby 1.9.3 or above. Heroku has a recent version of Ruby installed, however you can specify an exact version by using the `ruby` DSL in your `Gemfile`. For this guide we'll be using Ruby 2.0.0 so add this to your `Gemfile`:
+Rails 4 requires Ruby 1.9.3 or above. Heroku has a recent version of Ruby installed by default, however you can specify an exact version by using the `ruby` DSL in your `Gemfile`. For this guide we'll be using Ruby 2.
 
 ```ruby
-:::= file.append Gemfile
-ruby "2.0.0"
+:::>> file.append Gemfile
+ruby "2.3.4"
 ```
 
 You should also be running the same version of Ruby locally. You can verify by running `$ ruby -v`. You can get more information on [specifying your Ruby version on Heroku here](https://devcenter.heroku.com/articles/ruby-versions).
@@ -174,37 +182,33 @@ You should also be running the same version of Ruby locally. You can verify by r
 
 Heroku relies on [git](http://git-scm.com/), a distributed source control managment tool, for deploying your project. If your project is not already in git first verify that `git` is on your system:
 
-```sh
-::: $ git --help
-:::= | $ head -n 10
+```term
+:::> $ git --help
+:::-> | $ head -n 5
 ```
 
 If you don't see any output or get `command not found` you will need to install it on your system, verify that the [Heroku toolbelt](https://toolbelt.heroku.com/) is installed.
 
-Once you've verified that git works, first make sure you are in your Rails app directory by running:
-
-```sh
-$ ls
-```
+Once you've verified that git works, first make sure you are in your Rails app directory by running `$ ls`:
 
 The output should look like this:
 
-```sh
-:::= $ ls
+```term
+:::>> $ ls
 ```
 
 Now run these commands in your Rails app directory to initialize and commit your code to git:
 
-```sh
-::: $ git init
-::: $ git add .
-::: $ git commit -m "init"
+```term
+:::> $ git init
+:::> $ git add .
+:::> $ git commit -m "init"
 ```
 
 You can verify everything was committed correctly by running:
 
-```sh
-:::= $ git status
+```term
+:::>> $ git status
 ```
 
 Now that your application is committed to git you can deploy to Heroku.
@@ -213,22 +217,22 @@ Now that your application is committed to git you can deploy to Heroku.
 
 Make sure you are in the directory that contains your Rails app, then create an app on Heroku:
 
-```sh
-:::= $ heroku create
+```term
+:::>> $ heroku create
 ```
 
 You can verify that the remote was added to your project by running
 
-```sh
-$ git config -e
+```term
+:::>> $ git config --list | grep heroku
 ```
 
-If you see `fatal: not in a git directory` then you are likely not in the corect directory. Otherwise you may deploy your code. After you deploy your code, you will need to migrate your database, make sure it is properly scaled and use logs to debug any issues that come up.
+If you see `fatal: not in a git directory` then you are likely not in the correct directory. Otherwise you may deploy your code. After you deploy your code, you will need to migrate your database, make sure it is properly scaled and use logs to debug any issues that come up.
 
 Deploy your code:
 
-```sh
-:::= $ git push heroku master
+```term
+:::>> $ git push heroku master
 ```
 
 It is always a good idea to check to see if there are any warnings or errors in the output. If everything went well you can migrate your database.
@@ -237,12 +241,11 @@ It is always a good idea to check to see if there are any warnings or errors in
 
 If you are using the database in your application you need to manually migrate the database by running:
 
-```sh
+```term
 $ heroku run rake db:migrate
 ```
 
-Any commands after the `heroku run` will be executed on a Heroku [dyno](dynos).
-
+Any commands after the `heroku run` will be executed on a Heroku [dyno](dynos). You can obtain an interactive shell session by running `$ heroku run bash`.
 
 ## Visit your application
 
@@ -251,22 +254,22 @@ You've deployed your code to Heroku. You can now instruct Heroku to execute a pr
 
 Let's ensure we have one dyno running the `web` process type:
 
-```sh
-::: $ heroku ps:scale web=1
+```term
+:::> $ heroku ps:scale web=1
 ```
 
 You can check the state of the app's dynos. The `heroku ps` command lists the running dynos of your application:
 
-```sh
-:::= $ heroku ps
+```term
+:::>> $ heroku ps
 ```
 
 Here, one dyno is running.
 
 We can now visit the app in our browser with `heroku open`.
 
-```sh
-:::= $ heroku open
+```term
+:::>> $ heroku open
 ```
 
 You should now see the "Hello World" text we inserted above.
@@ -279,37 +282,31 @@ If you run into any problems getting your app to perform properly, you will need
 
 You can view information about your running app using one of the [logging commands](logging), `heroku logs`:
 
-```sh
-:::= $ heroku logs
+```term
+:::>> $ heroku logs
 ```
 
 You can also get the full stream of logs by running the logs command with the `--tail` flag option like this:
 
-```sh
+```term
 $ heroku logs --tail
 ```
 
 ## Dyno sleeping and scaling
 
-Having only a single web dyno running will result in the dyno [going to sleep](dynos#dyno-sleeping) after one hour of inactivity.  This causes a delay of a few seconds for the first request upon waking. Subsequent requests will perform normally.
-
-To avoid this, you can scale to more than one web dyno. For example:
+By default, your app is deployed on a free dyno. Free dynos will sleep after a half hour of inactivity and they can be active (receiving traffic) for no more than 18 hours a day before [going to sleep](dynos#dyno-sleeping).  If a free dyno is sleeping, and it hasn't exceeded the 18 hours, any web request will wake it. This causes a delay of a few seconds for the first request upon waking. Subsequent requests will perform normally.
 
-```sh
-$ heroku ps:scale web=2
-```
-
-For each application, Heroku provides [750 free dyno-hours](usage-and-billing#750-free-dyno-hours-per-app).  Running your app at 2 dynos would exceed this free, monthly allowance, so let's scale back:
-
-```sh
+```term
 $ heroku ps:scale web=1
 ```
 
+To avoid dyno sleeping, you can upgrade to a hobby or professional dyno type as described in the [Dyno Types](dyno-types) article. For example, if you migrate your app to a professional dyno, you can easily scale it by running a command telling Heroku to execute a specific number of dynos, each running your web process type.
+
 ## Console
 
-Heroku allows you to run commands in a [one-off dyno](oneoff-admin-ps) - scripts and applications that only need to be executed when needed - using the `heroku run` command. Use this to launch a Rails console process attached to your local terminal for experimenting in your app's environment:
+Heroku allows you to run commands in a [one-off dyno](one-off-dynos) - scripts and applications that only need to be executed when needed - using the `heroku run` command. Use this to launch a Rails console process attached to your local terminal for experimenting in your app's environment:
 
-```sh
+```term
 $ heroku run rails console
 irb(main):001:0> puts 1+1
 2
@@ -319,65 +316,28 @@ irb(main):001:0> puts 1+1
 
 Rake can be run as an attached process exactly like the console:
 
-```sh
+```term
 $ heroku run rake db:migrate
 ```
 
 ## Webserver
 
-By default, your app's web process runs `rails server`, which uses Webrick. This is fine for testing, but for production apps you'll want to switch to a more robust webserver. On Cedar, [we recommend Unicorn as the webserver](ruby-production-web-server). Regardless of the webserver you choose, production apps should always specify the webserver explicitly in the `Procfile`.
+By default, your app's web process runs `rails server`, which uses Webrick. This is fine for testing, but for production apps you'll want to switch to a more robust webserver. On Cedar, [we recommend Puma as the webserver](https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server). Regardless of the webserver you choose, production apps should always specify the webserver explicitly in the `Procfile`.
 
-First, add Unicorn to your application `Gemfile`:
+First, add Puma to your application `Gemfile`:
 
 ```ruby
-:::= file.append Gemfile
-gem 'unicorn'
+:::>> file.append Gemfile
+gem 'puma'
 ```
 
 Then run
 
-```sh
-::: $ bundle install
-```
-
-Now you are ready to configure your app to use Unicorn.
-
-Create a configuration file for Unicorn at `config/unicorn.rb`:
-
-```sh
-::: $ touch config/unicorn.rb
-```
-
-Now we're going to add Unicorn specific configuration options, that we explain in detail in [Heroku's Unicorn documentation](https://devcenter.heroku.com/articles/rails-unicorn):
-
-```ruby
-:::= file.write config/unicorn.rb
-
-worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
-timeout 15
-preload_app true
-
-before_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-end
+```term
+:::> $ bundle install
 ```
 
-This default configuration assumes a standard Rails app with Active Record. You should get acquainted with the different options in [the official Unicorn documentation](http://unicorn.bogomips.org/Unicorn/Configurator.html).
+Now you are ready to configure your app to use Puma. For this tutorial we will use the default settings of Puma, but we recommend generating a `config/puma.rb` file and reading more about configuring your application for maximum performance by [reading the Puma documentation](https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server)
 
 Finally you will need to tell Heroku how to run your Rails app by creating a `Procfile` in the root of your application directory.
 
@@ -386,36 +346,40 @@ Finally you will need to tell Heroku how to run your Rails app by creating a `Pr
 Change the command used to launch your web process by creating a file called [Procfile](procfile) and entering this:
 
 ```
-:::= file.write Procfile
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+:::>> file.write Procfile
+web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
 ```
 
 Note: The case of `Procfile` matters, the first letter must be uppercase.
 
+
+We recommend generating a puma config file based on [our Puma documentation](https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server) for maximum performance.
+
+
 Set the `RACK_ENV` to development in your environment and a `PORT` to connect to. Before pushing to Heroku you'll want to test with the `RACK_ENV` set to production since this is the enviroment your Heroku app will run in.
 
-```sh
-:::= $ echo "RACK_ENV=development" >>.env
-:::= $ echo "PORT=3000" >> .env
+```term
+:::>> $ echo "RACK_ENV=development" >>.env
+:::>> $ echo "PORT=3000" >> .env
 ```
 
 You'll also want to add `.env` to your `.gitignore` since this is for local enviroment setup.
 
-```sh
-::: $ echo ".env" >> .gitignore
-::: $ git add .gitignore
-::: $ git commit -m "add .env to .gitignore"
+```term
+:::> $ echo ".env" >> .gitignore
+:::> $ git add .gitignore
+:::> $ git commit -m "add .env to .gitignore"
 ```
 
 Test your Procfile locally using Foreman:
 
-```sh
-::: $ gem install foreman
+```term
+:::> $ gem install foreman
 ```
 
 You can now start your web server by running
 
-```sh
+```term
 $ foreman start
 18:24:56 web.1  | I, [2013-03-13T18:24:56.885046 #18793]  INFO -- : listening on addr=0.0.0.0:5000 fd=7
 18:24:56 web.1  | I, [2013-03-13T18:24:56.885140 #18793]  INFO -- : worker=0 spawning...
@@ -427,27 +391,27 @@ $ foreman start
 
 Looks good, so press Ctrl-C to exit and you can deploy your changes to Heroku:
 
-```sh
-::: $ git add .
-::: $ git commit -m "use unicorn via procfile"
-::: $ git push heroku master
+```term
+:::> $ git add .
+:::> $ git commit -m "use puma via procfile"
+:::> $ git push heroku master
 ```
 
-Check `ps`, you'll see the web process uses your new command specifying Unicorn as the web server
+Check `ps`, you'll see the web process uses your new command specifying Puma as the web server
 
-```sh
-:::= $ heroku ps
+```term
+:::>> $ heroku ps
 ```
 
-The logs also reflect that we are now using Unicorn:
+The logs also reflect that we are now using Puma:
 
-```sh
+```term
 $ heroku logs
 ```
 
 ## Rails Asset Pipeline
 
-There are several options for invoking the [Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html) when deploying to Heroku. For general information on the asset pipeline please see the [Rails 3.1+ Asset Pipeline on Heroku Cedar](rails3x-asset-pipeline-cedar) article.
+There are several options for invoking the [Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html) when deploying to Heroku. For general information on the asset pipeline please see the [Rails 3.1+ Asset Pipeline on Heroku Cedar](rails-asset-pipeline) article.
 
 The `config.assets.initialize_on_precompile` option has been removed is and not needed for Rails 4. Also, any failure in asset compilation will now cause the push to fail. For Rails 4 asset pipeline support see the [Ruby Support](https://devcenter.heroku.com/articles/ruby-support#rails-4-x-applications) page.
 
@@ -457,11 +421,11 @@ If you push up your app and it crashes (`heroku ps` shows state `crashed`), chec
 
 ### Runtime dependencies on development/test gems
 
-If you're missing a gem when you deploy, check your Bundler groups. Heroku builds your app without the `development` or `test` groups, and if you app depends on a gem from one of these groups to run, you should move it out of the group.
+If you're missing a gem when you deploy, check your Bundler groups. Heroku builds your app without the `development` or `test` groups, and if your app depends on a gem from one of these groups to run, you should move it out of the group.
 
 One common example using the RSpec tasks in your `Rakefile`. If you see this in your Heroku deploy:
 
-```sh
+```term
 $ heroku run rake -T
 Running `bundle exec rake -T` attached to terminal... up, ps.3
 rake aborted!
@@ -470,7 +434,7 @@ no such file to load -- rspec/core/rake_task
 
 Then you've hit this problem. First, duplicate the problem locally:
 
-```sh
+```term
 $ bundle install --without development:test
 …
 $ bundle exec rake -T
@@ -498,7 +462,6 @@ end
 
 Confirm it works locally, then push to Heroku.
 
-
 ## Done
 
 You now have your first application deployed to Heroku. The next step is to deploy your own application. If you're interested in reading more you can read more about [Ruby on Heroku at the Devcenter](https://devcenter.heroku.com/categories/ruby).