staticmatic2 2.1.2 → 2.1.3

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 
-gem "haml", "~> 3"
-gem "sass", "~> 3"
+gem "haml", "~> 3.1"
+gem "sass", "~> 3.1"
 gem "tilt", ">= 1.3"
-gem "compass"
+gem "compass", "~> 0.11.7"
 
 gem "rack", ">= 1.0"
 gem "thor", ">=0.14.6"

data/Gemfile.lock

@@ -6,10 +6,14 @@ GEM
       mime-types
       xml-simple
     builder (3.0.0)
-    compass (0.10.6)
-      haml (>= 3.0.4)
+    chunky_png (1.2.5)
+    compass (0.11.7)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    fssm (0.2.8.1)
     git (1.2.5)
-    haml (3.0.25)
+    haml (3.1.4)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -29,11 +33,11 @@ PLATFORMS
 DEPENDENCIES
   aws-s3
   bundler (~> 1.0)
-  compass
-  haml (~> 3)
+  compass (~> 0.11.7)
+  haml (~> 3.1)
   jeweler (~> 1.6)
   rack (>= 1.0)
   rspec (~> 1.3.1)
-  sass (~> 3)
+  sass (~> 3.1)
   thor (>= 0.14.6)
   tilt (>= 1.3)

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 1
-:patch: 2
+:patch: 3
 :build: !!null 

data/lib/staticmatic/configuration.rb

@@ -1,5 +1,6 @@
 module StaticMatic
   class Configuration
+    attr_accessor :preview_server
     attr_accessor :preview_server_host
     attr_accessor :preview_server_port
     
@@ -10,6 +11,7 @@ module StaticMatic
     attr_accessor :reverse_ext_mappings
     
     def initialize
+      self.preview_server = Rack::Handler::WEBrick
       self.preview_server_host = "localhost"
       self.preview_server_port = 4000
 

data/lib/staticmatic/server.rb

@@ -60,7 +60,7 @@ module StaticMatic
         run StaticMatic::Server.new(staticmatic)
       end 
       
-      Rack::Handler::WEBrick.run(app, :Port => port, :Host => host)
+      staticmatic.configuration.preview_server.run(app, :Port => port, :Host => host)
     end
 
   end

data/staticmatic2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "staticmatic2"
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Bartholomew", "Gilbert B Garza"]
-  s.date = "2012-02-17"
+  s.date = "2012-03-14"
   s.description = "    StaticMatic helps you quickly create maintainable Amazon S3 static websites using\n    tools such as Haml and Sass.\n    \n    Quickly deploy to services such as Amazon S3 in a single command.\n"
   s.email = "gilbertbgarza@gmail.com"
   s.executables = ["staticmatic"]
@@ -126,10 +126,10 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<haml>, ["~> 3"])
-      s.add_runtime_dependency(%q<sass>, ["~> 3"])
+      s.add_runtime_dependency(%q<haml>, ["~> 3.1"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3.1"])
       s.add_runtime_dependency(%q<tilt>, [">= 1.3"])
-      s.add_runtime_dependency(%q<compass>, [">= 0"])
+      s.add_runtime_dependency(%q<compass>, ["~> 0.11.7"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
       s.add_runtime_dependency(%q<thor>, [">= 0.14.6"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0"])
@@ -137,10 +137,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<haml>, ["~> 3"])
-      s.add_dependency(%q<sass>, ["~> 3"])
+      s.add_dependency(%q<haml>, ["~> 3.1"])
+      s.add_dependency(%q<sass>, ["~> 3.1"])
       s.add_dependency(%q<tilt>, [">= 1.3"])
-      s.add_dependency(%q<compass>, [">= 0"])
+      s.add_dependency(%q<compass>, ["~> 0.11.7"])
       s.add_dependency(%q<rack>, [">= 1.0"])
       s.add_dependency(%q<thor>, [">= 0.14.6"])
       s.add_dependency(%q<aws-s3>, [">= 0"])
@@ -149,10 +149,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<haml>, ["~> 3"])
-    s.add_dependency(%q<sass>, ["~> 3"])
+    s.add_dependency(%q<haml>, ["~> 3.1"])
+    s.add_dependency(%q<sass>, ["~> 3.1"])
     s.add_dependency(%q<tilt>, [">= 1.3"])
-    s.add_dependency(%q<compass>, [">= 0"])
+    s.add_dependency(%q<compass>, ["~> 0.11.7"])
     s.add_dependency(%q<rack>, [">= 1.0"])
     s.add_dependency(%q<thor>, [">= 0.14.6"])
     s.add_dependency(%q<aws-s3>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticmatic2
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2172877740 !ruby/object:Gem::Requirement
+  requirement: &2173268020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2172877740
+  version_requirements: *2173268020
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2172877180 !ruby/object:Gem::Requirement
+  requirement: &2173267080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2172877180
+  version_requirements: *2173267080
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2172876500 !ruby/object:Gem::Requirement
+  requirement: &2173266300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +44,21 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2172876500
+  version_requirements: *2173266300
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2172876000 !ruby/object:Gem::Requirement
+  requirement: &2173265600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.7
   type: :runtime
   prerelease: false
-  version_requirements: *2172876000
+  version_requirements: *2173265600
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2172875500 !ruby/object:Gem::Requirement
+  requirement: &2173264840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172875500
+  version_requirements: *2173264840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2172874980 !ruby/object:Gem::Requirement
+  requirement: &2173264080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2172874980
+  version_requirements: *2173264080
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2172874480 !ruby/object:Gem::Requirement
+  requirement: &2173263040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172874480
+  version_requirements: *2173263040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2172874000 !ruby/object:Gem::Requirement
+  requirement: &2173262080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2172874000
+  version_requirements: *2173262080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2172873500 !ruby/object:Gem::Requirement
+  requirement: &2173261160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2172873500
+  version_requirements: *2173261160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2172872960 !ruby/object:Gem::Requirement
+  requirement: &2173260280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,7 +121,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2172872960
+  version_requirements: *2173260280
 description: ! "    StaticMatic helps you quickly create maintainable Amazon S3 static
   websites using\n    tools such as Haml and Sass.\n    \n    Quickly deploy to services
   such as Amazon S3 in a single command.\n"
@@ -244,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4490559487800359970
+      hash: -552484330933525103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: