terminal 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1fd9f219146ed4463a928b67224582819d8757
-  data.tar.gz: 53c7767794c1bb69439d5e6e441bc70cb97e0b86
+  metadata.gz: c8080e014246d4d9ff730114e8369fd447402772
+  data.tar.gz: 7fd43ca59d7f083934c9a0139fbbe34e502cf3de
 SHA512:
-  metadata.gz: 9d1e0f48a43edfed6e63d95740fc51de8ad5ee17415f630dc43c1a39d1cbc5052927976614109633d0f3eaad57d736f52fa1c630bbda4db2ac951a9254cf4e59
-  data.tar.gz: debe42f4483592f784a20c739f95407852ed690c5924d58d587b9c7de3fca3592597b23c954a9145a7fcb6a802178eb6ee5f5ab6d8e3791b2f24026aaeec2fca
+  metadata.gz: 1babbd0249d209f6c20e09c75d65d7612edad91c39ee9be3f4fa9212274ec4a20ac11689d307d8673f85bd0bf929b2a86955827b51b1630d53a358b807fcd8c9
+  data.tar.gz: 651b8d7ffccde7d611ca3a1c7dd0ad7eec2cd00c0848838b001d1e1286ab0b826e2388648864137d8e90dd05507ec091b4c6def53562fe13ea859638c189ee62

data/Dockerfile

@@ -0,0 +1,4 @@
+FROM ruby:2.1.5
+
+ADD . /app
+WORKDIR /app

data/Gemfile.lock

@@ -1,33 +1,35 @@
 PATH
   remote: .
   specs:
-    terminal (0.4)
+    terminal (1.0.1)
       escape_utils (~> 1.0)
       gemoji (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    benchmark-ips (2.0.0)
+    benchmark-ips (2.1.1)
     diff-lcs (1.2.5)
     escape_utils (1.0.1)
     gemoji (2.1.0)
-    hirb (0.7.2)
+    hirb (0.7.3)
+    memory_profiler (0.0.4)
     method_profiler (2.0.1)
       hirb (>= 0.6.0)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
 
 PLATFORMS
   ruby
@@ -35,6 +37,7 @@ PLATFORMS
 DEPENDENCIES
   benchmark-ips
   bundler (~> 1.6)
+  memory_profiler
   method_profiler
   rake
   rspec

data/Readme.md

@@ -1,4 +1,4 @@
-![logo](http://buildbox.github.io/terminal/images/logo.svg)
+![logo](http://buildkite.github.io/terminal/images/logo.svg)
 
 [![Gem Version](https://badge.fury.io/rb/terminal.png)](https://rubygems.org/gems/terminal)
 
@@ -84,14 +84,14 @@ and when the render has finished, it will open in your web browser with a before
 rspec --color --tty | terminal --preview
 ```
 
-![preview mode](http://buildbox.github.io/terminal/images/preview.png)
+![preview mode](http://buildkite.github.io/terminal/images/preview.png)
 
-### With the Buildbox API
+### With the Buildkite API
 
-You can use the `job_url` returned by the [Builds API](https://buildbox.io/docs/api/builds) to pipe a job's log directly into terminal, for example:
+You can use the `job_url` returned by the [Builds API](https://buildkite.com/docs/api/builds) to pipe a job's log directly into terminal, for example:
 
 ```bash
-JOB_LOG_URL="https://api.buildbox.io/v1/accounts/[account]/projects/[project]/builds/[build]/jobs/[job]/log.txt?api_key=[api-key]"
+JOB_LOG_URL="https://api.buildkite.com/v1/accounts/[account]/projects/[project]/builds/[build]/jobs/[job]/log.txt?api_key=[api-key]"
 curl $JOB_LOG_URL | terminal --preview
 ```
 
@@ -120,7 +120,7 @@ mv examples/*{raw,rendered} spec/fixtures
 
 ## Licence
 
-> Copyright (c) 2014 Keith Pitt, Buildbox
+> Copyright (c) 2015 Keith Pitt, Tim Lucas, Buildkite Pty Ltd
 >
 > MIT License
 >

data/bin/terminal

@@ -22,7 +22,7 @@ Version:
 Preview in the browser:
   $ terminal --preview
 
-See https://buildbox.github.io/terminal for more information.
+See https://buildkite.github.io/terminal for more information.
   usage
 end
 

data/examples/curl.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 echo -e "\033[90m$\033[0m curl -o /tmp/file.txt https://example.com/file.txt"
-curl -o /tmp/buildbox-agent.tar.gz https://github.com/buildbox/buildbox-agent/releases/download/v0.1-alpha/buildbox-agent-darwin-386.tar.gz
+curl -o /tmp/buildkite-agent.tar.gz https://github.com/buildkite/buildkite-agent/releases/download/v0.1-alpha/buildkite-agent-darwin-386.tar.gz

data/lib/terminal/renderer.rb

@@ -2,6 +2,7 @@
 
 require 'escape_utils'
 require 'emoji'
+require 'strscan'
 
 module Terminal
   class Renderer
@@ -27,12 +28,8 @@ module Terminal
     def render
       return "" if @output.nil?
 
-      # First duplicate the string, because we're going to be editing and chopping it
-      # up directly.
-      output = @output.to_s.dup
-
       # Don't allow parsing of outputs longer than 4 meg
-      output = check_and_chomp_length(output)
+      output = dup_check_and_chomp_length(@output)
 
       # Force encoding on the output first
       force_encoding!(output)
@@ -57,7 +54,7 @@ module Terminal
 
     private
 
-    def check_and_chomp_length(output)
+    def dup_check_and_chomp_length(output)
       # Limit the entire size of the output to 4 meg
       max_total_size = 4 * MEGABYTES
       if output.bytesize > max_total_size
@@ -65,7 +62,7 @@ module Terminal
         new_output << "\n\nWarning: Terminal has chopped off the rest of the build as it's over the allowed 4 megabyte limit for logs."
         new_output
       else
-        output
+        output.dup
       end
     end
 
@@ -79,18 +76,15 @@ module Terminal
       end
     end
 
-    # Scan the string to create an array of interesting things, for example
-    # it would look like this:
-    # [ '\n', '\r', 'a', 'b', '\e123m' ]
-    def split_by_escape_character(string)
-      string.scan(INTERESTING_PARTS_REGEX)
-    end
-
     def render_to_screen(string)
-      # The when cases are ordered by most likely, the lest checks it has to go
-      # through before matching, the faster the render will be. Colors are
-      # usually most likey, so that's first.
-      split_by_escape_character(string).each do |char|
+      scanner = StringScanner.new(string)
+
+      # Scan the string for interesting things, for example:
+      # [ '\n', '\r', 'a', 'b', '\e123m' ]
+      while char = scanner.scan(INTERESTING_PARTS_REGEX)
+        # The when cases are ordered by most likely, the lest checks it has to go
+        # through before matching, the faster the render will be. Colors are
+        # usually most likey, so that's first.
         if char == "\n".freeze
           @screen.x = 0
           @screen.y += 1
@@ -98,7 +92,7 @@ module Terminal
           @screen.x = 0
         elsif char == "\b".freeze
           @screen.x -= 1
-        elsif char[0] == "\e".freeze && char.length > 1
+        elsif char.index("\e".freeze) == 0 && char.length > 1
           sequence = char.match(ESCAPE_CAPTURE_REGEX)
 
           instruction = sequence[1]

data/lib/terminal/version.rb

@@ -1,3 +1,3 @@
 module Terminal
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/script/memory_profile

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+# Usage:
+#
+#   script/memory_profile log.txt
+
+$:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
+
+require 'terminal'
+require 'memory_profiler'
+
+log = $<.read
+
+puts MemoryProfiler.report {
+  Terminal.render(log)
+}.pretty_print

data/spec/terminal/renderer_spec.rb

@@ -199,7 +199,7 @@ describe Terminal::Renderer do
     it "renders unicode emoji" do
       raw = "this is great 👍"
 
-      expect(render(raw)).to eql(%{this is great <img alt=":+1:" title=":+1:" src="/assets/emojis/unicode/1f44d.png" class="emoji" width="20" height="20" />})
+      expect(render(raw)).to eql(%{this is great <img alt="+1" title="+1" src="/assets/emojis/unicode/1f44d.png" class="emoji" width="20" height="20" />})
     end
 
     it "returns nothing if the unicode emoji can't be found" do

data/terminal.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["me@keithpitt.com"]
   spec.summary       = %q{Converts ANSI to HTML}
   spec.description   = %q{Converts ANSI to HTML}
-  spec.homepage      = "https://github.com/buildbox/terminal"
+  spec.homepage      = "https://github.com/buildkite/terminal"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "method_profiler"
+  spec.add_development_dependency "memory_profiler"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Converts ANSI to HTML
 email:
 - me@keithpitt.com
@@ -119,6 +133,7 @@ files:
 - ".DS_Store"
 - ".gitignore"
 - ".rspec"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -145,6 +160,7 @@ files:
 - script/buildbox/benchmark.sh
 - script/buildbox/profile_methods.sh
 - script/buildbox/specs.sh
+- script/memory_profile
 - script/profile_methods
 - spec/fixtures/curl.sh.raw
 - spec/fixtures/curl.sh.rendered
@@ -157,7 +173,7 @@ files:
 - spec/terminal/renderer_spec.rb
 - spec/terminal/screen_spec.rb
 - terminal.gemspec
-homepage: https://github.com/buildbox/terminal
+homepage: https://github.com/buildkite/terminal
 licenses:
 - MIT
 metadata: {}