heel 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de35e1a0be02782a8ae61c13b387b0248671a75
-  data.tar.gz: 42aa82f5bd32867dc4fd06f20345be8d0955fe24
+  metadata.gz: ddf4092171701ace806a71917763141cce205b54
+  data.tar.gz: d6f09ec079849ba132f1cf1e5b99c877f29583c0
 SHA512:
-  metadata.gz: d3ebbc2d3fc0964c8eaa9898a0ce445dc11c7bc9bedf481075ba13db6afd6f85369237dd1512771f898bbdc7798618d3e9cb5954b6bb2a1ab0cf5331e14e5f6d
-  data.tar.gz: a6692022c04dad0a61ffd5e83e31a7317ab0a53f1770822d668da48499c341f61f2f24ebd8b0fe57095749d93365a16675a30faefcf018e9870941cd95560a1c
+  metadata.gz: c3551bc3dbed252b3a4ad60cc423cb0b87e3735113baa674ae69b137b7931ac2bf4d69ebb934a97bb05b4d97a609f892fad2c88c6f6aa16842e52ad70b9be82b
+  data.tar.gz: 557cdd3013d70a85f4efc8cbfa705ef2286aad7cb68ade8206af3e416678cda2c38ff72a7257f095404d484c14fea1c4e9ee47725e91563158414cf670fa2f2b

data/HISTORY.md

@@ -1,4 +1,8 @@
 # Changelog
+## Version 3.2.0 - 2018-03-14
+* fix missing rack dependency [#17](https://github.com/copiousfreetime/heel/pull/17)
+* across the board gem dependency updates
+* ruby 2.2 minimum dependency - because of transitive dependencies
 
 ## Version 3.1.3 - 2013-11-26
 * URL encode the links to files [#14](https://github.com/copiousfreetime/heel/issues/14)

data/LICENSE

@@ -1,3 +1,5 @@
+BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause
+
 Copyright (c) 2007-2009, Jeremy Hinegardner
 
 All rights reserved.

data/README.md

@@ -17,10 +17,12 @@ Heel is built using [Rack](http://rack.github.com) and
 
     % heel
     Launching your browser...
-    Puma 1.6.3 starting...
+    Puma starting in single mode...
+    * Version 3.11.3 (ruby 2.4.3-p205), codename: Love Song
     * Min threads: 0, max threads: 16
-    * Environment: deployment
+    * Environment: none
     * Listening on tcp://0.0.0.0:4331
+    Use Ctrl-C to stop
 
 Or run it in the background
 
@@ -91,18 +93,18 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
- 
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the
-      distribution.  
-      
-    * Neither the name of Jeremy Hinegardner nor the
-      names of its contributors may be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Jeremy Hinegardner nor the
+    names of its contributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

data/Rakefile

@@ -7,16 +7,18 @@ This.email    = "jeremy@copiousfreetime.org"
 This.homepage = "http://github.com/copiousfreetime/#{ This.name }"
 
 This.ruby_gemspec do |spec|
-  spec.add_runtime_dependency( 'puma'      , '~> 2.0' )
-  spec.add_runtime_dependency( 'mime-types', '~> 1.25')
-  spec.add_runtime_dependency( 'launchy'   , '~> 2.3' )
+  spec.add_runtime_dependency( 'rack'      , '~> 2.0' )
+  spec.add_runtime_dependency( 'puma'      , '~> 3.11.3' )
+  spec.add_runtime_dependency( 'mime-types', '~> 3.1')
+  spec.add_runtime_dependency( 'launchy'   , '~> 2.4' )
   spec.add_runtime_dependency( 'coderay'   , '~> 1.1' )
 
-  spec.add_development_dependency( 'rake'     , '~> 10.1')
-  spec.add_development_dependency( 'minitest' , '~> 5.0' )
-  spec.add_development_dependency( 'rdoc'     , '~> 4.0' )
+  spec.add_development_dependency( 'rake'     , '~> 12.3')
+  spec.add_development_dependency( 'minitest' , '~> 5.11' )
+  spec.add_development_dependency( 'rdoc'     , '~> 6.0' )
+  spec.add_development_dependency( 'simplecov', '~> 0.15' )
 
-  spec.license = "BSD"
+  spec.license = "BSD-3-Clause"
 end
 
 load 'tasks/default.rake'

data/lib/heel.rb

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

data/lib/heel/mime_map.rb

@@ -50,11 +50,7 @@ module Heel
           MIME::Types.add(mt)
         else
           type = existing_type.first
-          mt.extensions.each do |ext|
-            type.extensions << ext unless type.extensions.include?( ext )
-          end
-          # have to reindex if new extensions added
-          MIME::Types.index_extensions(type)
+          type.add_extensions(mt.extensions)
         end
       end
     end

data/lib/heel/server.rb

@@ -166,7 +166,7 @@ module Heel
 
     # kill an already running background heel process
     def kill_existing_proc
-      if File.exists?(pid_file) then
+      if File.exist?(pid_file) then
         begin
           pid = open(pid_file).read.to_i
           @stdout.puts "Sending TERM to process #{pid}"
@@ -187,7 +187,7 @@ module Heel
     # setup the directory that heel will use as the location to run from, where its logs will
     # be stored and its PID file if backgrounded.
     def setup_heel_dir
-      if not File.exists?(default_directory) then
+      if not File.exist?(default_directory) then
         FileUtils.mkdir_p(default_directory)
         @stdout.puts "Created #{default_directory}"
         @stdout.puts "heel's PID (#{pid_file}) and log file (#{log_file}) are stored here"

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-if RUBY_VERSION >= '1.9.2' then
-  require 'simplecov'
-  puts "Using coverage!"
-  SimpleCov.start if ENV['COVERAGE']
-end
+require 'simplecov'
+SimpleCov.start if ENV['COVERAGE']
 
 gem 'minitest'
 require 'heel'

data/tasks/default.rake

@@ -10,41 +10,26 @@ namespace :develop do
 
   # Install all the development and runtime dependencies of this gem using the
   # gemspec.
-  task :default do
+  task :default => 'Gemfile' do
     require 'rubygems/dependency_installer'
     installer = ::Gem::DependencyInstaller.new
-
-    This.set_coverage_gem
-
-    puts "Installing gem depedencies needed for development"
-    This.platform_gemspec.dependencies.each do |dep|
-      if dep.matching_specs.empty? then
-        puts "Installing : #{dep}"
-        installer.install dep
-      else
-        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
-      end
-    end
+    puts "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
     puts "\n\nNow run 'rake test'"
   end
 
   # Create a Gemfile that just references the gemspec
   file 'Gemfile' => :gemspec do
     File.open( "Gemfile", "w+" ) do |f|
-      f.puts 'source "https://rubygems.org/"'
+      f.puts "# DO NOT EDIT - This file is automatically generated"
+      f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
+      f.puts 'source "https://rubygems.org"'
       f.puts 'gemspec'
     end
   end
-
-  desc "Create a bundler Gemfile"
-  task :using_bundler => 'Gemfile' do
-    puts "Now you can 'bundle'"
-  end
-
-  # Gemfiles are build artifacts
-  CLOBBER << FileList['Gemfile*']
 end
-desc "Boostrap development"
+desc "Bootstrap development"
 task :develop => "develop:default"
 
 #------------------------------------------------------------------------------
@@ -88,31 +73,16 @@ end
 # Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
 #            for the moment only rcov is listed.
 #------------------------------------------------------------------------------
-if RUBY_VERSION < "1.9.0"
-  begin
-   require 'rcov/rcovtask'
-   Rcov::RcovTask.new( 'coverage' ) do |t|
-     t.libs      << 'spec'
-     t.pattern   = 'spec/**/*_spec.rb'
-     t.verbose   = true
-     t.rcov_opts << "-x ^/"           # remove all the global files
-     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
-   end
-  rescue LoadError
-   This.task_warning( 'rcov' )
-  end
-else
-  begin
-    require 'simplecov'
-    desc 'Run tests with code coverage'
-    task :coverage do
-      ENV['COVERAGE'] = 'true'
-      Rake::Task[:test].execute
-    end
-    CLOBBER << FileList["coverage"]
-  rescue LoadError
-    This.task_warning( 'simplecov' )
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
   end
+  CLOBBER << 'coverage' if File.directory?( 'coverage' )
+rescue LoadError
+  This.task_warning( 'simplecov' )
 end
 
 #------------------------------------------------------------------------------
@@ -177,9 +147,10 @@ namespace :fixme do
   end
 
   def outdated_fixme_files
-    local_fixme_files.reject do |local|
+    local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
     end
   end
 
@@ -223,13 +194,12 @@ task :fixme => "fixme:default"
 desc "Build the #{This.name}.gemspec file"
 task :gemspec do
   File.open( This.gemspec_file, "wb+" ) do |f|
+    f.puts "# DO NOT EDIT - This file is automatically generated"
+    f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
     f.write This.platform_gemspec.to_ruby
   end
 end
 
-# the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file.to_s
-
 # .rbc files from ruby 2.0
 CLOBBER << FileList["**/*.rbc"]
 

data/tasks/this.rb

@@ -13,7 +13,7 @@ class ThisProject
   attr_accessor :email
 
   # The homepage of this project
-  attr_accessor :homepage 
+  attr_accessor :homepage
 
   # The regex of files to exclude from the manifest
   attr_accessor :exclude_from_manifest
@@ -25,7 +25,11 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)|^[^\/]+\.gemspec|\.(swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+                                          /^[^\/]+\.gemspec/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history)$/,
+                                          /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
   end
@@ -119,7 +123,7 @@ class ThisProject
 
   # Internal: Returns the gemspace associated with the current ruby platform
   def platform_gemspec
-    gemspecs[platform]
+    gemspecs.fetch(platform) { This.ruby_gemspec }
   end
 
   def core_gemspec
@@ -132,6 +136,7 @@ class ThisProject
 
       spec.summary     = summary
       spec.description = description
+      spec.license     = license
 
       spec.files       = manifest
       spec.executables = spec.files.grep(/^bin/) { |f| File.basename(f) }
@@ -140,6 +145,8 @@ class ThisProject
       spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc|md)$/)
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
+
+      spec.required_ruby_version = '>= 2.2.2'
     end
   end
 
@@ -166,20 +173,6 @@ class ThisProject
     return spec
   end
 
-  # Internal: Set the recovery gem development dependency
-  #
-  # These are dynamically set since they cannot be hard coded as there is 
-  # no way to ship them correctly in the gemspec
-  #
-  # Returns nothing.
-  def set_coverage_gem
-    if RUBY_VERSION < "1.9.0"
-      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
-    else
-      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.7.1' )
-    end
-  end
-
   # Internal: Return the platform of ThisProject at the current moment in time.
   def platform
     (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
@@ -189,17 +182,23 @@ class ThisProject
   def description_section
     section_of( 'README.md', 'DESCRIPTION')
   end
- 
- # Internal: Return the summary text from the README 
+
+  # Internal: Return the summary text from the README
   def summary
     description_section.first
   end
 
-  # Internal: Return the full description text from the READEM
+  # Internal: Return the full description text from the README
   def description
     description_section.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
   end
 
+  def license
+    license_file = project_path("LICENSE")
+    line = license_file.readlines.first
+    line.split(/\s+/).first
+  end
+
   # Internal: The path to the gemspec file
   def gemspec_file
     project_path( "#{ name }.gemspec" )

metadata

@@ -1,119 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: heel
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: 'Heel is a small static web server for use when you need a quick web
   server for a directory.  Once the server is running, heel will use (http://rubygems.org/gems/launchy/)
   to open your browser at the URL of your document root. Heel is built using (http://rack.github.com)
-  and (http://puma.io)     % heel     Launching your browser...     Puma 1.6.3 starting...     *
-  Min threads: 0, max threads: 16     * Environment: deployment     * Listening on
-  tcp://0.0.0.0:4331 Or run it in the background     % heel --daemonize     Launching
+  and (http://puma.io)     % heel     Launching your browser...     Puma starting
+  in single mode...     * Version 3.11.3 (ruby 2.4.3-p205), codename: Love Song     *
+  Min threads: 0, max threads: 16     * Environment: none     * Listening on tcp://0.0.0.0:4331     Use
+  Ctrl-C to stop Or run it in the background     % heel --daemonize     Launching
   your browser at http://0.0.0.0:4331/     % heel --kill     Sending TERM to process
   3304     Done.'
 email: jeremy@copiousfreetime.org
@@ -176,29 +205,29 @@ files:
 - tasks/this.rb
 homepage: http://github.com/copiousfreetime/heel
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --markup
+- "--markup"
 - tomdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Heel is a small static web server for use when you need a quick web server