Merge pull request #140 from bundler/allow-stdout-logging

Allow stdout logging when running --no-daemonize

docs/gemstash-configuration.5.md

@@ -228,4 +228,6 @@ Default value
 Valid values
 ------------
 
-Any valid file name
+Any valid file name, or `:stdout` to log to `$stdout`
+
+*Note: Using `:stdout` for the `:log_file` requires [running with `--no-daemonize`](gemstash-start.1.md#options).*

lib/gemstash/env.rb

@@ -97,7 +97,11 @@ def base_file(path)
     end
 
     def log_file
-      base_file(config[:log_file] || "server.log")
+      if config[:log_file] == :stdout
+        $stdout
+      else
+        base_file(config[:log_file] || "server.log")
+      end
     end
 
     def atomic_write(file, &block)

man/gemstash-configuration.5.md

@@ -222,10 +222,13 @@ the [base path][BASE_PATH].
 
 ## Valid values
 
-Any valid file name
+Any valid file name, or `:stdout` to log to `$stdout`
+
+*Note: Using `:stdout` for the `:log_file` requires [running with `--no-daemonize`][NO_DAEMONIZE].*
 
 [SETUP]: ./gemstash-setup.1.md
 [SEQUEL]: http://sequel.jeremyevans.net/
 [SEQUEL_CONNECT]: http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html#label-General+connection+options
 [PUMA_BINDING]: https://github.com/puma/puma#binding-tcp--sockets
 [BASE_PATH]: ./gemstash-configuration.5.md#base-path
+[NO_DAEMONIZE]: ./gemstash-start.1.md#options

spec/gemstash/env_spec.rb

@@ -1,6 +1,28 @@
 require "spec_helper"
 
 describe Gemstash::Env do
+  context ".log_file" do
+    let(:dir) { __dir__ }
+
+    it "has a default log file path" do
+      config = Gemstash::Configuration.new(config: { base_path: dir })
+      env = Gemstash::Env.new(config)
+      expect(env.log_file).to eq(File.join(dir, "server.log"))
+    end
+
+    it "supports a customized log file path" do
+      config = Gemstash::Configuration.new(config: { base_path: dir, log_file: "my_log.log" })
+      env = Gemstash::Env.new(config)
+      expect(env.log_file).to eq(File.join(dir, "my_log.log"))
+    end
+
+    it "supports :stdout from config to obtain standard out" do
+      config = Gemstash::Configuration.new(config: { log_file: :stdout })
+      env = Gemstash::Env.new(config)
+      expect(env.log_file).to eq($stdout)
+    end
+  end
+
   context "with a base path other than default" do
     let(:env) { Gemstash::Env.new }