heel 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3399d8178f772d4ee49f04043572be6d9f70d2fd
-  data.tar.gz: f34d5119b094801f39bd47f00791b415e97555a1
+  metadata.gz: 8de35e1a0be02782a8ae61c13b387b0248671a75
+  data.tar.gz: 42aa82f5bd32867dc4fd06f20345be8d0955fe24
 SHA512:
-  metadata.gz: 919208df9a5929ad044a896529055c9e15f1af077c50dcd20c805f10145c15f8f964adf16742cc954c435ca5eb3206b8f5e8cba3efe64c578f93ded918250d70
-  data.tar.gz: d1cb4ed0a1de12646c370eaa8629ed9a5d27619dd17a0ebd6b3996f23294f3a54016a1cf9a57c8e03945b446cb5eb873f5c0ee4386cc8222236bcf7e445d8099
+  metadata.gz: d3ebbc2d3fc0964c8eaa9898a0ce445dc11c7bc9bedf481075ba13db6afd6f85369237dd1512771f898bbdc7798618d3e9cb5954b6bb2a1ab0cf5331e14e5f6d
+  data.tar.gz: a6692022c04dad0a61ffd5e83e31a7317ab0a53f1770822d668da48499c341f61f2f24ebd8b0fe57095749d93365a16675a30faefcf018e9870941cd95560a1c

data/CONTRIBUTING.md

@@ -37,6 +37,7 @@ easiest way to contribute.
 
 * [Jeremy Hinegardner][https://github.com/copiousfreetime]
 * [Chris Wanstrath][http://github.com/defunkt]
+* [Justin Hill][http://github.com/justindhill]
 
 [GitHub Account]: https://github.com/signup/free "GitHub Signup"
 [GitHub Issues]:  https://github.com/copiousfreetime/heel/issues "Heel Issues"

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 3.1.3 - 2013-11-26
+* URL encode the links to files [#14](https://github.com/copiousfreetime/heel/issues/14)
+* Fix pid file cleanup on ruby 2.0 [#15](https://github.com/copiousfreetime/heel/issues/15)
+
 ## Version 3.1.2 - 2013-10-16
 * Fix usage of Mime::Types [#12](https://github.com/copiousfreetime/heel/issues/12) [#13](https://github.com/copiousfreetime/heel/issues/13)
 

data/lib/heel.rb

@@ -4,7 +4,7 @@
 #++
 
 module Heel
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end
 
 require 'heel/configuration'

data/lib/heel/directory_indexer.rb

@@ -66,7 +66,7 @@ module Heel
         entry_data      = OpenStruct.new 
 
         entry_data.name          = entry == ".." ? "Parent Directory" : entry
-        entry_data.link          = entry
+        entry_data.link          = ERB::Util.url_encode(entry)
         entry_data.size          = num_to_bytes(stat.size)
         entry_data.last_modified = stat.mtime.strftime("%Y-%m-%d %H:%M:%S")
 

data/lib/heel/server.rb

@@ -237,21 +237,31 @@ module Heel
       return stack.to_app
     end
 
+    # If we are daemonizing the fork and wait for the child to launch the server
+    # If we are not daemonizing, throw the Rack::Server in a background thread
     def start_server
-      server_thread = Thread.new do
-        if options.daemonize then
-          if cpid = fork then
-            Process.waitpid( cpid )
-          else
-            server = Rack::Server.new( server_options )
-            server.start
-          end
-        else
-          server = Rack::Server.new( server_options )
-          server.start
-        end
+      if options.daemonize then
+        start_background_server
+        return nil
+      else
+        return start_foreground_server
       end
-      return server_thread
+    end
+
+    def start_background_server
+      if cpid = fork then
+        Process.waitpid( cpid )
+      else
+        server = Rack::Server.new( server_options )
+        server.start
+      end
+    end
+
+    def start_foreground_server
+      Thread.new {
+        server = Rack::Server.new( server_options )
+        server.start
+      }
     end
 
     def server_options
@@ -279,7 +289,7 @@ module Heel
       if options.launch_browser then
         launch_browser.join
       end
-      server_thread.join
+      server_thread.join if server_thread
     end
   end
 end

data/tasks/default.rake

@@ -12,7 +12,7 @@ namespace :develop do
   # gemspec.
   task :default do
     require 'rubygems/dependency_installer'
-    installer = Gem::DependencyInstaller.new
+    installer = ::Gem::DependencyInstaller.new
 
     This.set_coverage_gem
 
@@ -235,7 +235,7 @@ CLOBBER << FileList["**/*.rbc"]
 
 # The standard gem packaging task, everyone has it.
 require 'rubygems/package_task'
-Gem::PackageTask.new( This.platform_gemspec ) do
+::Gem::PackageTask.new( This.platform_gemspec ) do
   # nothing
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heel
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Heel is a small static web server for use when you need a quick web server