RubyGems - heel - Versions diffs - 1.0.0 → 1.0.2 - Mend

heel 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/HISTORY CHANGED Viewed

@@ -1,4 +1,15 @@
 = Changelog
+== Version 1.0.2 - 2008-12-03
+* Fix FileType namespace issue (thanks defunkt) and new version of coderay
+* various task maintenance
+* updated version dependencies
+== Version 1.0.1 - 2008-04-24
+* Fix performance issue in serving large files
+* Fix performance issue in checking for coderay file type when coderay would not be used.
 == Version 1.0.0 - 2008-04-20
 * Convert Heel to a Rack and Thin application

data/README CHANGED Viewed

@@ -3,8 +3,9 @@
 * Homepage[http://copiousfreetime.rubyforge.org/heel/]
 * {Rubyforge Project}[http://rubyforge.org/projects/copiousfreetime/]
 * email jeremy at hinegardner dot org
+* git clone git://github.com/copiousfreetime/heel.git
-== DESCRIPTION:
+== 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
@@ -15,7 +16,7 @@ Heel is built using {Rack}[http://rack.rubyforge.org] and
 {Thin}[http://code.macournoyer.com/thin/]
    % heel
-   >> Thin web server (v0.8.1 codename Rebel Porpoise)
+   >> Thin web server (v1.0.0 codename That's What She Said)
    >> Threaded mode OFF
    >> Maximum connections set to 1024
    >> Listening on 0.0.0.0:4331, CTRL+C to stop

data/gemspec.rb CHANGED Viewed

@@ -18,10 +18,10 @@ Heel::GEM_SPEC = Gem::Specification.new do |spec|
   pkg = Configuration.for('packaging')
   spec.files        = pkg.files.all
   spec.executables  = pkg.files.bin.collect { |b| File.basename(b) }
-  spec.add_dependency("thin", ">= 0.7.0")
-  spec.add_dependency("mime-types", ">= 1.15")
-  spec.add_dependency("launchy", ">= 0.3.1")
-  spec.add_dependency("coderay", ">= 0.7.4.215")
+  spec.add_dependency("thin", "~> 1.0.0")
+  spec.add_dependency("mime-types", "~> 1.15")
+  spec.add_dependency("launchy", "~> 0.3.2")
+  spec.add_dependency("coderay", "~> 0.8.260")
   if rdoc = Configuration.for_if_exist?('rdoc') then
     spec.has_rdoc         = true

data/lib/heel/rackapp.rb CHANGED Viewed

@@ -8,6 +8,7 @@ require 'rack'
 require 'rack/utils'
 require 'coderay'
 require 'coderay/helpers/file_type'
+require 'time'
 module Heel
   class RackApp
@@ -85,37 +86,53 @@ module Heel
     # html file.
     #
     def file_response(req)
-      code_ray_type = ::FileType[req.request_path, true]
-      response      = ::Rack::Response.new
+      response = ::Rack::Response.new
       response['Last-Modified'] = req.stat.mtime.rfc822
-      if highlighting? and req.highlighting? and code_ray_type and (code_ray_type != :html) then
-        body = <<-EOM
-        <html>
-          <head>
-          <title>#{req.path_info}</title>
-          <!-- CodeRay syntax highlighting CSS -->
-          <link rel="stylesheet" href="/heel_css/coderay-cycnus.css" type="text/css" />
-          </head>
-          <body>
-            <div class="CodeRay">
-              <pre>
-#{CodeRay.scan_file(req.request_path,:auto).html({:line_numbers => :inline})}
-              </pre>
-            </div>
-          </body>
-        </html>
-        EOM
-        response['Content-Type']    = 'text/html'
-        response['Content-Length']  = body.length.to_s
-        response.body << body
-      else
-        file_type                   = mime_map.mime_type_of(req.request_path)
-        response['Content-Type']    = file_type.to_s
-        response['Content-Length']  = req.stat.size.to_s
-        response.body = File.open(req.request_path)
+      if highlighting? and req.highlighting? then
+        # only do a coderay type check if we are going to use coderay in the
+        # response
+        code_ray_type = CodeRay::FileType[req.request_path, true]
+        if code_ray_type and (code_ray_type != :html) then
+          body = <<-EOM
+          <html>
+            <head>
+            <title>#{req.path_info}</title>
+            <!-- CodeRay syntax highlighting CSS -->
+            <link rel="stylesheet" href="/heel_css/coderay-cycnus.css" type="text/css" />
+            </head>
+            <body>
+              <div class="CodeRay">
+                <pre>
+  #{CodeRay.scan_file(req.request_path,:auto).html({:line_numbers => :inline})}
+                </pre>
+              </div>
+            </body>
+          </html>
+          EOM
+          response['Content-Type']    = 'text/html'
+          response['Content-Length']  = body.length.to_s
+          response.body << body
+          return response.finish
+        end
       end
-      return response.finish
+      # fall through to a default file return
+      #
+      file_type                   = mime_map.mime_type_of(req.request_path)
+      response['Content-Type']    = file_type.to_s
+      response['Content-Length']  = req.stat.size.to_s
+      return response.finish do
+        File.open(req.request_path) do |f|
+          while p = f.read(8192)
+            response.write p
+          end
+        end
+      end
     end
     # interface to rack, env is a hash

data/lib/heel/version.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module Heel
   module Version
     MAJOR   = 1
     MINOR   = 0
-    BUILD   = 0
+    BUILD   = 2
     def to_a
       [MAJOR, MINOR, BUILD]

data/tasks/config.rb CHANGED Viewed

@@ -44,14 +44,14 @@ Configuration.for('packaging') {
   formats {
     tgz true
     zip true
-    gem Configuration::Table.has_key?('gem')
+    rubygem Configuration::Table.has_key?('rubygem')
   }
 }
 #-----------------------------------------------------------------------
 # Gem packaging
 #-----------------------------------------------------------------------
-Configuration.for("gem") {
+Configuration.for("rubygem") {
   spec "gemspec.rb"
   Configuration.for('packaging').files.all << spec
 }

data/tasks/distribution.rake CHANGED Viewed

@@ -1,8 +1,3 @@
-#--
-# Copyright (c) 2007, 2008 Jeremy Hinegardner
-# All rights reserved.  Licensed under the BSD license.  See LICENSE for details
-#++
 require 'tasks/config'
 #-------------------------------------------------------------------------------
@@ -23,7 +18,7 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
     desc "Install as a gem"
     task :install => [:clobber, :package] do
-      sh "sudo gem install -y pkg/#{Heel::GEM_SPEC.full_name}.gem"
+      sh "sudo gem install --local pkg/#{Heel::GEM_SPEC.full_name}.gem"
     end
     desc "Uninstall gem"

data/tasks/rspec.rb CHANGED Viewed

@@ -25,6 +25,7 @@ if spec_config = Configuration.for_if_exist?('test') then
       if rcov_config = Configuration.for_if_exist?('rcov') then
         r.rcov      = true
+        r.spec_opts = %w(--format specdoc --color)
         r.rcov_dir  = rcov_config.output_dir
         r.rcov_opts = rcov_config.rcov_opts
       end

data/tasks/rubyforge.rb CHANGED Viewed

@@ -19,21 +19,29 @@ if rf_conf = Configuration.for_if_exist?('rubyforge') then
       rubyforge = ::RubyForge.new
+      config = {}
+      config["release_notes"]   = proj_conf.description
+      config["release_changes"] = Utils.release_notes_from( proj_conf.history )[Heel::VERSION]
+      config["Preformatted"]    = true
+      rubyforge.configure config
       # make sure this release doesn't already exist
       releases = rubyforge.autoconfig['release_ids']
       if releases.has_key?(proj_conf.name) and releases[proj_conf.name][Heel::VERSION] then
         abort("Release #{Heel::VERSION} already exists! Unable to release.")
       end
-      config = rubyforge.userconfig
-      config["release_notes"]     = proj_conf.description
-      config["release_changes"]   = Utils.release_notes_from(proj_conf.history)[Heel::VERSION]
-      config["Prefomatted"]       = true
       puts "Uploading to rubyforge..."
       files = FileList[File.join("pkg","#{proj_conf.name}-#{Heel::VERSION}*.*")].to_a
+      files.each do |f|
+        puts "  * #{f}"
+      end
       rubyforge.login
       rubyforge.add_release(rf_conf.project, proj_conf.name, Heel::VERSION, *files)
       puts "done."
     end
   end
@@ -41,10 +49,17 @@ if rf_conf = Configuration.for_if_exist?('rubyforge') then
   namespace :announce do
     desc "Post news of #{proj_conf.name} to #{rf_conf.project} on rubyforge"
     task :rubyforge do
-      subject, title, body, urls = announcement
+      info = Utils.announcement
+      puts "Subject : #{info['subject']}"
+      msg = "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:release_notes]}"
+      puts msg
       rubyforge = RubyForge.new
+      rubyforge.configure
       rubyforge.login
-      rubyforge.post_news(rf_conf.project, subject, "#{title}\n\n#{urls}\n\n#{body}")
+      rubyforge.post_news( rf_conf.project, info[:subject], msg )
       puts "Posted to rubyforge"
     end

data/tasks/utils.rb CHANGED Viewed

@@ -59,7 +59,7 @@ module Utils
     #
     def release_notes_from(history_file)
       releases = {}
-      File.read(history_file).split(/^(?==)/).each do |section|
+      File.read(history_file).split(/^(?=== Version)/).each do |section|
         lines = section.split("\n")
         md = %r{Version ((\w+\.)+\w+)}.match(lines.first)
         next unless md

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeremy Hinegardner
@@ -9,46 +9,50 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-04-21 00:00:00 -06:00
+date: 2008-12-03 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.0.0
     version:
 - !ruby/object:Gem::Dependency
   name: mime-types
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         version: "1.15"
     version:
 - !ruby/object:Gem::Dependency
   name: launchy
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
     version:
 - !ruby/object:Gem::Dependency
   name: coderay
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.4.215
+        version: 0.8.260
     version:
-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 {launchy}[http://copiousfreetime.rubyforge.org/launchy/] to open your browser at the URL of your document root.  Heel is built using {Rack}[http://rack.rubyforge.org] and {Thin}[http://code.macournoyer.com/thin/]  % heel         >> Thin web server (v0.8.1 codename Rebel Porpoise) >> Threaded mode OFF >> Maximum connections set to 1024 >> Listening on 0.0.0.0:4331, CTRL+C to stop Launching your browser...  Or run it in the background  % heel --daemonize Created /Users/jeremy/.heel heel's PID (/Users/jeremy/.heel/heel.pid) and log file (/Users/jeremy/.heel/heel.log) are stored here Launching your browser at http://0.0.0.0:4331/  % heel --kill Sending TERM to process 3304 Done.
+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 {launchy}[http://copiousfreetime.rubyforge.org/launchy/] to open your browser at the URL of your document root.  Heel is built using {Rack}[http://rack.rubyforge.org] and {Thin}[http://code.macournoyer.com/thin/]  % heel         >> Thin web server (v1.0.0 codename That's What She Said) >> Threaded mode OFF >> Maximum connections set to 1024 >> Listening on 0.0.0.0:4331, CTRL+C to stop Launching your browser...  Or run it in the background  % heel --daemonize Created /Users/jeremy/.heel heel's PID (/Users/jeremy/.heel/heel.pid) and log file (/Users/jeremy/.heel/heel.log) are stored here Launching your browser at http://0.0.0.0:4331/  % heel --kill Sending TERM to process 3304 Done.
 email: jeremy at hinegardner dot org
 executables:
 - heel
@@ -145,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: copiousfreetime
-rubygems_version: 0.9.5
+rubygems_version: 1.3.1
 signing_key:
 specification_version: 2
 summary: Heel is a small static web server for use when you need a quick web server for a directory