jobim 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac1f285dd7910f146c63dcad408ce2351dbe456
-  data.tar.gz: 32036107d6d25b517648aa1f2a07b539f1e77b45
+  metadata.gz: bfa8178336f50e709e059a336e5c6591369dec55
+  data.tar.gz: 3b493302ce532f7253b9cb479928c55acf171675
 SHA512:
-  metadata.gz: 8356e9b1d0ae90852a69e1cd3debc4178d63da25acbecf828845fe1d0be7989fcad06ecdd85979752af833b843f42c4a9af644ba7bd7c622eca72810441eb68b
-  data.tar.gz: 8cc2ddb3c4dd8cb1f2228918360cfb5e29967d1812b2fd64f83fdda977961edb5d974ce7a2ef328a049ce892ccdbf4f9bbc043ea3ac62612c5a49175f44bb1b0
+  metadata.gz: b7088b4464eb2a73c88a1d36273426b00bacdedc2e62d41861e67cff013dbe7fe6834cfd9e6fe82561097d3a5c4e9ec387db003f0133f0bf9c83aaf4f4f626b4
+  data.tar.gz: 19e8af1b48aa7ef99ffbeb9eae774a31e772a8d471628c102eb9cf18f9c7ac8533492e84a400886393384b0436bb8c0f7f80817c9f5109684925ca5807c89173

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.rubocop.yml

@@ -0,0 +1,2 @@
+MethodLength:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0

data/README.md

@@ -1,6 +1,7 @@
 # Jobim
 
 [![Gem Version](https://badge.fury.io/rb/jobim.png)](http://badge.fury.io/rb/jobim)
+[![Build Status](https://secure.travis-ci.org/zellio/jobim.png?branch=master)](http://travis-ci.org/zellio/jobim)
 [![Dependency Status](https://gemnasium.com/zellio/jobim.png)](https://gemnasium.com/zellio/jobim)
 [![Code Climate](https://codeclimate.com/github/zellio/jobim.png)](https://codeclimate.com/github/zellio/jobim)
 
@@ -8,7 +9,8 @@
 for rapid website design and development without the hassle and security risk
 of a full web-server installation. `jobim` leverages
 [Thin](//github.com/macournoyer/thin/) and exposes a limited subset of the
-`thin` executable command flags for your convenience.
+`thin` executable command flags for your convenience in addition to a set of
+flags for its own configuration.
 
 ## Installation
 
@@ -26,8 +28,9 @@ Usage: jobim [OPTION]... [DIRECTORY]
 
 Specific options:
     -a, --address HOST               bind to HOST address (default: 0.0.0.0)
+    -c, --[no-]config [PATH]         Disable config loading or specify path to load from
     -d, --daemonize                  Run as a daemon process
-    -p, --port PORT                  use PORT (default: 5634)
+    -p, --port PORT                  use PORT (default: 3000)
     -P, --prefix PATH                Mount the app under PATH
     -q, --quiet                      Silence all logging
 
@@ -40,14 +43,36 @@ Report bugs to: <https://github.com/zellio/jobim/issues>
 ```
 
 `jobim` is run like `thin` but does not require a configuration script. By
-default `jobim` will bind to `0.0.0.0:5634` and serve the current working
+default `jobim` will bind to `0.0.0.0:3000` and serve the current working
 directory.
 
 ``` shell
 jobim path/to/webroot
 ```
 
-The site can be viewed at `http://localhost:5634` via a normal web browser.
+The site can be viewed at `http://localhost:3000` via a normal web browser.
+
+### Configuration Files
+
+`jobim` also allows for the use of a configuration file `.jobim.yml`. This can
+be used to set sane defaults for the `jobim` program to use in every
+execution. `jobim` will search up from the current working directory until it
+reaches `/` in the pursuit of configuration files, with the configuration
+options cascading from root to the current working directory. Options passed
+as command flags to `jobim` always win.
+
+```
+# Example config file
+---
+:dir: /web_root
+:prefix: /foo
+:port: 300
+```
+
+All options must be specified as key value pairs in a depth one hash. The keys
+must be ruby symbols (For historical reasons capitalization of these keys is
+irrelevant but they should be all downcase). The valid options are
+`:daemonize`, `:dir`, `:host`, `:port`, `:prefix`, `:quiet`, and `:conf_dir`.
 
 ## Contributing
 
@@ -59,4 +84,5 @@ The site can be viewed at `http://localhost:5634` via a normal web browser.
 
 ## Copyright
 
-Copyright (c) 2013 Zachary Elliott. See [LICENSE](/LICENSE) for further details.
+Copyright (c) 2013-2014 Zachary Elliott. See [LICENSE](/LICENSE) for further
+details.

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/jobim

@@ -3,8 +3,8 @@
 require 'pathname'
 file = Pathname.new(__FILE__).realpath
 
-$:.unshift File.expand_path("../../lib", file)
+$LOAD_PATH.unshift File.expand_path('../../lib', file)
 
 require 'jobim'
 
-Jobim::CLI.run!(*ARGV)
+Jobim::Application.run(*ARGV)

data/jobim.gemspec

@@ -25,9 +25,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency 'yard', "~> 0.8"
   spec.add_development_dependency 'redcarpet', "~> 3.0"
   spec.add_development_dependency 'github-markup', "~> 0.7"
+  spec.add_development_dependency 'fakefs', '~> 0.5'
+  spec.add_development_dependency 'rack-test'
 
   spec.add_runtime_dependency "thin", "~> 1.5"
   spec.add_runtime_dependency "rack-rewrite", "~> 1.2"

data/lib/jobim.rb

@@ -1,9 +1,8 @@
-
+# Jobim application container
 module Jobim
-
-  require "jobim/version"
-  require "jobim/settings"
-  require "jobim/server"
-  require "jobim/cli"
-
+  require 'jobim/version'
+  require 'jobim/settings'
+  require 'jobim/server'
+  require 'jobim/cli'
+  require 'jobim/application'
 end

data/lib/jobim/application.rb

@@ -0,0 +1,26 @@
+# Application container for initialization and execution of Jobim's
+# resources. Generates a new `Jobim::CLI` instance, and then passes it off to
+# a `Jobim::Server`. Good chance this will change in the future.
+module Jobim::Application
+  # Initializes and runs the CLI and Server
+  #
+  # @param args [Array<String>] list of args passed to the application
+  # @param block [Block] dummy block object (Not used)
+  def self.run(*args, &block)
+    cli = Jobim::CLI.new
+    begin
+      cli.parse(args)
+
+      exit if cli.exit
+
+      Jobim::Server.start!(cli.settings)
+    rescue OptionParser::InvalidOption => invalid_option
+      $stderr.puts ">>> Error: #{invalid_option}"
+      $stderr.puts cli.help
+
+    rescue RuntimeError => runtime_error
+      $stderr.puts '>>> Failed to start server'
+      $stderr.puts ">> #{runtime_error}"
+    end
+  end
+end

data/lib/jobim/cli.rb

@@ -1,91 +1,108 @@
 require 'optparse'
 
+# Command line interface for the Jobim application. Utilizes optparse to
+# manage user arguments and populates a `Jobim::Settings` object.
 class Jobim::CLI
+  attr_reader :parser, :settings, :exit, :options
 
-  attr_reader :parser, :settings
-
-  def self.run!(*args, &opts)
-    cli = Jobim::CLI.new
-    begin
-      cli.parse(args)
-
-      exit if cli.options.nil?
-
-      Jobim::Server.start cli.options
-
-    rescue OptionParser::InvalidOption => invalid_option
-      puts ">>> Error: #{invalid_option}"
-      puts cli.help
-
-    rescue RuntimeError => runtime_error
-      puts ">>> Failed to start server"
-      puts ">> #{runtime_error}"
-    end
-  end
-
+  # Memoized, lazy accessor for the settings object.
+  #
+  # @return [Jobim::Settings]
   def settings
-    @settings ||= Jobim::Settings.new
+    @settings ||= Jobim::Settings.new(options)
   end
 
+  # Memoized, lazy accessor for the options hash.
+  #
+  # @return [Hash] options generated from #parse
   def options
-    settings.options
+    @options ||= {
+      daemonize: false,
+      dir: Dir.pwd,
+      host: '0.0.0.0',
+      port: 3000,
+      prefix: '/',
+      quiet: false,
+      conf_dir: Dir.pwd
+    }
   end
 
+  # Memoized accessor for the `OptionParser` object. It is generated only when
+  # called upon. See the readme for information about the command flags.
+  #
+  # @return [OptionParser]
   def parser
     @parser ||= OptionParser.new do |o|
-      o.banner = "Usage: jobim [OPTION]... [DIRECTORY]"
+      o.banner = 'Usage: jobim [OPTION]... [DIRECTORY]'
+
+      o.separator ''
+      o.separator 'Specific options:'
 
-      o.separator ""
-      o.separator "Specific options:"
+      o.on('-a', '--address HOST',
+           'bind to HOST address (default: 0.0.0.0)') do |host|
+        options[:host] = host
+      end
 
-      o.on("-a", "--address HOST",
-           "bind to HOST address (default: 0.0.0.0)") do |host|
-        options[:Host] = host
+      o.on('-c', '--[no-]config [PATH]',
+           'Disable config loading or specify path to load from') do |v|
+        options[:conf_dir] = v.nil? ? Dir.pwd : v
       end
 
-      o.on "-d", "--daemonize", "Run as a daemon process" do
-        options[:Daemonize] = true
+      o.on '-d', '--daemonize', 'Run as a daemon process' do
+        options[:daemonize] = true
       end
 
-      o.on "-p", "--port PORT", "use PORT (default: 5634)" do |port|
-        options[:Port] = port
+      o.on('-p', '--port PORT', OptionParser::DecimalInteger,
+           'use PORT (default: 3000)') do |port|
+        fail OptionParser::InvalidArgument if port == 0
+        options[:port] = port
       end
 
-      o.on "-P", "--prefix PATH", "Mount the app under PATH" do |path|
-        options[:Prefix] = path
+      o.on '-P', '--prefix PATH', 'Mount the app under PATH' do |path|
+        options[:prefix] = path
       end
 
-      o.on "-q", "--quiet", "Silence all logging" do
-        options[:Quiet] = true
+      o.on '-q', '--quiet', 'Silence all logging' do
+        options[:quiet] = true
       end
 
-      o.separator ""
-      o.separator "General options:"
+      o.separator ''
+      o.separator 'General options:'
 
-      o.on "-h", "--help", "Display this help message." do
+      o.on '-h', '--help', 'Display this help message.' do
+        @exit = true
         puts help
-        exit
       end
-      o.on "--version", "Display the version number" do
-        options[:version] = Jobim::VERSION
-        puts options[:version]
-        exit
+      o.on '--version', 'Display the version number' do
+        @exit = true
+        puts "#{Jobim::VERSION}\n"
       end
 
-      o.separator ""
-      o.separator "Jobim home page: <https://github.com/zellio/jobim/>"
-      o.separator "Report bugs to: <https://github.com/zellio/jobim/issues>"
-      o.separator ""
+      o.separator ''
+      o.separator 'Jobim home page: <https://github.com/zellio/jobim/>'
+      o.separator 'Report bugs to: <https://github.com/zellio/jobim/issues>'
+      o.separator ''
     end
   end
 
+  # Runs the parse method of the value returned by the `#parser` method. This
+  # is done in a manner destructive to the passed args `Array`. If there is a
+  # trailing value after parsing is completed it is treated as the `:dir`
+  # option.
+  #
+  # @param [Array<String>] args to be paresed
+  # @return [NilClass] sentitinal nil value
   def parse(args)
     parser.parse!(args)
-    options[:Dir] = File.expand_path(args[0]) if args.length == 1
+    options[:dir] = File.expand_path(args[0]) if args.length == 1
+
+    nil
   end
 
+  # Help documentation of the program.
+  #
+  # @return [String]
   def help
     parser.to_s
   end
-
 end

data/lib/jobim/server.rb

@@ -1,21 +1,94 @@
+require 'thin'
 require 'rack'
 require 'rack/rewrite'
 
-module Jobim::Server
+# HTTP Server container. Contains the Rack application definition and routing
+# tables. Class explicitly leverages `::Thin::Server` to create the HTTP
+# server, this should possibly be changed.
+class Jobim::Server
+  # Utitly wrapper to create and start a new `Jobim::Server` instnace.
+  #
+  # @param opts [Hash] option hash for server configuration
+  # @return [Jobim::Server] new running server instance
+  def self.start!(opts)
+    Jobim::Server.new(opts).start
+  end
+
+  attr_accessor :app, :settings, :server
+
+  def initialize(settings, &block)
+    @settings = settings
+
+    yield self if block_given?
+  end
+
+  # Memoized accessor for the server Rack application.
+  #
+  # NB. This has been split into a memoized called to `#build_app` becuase of
+  # the way the `Rack::Builder` class handles scope in the context of
+  # `instance_eval` instead of `yield`.
+  #
+  # @return [Rack::Builder]
+  def app
+    @app ||= build_app(settings)
+  end
+
+  # Memoized accessor for the internal server instance.
+  #
+  # This is currently explicitly a `::Thin::Server`, possibly should change
+  # into a more generic form.
+  #
+  # @return [Thin::Server]
+  def server
+    if @server.nil?
+      thin_app = Rack::Chunked.new(Rack::ContentLength.new(app))
+      server = ::Thin::Server.new(settings.host, settings.port, thin_app)
 
-  def self.start(opts)
-    app = Rack::Builder.new do
+      if settings.daemonize
+        server.pid_file = 'jobim.pid'
+        server.log_file = 'jobim.log'
+      end
+
+      @server = server
+    end
+
+    @server
+  end
+
+  # Pass through delegation to the internal server object's start method.
+  # Handles daemonizing the server before starting it if nessesary.
+  def start
+    Thin::Logging.silent = settings.quiet
+
+    puts ">>> Serving #{settings.dir}"
+
+    server.daemonize if settings.daemonize
+    server.start
+  end
+
+  private
+
+  # Method to create a new instance of the Rack application. The creation
+  # functionality has been broken out into its own method for scope
+  # reason. `Rack::Builder` uses instance_eval which makes generating
+  # applicaitons a pain.
+  #
+  # @param opts [Hash] option hash for server configuration
+  # @return [Rack::Builder] Rack::Builder instance for application routing
+  def build_app(opts)
+    Rack::Builder.new do
       use Rack::Rewrite do
-        rewrite(%r{(.*)}, lambda do |match, env|
-          request_path = env["REQUEST_PATH"]
+        rewrite(/(.*)/, lambda do |match, env|
+          request_path = env['PATH_INFO']
 
-          return match[1] if opts[:Prefix].length > request_path.length
+          return match[1] if opts.prefix.length > request_path.length
 
-          local_path = File.join(opts[:Dir], request_path[opts[:Prefix].length..-1])
+          local_path = File.join(opts.dir,
+                                 request_path[opts.prefix.length..-1])
 
-          if File.directory?(local_path) and
-              File.exists?(File.join(local_path, "index.html"))
-            File.join(request_path, "index.html")
+          if File.directory?(local_path) &&
+              File.exists?(File.join(local_path, 'index.html'))
+            File.join(request_path, 'index.html')
           else
             match[1]
           end
@@ -24,22 +97,9 @@ module Jobim::Server
 
       use Rack::CommonLogger, STDOUT
 
-      map opts[:Prefix] do
-        run Rack::Directory.new(opts[:Dir])
-      end
-    end
-
-    puts ">>> Serving #{opts[:Dir]}"
-
-    Rack::Handler::Thin.run(app, opts) do |server|
-      if opts[:Daemonize]
-        server.pid_file = 'jobim.pid'
-        server.log_file = 'jobim.log'
-        server.daemonize
+      map opts.prefix do
+        run Rack::Directory.new(opts.dir)
       end
-
-      Thin::Logging.silent = opts[:Quiet]
     end
   end
-
 end

data/lib/jobim/settings.rb

@@ -1,56 +1,70 @@
 require 'yaml'
 
+# Manages applications settings and configuration. Handles sane defaults and
+# the loading / merging of configuration from files.
 class Jobim::Settings
+  VALID_KEYS = [:daemonize, :dir, :host, :port, :prefix, :quiet, :conf_dir]
 
-  attr_reader :options
+  attr_accessor *VALID_KEYS
 
-  def initialize
-    load
+  def initialize(defaults = {})
+    update(defaults)
+    load if conf_dir
   end
 
-  def options
-    @options ||= {
-      :Daemonize => false,
-      :Dir => Dir.pwd,
-      :Host => '0.0.0.0',
-      :Port => 5634,
-      :Prefix => '/',
-      :Quiet => false
-    }
+  def update(opts)
+    VALID_KEYS.each { |key| send("#{key}=", opts[key]) unless opts[key].nil? }
+    self
   end
 
+  # Loads a configuration file in the yaml format into the settings object.
+  #
+  # @param [String] file path to the configuration file
+  # @return [Jobim::Settings] self
   def load_file(file)
-    opts = YAML.load_file(file)
+    opts = YAML.load_file(file) || {}
     opts.keys.each do |key|
-      opts[(key.to_s.capitalize.to_sym rescue key) || key] = opts.delete(key)
+      begin
+        opts[key.to_s.downcase.to_sym || key] = opts.delete(key)
+      rescue
+        opts[key] = opts.delete(key)
+      end
     end
 
-    if opts[:Dir]
-      unless Pathname.new(opts[:Dir]).absolute?
-        opts[:Dir] = File.expand_path("../#{opts[:Dir]}", file)
+    if opts[:dir]
+      unless Pathname.new(opts[:dir]).absolute?
+        opts[:dir] = File.expand_path("../#{opts[:dir]}", file)
       end
     end
 
-    options.merge!(opts)
+    update(opts)
   end
 
-  def load
-    dir = Pathname('.').realpath
+  # Loads all configuration files from provided directory up. Defaults to the
+  # current working directory of the program.
+  #
+  # @param [String] directory to load files from (defaults to Dir.pwd)
+  # @return [Jobim::Settings] self
+  def load(dir = conf_dir)
+    dir = Pathname(File.expand_path(dir))
     files = []
 
     loop do
-      file = File.expand_path('.jobim.yaml', dir)
-
-      files.unshift(file) if File.exists? file
+      file = File.expand_path('.jobim.yml', dir)
+      if File.exists? file
+        files.unshift(file)
+      else
+        file = File.expand_path('.jobim.yaml', dir)
+        files.unshift(file) if File.exists? file
+      end
 
       break if dir.root?
 
       dir = dir.parent
     end
 
-    files.each {|file| self.load_file(file)}
+    files.each { |file| load_file(file) }
 
-    options
+    self
   end
-
 end

data/lib/jobim/version.rb

@@ -1,3 +1,4 @@
 module Jobim
-  VERSION = "0.5.0"
+  # Applcation version number
+  VERSION = '0.6.0'
 end

data/spec/configs/empty_conf.yml

@@ -0,0 +1 @@
+---

data/spec/configs/local_conf.yml

@@ -0,0 +1,2 @@
+---
+:prefix: '/jobim'

data/spec/configs/root_conf.yml

@@ -0,0 +1,3 @@
+---
+:daemonize: true
+:dir: '/pub'

data/spec/configs/user_conf.yml

@@ -0,0 +1,4 @@
+---
+:port: 1234
+:dir: 'public_html'
+:prefix: '/web_root'

data/spec/jobim_application_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Jobim::Application, fakefs: true do
+
+  describe '::run' do
+    before(:each) do
+      Jobim::Server.stub(:start!)
+      $stdout.stub(:write)
+      $stderr.stub(:write)
+    end
+
+    it 'exits on --help command flag' do
+      expect { Jobim::Application.run('--help') }.to raise_error SystemExit
+    end
+
+    it 'exits on --version command flags' do
+      expect { Jobim::Application.run('--version') }.to raise_error SystemExit
+    end
+
+    it 'starts the server' do
+      expect(Jobim::Server).to receive(:start!)
+      Jobim::Application.run
+    end
+
+    it 'catches InvalidOption and reports to stderr' do
+      expect($stderr).to receive(:write)
+      Jobim::Application.run('--foo')
+    end
+
+    it 'catches RuntimeError and reports to stderr' do
+      expect($stderr).to receive(:write)
+      Jobim::Server.unstub(:start!)
+      Jobim::Application.run('--port', '1')
+    end
+  end
+
+end

data/spec/jobim_cli_spec.rb

@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+describe Jobim::CLI, fakefs: true do
+
+  let(:cli) { Jobim::CLI.new }
+
+  describe 'options' do
+    it 'defaults conf_dir to Dir.pwd' do
+      expect(cli.options[:conf_dir]).to eql Dir.pwd
+    end
+
+    it 'defaults daemonize to false' do
+      expect(cli.options[:daemonize]).to be_false
+    end
+
+    it 'defaults dir to current working directory' do
+      expect(cli.options[:dir]).to eql Dir.pwd
+    end
+
+    it 'defaults host to 0.0.0.0' do
+      expect(cli.options[:host]).to eql '0.0.0.0'
+    end
+
+    it 'defaults port to 3000' do
+      expect(cli.options[:port]).to eql 3000
+    end
+
+    it 'defaults prefix to /' do
+      expect(cli.options[:prefix]).to eql '/'
+    end
+
+    it 'defaults quiet to false' do
+      expect(cli.options[:quiet]).to be_false
+    end
+  end
+
+  describe '#parser' do
+    describe '-a, --address' do
+      it 'sets the host address' do
+        cli.parse(%w[--address foo])
+        expect(cli.options[:host]).to eql 'foo'
+      end
+    end
+
+    describe '-c, --[no-]config' do
+      it 'sets the conf_dir value' do
+        cli.parse(%w[--no-config])
+        expect(cli.options[:conf_dir]).to be_false
+
+        cli.parse(%w[--config foo/bar])
+        expect(cli.options[:conf_dir]).to eql 'foo/bar'
+      end
+    end
+
+    describe '-d, --daemonize' do
+      it 'sets the daemonize flag' do
+        cli.parse(%w[--daemonize])
+        expect(cli.options[:host]).to be_true
+      end
+    end
+
+    describe '-p, --port' do
+      it 'takes an Integer' do
+        expect do
+          cli.parse(%w[--port foo])
+        end.to raise_error OptionParser::InvalidArgument
+      end
+
+      it 'considers 0 to be an invalid argument' do
+        expect do
+          cli.parse(%w[--port 0])
+        end.to raise_error OptionParser::InvalidArgument
+      end
+
+      it 'sets the binding port' do
+        cli.parse(%w[--port 3333])
+        expect(cli.options[:port]).to eql 3333
+      end
+    end
+
+    describe '-P, --prefix' do
+      it 'sets the path to mount the app under' do
+        cli.parse(%w[--prefix /foo])
+        expect(cli.options[:prefix]).to eql '/foo'
+      end
+    end
+
+    describe '-q, --quiet' do
+      it 'sets the quiet flag' do
+        cli.parse(%w[--quiet])
+        expect(cli.options[:quiet]).to be_true
+      end
+    end
+
+    describe '-h, --help' do
+      it 'displays the help message' do
+        expect($stdout).to receive(:write).with(cli.help)
+        cli.parse(%w[--help])
+      end
+    end
+
+    describe '--version' do
+      it 'displays the version number' do
+        expect($stdout).to receive(:write).with("#{Jobim::VERSION}\n")
+        cli.parse(%w[--version])
+      end
+    end
+  end
+
+  describe '#parse', fakefs: true do
+    it 'parses the cli option array' do
+      args = %w[--port 3333 --prefix /foo]
+      cli.parse(args)
+      expect(args).to eql []
+    end
+
+    it 'sets the Directory option to its trailing argument' do
+      args = %w[dir]
+      cli.parse(args)
+      expect(cli.options[:dir]).to eql '/dir'
+    end
+  end
+
+  describe '#help' do
+    it 'returns the help message' do
+      expect(cli.help).to include('Usage: jobim [OPTION]... [DIRECTORY]')
+    end
+  end
+
+end

data/spec/jobim_server_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Jobim::Server, fakefs: true do
+
+  before(:each) do
+    Dir.mkdir('/web_app')
+    Dir.mkdir('/web_app/trail_test')
+    Dir.mkdir('/web_app/index_test')
+
+    File.open('/web_app/index_test/index.html', 'w') { |f| f.write(index) }
+    File.open('/web_app/trail_test/foo.html', 'w')   { |f| f.write(index) }
+    File.open('/web_app/trail_test/foo', 'w') { |f| f.write(index) }
+  end
+
+  let(:index)    { "<!DOCTYPE html>\n<html />\n" }
+  let(:settings) { Jobim::CLI.new.settings }
+
+  describe 'app', rack_test: true do
+    before(:each) { $stdout.stub(:write) }
+
+    let(:server) do
+      settings.dir = '/web_app'
+      Jobim::Server.new(settings)
+    end
+
+    let(:app) { server.app }
+
+    it 'returns index.html from dirs when it exists' do
+      get '/index_test/'
+      expect(last_response).to be_ok
+      expect(last_response.body).to eql index
+    end
+
+    it 'treats bare urls as directories when they are' do
+      get '/trail_test'
+      expect(last_response).to be_ok
+      expect(last_response.body).to include '/trail_test/foo.html'
+    end
+
+    it 'treats bare urls as files when they are' do
+      get '/trail_test/foo'
+      expect(last_response).to be_ok
+      expect(last_response.body).to eql index
+    end
+  end
+
+  describe 'server' do
+    let(:server) do
+      settings.daemonize = true
+      Jobim::Server.new(settings)
+    end
+
+    it 'sets server.pid_file if :daemonize is true' do
+      expect(server.server.pid_file).to eql('jobim.pid')
+    end
+
+    it 'sets server.log_file if :daemonize is true' do
+      expect(server.server.log_file).to eql('jobim.log')
+    end
+  end
+
+end

data/spec/jobim_settings_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe Jobim::Settings, fakefs: true do
+
+  before(:each) do
+    unless example.metadata[:no_conf]
+      Dir.mkdir('/home')
+      Dir.mkdir('/home/jobim')
+      Dir.mkdir('/home/jobim/public_html')
+      Dir.mkdir('/home/jobim/projects')
+
+      Dir.chdir('/home/jobim/projects')
+
+      file = RealFile.expand_path(__FILE__)
+      config_dir = RealFile.expand_path('../configs', file)
+
+      r_cfg = RealFile.read(RealFile.expand_path('root_conf.yml', config_dir))
+      u_cfg = RealFile.read(RealFile.expand_path('user_conf.yml', config_dir))
+      l_cfg = RealFile.read(RealFile.expand_path('local_conf.yml', config_dir))
+      e_cfg = RealFile.read(RealFile.expand_path('empty_conf.yml', config_dir))
+
+      File.open('/.jobim.yml', 'w') { |f| f.write r_cfg }
+      File.open('/home/.jobim.yml', 'w') { |f| f.write e_cfg }
+      File.open('/home/jobim/.jobim.yaml', 'w') { |f| f.write u_cfg }
+      File.open('/home/jobim/projects/.jobim.yaml', 'w') do |f|
+        f.write l_cfg
+      end
+    end
+  end
+
+  let(:settings) do
+    cli = Jobim::CLI.new
+    cli.parse(%w[--no-config])
+
+    settings = cli.settings
+    settings.conf_dir = Dir.pwd
+    settings
+  end
+
+  describe '#initialize' do
+
+  end
+
+  describe '#load_file' do
+    it 'loads config data into settings' do
+      settings.load_file('/.jobim.yml')
+      expect(settings.daemonize).to be_true
+    end
+
+    it 'only changes configured options' do
+      settings.load_file('/.jobim.yml')
+      expect(settings.port).to eql 3000
+    end
+
+    it 'expands directories relative to the config file location' do
+      settings.load_file('/home/jobim/.jobim.yaml')
+      expect(settings.dir).to eql '/home/jobim/public_html'
+    end
+
+    it 'overrides only specified options' do
+      settings.load_file('/home/jobim/.jobim.yaml')
+      expect(settings.quiet).to be_false
+    end
+
+    it 'handles empty configuration files' do
+      expect { settings.load_file('/home/.jobim.yml') }.to_not raise_error
+    end
+  end
+
+  describe '#load' do
+    before(:each) { settings.load }
+
+    it 'loads all config files from CWD to root by default' do
+      expect(settings.daemonize).to be_true
+      expect(settings.port).to eql 1234
+      expect(settings.dir).to eql '/home/jobim/public_html'
+    end
+
+    it 'overrides previous directory options with current ones' do
+      expect(settings.dir).to eql '/home/jobim/public_html'
+    end
+
+    it 'will check for yaml files only if there is no yml file' do
+      expect(settings.prefix).to eql '/jobim'
+    end
+
+    it 'can handle absolute directories' do
+      expect(settings.daemonize).to be_true
+      expect(settings.port).to eql 1234
+      expect(settings.dir).to eql '/home/jobim/public_html'
+    end
+
+    it 'can handle relative directories' do
+      settings.load('../')
+      expect(settings.prefix).to eql '/web_root'
+      expect(settings.port).to eql 1234
+    end
+  end
+
+end

data/spec/jobim_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Jobim do
+
+  it 'has a version number' do
+    expect(Jobim::VERSION).to_not be_nil
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+require 'simplecov'
+SimpleCov.start
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'jobim'
+
+require 'fakefs/spec_helpers'
+require 'rack/test'
+
+RSpec.configure do |config|
+  config.include FakeFS::SpecHelpers, fakefs: true
+  config.include Rack::Test::Methods, rack_test: true
+end

metadata

@@ -1,111 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: jobim
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Zachary Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 description: Popup HTTP Server for serving static content.
@@ -116,7 +172,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -124,10 +183,21 @@ files:
 - bin/jobim
 - jobim.gemspec
 - lib/jobim.rb
+- lib/jobim/application.rb
 - lib/jobim/cli.rb
 - lib/jobim/server.rb
 - lib/jobim/settings.rb
 - lib/jobim/version.rb
+- spec/configs/empty_conf.yml
+- spec/configs/local_conf.yml
+- spec/configs/root_conf.yml
+- spec/configs/user_conf.yml
+- spec/jobim_application_spec.rb
+- spec/jobim_cli_spec.rb
+- spec/jobim_server_spec.rb
+- spec/jobim_settings_spec.rb
+- spec/jobim_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/zellio/jobim
 licenses:
 - MIT
@@ -138,19 +208,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Popup HTTP Server
-test_files: []
+test_files:
+- spec/configs/empty_conf.yml
+- spec/configs/local_conf.yml
+- spec/configs/root_conf.yml
+- spec/configs/user_conf.yml
+- spec/jobim_application_spec.rb
+- spec/jobim_cli_spec.rb
+- spec/jobim_server_spec.rb
+- spec/jobim_settings_spec.rb
+- spec/jobim_spec.rb
+- spec/spec_helper.rb
 has_rdoc: