vitrine 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad569a8f77f0b68b74690887547a4b0b59e2de6c
-  data.tar.gz: eedc4cd325749f108a518be915db23b78974b39d
+  metadata.gz: b2ee7e09a8988d7a3c4a75c6abeaa3b7c200fbdc
+  data.tar.gz: d56b6e7784bf98f48bffbe3db9d8a5304813e691
 SHA512:
-  metadata.gz: 7b6937c1067c446acf3f187df58004da35babcc8204450812e56d2ff0baac3c382649b55c0b743690ee6af1d4d798eae3e594225cf498c7b1b53b7d463a0df97
-  data.tar.gz: 9cfb7408119fcf4b81d4b42d71e55ec97724ccefbeeef350751f59b9c6d0d2786cceaca70e9c71216f023ebc6470022376bac981c44e1c12410995f96490e585
+  metadata.gz: 9bd2922fe92450918e3f5f3a4250b63a45791947b1b36e3918f7822f3d57bb2056bd6ac41b1258a7421a3e1d8061cdbae9250623674738f8ae852302df75cb8e
+  data.tar.gz: b052b6069dcd9172de78dd44c3578d92681f75ef05c4fd2cd7ea5ca37b963e7bbe8c2f6e3903515319f6533d055c095bb563fd777e10ffcf86de31a9a60da7ef

data/Gemfile

@@ -3,7 +3,8 @@ source "http://rubygems.org"
 gem 'sinatra', '~> 1.4', require: 'sinatra/base'
 gem 'coffee-script', '~> 2.2'
 gem 'sass', '~> 3'
-gem 'guard'
+gem 'guard', '~> 2.2'
+gem 'guard-livereload'
 gem 'rack-livereload'
 
 # Add dependencies to develop your gem here.

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/vitrine.rb

@@ -10,7 +10,6 @@ require_relative 'sourcemaps'
 
 module Vitrine
   DEFAULTS = { root: Dir.getwd, port: 4000, host: '127.0.0.1' }
-  SEED = rand
   
   def self.check_dirs_present!
     views = DEFAULTS[:root] + '/views'
@@ -18,9 +17,9 @@ module Vitrine
       $stderr.puts "WARNING: `views' directory not found under the current tree, you might want to create it"
     end
     
-    public = DEFAULTS[:root] + '/public'
-    unless File.exist?(views) and File.directory?(views)
-      $stderr.puts "ERROR: `public' directory not found under the current tree, you might want to create it"
+    public_dir = DEFAULTS[:root] + '/public'
+    unless File.exist?(public_dir) and File.directory?(public_dir)
+      $stderr.puts "ERROR: `public' directory not found under the current tree, you should create it. Vitrine won't run without it"
       exit 1
     end
   end
@@ -188,25 +187,26 @@ class Vitrine::App < Sinatra::Base
     end
   end
   
+  require 'fileutils'
   
   def mtime_cache(path, &blk)
     # Mix in the request URL into the cache key so that we can hash
     # .map sourcemaps and .js compiles based off of the same file path
     # and mtime
-    
-    key = [File.expand_path(path), File.mtime(path), request.path_info, Vitrine::SEED]
+    key = [File.expand_path(path), File.mtime(path), request.path_info, settings.root]
     cache_sha = Digest::SHA1.hexdigest(Marshal.dump(key))
     
-    p = File.join('/tmp', cache_sha)
-    if File.exist?(p)
-      return File.read(p)
-    else
+    # Store in a temp dir
+    FileUtils.mkdir_p '/tmp/vitrine'
+    p = '/tmp/vitrine/%s' % cache_sha
+    begin
+      File.read(p)
+    rescue Errno::ENOENT => e
       Vitrine.atomic_write(p) do |f|
-        $stderr.puts "---> Recompiling #{path}"
-        body = yield
-        f.write(body)
-        return body
+        $stderr.puts "---> Recompiling #{path} for #{request.path_info}"
+        f.write(yield)
       end
+      retry
     end
   end
   

data/vitrine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-11-11"
+  s.date = "2013-11-22"
   s.description = " Serves ERB templates with live CoffeeScript and SASS "
   s.email = "me@julik.nl"
   s.executables = ["vitrine"]
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/julik/vitrine"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.0.3"
   s.summary = "Quickie micro-app preview server"
 
   if s.respond_to? :specification_version then
@@ -45,7 +45,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, ["~> 1.4"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2.2"])
       s.add_runtime_dependency(%q<sass>, ["~> 3"])
-      s.add_runtime_dependency(%q<guard>, [">= 0"])
+      s.add_runtime_dependency(%q<guard>, ["~> 2.2"])
+      s.add_runtime_dependency(%q<guard-livereload>, [">= 0"])
       s.add_runtime_dependency(%q<rack-livereload>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -54,7 +55,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, ["~> 1.4"])
       s.add_dependency(%q<coffee-script>, ["~> 2.2"])
       s.add_dependency(%q<sass>, ["~> 3"])
-      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<guard>, ["~> 2.2"])
+      s.add_dependency(%q<guard-livereload>, [">= 0"])
       s.add_dependency(%q<rack-livereload>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -64,7 +66,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, ["~> 1.4"])
     s.add_dependency(%q<coffee-script>, ["~> 2.2"])
     s.add_dependency(%q<sass>, ["~> 3"])
-    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<guard>, ["~> 2.2"])
+    s.add_dependency(%q<guard-livereload>, [">= 0"])
     s.add_dependency(%q<rack-livereload>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -54,6 +54,20 @@ dependencies:
         version: '3'
 - !ruby/object:Gem::Dependency
   name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -164,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Quickie micro-app preview server