staticmatic2 2.0.2 → 2.1.0

data/staticmatic2.gemspec

@@ -4,33 +4,29 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{staticmatic2}
-  s.version = "2.0.2"
+  s.name = "staticmatic2"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Bartholomew", "Gilbert B Garza"]
-  s.date = %q{2011-03-14}
-  s.default_executable = %q{staticmatic}
-  s.description = %q{    StaticMatic helps you quickly create maintainable static websites using
-    tools such as Haml and Sass.
-    
-    Quickly deploy to services such as Amazon S3 in a single command.
-}
-  s.email = %q{gilbertbgarza@gmail.com}
+  s.date = "2011-09-27"
+  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"]
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.markdown"
+    "README.md"
   ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README.markdown",
+    "README.md",
     "Rakefile",
     "VERSION.yml",
     "bin/staticmatic",
     "lib/staticmatic.rb",
+    "lib/staticmatic/ambiguous_template_error.rb",
     "lib/staticmatic/base.rb",
     "lib/staticmatic/compass.rb",
     "lib/staticmatic/compass/app_integration.rb",
@@ -65,26 +61,28 @@ Gem::Specification.new do |s|
     "spec/rescue_spec.rb",
     "spec/sandbox/test_site/config/compass.rb",
     "spec/sandbox/test_site/config/site.rb",
-    "spec/sandbox/test_site/src/helpers/application_helper.rb",
-    "spec/sandbox/test_site/src/layouts/alternate_layout.haml",
-    "spec/sandbox/test_site/src/layouts/default.haml",
-    "spec/sandbox/test_site/src/layouts/projects.haml",
-    "spec/sandbox/test_site/src/pages/hello_world.erb",
-    "spec/sandbox/test_site/src/pages/index.haml",
-    "spec/sandbox/test_site/src/pages/layout_test.haml",
-    "spec/sandbox/test_site/src/pages/page_one.haml",
-    "spec/sandbox/test_site/src/pages/page_two.haml",
-    "spec/sandbox/test_site/src/pages/page_with_error.haml",
-    "spec/sandbox/test_site/src/pages/page_with_partial_error.haml",
-    "spec/sandbox/test_site/src/partials/menu.haml",
-    "spec/sandbox/test_site/src/partials/partial_with_error.haml",
+    "spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html",
+    "spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html",
+    "spec/sandbox/test_site/site/sub_folder/index.html",
+    "spec/sandbox/test_site/src/_helpers/application_helper.rb",
+    "spec/sandbox/test_site/src/_layouts/alternate_layout.haml",
+    "spec/sandbox/test_site/src/_layouts/default.haml",
+    "spec/sandbox/test_site/src/_layouts/projects.haml",
+    "spec/sandbox/test_site/src/_partials/menu.haml",
+    "spec/sandbox/test_site/src/_partials/partial_with_error.haml",
+    "spec/sandbox/test_site/src/hello_world.erb",
+    "spec/sandbox/test_site/src/index.haml",
+    "spec/sandbox/test_site/src/layout_test.haml",
+    "spec/sandbox/test_site/src/page_one.haml",
+    "spec/sandbox/test_site/src/page_two.haml",
+    "spec/sandbox/test_site/src/page_with_error.haml",
+    "spec/sandbox/test_site/src/page_with_partial_error.haml",
     "spec/sandbox/test_site/src/stylesheets/application.sass",
     "spec/sandbox/test_site/src/stylesheets/css_with_error.sass",
     "spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass",
     "spec/sandbox/test_site/src/stylesheets/partials/_forms.sass",
     "spec/sandbox/test_site/src/stylesheets/sassy.scss",
     "spec/server_spec.rb",
-    "spec/setup_spec.rb",
     "spec/spec_helper.rb",
     "spec/template_error_spec.rb",
     "staticmatic.gemspec",
@@ -117,58 +115,49 @@ Gem::Specification.new do |s|
     "website/src/stylesheets/print.scss",
     "website/src/stylesheets/screen.scss"
   ]
-  s.homepage = %q{http://github.com/mindeavor/staticmatic}
+  s.homepage = "http://github.com/mindeavor/staticmatic2"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{staticmatic2}
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{Build static websites using modern dynamic tools}
-  s.test_files = [
-    "spec/base_spec.rb",
-    "spec/compass_integration_spec.rb",
-    "spec/helpers/asset_helper_spec.rb",
-    "spec/helpers/custom_helper_spec.rb",
-    "spec/render_spec.rb",
-    "spec/rescue_spec.rb",
-    "spec/sandbox/test_site/config/compass.rb",
-    "spec/sandbox/test_site/config/site.rb",
-    "spec/sandbox/test_site/src/helpers/application_helper.rb",
-    "spec/server_spec.rb",
-    "spec/setup_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/template_error_spec.rb"
-  ]
+  s.rubyforge_project = "staticmatic2"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Build Amazon S3 static websites using modern dynamic tools"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<haml>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<haml>, ["~> 3"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3"])
+      s.add_runtime_dependency(%q<tilt>, [">= 1.3"])
       s.add_runtime_dependency(%q<compass>, [">= 0"])
       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"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<haml>, [">= 2.0.0"])
+      s.add_dependency(%q<haml>, ["~> 3"])
+      s.add_dependency(%q<sass>, ["~> 3"])
+      s.add_dependency(%q<tilt>, [">= 1.3"])
       s.add_dependency(%q<compass>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 1.0"])
       s.add_dependency(%q<thor>, [">= 0.14.6"])
       s.add_dependency(%q<aws-s3>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.10"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<haml>, [">= 2.0.0"])
+    s.add_dependency(%q<haml>, ["~> 3"])
+    s.add_dependency(%q<sass>, ["~> 3"])
+    s.add_dependency(%q<tilt>, [">= 1.3"])
     s.add_dependency(%q<compass>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 1.0"])
     s.add_dependency(%q<thor>, [">= 0.14.6"])
     s.add_dependency(%q<aws-s3>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.10"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticmatic2
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,23 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-14 00:00:00.000000000 -05:00
-default_executable: staticmatic
+date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2151852600 !ruby/object:Gem::Requirement
+  requirement: &2157824440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157824440
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &2157816860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157816860
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &2157812260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2151852600
+  version_requirements: *2157812260
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2151833420 !ruby/object:Gem::Requirement
+  requirement: &2157799240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151833420
+  version_requirements: *2157799240
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151831020 !ruby/object:Gem::Requirement
+  requirement: &2157795280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +66,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151831020
+  version_requirements: *2157795280
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2151829180 !ruby/object:Gem::Requirement
+  requirement: &2157792060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +77,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2151829180
+  version_requirements: *2157792060
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2151825580 !ruby/object:Gem::Requirement
+  requirement: &2157788240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,32 +88,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151825580
+  version_requirements: *2157788240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151817780 !ruby/object:Gem::Requirement
+  requirement: &2157785400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2151817780
+  version_requirements: *2157785400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151813700 !ruby/object:Gem::Requirement
+  requirement: &2157780380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2151813700
+  version_requirements: *2157780380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151808920 !ruby/object:Gem::Requirement
+  requirement: &2157777680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,26 +121,27 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151808920
-description: ! "    StaticMatic helps you quickly create maintainable 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"
+  version_requirements: *2157777680
+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"
 email: gilbertbgarza@gmail.com
 executables:
 - staticmatic
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.markdown
+- README.md
 files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - VERSION.yml
 - bin/staticmatic
 - lib/staticmatic.rb
+- lib/staticmatic/ambiguous_template_error.rb
 - lib/staticmatic/base.rb
 - lib/staticmatic/compass.rb
 - lib/staticmatic/compass/app_integration.rb
@@ -154,26 +176,28 @@ files:
 - spec/rescue_spec.rb
 - spec/sandbox/test_site/config/compass.rb
 - spec/sandbox/test_site/config/site.rb
-- spec/sandbox/test_site/src/helpers/application_helper.rb
-- spec/sandbox/test_site/src/layouts/alternate_layout.haml
-- spec/sandbox/test_site/src/layouts/default.haml
-- spec/sandbox/test_site/src/layouts/projects.haml
-- spec/sandbox/test_site/src/pages/hello_world.erb
-- spec/sandbox/test_site/src/pages/index.haml
-- spec/sandbox/test_site/src/pages/layout_test.haml
-- spec/sandbox/test_site/src/pages/page_one.haml
-- spec/sandbox/test_site/src/pages/page_two.haml
-- spec/sandbox/test_site/src/pages/page_with_error.haml
-- spec/sandbox/test_site/src/pages/page_with_partial_error.haml
-- spec/sandbox/test_site/src/partials/menu.haml
-- spec/sandbox/test_site/src/partials/partial_with_error.haml
+- spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
+- spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html
+- spec/sandbox/test_site/site/sub_folder/index.html
+- spec/sandbox/test_site/src/_helpers/application_helper.rb
+- spec/sandbox/test_site/src/_layouts/alternate_layout.haml
+- spec/sandbox/test_site/src/_layouts/default.haml
+- spec/sandbox/test_site/src/_layouts/projects.haml
+- spec/sandbox/test_site/src/_partials/menu.haml
+- spec/sandbox/test_site/src/_partials/partial_with_error.haml
+- spec/sandbox/test_site/src/hello_world.erb
+- spec/sandbox/test_site/src/index.haml
+- spec/sandbox/test_site/src/layout_test.haml
+- spec/sandbox/test_site/src/page_one.haml
+- spec/sandbox/test_site/src/page_two.haml
+- spec/sandbox/test_site/src/page_with_error.haml
+- spec/sandbox/test_site/src/page_with_partial_error.haml
 - spec/sandbox/test_site/src/stylesheets/application.sass
 - spec/sandbox/test_site/src/stylesheets/css_with_error.sass
 - spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass
 - spec/sandbox/test_site/src/stylesheets/partials/_forms.sass
 - spec/sandbox/test_site/src/stylesheets/sassy.scss
 - spec/server_spec.rb
-- spec/setup_spec.rb
 - spec/spec_helper.rb
 - spec/template_error_spec.rb
 - staticmatic.gemspec
@@ -205,8 +229,7 @@ files:
 - website/src/stylesheets/ie.scss
 - website/src/stylesheets/print.scss
 - website/src/stylesheets/screen.scss
-has_rdoc: true
-homepage: http://github.com/mindeavor/staticmatic
+homepage: http://github.com/mindeavor/staticmatic2
 licenses:
 - MIT
 post_install_message: 
@@ -221,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211925824253261974
+      hash: 1689759599891313852
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,21 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: staticmatic2
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Build static websites using modern dynamic tools
-test_files:
-- spec/base_spec.rb
-- spec/compass_integration_spec.rb
-- spec/helpers/asset_helper_spec.rb
-- spec/helpers/custom_helper_spec.rb
-- spec/render_spec.rb
-- spec/rescue_spec.rb
-- spec/sandbox/test_site/config/compass.rb
-- spec/sandbox/test_site/config/site.rb
-- spec/sandbox/test_site/src/helpers/application_helper.rb
-- spec/server_spec.rb
-- spec/setup_spec.rb
-- spec/spec_helper.rb
-- spec/template_error_spec.rb
+summary: Build Amazon S3 static websites using modern dynamic tools
+test_files: []

data/spec/setup_spec.rb

@@ -1,22 +0,0 @@
-require File.dirname(__FILE__) + "/spec_helper"
-
-describe "StaticMatic::Setup" do
-  before do
-    setup_staticmatic
-    @tmp_dir = File.dirname(__FILE__) + '/sandbox/tmp'
-    staticmatic = StaticMatic::Base.new(@tmp_dir)
-    staticmatic.run('setup')
-  end
-  
-  it "should set up project directory in given path" do
-    %w(
-    site/images
-    site/javascripts
-    site/stylesheets
-    src/layouts/site.haml
-    src/pages/index.haml
-    src/stylesheets/screen.sass
-    config/site.rb
-    ).each {|path| File.exists?(File.join(@tmp_dir, path)).should(be_true, "#{path} expected to exist in #{@tmp_dir}") }
-  end
-end