spontaneous 0.2.0.alpha1 → 0.2.0.alpha2

data/spontaneous.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'spontaneous'
-  s.version           = '0.2.0.alpha1'
-  s.date              = '2012-02-16'
+  s.version           = '0.2.0.alpha2'
+  s.date              = '2012-02-17'
   s.rubyforge_project = 'spontaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -58,11 +58,11 @@ Gem::Specification.new do |s|
   s.add_dependency('erubis', ["~> 2.6"])
   s.add_dependency('fog', ["~> 1.1.1"])
   s.add_dependency('sinatra', ["~> 1.3.0"])
-  s.add_dependency('rack', ["~> 1.3.4"])
+  s.add_dependency('rack', ["~> 1.4.1"])
   s.add_dependency('thin', ["~> 1.2"])
   s.add_dependency('less', ["~> 1.2"])
   s.add_dependency('sass', ["~> 3.1.4"])
-  s.add_dependency('stringex', ["~> 1.1"])
+  s.add_dependency('stringex', ["= 1.3"])
   s.add_dependency('mini_magick', ["~> 3.3"])
   s.add_dependency('thor', ["~> 0.14.6"])
   s.add_dependency('base58', ["~> 0.1.0"])
@@ -105,9 +105,6 @@ Gem::Specification.new do |s|
     application/css/developer.scss
     application/css/editing.scss
     application/css/login.scss
-    application/css/min/565d4c25e82148acb01c45c8d675b37a08676d77.css
-    application/css/min/84dbe894ea96eafd321c30823d630817bfc4b03b.css
-    application/css/min/d1b54ff4847c613618267ca1c15658e2aee0a4e5.css
     application/css/popover.scss
     application/css/schema_error.scss
     application/css/spontaneous.scss
@@ -145,11 +142,6 @@ Gem::Specification.new do |s|
     application/js/load.js
     application/js/location.js
     application/js/login.js
-    application/js/min/2a0c2962537a3181fedfff5c92596ba6d3122dc9.js
-    application/js/min/4cf1c493d3379ecba5287758c61238034c0893f9.js
-    application/js/min/78ac6b99d96750bb6b9f9aad4cb9cd91cd03f391.js
-    application/js/min/b8abf302a824c35385ff517b34111e1710ff3b37.js
-    application/js/min/c8efb9b9f7c3f6613fcebc6be60f605b6570a382.js
     application/js/page.js
     application/js/page_browser.js
     application/js/page_entry.js
@@ -323,6 +315,7 @@ Gem::Specification.new do |s|
     lib/spontaneous/generators/page/page.rb.tt
     lib/spontaneous/generators/site.rb
     lib/spontaneous/generators/site/.gitignore
+    lib/spontaneous/generators/site/Capfile.tt
     lib/spontaneous/generators/site/Gemfile.tt
     lib/spontaneous/generators/site/Rakefile.tt
     lib/spontaneous/generators/site/config/back.ru
@@ -475,6 +468,9 @@ Gem::Specification.new do |s|
     lib/spontaneous/style.rb
     lib/spontaneous/tasks.rb
     lib/spontaneous/tasks/database.rake
+    lib/spontaneous/utils.rb
+    lib/spontaneous/utils/database.rb
+    lib/spontaneous/utils/database/mysql_dumper.rb
     lib/spontaneous/version.rb
     spontaneous.gemspec
     test/disabled/test_slots.rb

data/test/functional/test_back.rb

@@ -839,7 +839,7 @@ class BackTest < MiniTest::Spec
       end
 
       should "have the right setting for shard_dir" do
-        shard_path = File.join(@site.root / 'cache/media/tmp')
+        shard_path = File.join(@site.root / 'cache/tmp')
         Spontaneous.shard_path.should == shard_path
         Spontaneous.shard_path("abcdef0123").should == shard_path/ "ab/cd/abcdef0123"
       end

data/test/unit/test_generators.rb

@@ -68,7 +68,8 @@ class GeneratorsTest < MiniTest::Spec
       assert File.read(site_root / 'lib/site.rb') =~ /class Site < Spontaneous::Site/
       assert_file_exists(site_root, 'log')
       assert_file_exists(site_root, 'tmp')
-      assert_file_exists(site_root, 'cache/media/tmp')
+      assert_file_exists(site_root, 'cache/media')
+      assert_file_exists(site_root, 'cache/tmp')
       assert_file_exists(site_root, 'cache/revisions')
       assert_file_exists(site_root, '.gitignore')
       assert File.read(site_root / '.gitignore') =~ /cache\/\*/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha1
+  version: 0.2.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70330056810260 !ruby/object:Gem::Requirement
+  requirement: &70299584820820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *70330056810260
+  version_requirements: *70299584820820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70330056809560 !ruby/object:Gem::Requirement
+  requirement: &70299584820220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70330056809560
+  version_requirements: *70299584820220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70330056809000 !ruby/object:Gem::Requirement
+  requirement: &70299584819640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70330056809000
+  version_requirements: *70299584819640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70330056797600 !ruby/object:Gem::Requirement
+  requirement: &70299584819100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.2.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70330056797600
+  version_requirements: *70299584819100
 - !ruby/object:Gem::Dependency
   name: home_run
-  requirement: &70330056793740 !ruby/object:Gem::Requirement
+  requirement: &70299584818540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056793740
+  version_requirements: *70299584818540
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70330056793100 !ruby/object:Gem::Requirement
+  requirement: &70299584817960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056793100
+  version_requirements: *70299584817960
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70330056792620 !ruby/object:Gem::Requirement
+  requirement: &70299584817440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056792620
+  version_requirements: *70299584817440
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70330056792020 !ruby/object:Gem::Requirement
+  requirement: &70299584816960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056792020
+  version_requirements: *70299584816960
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70330056791540 !ruby/object:Gem::Requirement
+  requirement: &70299584832660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70330056791540
+  version_requirements: *70299584832660
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70330056791060 !ruby/object:Gem::Requirement
+  requirement: &70299584831860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,21 +120,21 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056791060
+  version_requirements: *70299584831860
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70330056790560 !ruby/object:Gem::Requirement
+  requirement: &70299584831340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70330056790560
+  version_requirements: *70299584831340
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70330056790000 !ruby/object:Gem::Requirement
+  requirement: &70299584830660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056790000
+  version_requirements: *70299584830660
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70330056789460 !ruby/object:Gem::Requirement
+  requirement: &70299584830020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056789460
+  version_requirements: *70299584830020
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70330056788820 !ruby/object:Gem::Requirement
+  requirement: &70299584829360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,21 +164,21 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70330056788820
+  version_requirements: *70299584829360
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70330056787920 !ruby/object:Gem::Requirement
+  requirement: &70299584828680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056787920
+  version_requirements: *70299584828680
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70330056786640 !ruby/object:Gem::Requirement
+  requirement: &70299584827840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056786640
+  version_requirements: *70299584827840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70330056785880 !ruby/object:Gem::Requirement
+  requirement: &70299584825980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70330056785880
+  version_requirements: *70299584825980
 - !ruby/object:Gem::Dependency
   name: base58
-  requirement: &70330056785080 !ruby/object:Gem::Requirement
+  requirement: &70299584824860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056785080
+  version_requirements: *70299584824860
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70330056784320 !ruby/object:Gem::Requirement
+  requirement: &70299584840200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *70330056784320
+  version_requirements: *70299584840200
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70330056783520 !ruby/object:Gem::Requirement
+  requirement: &70299584839200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056783520
+  version_requirements: *70299584839200
 - !ruby/object:Gem::Dependency
   name: shine
-  requirement: &70330056782560 !ruby/object:Gem::Requirement
+  requirement: &70299584838660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056782560
+  version_requirements: *70299584838660
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70330056781680 !ruby/object:Gem::Requirement
+  requirement: &70299584838120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,10 +252,10 @@ dependencies:
         version: 0.22.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056781680
+  version_requirements: *70299584838120
 - !ruby/object:Gem::Dependency
   name: simultaneous
-  requirement: &70330056780920 !ruby/object:Gem::Requirement
+  requirement: &70299584837420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -263,10 +263,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056780920
+  version_requirements: *70299584837420
 - !ruby/object:Gem::Dependency
   name: rack-async
-  requirement: &70330056780200 !ruby/object:Gem::Requirement
+  requirement: &70299584836800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -274,10 +274,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056780200
+  version_requirements: *70299584836800
 - !ruby/object:Gem::Dependency
   name: xapian-full
-  requirement: &70330056779520 !ruby/object:Gem::Requirement
+  requirement: &70299584836320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,10 +285,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70330056779520
+  version_requirements: *70299584836320
 - !ruby/object:Gem::Dependency
   name: xapian-fu
-  requirement: &70330056778980 !ruby/object:Gem::Requirement
+  requirement: &70299584835840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -296,10 +296,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056778980
+  version_requirements: *70299584835840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70330056778500 !ruby/object:Gem::Requirement
+  requirement: &70299584835300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -307,10 +307,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330056778500
+  version_requirements: *70299584835300
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70330056778020 !ruby/object:Gem::Requirement
+  requirement: &70299584834780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -318,10 +318,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70330056778020
+  version_requirements: *70299584834780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70330056777540 !ruby/object:Gem::Requirement
+  requirement: &70299584834180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -329,10 +329,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70330056777540
+  version_requirements: *70299584834180
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70330056777020 !ruby/object:Gem::Requirement
+  requirement: &70299584833520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -340,10 +340,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70330056777020
+  version_requirements: *70299584833520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70330056776500 !ruby/object:Gem::Requirement
+  requirement: &70299584848980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -351,10 +351,10 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *70330056776500
+  version_requirements: *70299584848980
 - !ruby/object:Gem::Dependency
   name: jnunemaker-matchy
-  requirement: &70330056775920 !ruby/object:Gem::Requirement
+  requirement: &70299584847640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -362,10 +362,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70330056775920
+  version_requirements: *70299584847640
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70330056775340 !ruby/object:Gem::Requirement
+  requirement: &70299584846420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -373,10 +373,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70330056775340
+  version_requirements: *70299584846420
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70330056764800 !ruby/object:Gem::Requirement
+  requirement: &70299584845420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -384,10 +384,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70330056764800
+  version_requirements: *70299584845420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70330056764140 !ruby/object:Gem::Requirement
+  requirement: &70299584844760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -395,10 +395,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70330056764140
+  version_requirements: *70299584844760
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70330056763640 !ruby/object:Gem::Requirement
+  requirement: &70299584843760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -406,10 +406,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70330056763640
+  version_requirements: *70299584843760
 - !ruby/object:Gem::Dependency
   name: leftright
-  requirement: &70330056762900 !ruby/object:Gem::Requirement
+  requirement: &70299584842420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -417,10 +417,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70330056762900
+  version_requirements: *70299584842420
 - !ruby/object:Gem::Dependency
   name: stackdeck
-  requirement: &70330056762260 !ruby/object:Gem::Requirement
+  requirement: &70299584841440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -428,7 +428,7 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70330056762260
+  version_requirements: *70299584841440
 description: Spontaneous is a next-generation Ruby CMS
 email: garry@magnetised.net
 executables:
@@ -448,9 +448,9 @@ files:
 - application/css/developer.scss
 - application/css/editing.scss
 - application/css/login.scss
+- application/css/min/14c2a35812c443001b15d8b12a4780f88c678035.css
 - application/css/min/565d4c25e82148acb01c45c8d675b37a08676d77.css
 - application/css/min/84dbe894ea96eafd321c30823d630817bfc4b03b.css
-- application/css/min/d1b54ff4847c613618267ca1c15658e2aee0a4e5.css
 - application/css/popover.scss
 - application/css/schema_error.scss
 - application/css/spontaneous.scss
@@ -666,6 +666,7 @@ files:
 - lib/spontaneous/generators/page/page.rb.tt
 - lib/spontaneous/generators/site.rb
 - lib/spontaneous/generators/site/.gitignore
+- lib/spontaneous/generators/site/Capfile.tt
 - lib/spontaneous/generators/site/Gemfile.tt
 - lib/spontaneous/generators/site/Rakefile.tt
 - lib/spontaneous/generators/site/config/back.ru
@@ -818,6 +819,9 @@ files:
 - lib/spontaneous/style.rb
 - lib/spontaneous/tasks.rb
 - lib/spontaneous/tasks/database.rake
+- lib/spontaneous/utils.rb
+- lib/spontaneous/utils/database.rb
+- lib/spontaneous/utils/database/mysql_dumper.rb
 - lib/spontaneous/version.rb
 - spontaneous.gemspec
 - test/disabled/test_slots.rb
@@ -1074,7 +1078,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: spontaneous
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 2
 summary: Spontaneous is a next-generation Ruby CMS