ufo 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c909def5e8c50d44c06b4fb96dbe5c56d1fa534fe919e01a9ec206ae95246dfd
-  data.tar.gz: cfc0ec639cc48c7cbb2ab9ba3fdaa29fe3337ae0ef95d7eca92c7f77c65e65ef
+  metadata.gz: dedb38a858d8b1102de582ba673bd398f1e32bdae146242318e5d315b0f86179
+  data.tar.gz: 485ac8e92765ae56c44937d59f644d82b6396a6b077346b1ece4046ed11b724d
 SHA512:
-  metadata.gz: a6a1ce7a570829d4201c978dfe6e0d4cf6c5b3c0e172e0cce9df9cac0573d16a42fa90328843381f42e144da58b9ae816c15393ae12bc590c53557041e2a6227
-  data.tar.gz: 138a530c4e23df2b55c83477a9dc183b6cd7191fb3c231dabfbdc4053088b5006394cbc54e517fdbf831f915d9e9ce67146468fc5729a5737c175b319406b8c8
+  metadata.gz: 41c20ad01a60c0948abe4725f5ed6920ab1285191fff50a634b8f71cd817f15ee1b68c745a7c523c6f49ca8bd6fd1d57c3df3f666138048cec124ba33e50f477
+  data.tar.gz: 1b115b297a6a1df69765d5824c107bf0e676b4cc838cbec1d1b72372df2427f980e2f28c16d2b3b4e1156b737c9377301c24bfa07f96c652ddbec11fa5726b36

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [3.0.1]
+- add vendor files to gem package: fixes gem install ufo misses 'render_me_pretty' #18
+
 ## [3.0.0]
 - dotufo: rename ufo folder to .ufo. Use ufo upgrade3 command to upgrade.
 - new settings.yml format to account for multiple AWS accounts and environments.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (2.3.0)
+    ufo (3.0.0)
       activesupport
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
@@ -21,7 +21,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-partitions (1.60.0)
+    aws-partitions (1.61.0)
     aws-sdk-cloudwatchlogs (1.2.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
@@ -50,7 +50,7 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    i18n (0.9.4)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.3.1)
     json (2.1.0)

data/README.md

@@ -41,7 +41,7 @@ gem install ufo
 git clone https:///github.com/tongueroo/hi.git
 cd hi
 ufo init --app=hi --image=tongueroo/hi
-ufo ship hi-web-stag
+ufo ship hi-web
 ```
 
 Congratulations, you have successfully used ufo to deploy to an ECS service.

data/docs/_docs/auto-completion.md

@@ -8,6 +8,8 @@ Ufo supports bash auto-completion.  To set it up add this to your `~/.profile` o
 eval $(ufo completion_script)
 ```
 
+Don't forget to restart your shell.
+
 Auto Completion examples:
 
 ```

data/docs/_docs/settings.md

@@ -2,18 +2,17 @@
 title: Settings
 ---
 
-The behavior of ufo can be configured via the `ufo/settings.yml` file.  A starter project `ufo/settings.yml` file is generated as part of the `ufo init` command. You can have multiple settings files. The options from the files get merged and respect the following precedence:
+The behavior of ufo can be configured with a `settings.yml` file.  A starter project `.ufo/settings.yml` file is generated as part of the `ufo init` command. You can have multiple settings files. The options from the files get merged and respected in the following precedence:
 
-1. current folder - The current folder's `ufo/settings.yml` values take the highest precedence.
+1. current folder - The current folder's `.ufo/settings.yml` values take the highest precedence.
 2. user - The user's `~/.ufo/settings.yml` values take the second highest precedence.
 3. default - The [default settings](https://github.com/tongueroo/ufo/blob/master/lib/ufo/default/settings.yml) bundled with the tool takes the lowest precedence.
 
-Let's take a look at an example `ufo/settings.yml`:
+Let's take a look at an example `settings.yml`:
 
 ```yaml
-image: tongueroo/hi
 base:
-  image: <%= @image %>
+  image: tongueroo/hi
   # clean_keep: 30 # cleans up docker images on your docker server.
   # ecr_keep: 30 # cleans up images on ECR and keeps this remaining amount. Defaults to keep all.
   # defaults when an new ECS service is created by ufo ship
@@ -46,15 +45,12 @@ Setting  | Description
 `image`  | The `image` value is the name that ufo will use for the Docker image name to be built.  Only provide the basename part of the image name without the tag because ufo automatically generates the tag for you. For example, `tongueroo/hi` is correct and `tongueroo/hi:my-tag` is incorrect.
 `clean_keep`  | Docker images generated from ufo are cleaned up automatically for you at the end of `ufo ship`. This controls how many docker images to keep around. The default is 3.
 `ecr_keep`  | If you are using AWS ECR, then the ECR images can also be automatically cleaned up at the end of `ufo ship`. By default this is set to `nil` and all AWS ECR are kept.
-`cluster`  | By convention, the ECS cluster that ufo deploys to matches the `UFO_ENV`. If `UFO=development`, then `ufo ship` deploys to the `development` ECS cluster. This is option overrides this convetion.
+`cluster`  | By convention, the ECS cluster that ufo deploys to matches the `UFO_ENV`. If `UFO=development`, then `ufo ship` deploys to the `development` ECS cluster. This is option overrides this convention.
 `aws_profiles`  | If you have the `AWS_PROFILE` environment variable set, this will ensure that you are deploying the right `UFO_ENV` to the right AWS
 
-Maps the `UFO_ENV` to an ECS cluster value.  This allows you to override the convention where the default cluster equals to `UFO_ENV`. value.  This is covered in detailed at [Conventions]({% link _docs/conventions.md %}).
-
-
 ### ECS Cluster Convention
 
-Normally, the ECS cluster defaults to whatever UFO_ENV is set to by [convention]({% link _docs/conventions.md %}).  For example, when `UFO_ENV=production` the ECS Cluster is `production` and when `UFO_ENV=development` the ECS Cluster is `development`.  This setting allows you to override this behavior so that you do not have to specify the `--cluster` CLI option repeatedly.  Let's go through an example:
+Normally, the ECS cluster defaults to whatever UFO_ENV is set to by [convention]({% link _docs/conventions.md %}).  For example, when `UFO_ENV=production` the ECS Cluster is `production` and when `UFO_ENV=development` the ECS Cluster is `development`.  There are several ways to override this behavior. Let's go through an example:
 
 By default, these are all the same:
 
@@ -71,16 +67,25 @@ UFO_ENV=production ufo ship hi-web
 UFO_ENV=production ufo ship hi-web --cluster production # same
 ```
 
-Override the convention and explicitly specify the `--cluster` option in the CLI.
+Override the convention by explicitly specifying the `--cluster` option in the CLI.
 
 ```sh
 ufo ship hi-web --cluster custom-cluster # override the cluster
 UFO_ENV=production ufo ship hi-web --cluster production-cluster # override the cluster
 ```
 
-By setting the cluster option in the `settings.yml` file, you won't have to specify the cluster repeatedly.
+Override the convention by setting the cluster option in the `settings.yml` file, so you won't have to specify the `--cluster` option in the command repeatedly.
+
+```yaml
+development:
+  cluster: dev
+
+production:
+  cluster: prod
+```
+
 
-### AWS_PROFILE awareness
+### AWS_PROFILE support
 
 An interesting option is `aws_profiles`.  Here's an example:
 

data/docs/_docs/structure.md

@@ -13,8 +13,8 @@ Ufo creates a `.ufo` folder within your project which contains the required file
 |   └── main.json.erb
 └── variables
     ├── base.rb
-    ├── prod.rb
-    └── stag.rb
+    ├── production.rb
+    └── development.rb
 ```
 
 The table below covers the purpose of each folder and file.

data/docs/_docs/tutorial-ufo-init.md

@@ -46,8 +46,8 @@ The `ufo init` command generated a few starter ufo files for you. The standard d
 |   └── main.json.erb
 └── variables
     ├── base.rb
-    ├── prod.rb
-    └── stag.rb
+    ├── production.rb
+    └── development.rb
 ```
 
 The explanation of the folders and files were covered in detailed earlier at [Structure]({% link _docs/structure.md %}).

data/docs/_docs/tutorial-ufo-tasks-build.md

@@ -6,7 +6,7 @@ title: Task Definitions
 
 Now that we have a docker image pushed to a registry we can use that image for ECS.  Ufo takes that image and adds it to an ECS task definition.  This is where ufo is super powerful.  Ufo gives you the power to build and control your ECS task definition easily.
 
-Let's take a look at the 2 files that are used by ufo to build the the ECS task definition.  These files were generated by the `ufo init` command at the beginning.
+Let's take a look at the 2 files that are used by ufo to build the ECS task definition.  These files were generated by the `ufo init` command at the beginning.
 
 1. ufo/templates/main.json.erb
 2. ufo/task_definitions.rb

data/docs/_docs/ufo-init.md

@@ -42,8 +42,8 @@ ufo
 ├   └── main.json.erb
 └── variables
     ├── base.rb
-    ├── prod.rb
-    └── stag.rb
+    ├── production.rb
+    └── development.rb
 ```
 
 The explanation of the folders and files were covered in detailed earlier at [Structure]({% link _docs/structure.md %}).

data/docs/_docs/ufo-tasks-build.md

@@ -96,7 +96,7 @@ The shared variables are set in the variables folder:
 @environment = helper.env_file(".env")
 ```
 
-**ufo/variables/prod.rb**:
+**ufo/variables/production.rb**:
 
 ```ruby
 @environment = helper.env_vars(%Q{

data/lib/template/.ufo/task_definitions.rb.tt

@@ -20,6 +20,12 @@ task_definition "<%= @app %>-web" do
     # Comment out awslogs_* if you do not want logs to be sent to CloudWatch.
     # Strongly recommended to use CloudWatch/centralized logging.
     # Ufo automatically creates the log group as part of deployment.
+    #
+    # More info on awslogs settings: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_awslogs.html
+    # The log stream takes the following format:
+    #   prefix-name/container-name/ecs-task-id
+    # Here's an exmaple when you specify the prefix of "demo"
+    #   demo/web/209e93b4-5523-4496-9a27-662fd151eb78
     awslogs_group: "ecs/<%= @app %>-web",
     awslogs_stream_prefix: "<%= @app %>",
     awslogs_region: helper.current_region,

data/lib/ufo/cli.rb

@@ -110,7 +110,7 @@ module Ufo
       Completer::Script.generate
     end
 
-    desc "upgrade3", "upgrades from version 2 and below to 3"
+    desc "upgrade3", "upgrade from version 2 to 3"
     long_desc Help.text("upgrade3")
     def upgrade3
       Upgrade3.new(options).run

data/lib/ufo/init.rb

@@ -17,9 +17,9 @@ module Ufo
 
     # for specs
     def set_destination_root
-      return unless ENV['DEST_ROOT']
+      return unless ENV['UFO_ROOT']
 
-      dest = ENV['DEST_ROOT']
+      dest = ENV['UFO_ROOT']
       FileUtils.rm_rf(dest) && FileUtils.mkdir_p(dest)
       self.destination_root = dest
       FileUtils.cd(dest)

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/lib/cli_spec.rb

@@ -1,6 +1,6 @@
 describe Ufo::CLI do
   before(:all) do
-    create_starter_project_fixture
+    create_ufo_project
     @args = "--noop"
   end
 

data/spec/lib/core_spec.rb

@@ -1,6 +1,6 @@
 describe Ufo::Core do
   before(:all) do
-    create_starter_project_fixture
+    create_ufo_project
   end
 
   it "finds the first env that contains the aws profile" do

data/spec/lib/setting_spec.rb

@@ -1,6 +1,6 @@
 describe Ufo::Setting do
   before(:all) do
-    create_starter_project_fixture
+    create_ufo_project
   end
 
   let(:setting) { Ufo::Setting.new }

data/spec/spec_helper.rb

@@ -11,20 +11,18 @@ require "byebug"
 root = File.expand_path("../", File.dirname(__FILE__))
 require "#{root}/lib/ufo"
 
-$dest = "tmp/project"
-ENV['DEST_ROOT'] = $dest
-ENV['UFO_ROOT'] = $dest
+ENV['UFO_ROOT'] = "tmp/project"
 
 module Helpers
-  def create_starter_project_fixture
-    FileUtils.rm_rf($dest)
+  def create_ufo_project
+    FileUtils.rm_rf(Ufo.root)
     execute("exe/ufo init --app hi --image tongueroo/hi")
     create_test_settings
   end
 
   # modify the generated settings so we can spec the settings themselves
   def create_test_settings
-    FileUtils.cp("spec/fixtures/settings.yml", "#{$dest}/.ufo/settings.yml")
+    FileUtils.cp("spec/fixtures/settings.yml", "#{Ufo.root}/.ufo/settings.yml")
   end
 
   def execute(cmd)

data/ufo.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://ufoships.com"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  vendor_files       = Dir.glob("vendor/**/*")
+  spec.files         = `git ls-files`.split($/) + vendor_files
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/vendor/render_me_pretty/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
+
+## [0.6.0]
+- Handle SyntaxError errors correctly
+- refactor into MainErrorHandler and SyntaxError classes
+
+## [0.5.0]
+- fix find_template_error_line
+- remove some of the filtering for backtrace lines
+
+## [0.4.0]
+- fix erb and context definitions, fix bug with empty variables={}
+- improve original backtrace info, colorize exact line
+
+## [0.3.0]
+- fix bug with empty variables={}
+- fix erb and context definitions
+
+## [0.2.0]
+- add RenderMePretty.result convenience class method
+
+## [0.1.0]
+- initial release
+

data/vendor/render_me_pretty/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in render_me_pretty.gemspec
+gemspec

data/vendor/render_me_pretty/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    render_me_pretty (0.6.0)
+      activesupport
+      colorize
+      tilt
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    colorize (0.8.1)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  rake
+  render_me_pretty!
+  rspec
+
+BUNDLED WITH
+   1.16.1

data/vendor/render_me_pretty/README.md

@@ -0,0 +1,90 @@
+# Render Me Pretty
+
+Let's say you have an error in your ERB template:
+
+```
+line 1
+<%= sdsd %>
+line 3
+```
+
+Normally, when render it with ERB you get an error message that looks something like this:
+
+```sh
+ NameError:
+   undefined local variable or method `sdsd' for #<RenderMePretty::Context:0x00007fcda414d358>
+ (erb):2:in `get_binding'
+ ./lib/render_me_pretty.rb:71:in `render'
+ ./spec/lib/render_me_pretty/erb_spec.rb:41:in `block (3 levels) in <top (required)>'
+```
+
+Instead, this library produces an output with an error pointing out the original line in the ERB template like so:
+
+```
+NameError evaluating ERB template on line 2 of: spec/fixtures/invalid.erb
+1 line 1
+2 <%= sdsd %>
+3 line 3
+```
+
+The output also colorizes the error line in red so it stands out.
+
+
+## Usage
+
+Here's a simple example:
+
+```ruby
+erb = RenderMePretty::Erb.new("/path/to/tempate.erb", a: 3) }
+erb.render(a: 4)
+```
+
+There's also a convenience class method:
+
+```ruby
+RenderMePretty.result("/path/to/tempate.erb", a: 5)
+```
+
+### Custom Context
+
+```ruby
+person = Person.new("tung")
+erb = RenderMePretty::Erb.new("/path/to/tempate.erb", a: 3, context: person) } # passing context here
+erb.render(a: 4)
+
+person = Person.new("tung")
+erb = RenderMePretty::Erb.new("/path/to/tempate.erb", a: 3) }
+erb.render(person, a: 4) # passing context here
+```
+
+The context's methods and instance variables are available in the ERB template. Variables passed at initialization time to `RenderMePretty::Erb.new` or at call time for `render` be set as instance variables to a clone of the original context object.
+
+So in the case above, if there was an `@a` instance variable in the Person object, it will not get respected. Instead the value would be `@a = 4`.
+
+### Context
+
+You can pass in a context object also.  Examples:
+
+A few more examples are in the [erb_spec.rb](spec/lib/render_me_pretty/erb_spec.rb)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'render_me_pretty'
+```
+
+And then execute:
+
+    $ bundle
+
+## Contributing
+
+Please fork the project and open a pull request! I'd love your pull requests. Contributions are encouraged and welcomed!
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/vendor/render_me_pretty/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+task :default => :spec

data/vendor/render_me_pretty/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "render_me_pretty"
+
+# 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(__FILE__)

data/vendor/render_me_pretty/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/vendor/render_me_pretty/lib/render_me_pretty.rb

@@ -0,0 +1,14 @@
+require "render_me_pretty/version"
+require "active_support/core_ext/string"
+require "colorize"
+
+module RenderMePretty
+  autoload :Erb, 'render_me_pretty/erb'
+
+  def result(path, variables={})
+    erb = Erb.new(path, variables)
+    erb.render
+  end
+
+  extend self
+end

data/vendor/render_me_pretty/lib/render_me_pretty/erb.rb

@@ -0,0 +1,153 @@
+=begin
+## Usage examples:
+
+Given an example template /path/to/template.erb that contains:
+
+  a: <%= @a %>
+
+### Variables at initialization
+
+  erb = RenderMePretty::Erb.new("/path/to/template.erb", a: 1)
+  erb.render
+
+Result: a: 1
+
+### Variables at render time
+
+  erb = RenderMePretty::Erb.new("/path/to/template.erb")
+  erb.render(a: 2)
+
+Result: a: 2
+
+### Variables at both initialization and render time:
+
+  erb = RenderMePretty::Erb.new("/path/to/template.erb", a: 3)
+  erb.render(a: "override", a: 4)
+
+Result: a: 4
+
+Variables at render time will override variables at initialization time.
+
+## Context Scope
+
+If you want to use your own context object, pass it as a variable.  The context variable is specially treated as a context object.  Example:
+
+  person = Person.new # must implement get_binding
+  erb = RenderMePretty::Erb.new("/path/to/template.erb")
+  erb.render(context: person, a: 2)
+
+The context will be `person`.  So person methods and instance variables will be available in the ERB templates.
+
+=end
+require 'tilt/erb'
+
+module RenderMePretty
+  class Erb
+    autoload :BaseHandler, 'render_me_pretty/erb/base_handler'
+    autoload :SyntaxErrorHandler, "render_me_pretty/erb/syntax_error_handler"
+    autoload :MainErrorHandler, "render_me_pretty/erb/main_error_handler"
+
+    def initialize(path, variables={})
+      @path = path
+      @init_vars = variables
+      @context = variables.delete(:context)
+    end
+
+    # Usage:
+    #
+    #   render(context, a: 1, b: 2)
+    #   render(a: 1, b: 2)
+    #   render
+    def render(*args)
+      if args.last.is_a?(Hash)
+        render_vars = args.pop
+        @init_vars = @init_vars.merge(render_vars)
+      end
+      context = args[0]
+      context ||= @context || Object.new
+
+      context = context.clone # so we dont stomp the original object
+      # override context's instance variables with init and render vars.
+      @init_vars.each do |key, value|
+        context.instance_variable_set('@' + key.to_s, value)
+      end
+
+      template = Tilt::ERBTemplate.new(@path)
+      begin
+        template.render(context)
+      rescue Exception => e
+        handle_exception(e)
+      end
+    end
+
+    # Handles Tilt error in prettier manner.
+    #
+    # When there's a syntax error Tilt does not include the line nubmer of the
+    # error in the backtrace it is instead included in the e.message itself.
+    #
+    # When for other errors the line_number is included in the backtrace.
+    #
+    # Refer to specs and uncomment puts out to see the different types of errors.
+    def handle_exception(e)
+      # puts "*" * 30
+      # puts e.class.to_s.colorize(:cyan)
+      # puts e.message.colorize(:cyan)
+      # puts e.backtrace
+      # puts "*" * 30
+      handler = e.is_a?(SyntaxError) ?
+                  SyntaxErrorHandler.new(@path, e) :
+                  MainErrorHandler.new(@path, e)
+      io = handler.handle
+      print_result(io)
+    end
+
+    def print_result(io)
+      if ENV['TEST']
+        io.string
+      else
+        puts io.string
+        exit 1
+      end
+    end
+
+    # Method produces a filtered original stack trace that can be appended to
+    # the pretty backtrace output.
+    #
+    # It parses the original backtrace that looks something like this:
+    #
+    #   (erb):380:in `get_binding'
+    #   /Users/tung/.rbenv/versions/2.5.0/lib/ruby/2.5.0/erb.rb:885:in `eval'
+    #   /Users/tung/.rbenv/versions/2.5.0/lib/ruby/2.5.0/erb.rb:885:in `result'
+    #   /Users/tung/src/tongueroo/lono/vendor/render_me_pretty/lib/render_me_pretty/erb.rb:67:in `render'
+    #   /Users/tung/src/tongueroo/lono/vendor/render_me_pretty/lib/render_me_pretty.rb:11:in `result'
+    #   /Users/tung/src/tongueroo/lono/lib/lono/template/template.rb:32:in `build'
+    #   /Users/tung/src/tongueroo/lono/lib/lono/template/dsl.rb:82:in `block in build_templates'
+    #   /Users/tung/src/tongueroo/lono/lib/lono/template/dsl.rb:81:in `each'
+    def backtrace_lines(e)
+      full = ENV['FULL_BACKTRACE']
+      if full
+        lines = e.backtrace
+      else
+        lines = e.backtrace
+        # This filtering business makes is hiding useful info.
+        # Think it was needed for ERB but Tilt provides a better stack trace.
+        # Commenting out for now.
+
+        # filter out internal lines
+        # removal_index = lines.find_index { |l| l =~ %r[lib/render_me_pretty] }
+        # lines = lines[removal_index..-1] # remove leading lines above the lib/
+          # render_me_pretty lines by keeping lines past the removal index
+        # lines.reject! { |l| l =~ %r[lib/render_me_pretty] } # now filter out
+          # render_me_pretty lines
+        lines = lines[0..7] # keep 8 lines
+      end
+      lines[0] = lines[0].colorize(:red)
+
+      # header
+      lines.unshift "\nOriginal backtrace#{full ? '' : ' (last 8 lines)'}:"
+      # footer
+      lines << "\nRe-run with FULL_BACKTRACE=1 to see all lines"
+      lines.join("\n")
+    end
+  end
+end

data/vendor/render_me_pretty/lib/render_me_pretty/erb/base_handler.rb

@@ -0,0 +1,80 @@
+class RenderMePretty::Erb
+  class BaseHandler
+    def initialize(path, exception)
+      @path = path
+      @exception = exception
+    end
+
+    def handle
+      line_number = find_line_number
+      pretty_trace(line_number, full_message=true) # returns StringIO
+    end
+
+    def pretty_trace(error_line_number, full_message=true)
+      io = StringIO.new
+
+      message = full_message ? ": #{@exception.message}" : ""
+      io.puts "#{@exception.class}#{message}".colorize(:red)
+
+      pretty_path = @path.sub(/^\.\//, '')
+      io.puts "Error evaluating ERB template around line #{error_line_number.to_s.colorize(:red)} of: #{pretty_path}:"
+
+      context = 5 # lines of context
+      top, bottom = [error_line_number-context-1, 0].max, error_line_number+context-1
+
+      lines = IO.read(@path).split("\n")
+      spacing = lines.size.to_s.size
+      lines[top..bottom].each_with_index do |line_content, index|
+        current_line_number = top+index+1
+        if current_line_number == error_line_number
+          io.printf("%#{spacing}d %s\n".colorize(:red), current_line_number, line_content)
+        else
+          io.printf("%#{spacing}d %s\n", current_line_number, line_content)
+        end
+      end
+
+      io.puts backtrace_lines
+      io
+    end
+
+    # Method produces a filtered original stack trace that can be appended to
+    # the pretty backtrace output.
+    #
+    # It parses the original backtrace that looks something like this:
+    #
+    #   (erb):380:in `get_binding'
+    #   /Users/tung/.rbenv/versions/2.5.0/lib/ruby/2.5.0/erb.rb:885:in `eval'
+    #   /Users/tung/.rbenv/versions/2.5.0/lib/ruby/2.5.0/erb.rb:885:in `result'
+    #   /Users/tung/src/tongueroo/lono/vendor/render_me_pretty/lib/render_me_pretty/erb.rb:67:in `render'
+    #   /Users/tung/src/tongueroo/lono/vendor/render_me_pretty/lib/render_me_pretty.rb:11:in `result'
+    #   /Users/tung/src/tongueroo/lono/lib/lono/template/template.rb:32:in `build'
+    #   /Users/tung/src/tongueroo/lono/lib/lono/template/dsl.rb:82:in `block in build_templates'
+    #   /Users/tung/src/tongueroo/lono/lib/lono/template/dsl.rb:81:in `each'
+    def backtrace_lines
+      full = ENV['FULL_BACKTRACE']
+      if full
+        lines = @exception.backtrace
+      else
+        lines = @exception.backtrace
+        # This filtering business makes is hiding useful info.
+        # Think it was needed for ERB but Tilt provides a better stack trace.
+        # Commenting out for now.
+
+        # filter out internal lines
+        # removal_index = lines.find_index { |l| l =~ %r[lib/render_me_pretty] }
+        # lines = lines[removal_index..-1] # remove leading lines above the lib/
+          # render_me_pretty lines by keeping lines past the removal index
+        # lines.reject! { |l| l =~ %r[lib/render_me_pretty] } # now filter out
+          # render_me_pretty lines
+        lines = lines[0..7] # keep 8 lines
+      end
+      lines[0] = lines[0].colorize(:red)
+
+      # header
+      lines.unshift "\nOriginal backtrace#{full ? '' : ' (last 8 lines)'}:"
+      # footer
+      lines << "\nRe-run with FULL_BACKTRACE=1 to see all lines"
+      lines.join("\n")
+    end
+  end
+end

data/vendor/render_me_pretty/lib/render_me_pretty/erb/main_error_handler.rb

@@ -0,0 +1,16 @@
+class RenderMePretty::Erb
+  class MainErrorHandler < BaseHandler
+    # For general Tilt errors first line of the backtrace that contains the path
+    # of the file we're rendeirng and has the line number. Example:
+    #
+    #   spec/fixtures/invalid.erb:2:in `block in singleton class'
+    #   error_info = e.backtrace[0]
+    def find_line_number
+      lines = @exception.backtrace
+      error_line = lines.select do |line|
+        line.include?(@path)
+      end.first
+      error_line.split(':')[1].to_i
+    end
+  end
+end

data/vendor/render_me_pretty/lib/render_me_pretty/erb/syntax_error_handler.rb

@@ -0,0 +1,21 @@
+class RenderMePretty::Erb
+  class SyntaxErrorHandler < BaseHandler
+    # spec/fixtures/invalid/syntax.erb:2: syntax error, unexpected ';', expecting ']'
+    # );  if ENV['TEST' ; _erbout.<<(-" missing ending...
+    #                   ^
+    # spec/fixtures/invalid/syntax.erb:12: syntax error, unexpected keyword_end, expecting end-of-input
+    # end;end;end;end
+    #             ^~~
+    #
+    # We will only find the first line number for the error.
+    def find_line_number
+      pattern = Regexp.new("#{@path}:(\\\d+): syntax error")
+      lines = @exception.message.split("\n")
+      found_line = lines.find do |line|
+        line.match(pattern)
+      end
+      md = found_line.match(pattern)
+      md[1].to_i # line_number
+    end
+  end
+end

data/vendor/render_me_pretty/lib/render_me_pretty/version.rb

@@ -0,0 +1,3 @@
+module RenderMePretty
+  VERSION = "0.6.0"
+end

data/vendor/render_me_pretty/render_me_pretty.gemspec

@@ -0,0 +1,28 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "render_me_pretty/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "render_me_pretty"
+  spec.version       = RenderMePretty::VERSION
+  spec.authors       = ["Tung Nguyen"]
+  spec.email         = ["tongueroo@gmail.com"]
+
+  spec.summary       = %q{Render ERB template and provide more useful message pointing out the line with the error in the view}
+  spec.homepage      = "https://github.com/tongueroo/render_me_pretty"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activesupport"
+  spec.add_dependency "colorize"
+  spec.add_dependency "tilt"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end

data/vendor/render_me_pretty/spec/fixtures/invalid/syntax.erb

@@ -0,0 +1,5 @@
+line 1
+<% if ENV['TEST' %> missing ending ]
+  <%= "foo" %>
+<% end %>
+line 3

data/vendor/render_me_pretty/spec/fixtures/invalid/variable.erb

@@ -0,0 +1,3 @@
+line 1
+<%= breakme %>
+line 3

data/vendor/render_me_pretty/spec/fixtures/valid.erb

@@ -0,0 +1,4 @@
+test:
+a: <%= @a %>
+my_helper: <%= my_helper %>
+hello test: <%= hello("tung") %>

data/vendor/render_me_pretty/spec/lib/render_me_pretty/erb_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe RenderMePretty do
+  let(:context) { TestContext.new }
+
+  context "valid" do
+    let(:path) { "spec/fixtures/valid.erb" }
+
+    context "initial variables" do
+      let(:erb) { RenderMePretty::Erb.new(path, a: 1) }
+      it "#render" do
+        out = erb.render(context)
+        expect(out).to include "a: 1"
+        # test helper methods also
+        expect(out).to include "my_helper: my_helper value"
+        expect(out).to include "hello test: hello tung"
+      end
+    end
+
+    context "render time variables" do
+      let(:erb) { RenderMePretty::Erb.new(path) }
+      it "#render" do
+        out = erb.render(context, a: 2)
+        expect(out).to include "a: 2"
+      end
+    end
+
+    context "both initial and render time variables" do
+      let(:erb) { RenderMePretty::Erb.new(path, a: 3) }
+      it "#render" do
+        out = erb.render(context, a: 4)
+        expect(out).to include "a: 4"
+      end
+    end
+
+    it "convenience class method" do
+      out = RenderMePretty.result(path, context: context)
+      expect(out).to include "hello test: hello tung"
+    end
+  end
+
+  context "invalid" do
+    let(:erb) { RenderMePretty::Erb.new(path) }
+
+    context "variable" do
+      let(:path) { "spec/fixtures/invalid/variable.erb" }
+      it "#render" do
+        out = erb.render(context)
+        # puts out
+        expect(out).to include("2 <%= breakme %>")
+      end
+    end
+
+    context "syntax" do
+      let(:path) { "spec/fixtures/invalid/syntax.erb" }
+      it "#render" do
+        out = erb.render(context)
+        # puts out
+        # spec/fixtures/invalid/syntax.erb:2: syntax error, unexpected ';', expecting ']'
+        # );  if ENV['TEST' ; _erbout.<<(-" missing ending...
+                          # ^
+        # spec/fixtures/invalid/syntax.erb:12: syntax error, unexpected keyword_end, expecting end-of-input
+        # end;end;end;end
+                    # ^~~
+        expect(out).to include("ENV['TEST' ")
+      end
+    end
+  end
+end

data/vendor/render_me_pretty/spec/spec_helper.rb

@@ -0,0 +1,87 @@
+ENV['TEST'] = '1'
+
+require "./lib/render_me_pretty"
+require "./spec/test_context"
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/vendor/render_me_pretty/spec/test_context.rb

@@ -0,0 +1,20 @@
+class TestContext
+  def initialize(hash={})
+    # http://stackoverflow.com/questions/1338960/ruby-templates-how-to-pass-variables-into-inlined-erb
+    hash.each do |key, value|
+      instance_variable_set('@' + key.to_s, value)
+    end
+  end
+
+  def my_helper
+    "my_helper value"
+  end
+
+  def hello(name)
+    "hello #{name}"
+  end
+
+  def foo_helper
+    "foo_helper"
+  end
+end

data/vendor/render_me_pretty/tilt_examples.rb

@@ -0,0 +1,18 @@
+require 'tilt/erb'
+template = Tilt::ERBTemplate.new('templates/foo.erb')
+joe = Person.find('joe')
+output = template.render(joe, :x => 35, :y => 42)
+# If no scope is provided, the template is evaluated within the context of an object created with Object.new.
+
+# A single Template instance's render method may be called multiple times with different scope and locals arguments. Continuing the previous example, we render the same compiled template but this time in jane's scope:
+
+jane = Person.find('jane')
+output = template.render(jane, :x => 22, :y => nil)
+# Blocks can be passed to render for templates that support running arbitrary ruby code (usually with some form of yield). For instance, assuming the following in foo.erb:
+
+# Hey <%= yield %>!
+# The block passed to render is called on yield:
+
+template = Tilt::ERBTemplate.new('foo.erb')
+template.render { 'Joe' }
+# => "Hey Joe!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -416,6 +416,27 @@ files:
 - spec/lib/task_spec.rb
 - spec/spec_helper.rb
 - ufo.gemspec
+- vendor/render_me_pretty/CHANGELOG.md
+- vendor/render_me_pretty/Gemfile
+- vendor/render_me_pretty/Gemfile.lock
+- vendor/render_me_pretty/README.md
+- vendor/render_me_pretty/Rakefile
+- vendor/render_me_pretty/bin/console
+- vendor/render_me_pretty/bin/setup
+- vendor/render_me_pretty/lib/render_me_pretty.rb
+- vendor/render_me_pretty/lib/render_me_pretty/erb.rb
+- vendor/render_me_pretty/lib/render_me_pretty/erb/base_handler.rb
+- vendor/render_me_pretty/lib/render_me_pretty/erb/main_error_handler.rb
+- vendor/render_me_pretty/lib/render_me_pretty/erb/syntax_error_handler.rb
+- vendor/render_me_pretty/lib/render_me_pretty/version.rb
+- vendor/render_me_pretty/render_me_pretty.gemspec
+- vendor/render_me_pretty/spec/fixtures/invalid/syntax.erb
+- vendor/render_me_pretty/spec/fixtures/invalid/variable.erb
+- vendor/render_me_pretty/spec/fixtures/valid.erb
+- vendor/render_me_pretty/spec/lib/render_me_pretty/erb_spec.rb
+- vendor/render_me_pretty/spec/spec_helper.rb
+- vendor/render_me_pretty/spec/test_context.rb
+- vendor/render_me_pretty/tilt_examples.rb
 homepage: http://ufoships.com
 licenses:
 - MIT