rackstatic 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1751213160fd605d7884ac94edf263ba7c2050
-  data.tar.gz: e783ebc5fe72cd0a64b5ba01641690fd9d6fb8f2
+  metadata.gz: 988438ddf50817e39303c24d76b78b34917fdf2b
+  data.tar.gz: ea0c783934b0116db4b4c6381ba286156ffd55ca
 SHA512:
-  metadata.gz: 19284839fe275f71d4e42f23d511a197af1a0ff5d7f5a866ea5ea30f98a90d63093e31dda37a3e442103e82d8dffc2e097a4716552b498d28e956a942a6c89ac
-  data.tar.gz: 72dc00451eee38e4afb170e3ba76e7e09c7163d9b7391d5c3f5dcd2b16fc14aef9ebc5f59d8580047a28eb5ecbd795c4c566251b525db5c35e911061847e931b
+  metadata.gz: fd01b6ddb7882f58c879b73b354819fdea97bedf011f372133e758db147801205596bf1c2c32504a7d817df220ce8f080b06022f251bb4a98cb16116ecbc20f3
+  data.tar.gz: 82a3a8e7112867e4e84ced5a50e4c3941f0ed13aafc837bec63baaafd9ff2cd58ce87bf6d88262a25ce6e9ee3d7c0404b7c507456766f156cae19be73cc64498

data/bin/rackstatic

@@ -9,17 +9,20 @@ opts = {}
 opts[:app_dir] = 'app'
 opts[:app_static_dir] = 'public'
 opts[:dest_dir] = 'dist'
-opts[:noisy] = true
+opts[:noise_level] = 1
 
 OptionParser.new do |op|
-  op.banner = "Usage: rackstatic [opts] [destination]"
+  op.banner = "Usage: #{File.basename($0)} [opts] [destination]"
 
   op.on("-a", "--app DIRECTORY", "Application directory (where config.ru is)"){ |v| opts[:app_dir] = v }
   op.on("-s", "--static SUBDIRECTORY", "Directory within the app dir where static files are kept"){ |v| opts[:app_static_dir] = v }
 
   op.on("-d", "--dest DIRECTORY", "Build output directory"){ |v| opts[:dest_dir] = v }
 
-  op.on("-q", "--quiet", "Build quietly"){ opts[:noisy] = false }
+  op.on("-p", "--preserve-on-error", "Keep the build output even if the build fails"){ opts[:preserve_on_error] = true }
+
+  op.on("-q", "--quiet", "Build quietly"){ opts[:noise_level] = 0 }
+  op.on("-v", "--verbose", "Build with lots of output"){ opts[:noise_level] = 2 }
 
   op.on_tail("-h", "--help", "Show this message") { puts opts; exit }
   op.on_tail("--version", "Show version") { puts Rack::StaticBuilder::VERSION }
@@ -30,9 +33,14 @@ if ARGV.length == 1
 end
   
 begin
-  status = Rack::StaticBuilder.new(opts).build!
-  Kernel.exit( status ? 0 : 1 )
+  Rack::StaticBuilder.new(opts).build!
+rescue Rack::StaticBuilder::BuildError => e
+  if opts[:noise_level] > 0
+    $stderr.puts "#{File.basename($0)}: build failed - " + e.message
+  end
+
+  Kernel.exit 1
 rescue ArgumentError
-  $stderr.puts "rackstatic: must be run within or above a rack-compatible application directory"
+  $stderr.puts "#{File.basename($0)}: must be run within or above a rack-compatible application directory"
   Kernel.exit 1
 end

data/lib/rack/static-builder.rb

@@ -6,8 +6,9 @@ require 'rack/test'
 require 'nokogiri'
 
 class Rack::StaticBuilder
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 
+  class BuildError < Exception; end
 
   class RequestPathQueue
     def initialize
@@ -39,6 +40,8 @@ class Rack::StaticBuilder
 
 
   def initialize(opts)
+    opts = opts.dup
+
     @app_dir = [opts.delete(:app_dir), 'app', '.'].compact.find{ |d| File.file?(d + '/config.ru') }
     raise ArgumentError unless @app_dir
 
@@ -46,30 +49,45 @@ class Rack::StaticBuilder
     @dest_dir = Pathname.new(opts.delete(:dest_dir) || 'dist').expand_path.cleanpath
     @app_static_dir = (@app_dir + (opts.delete(:static_dir) || 'public')).expand_path.cleanpath
 
-    @noisy = opts.delete(:noisy)
+    @noise_level = (opts.delete(:noise_level) || '0').to_i
+    @preserve_on_error = opts.delete(:preserve_on_error)
   end
 
-  def build!
+  def build
     @dest_dir.rmtree if @dest_dir.directory?
 
     queue = RequestPathQueue.new
 
     enqueue_static_assets(queue)
 
-    counts = {true => 0, false => 0}
+    req_stats = {
+      :status => Hash.new(0),
+      :category => Hash.new(0),
+      :succeeded => 0,
+      :failed => 0,
+      :total => 0
+    }
 
     with_rack_client do |client|
 
       queue.drain do |req_path|
         resp = client.get req_path
 
-        if @noisy
-          channel = (resp.status == 200) ? $stdout : $stderr
-          channel.puts("#{resp.status} #{req_path}")
-          counts[(resp.status == 200)] += 1
+        req_status = resp.status
+        req_category = (req_status / 100)
+        req_succeeded = (req_category == 2)
+
+        req_stats[:status][req_status] += 1
+        req_stats[:category][req_category] += 1
+        req_stats[(req_succeeded ? :succeeded : :failed)] += 1
+        req_stats[:total] += 1
+
+        if @noise_level > 1 or (!req_succeeded and @noise_level > 0)
+          channel = req_succeeded ? $stdout : $stderr
+          channel.puts("#{req_status} #{req_path}")
         end
 
-        next unless resp.status == 200
+        next unless req_succeeded
         next unless store_response!(req_path, resp.body)
 
         if enqueue_links = capture_method_for(resp.content_type)
@@ -79,11 +97,19 @@ class Rack::StaticBuilder
 
     end
 
-    if @noisy and counts[false] > 0
-      $stderr.puts "\nFAILED: #{ counts[false] } requests returned non-200 and were discarded"
+    if req_stats[:failed] > 0 and not @preserve_on_error
+      @dest_dir.rmtree if @dest_dir.directory?
     end
 
-    (counts[false] > 0)
+    req_stats
+  end
+
+  def build!
+    req_stats = self.build
+
+    raise BuildError, "#{ req_stats[:failed] } URLs requested with non-2XX responses" unless (req_stats[:failed] == 0)
+
+    req_stats
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackstatic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Sean Keith McAuley