puma 2.3.0 → 2.3.1

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "hoe"
 gem "hoe-git"
+gem "hoe-ignore"
 gem "rdoc"
 gem "rake-compiler"
 gem "rack"

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.3.1 / 2013-07-06
+
+* 2 bug fixes:
+
+  * Include the right files in the Manifest.
+  * Disable inheriting connections on restart on windows. Fixes #166
+
+* 1 doc change:
+  * Better document some platform constraints
+
 === 2.3.0 / 2013-07-05
 
 * 1 major bug fix:

data/Manifest.txt

@@ -31,6 +31,7 @@ lib/puma/binder.rb
 lib/puma/capistrano.rb
 lib/puma/cli.rb
 lib/puma/client.rb
+lib/puma/cluster.rb
 lib/puma/compat.rb
 lib/puma/configuration.rb
 lib/puma/const.rb
@@ -47,14 +48,18 @@ lib/puma/null_io.rb
 lib/puma/rack_default.rb
 lib/puma/rack_patch.rb
 lib/puma/reactor.rb
+lib/puma/runner.rb
 lib/puma/server.rb
+lib/puma/single.rb
 lib/puma/thread_pool.rb
 lib/puma/util.rb
 lib/rack/handler/puma.rb
 puma.gemspec
+tools/jungle/README.md
 tools/jungle/init.d/README.md
 tools/jungle/init.d/puma
 tools/jungle/init.d/run-puma
 tools/jungle/upstart/README.md
 tools/jungle/upstart/puma-manager.conf
 tools/jungle/upstart/puma.conf
+tools/trickletest.rb

data/README.md

@@ -175,6 +175,14 @@ Puma isn't able to understand all the resources that your app may use, so it pro
 
 You should place code to close global log files, redis connections, etc in this block so that their file descriptors don't leak into the restarted process. Failure to do so will result in slowly running out of descriptors and eventually obscure crashes as the server is restart many times.
 
+### Platform Constaints
+
+Because of various platforms not being implement certain things, the following differences occur when puma is used on different platforms:
+
+  * On JRuby and Windows, server sockets are not seamless on restart, they must be closed and reopened. These platforms have no way to pass descriptors into a new process that is exposed to ruby.
+  * On Windows, daemon mode is not supported due to a lack of fork(2).
+  * On JRuby and Windows, cluster mode is not supported due to a lack of fork(2).
+
 ## pumactl
 
 If you start puma with `-S some/path` then you can pass that same path to the `pumactl` program to control your server. For instance:

data/Rakefile

@@ -5,6 +5,7 @@ require "rake/javaextensiontask"
 IS_JRUBY = defined?(RUBY_ENGINE) ? RUBY_ENGINE == "jruby" : false
 
 Hoe.plugin :git
+Hoe.plugin :ignore
 
 HOE = Hoe.spec "puma" do
   self.rubyforge_name = 'puma'
@@ -24,6 +25,8 @@ HOE = Hoe.spec "puma" do
   extra_dev_deps << ["rake-compiler", "~> 0.8.0"]
 end
 
+task :prerelease => [:clobber, :check_manifest, :test]
+
 # hoe/test and rake-compiler don't seem to play well together, so disable
 # hoe/test's .gemtest touch file thingy for now
 HOE.spec.files -= [".gemtest"]

data/lib/puma/cli.rb

@@ -365,6 +365,26 @@ module Puma
 
         require 'puma/jruby_restart'
         JRubyRestart.chdir_exec(@restart_dir, restart_args)
+
+      elsif windows?
+        @binder.listeners.each_with_index do |(str,io),i|
+          io.close
+
+          # We have to unlink a unix socket path that's not being used
+          uri = URI.parse str
+          if uri.scheme == "unix"
+            path = "#{uri.host}#{uri.path}"
+            File.unlink path
+          end
+        end
+
+        argv = restart_args
+
+        Dir.chdir @restart_dir
+
+        argv += [redirects] unless RUBY_VERSION < '1.9'
+        Kernel.exec(*argv)
+
       else
         redirects = {:close_others => true}
         @binder.listeners.each_with_index do |(l,io),i|

data/lib/puma/cluster.rb

@@ -0,0 +1,313 @@
+require 'puma/runner'
+
+module Puma
+  class Cluster < Runner
+    def initialize(cli)
+      super cli
+
+      @phase = 0
+      @workers = []
+
+      @phased_state = :idle
+      @phased_restart = false
+    end
+
+    def stop_workers
+      log "- Gracefully shutting down workers..."
+      @workers.each { |x| x.term }
+
+      begin
+        Process.waitall
+      rescue Interrupt
+        log "! Cancelled waiting for workers"
+      end
+    end
+
+    def start_phased_restart
+      @phase += 1
+      log "- Starting phased worker restart, phase: #{@phase}"
+    end
+
+    class Worker
+      def initialize(pid, phase)
+        @pid = pid
+        @phase = phase
+        @stage = :started
+      end
+
+      attr_reader :pid, :phase
+
+      def booted?
+        @stage == :booted
+      end
+
+      def boot!
+        @stage = :booted
+      end
+
+      def term
+        begin
+          Process.kill "TERM", @pid
+        rescue Errno::ESRCH
+        end
+      end
+    end
+
+    def spawn_workers
+      diff = @options[:workers] - @workers.size
+
+      upgrade = (@phased_state == :waiting)
+
+      master = Process.pid
+
+      diff.times do
+        pid = fork { worker(upgrade, master) }
+        @cli.debug "Spawned worker: #{pid}"
+        @workers << Worker.new(pid, @phase)
+      end
+
+      if diff > 0
+        @phased_state = :idle
+      end
+    end
+
+    def all_workers_booted?
+      @workers.count { |w| !w.booted? } == 0
+    end
+
+    def check_workers
+      while @workers.any?
+        pid = Process.waitpid(-1, Process::WNOHANG)
+        break unless pid
+
+        @workers.delete_if { |w| w.pid == pid }
+      end
+
+      spawn_workers
+
+      if @phased_state == :idle && all_workers_booted?
+        # If we're running at proper capacity, check to see if
+        # we need to phase any workers out (which will restart
+        # in the right phase).
+        #
+        w = @workers.find { |x| x.phase != @phase }
+
+        if w
+          @phased_state = :waiting
+          log "- Stopping #{w.pid} for phased upgrade..."
+          w.term
+        end
+      end
+    end
+
+    def wakeup!
+      begin
+        @wakeup.write "!" unless @wakeup.closed?
+      rescue SystemCallError, IOError
+      end
+    end
+
+    def worker(upgrade, master)
+      $0 = "puma: cluster worker: #{master}"
+      Signal.trap "SIGINT", "IGNORE"
+
+      @master_read.close
+      @suicide_pipe.close
+
+      Thread.new do
+        IO.select [@check_pipe]
+        log "! Detected parent died, dying"
+        exit! 1
+      end
+
+      # Be sure to change the directory again before loading
+      # the app. This way we can pick up new code.
+      if upgrade
+        if dir = @options[:worker_directory]
+          log "+ Changing to #{dir}"
+          Dir.chdir dir
+        end
+      end
+
+      # Invoke any worker boot hooks so they can get
+      # things in shape before booting the app.
+      hooks = @options[:worker_boot]
+      hooks.each { |h| h.call }
+
+      server = start_server
+
+      Signal.trap "SIGTERM" do
+        server.stop
+      end
+
+      begin
+        @worker_write << "b#{Process.pid}\n"
+      rescue SystemCallError, IOError
+        STDERR.puts "Master seems to have exitted, exitting."
+        return
+      end
+
+      server.run.join
+
+    ensure
+      @worker_write.close
+    end
+
+    def restart
+      @restart = true
+      stop
+    end
+
+    def phased_restart
+      return false if @options[:preload_app]
+
+      @phased_restart = true
+      wakeup!
+
+      true
+    end
+
+    def stop
+      @status = :stop
+      wakeup!
+    end
+
+    def stop_blocked
+      @status = :stop if @status == :run
+      wakeup!
+      Process.waitall
+    end
+
+    def halt
+      @status = :halt
+      wakeup!
+    end
+
+    def stats
+      %Q!{ "workers": #{@workers.size}, "phase": #{@phase} }!
+    end
+
+    def preload?
+      @options[:preload_app]
+    end
+
+    def run
+      @status = :run
+
+      output_header "cluster"
+
+      log "* Process workers: #{@options[:workers]}"
+
+      if preload?
+        log "* Preloading application"
+        load_and_bind
+      else
+        log "* Phased restart available"
+
+        unless @cli.config.app_configured?
+          error "No application configured, nothing to run"
+          exit 1
+        end
+
+        @cli.binder.parse @options[:binds], self
+      end
+
+      read, @wakeup = Puma::Util.pipe
+
+      Signal.trap "SIGCHLD" do
+        wakeup!
+      end
+
+      master_pid = Process.pid
+
+      Signal.trap "SIGTERM" do
+        # The worker installs their own SIGTERM when booted.
+        # Until then, this is run by the worker and the worker
+        # should just exit if they get it.
+        if Process.pid != master_pid
+          log "Early termination of worker"
+          exit! 0
+        else
+          stop
+        end
+      end
+
+      if preload?
+        Signal.trap "SIGUSR1" do
+          log "App preloaded, phased restart unavailable"
+        end
+      else
+        Signal.trap "SIGUSR1" do
+          phased_restart
+        end
+      end
+
+      # Used by the workers to detect if the master process dies.
+      # If select says that @check_pipe is ready, it's because the
+      # master has exited and @suicide_pipe has been automatically
+      # closed.
+      #
+      @check_pipe, @suicide_pipe = Puma::Util.pipe
+
+      if daemon?
+        log "* Daemonizing..."
+        Process.daemon(true)
+      else
+        log "Use Ctrl-C to stop"
+      end
+
+      redirect_io
+
+      @cli.write_state
+
+      @master_read, @worker_write = read, @wakeup
+      spawn_workers
+
+      Signal.trap "SIGINT" do
+        stop
+      end
+
+      @cli.events.fire_on_booted!
+
+      begin
+        while @status == :run
+          begin
+            res = IO.select([read], nil, nil, 5)
+
+            if res
+              req = read.read_nonblock(1)
+
+              if req == "b"
+                pid = read.gets.to_i
+                w = @workers.find { |x| x.pid == pid }
+                if w
+                  w.boot!
+                  log "- Worker #{pid} booted, phase: #{w.phase}"
+                else
+                  log "! Out-of-sync worker list, no #{pid} worker"
+                end
+              end
+            end
+
+            if @phased_restart
+              start_phased_restart
+              @phased_restart = false
+            end
+
+            check_workers
+
+          rescue Interrupt
+            @status = :stop
+          end
+        end
+
+        stop_workers unless @status == :halt
+      ensure
+        @check_pipe.close
+        @suicide_pipe.close
+        read.close
+        @wakeup.close
+      end
+    end
+  end
+end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.3.0".freeze
+    PUMA_VERSION = VERSION = "2.3.1".freeze
     CODE_NAME = "Delicious Thin Mints"
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/runner.rb

@@ -0,0 +1,90 @@
+module Puma
+  class Runner
+    def initialize(cli)
+      @cli = cli
+      @options = cli.options
+      @app = nil
+    end
+
+    def daemon?
+      @options[:daemon]
+    end
+
+    def development?
+      @options[:environment] == "development"
+    end
+
+    def log(str)
+      @cli.log str
+    end
+
+    def error(str)
+      @cli.error str
+    end
+
+    def output_header(mode)
+      min_t = @options[:min_threads]
+      max_t = @options[:max_threads]
+
+      log "Puma starting in #{mode} mode..."
+      log "* Version #{Puma::Const::PUMA_VERSION}, codename: #{Puma::Const::CODE_NAME}"
+      log "* Min threads: #{min_t}, max threads: #{max_t}"
+      log "* Environment: #{ENV['RACK_ENV']}"
+    end
+
+    def redirect_io
+      stdout = @options[:redirect_stdout]
+      stderr = @options[:redirect_stderr]
+      append = @options[:redirect_append]
+
+      if stdout
+        STDOUT.reopen stdout, (append ? "a" : "w")
+        STDOUT.sync = true
+        STDOUT.puts "=== puma startup: #{Time.now} ==="
+      end
+
+      if stderr
+        STDERR.reopen stderr, (append ? "a" : "w")
+        STDERR.sync = true
+        STDERR.puts "=== puma startup: #{Time.now} ==="
+      end
+    end
+
+    def load_and_bind
+      unless @cli.config.app_configured?
+        error "No application configured, nothing to run"
+        exit 1
+      end
+
+      # Load the app before we daemonize.
+      begin
+        @app = @cli.config.app
+      rescue Exception => e
+        log "! Unable to load application"
+        raise e
+      end
+
+      @cli.binder.parse @options[:binds], self
+    end
+
+    def app
+      @app ||= @cli.config.app
+    end
+
+    def start_server
+      min_t = @options[:min_threads]
+      max_t = @options[:max_threads]
+
+      server = Puma::Server.new app, @cli.events
+      server.min_threads = min_t
+      server.max_threads = max_t
+      server.inherit_binder @cli.binder
+
+      unless development?
+        server.leak_stack_on_error = false
+      end
+
+      server
+    end
+  end
+end

data/lib/puma/single.rb

@@ -0,0 +1,88 @@
+require 'puma/runner'
+
+module Puma
+  class Single < Runner
+    def stats
+      b = @server.backlog
+      r = @server.running
+      %Q!{ "backlog": #{b}, "running": #{r} }!
+    end
+
+    def restart
+      @server.begin_restart
+    end
+
+    def stop
+      @server.stop false
+    end
+
+    def halt
+      @server.halt
+    end
+
+    def stop_blocked
+      log "- Gracefully stopping, waiting for requests to finish"
+      @server.stop(true)
+    end
+
+    def jruby_daemon?
+      daemon? and @cli.jruby?
+    end
+
+    def run
+      already_daemon = false
+
+      if jruby_daemon?
+        require 'puma/jruby_restart'
+
+        if JRubyRestart.daemon?
+          # load and bind before redirecting IO so errors show up on stdout/stderr
+          load_and_bind
+        end
+
+        already_daemon = JRubyRestart.daemon_init
+      end
+
+      output_header "single"
+
+      if jruby_daemon?
+        unless already_daemon
+          pid = nil
+
+          Signal.trap "SIGUSR2" do
+            log "* Started new process #{pid} as daemon..."
+            exit
+          end
+
+          pid = @cli.jruby_daemon_start
+          sleep
+        end
+      else
+        load_and_bind
+
+        if daemon?
+          log "* Daemonizing..."
+          Process.daemon(true)
+        end
+      end
+
+      @cli.write_state
+
+      @server = server = start_server
+
+      unless @options[:daemon]
+        log "Use Ctrl-C to stop"
+      end
+
+      redirect_io
+
+      @cli.events.fire_on_booted!
+
+      begin
+        server.run.join
+      rescue Interrupt
+        # Swallow it
+      end
+    end
+  end
+end

data/puma.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "docs/config.md", "docs/nginx.md", "tools/jungle/init.d/README.md", "tools/jungle/upstart/README.md"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "docs/config.md", "docs/nginx.md", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/upstart/README.md"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/cluster.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/runner.rb", "lib/puma/server.rb", "lib/puma/single.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "tools/trickletest.rb", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]

data/tools/jungle/README.md

@@ -0,0 +1,9 @@
+# Puma as a service
+
+## Init.d
+
+See `/tools/jungle/init.d` for tools to use with init.d and start-stop-daemon.
+
+## Upstart
+
+See `/tools/jungle/upstart` for Ubuntu's upstart scripts.

data/tools/trickletest.rb

@@ -0,0 +1,45 @@
+require 'socket'
+require 'stringio'
+
+def do_test(st, chunk)
+  s = TCPSocket.new('127.0.0.1',ARGV[0].to_i);
+  req = StringIO.new(st)
+  nout = 0
+  randstop = rand(st.length / 10)
+  STDERR.puts "stopping after: #{randstop}"
+
+  begin
+    while data = req.read(chunk)
+      nout += s.write(data)
+      s.flush
+      sleep 0.1
+      if nout > randstop
+        STDERR.puts "BANG! after #{nout} bytes."
+        break
+      end
+    end
+  rescue Object => e
+    STDERR.puts "ERROR: #{e}"
+  ensure
+    s.close
+  end
+end
+
+content = "-" * (1024 * 240)
+st = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\nContent-Length: #{content.length}\r\n\r\n#{content}"
+
+puts "length: #{content.length}"
+
+threads = []
+ARGV[1].to_i.times do 
+  t = Thread.new do
+    size = 100
+    puts ">>>> #{size} sized chunks"
+    do_test(st, size)
+  end
+
+  t.abort_on_exception = true
+  threads << t
+end
+
+threads.each {|t|  t.join}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -98,6 +98,7 @@ extra_rdoc_files:
 - README.md
 - docs/config.md
 - docs/nginx.md
+- tools/jungle/README.md
 - tools/jungle/init.d/README.md
 - tools/jungle/upstart/README.md
 files:
@@ -134,6 +135,7 @@ files:
 - lib/puma/capistrano.rb
 - lib/puma/cli.rb
 - lib/puma/client.rb
+- lib/puma/cluster.rb
 - lib/puma/compat.rb
 - lib/puma/configuration.rb
 - lib/puma/const.rb
@@ -150,17 +152,21 @@ files:
 - lib/puma/rack_default.rb
 - lib/puma/rack_patch.rb
 - lib/puma/reactor.rb
+- lib/puma/runner.rb
 - lib/puma/server.rb
+- lib/puma/single.rb
 - lib/puma/thread_pool.rb
 - lib/puma/util.rb
 - lib/rack/handler/puma.rb
 - puma.gemspec
+- tools/jungle/README.md
 - tools/jungle/init.d/README.md
 - tools/jungle/init.d/puma
 - tools/jungle/init.d/run-puma
 - tools/jungle/upstart/README.md
 - tools/jungle/upstart/puma-manager.conf
 - tools/jungle/upstart/puma.conf
+- tools/trickletest.rb
 - test/test_app_status.rb
 - test/test_cli.rb
 - test/test_config.rb