widow 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4793e1544143f12dcb911058fd50d0556e9729a7
-  data.tar.gz: 9b3abf172a4aaaf3632abf2c5d6a905f85df455e
+  metadata.gz: 35ef838be5110f77688f4f4cb226ac2635d7daba
+  data.tar.gz: 64948953b16fe1a60bcf135089a480e4becbe836
 SHA512:
-  metadata.gz: a9290928f556d87e4d29f635341a9cd4918459fca1d3d61b2a5015ed1a1c675d034abf4871cf7ad358f01250b66bab0fda03e6be7df64dd728533d90a9cd5014
-  data.tar.gz: 8fbad2d0d8a51f4f4654f5973a5bb5777a055282955c5c01bd8bd0dcd00e29ad9b14943f1e3ed716b1ba1a38eb98a6303f4dfab470d0a17544e509cbb0b51db9
+  metadata.gz: f7e929dcb1861b2c5389f5aea8e11a7d9d99ee9a8fce67d98826d6264b8d4a438411005e346318c80e1f6b3c54ee289de0bd282b7457596dbe5cdcfa1e222836
+  data.tar.gz: bea70a334096a54e2334aeea16c98731aa18a7b2d341425672cf91e8be22c215ac856f7609bf38663ab145003f2292ad2716bd839b585a726b1466542064444b

data/bin/widow

@@ -1,127 +1,24 @@
 #!/usr/bin/env ruby
-require 'optparse'
-require 'tilt'
-require 'find'
-require 'pathname'
-require 'fileutils'
-require 'rack'
-
-class Widow
-	@@opt_parser = OptionParser.new do |parser|
-	end
-
-	def initialize args = {}
-		opts = args[:opts]
-		return if opts.empty?
-
-		case opts.first
-		when /cut/
-			if opts[1]
-				cut *opts[1].split(':')
-			else
-				cut
-			end
-		when /spin/
-			if opts[1]
-				spin *opts[1].split(':')
-			else
-				cut
-			end
-		end
-	end
-
-	def cut from = Dir.pwd, to = Dir.pwd
-		puts from = Pathname.new(from)
-		puts to = Pathname.new(to)
-		Find.find from do |path|
-			path = Pathname.new path
-			next if path == from
-			make from, path.relative_path_from(from), to
-		end
-	end
-
-	def spin src = Dir.pwd, bin = Dir.pwd
-		src = Pathname.new src
-		bin = Pathname.new bin
-
-		allowed_templates = Tilt.lazy_map.map do |ext, _|
-			begin
-				Tilt[ext]
-				next ext
-			rescue LoadError
-				next nil
-			end
-		end.compact
-
-		Rack::Handler.default.run(
-			Proc.new do |env|
-				name = Pathname.new env["PATH_INFO"][1..-1]
-				file = bin + name
-				original = src + name
-				puts original
-				unless original.exist?
-					matching_templates = allowed_templates.select do |ext|
-						next Tilt[ext].metadata[:mime_type] == case name.extname[1..-1]
-						when 'js' then 'application/javascript'
-						when 'css' then 'text/css'
-						when 'html' then 'text/html'
-						else nil
-						end
-					end
-					original = Pathname.glob(src + "#{name.basename name.extname}.{#{matching_templates.join ?,}}").first
-				end
-				puts original
-				next [404, {'Content-Type' => 'text/html'}, ["File not found!"]] if original.nil? || !original.exist?
-
-				begin
-					make src, original.relative_path_from(src), bin if !file.exist? || file.mtime < original.mtime
-					next [200, {'Content-Type' => 'text/html'}, [file.file? ? file.read : '']]
-				rescue RuntimeError, LoadError => e
-					next [502, {'Content-Type' => 'text/html'}, [e.message]]
-				end
-			end,
-			Port: 8888
-		)
-	end
-
-	private
-	# proxies or renders a file based on it's properties and tilt capacity
-	def make root, file, to
-		unless Tilt.registered? file.extname[1..-1].to_s
-			proxy root, file, to
-			return
-		end
-
-		begin
-			render root, file, to
-		rescue RuntimeError, LoadError => e
-			puts e.message
-			proxy root, file, to
-		end
-	end
-
-	# creates a carbon copy of a file elsewhere
-	def proxy root, file, to
-		to.mkpath unless to.exist?
-		obj = to + file
-		src = root + file
-		if src.directory?
-			obj.mkpath unless obj.exist?
-		elsif src.file?
-			FileUtils.cp src, obj
-		end
+require 'thor'
+require 'widow'
+
+class Spiderling < Thor
+	desc "cut", "Compile files from current directory into current directory. Copies files that cannot be processed by tilt"
+	method_option :from, type: :string, desc: "Defaults to current directory"
+	method_option :to, type: :string, desc: "Defaults to current directory"
+	def cut 
+		Widow.new.cut options
 	end
 
-	# Takes a file and tries to render it through tilt to the destination directory
-	def render root, file, to
-		tilt = Tilt.new root + file
-		type = case tilt.metadata[:mime_type]
-		when 'application/javascript' then 'js'
-		when 'text/css' then 'css'
-		else 'html'
-		end
-		File.write to + "#{file.basename file.extname}.#{type}", tilt.render
+	
+	
+	desc "spin", "Start a webserver on localhost and serve files from the destination forlder, compiling them as necessary"
+	method_option :from, type: :string, desc: "Defaults to current directory"
+	method_option :to, type: :string, desc: "Defaults to current directory"
+	method_option :port, type: :numeric, desc: "Defaults to 8888"
+	def spin
+		Widow.new.spin options
 	end
 end
 
-Widow.new opts: ARGV
+Spiderling.start

data/lib/widow.rb

@@ -0,0 +1,160 @@
+require 'optparse'
+require 'tilt'
+require 'find'
+require 'pathname'
+require 'fileutils'
+require 'rack'
+
+class Widow
+	class CompileError < Exception
+		def initialize filename, exception
+			super "#{filename} failed to compile:\n#{exception.message}\n\t#{exception.backtrace.join "\n\t"}"
+		end
+	end
+	
+	def cut options = {}
+		options = {from: Pathname.pwd, to: Pathname.pwd}.merge options
+		from = Pathname.new(options[:from])
+		to = Pathname.new(options[:to])
+		exclude = Exclude.new from
+
+		Find.find from do |path|
+			path = Pathname.new path
+			next if path == from
+			if exclude.ingnored? path
+				log info: "#{path} ignored"
+				next
+			end
+			begin
+				make from, path.relative_path_from(from), to
+			rescue CompileError
+			end
+		end
+		return
+	end
+
+	def spin options = {}
+		options = {from: Pathname.pwd, to: Pathname.pwd, port: 8888}.merge options
+		from = Pathname.new(options[:from])
+		to = Pathname.new(options[:to])
+		exclude = Exclude.new from
+
+		allowed_templates = Tilt.lazy_map.map do |ext, _|
+			begin
+				Tilt[ext]
+				next ext
+			rescue LoadError
+				next
+			end
+		end.compact
+
+		Rack::Handler.default.run(
+			Proc.new do |env|
+				name = Pathname.new env["PATH_INFO"][1..-1]
+				log info: "#{name} requested"
+				file = bin + name
+				original = src + name
+				unless original.exist?
+					matching_templates = allowed_templates.select do |ext|
+						next Tilt[ext].metadata[:mime_type] == case name.extname[1..-1]
+						when 'js' then 'application/javascript'
+						when 'css' then 'text/css'
+						when 'html' then 'text/html'
+						end
+					end
+					original = Pathname.glob(src + "#{name.basename name.extname}.{#{matching_templates.join ?,}}").first
+				end
+				next [404, {'Content-Type' => 'text/html'}, ["File not found!"]] if exclude.ingnored?(original) || original.nil? || !original.exist?
+
+				begin
+					make src, original.relative_path_from(src), bin if !file.exist? || file.mtime < original.mtime
+					next [200, {'Content-Type' => 'text/html'}, [file.file? ? file.read : '']]
+				rescue CompileError => e
+					next [502, {'Content-Type' => 'text/html'}, [e.message]]
+				end
+			end,
+			Port: options[:port]
+		)
+		return
+	end
+
+	private
+	class Exclude
+		def initialize root_dir
+			@patterns = Pathname.glob("#{root_dir}/**/.widowignore").map do |file|
+				next [file, File.readlines(file)]
+			end.to_h.map do |file, lines|
+				lines.map do |line|
+					/^#{file.dirname}\/#{line}/ unless line =~ /^\s*$/
+				end.compact
+			end.flatten(1) << /.*\/\.widowignore$/
+		end
+
+		def ingnored? file
+			return @patterns.any? do |pattern|
+				file.to_s =~ pattern
+			end
+		end
+	end
+	
+	# proxies or renders a file based on it's properties and tilt capacity
+	# throws a CompileError when the file fails to compile
+	def make root, file, to
+		unless Tilt.registered? file.extname[1..-1].to_s
+			proxy root, file, to
+			return
+		end
+
+		begin
+			render root, file, to
+		rescue LoadError
+			log warning: "#{file} has a Tilt template that cannot be loaded" 
+			proxy root, file, to
+		rescue CompileError => e
+			log error: e
+			raise e
+		end
+	end
+
+	# creates a carbon copy of a file elsewhere
+	def proxy root, file, to
+		to.mkpath unless to.exist?
+		obj = to + file
+		src = root + file
+		return if src == obj
+		if src.directory?
+			obj.mkpath unless obj.exist?
+		elsif src.file?
+			FileUtils.cp src, obj
+		end
+		log info: "\t#{src} => #{src}"
+	end
+
+	# Takes a file and tries to render it through tilt to the destination directory
+	# Throws load error when tilt template is not resolvable
+	# Throws a BuildError when on an internal error
+	def render root, file, to
+		tilt = Tilt.new root + file
+		type = case tilt.metadata[:mime_type]
+		when 'application/javascript' then 'js'
+		when 'text/css' then 'css'
+		else 'html'
+		end
+
+		begin
+			dest = to + "#{file.basename file.extname}.#{type}"
+			File.write dest, tilt.render
+			log info: "\t#{tilt.file} => #{dest}"
+		rescue LoadError => e
+			raise e
+		rescue Exception => e
+			raise CompileError.new root + file, e
+		end
+	end
+	
+	def log line
+		line.each do |level , string|
+			puts "#{level}: #{string}"
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: widow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Denis Victorovich Matveev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/widow
+- lib/widow.rb
 homepage: https://github.com/strigonLeader/widow
 licenses:
 - MIT