sitefuel 0.0.0b → 0.1.0a

data/test/test_FileComparisons.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_FileComparisons.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_FileComparisons.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for File.equivalent? class method. The method is
 # heuristic based so lots of tests are needed, although perhaps

data/test/test_GIT.rb

@@ -0,0 +1,41 @@
+#
+# File::      test_GIT.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
+#
+# Unit tests for the Git version system abstraction
+#
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'test/unit'
+require 'sitefuel/external/GIT'
+
+include SiteFuel::External
+
+class GIT
+  def self.capture_stderr
+    true
+  end
+end
+
+class TestGIT < Test::Unit::TestCase
+  TEST_REPOSITORIES = File.join(File.dirname(__FILE__), 'repositories', 'git')
+
+  def test_checkout
+    dir = GIT.shallow_clone(File.join(TEST_REPOSITORIES, 'few_files'))
+    files = Dir[File.join(dir, "**/*")]
+    files.collect! do |f|
+      File.basename(f)
+    end
+
+    assert files.include? 'style.css'
+    assert files.include? 'deployment.yml'
+    assert files.include? 'index.html'
+
+    assert_raises(ProgramExitedWithFailure) do
+      GIT.shallow_clone File.join(TEST_REPOSITORIES, 'this_repo_no_exist')
+    end
+  end
+end

data/test/{test_HAMLProcessor.rb.rb → test_HAMLProcessor.rb}

@@ -1,8 +1,8 @@
 #
-# File::       test_HAMLProcessor.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_HAMLProcessor.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the HAMLProcessor
 #

data/test/test_HTMLProcessor.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_HTMLProcessor.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_HTMLProcessor.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the HTMLProcessor
 #

data/test/test_JPEGTran.rb

@@ -1,8 +1,8 @@
 #
 # File::      test_JPEGTran.rb
 # Author::    wkm
-# Copyright:: 2009
-# License::   GPL
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the JPEGTran wrapper.
 #
@@ -17,7 +17,7 @@ include SiteFuel::External
 class TestJPEGTran < Test::Unit::TestCase
   include ExternalProgramTestCase
 
-  SAMPLE_IMAGE = 'test/test_images/sample_jpg01.jpg'
+  SAMPLE_IMAGE = 'test/images/sample_jpg01.jpg'
 
   def test_options
     assert JPEGTran.option?(:version)
@@ -31,7 +31,7 @@ class TestJPEGTran < Test::Unit::TestCase
   end
 
   def test_lossless
-    new_image =  'test/test_images/tmp-sample_jpg01-lossless.jpg'
+    new_image =  'test/images/tmp-sample_jpg01-lossless.jpg'
     JPEGTran.compress_losslessly SAMPLE_IMAGE, new_image
 
 

data/test/test_JavaScriptProcessor.rb

@@ -1,7 +1,8 @@
 #
 # File::      test_JavaScriptProcessor.rb
-# Copyright:: 2009
-# License::   GPL
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the JavaScriptProcessor
 #

data/test/test_PHPProcessor.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_PHPProcessor.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_PHPProcessor.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the PHPProcessor
 #

data/test/test_PNGCrush.rb

@@ -1,8 +1,8 @@
 #
-# File::        test_PNGCrush.m
-# Author::      wkm
-# Copyright::   2009
-# License::     GPL
+# File::      test_PNGCrush.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the PNGCrush wrapper.
 #
@@ -17,7 +17,7 @@ include SiteFuel::External
 class TestPNGCrush < Test::Unit::TestCase
   include ExternalProgramTestCase
 
-  SAMPLE_IMAGE = 'test/test_images/sample_png01.png'
+  SAMPLE_IMAGE = 'test/images/sample_png01.png'
 
   def test_option
     # test that we have all options
@@ -34,7 +34,7 @@ class TestPNGCrush < Test::Unit::TestCase
 
   def test_brute
     # test the crush capability against one of the test files
-    new_image = './test/test_images/tmp-sample_png01-brute.png'
+    new_image = './test/images/tmp-sample_png01-brute.png'
     PNGCrush.brute SAMPLE_IMAGE, new_image
 
     assert File.size(SAMPLE_IMAGE) > File.size(new_image)
@@ -42,14 +42,14 @@ class TestPNGCrush < Test::Unit::TestCase
   end
 
   def test_quick
-    new_image = './test/test_images/tmp-sample_png01-quick.png'
+    new_image = './test/images/tmp-sample_png01-quick.png'
     PNGCrush.quick SAMPLE_IMAGE, new_image
 
     assert File.size(SAMPLE_IMAGE) > File.size(new_image)
   end
 
   def test_chainsaw
-    new_image = './test/test_images/tmp-sample_png01-chainsaw.png'
+    new_image = './test/images/tmp-sample_png01-chainsaw.png'
     PNGCrush.chainsaw SAMPLE_IMAGE, new_image
 
     assert File.size(SAMPLE_IMAGE) > File.size(new_image)

data/test/test_PNGProcessor.rb

@@ -1,8 +1,8 @@
 #
-# File::           test_PNGProcessor.rb
-# Author::         wkm
-# Copyright::      2009
-# License::        GPL
+# File::      test_PNGProcessor.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the PNGProcessor
 #
@@ -27,6 +27,6 @@ class TestPNGProcessor < Test::Unit::TestCase
   end
 
   def test_crush
-    PNGProcessor.process_file('test/test_images/sample_png01.png')
+    PNGProcessor.process_file('test/images/sample_png01.png')
   end
 end

data/test/test_RHTMLProcessor.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_RHTMLProcessor.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_RHTMLProcessor.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the RHTMLProcessor
 #

data/test/test_SASSProcessor.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_SASSProcessor.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_SASSProcessor.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the SASSProcessor
 #

data/test/test_SVN.rb

@@ -0,0 +1,44 @@
+#
+# File::      test_SVN.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
+#
+# Unit tests for the SVN version system abstraction
+#
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'test/unit'
+require 'sitefuel/external/SVN'
+
+include SiteFuel::External
+
+# just for testing we capture stderr since the negative tests
+# get rather verbose
+class SVN
+  def self.capture_stderr
+    true
+  end
+end
+
+class TestSVN < Test::Unit::TestCase
+  TEST_REPOSITORIES = File.expand_path(File.join(File.dirname(__FILE__), 'repositories', 'svn'))
+
+  def test_checkout
+    dir = SVN.export 'file://'+File.join(TEST_REPOSITORIES, 'testrepo1')
+    files = Dir[File.join(dir, "**/*")].map do |f|
+      File.basename(f)
+    end
+    
+    assert files.include? 'style.css'
+    assert files.include? 'deployment.yml'
+    assert files.include? 'index.html'
+
+
+    # now let's test a checkout where the repo doesn't exist...
+    assert_raises(ProgramExitedWithFailure) do
+      SVN.export 'file://'+File.join(TEST_REPOSITORIES, 'nonexistentrepo')
+    end
+  end
+end

data/test/test_SiteFuelLogging.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_SiteFuelLogging.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_SiteFuelLogging.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the sitefuel logging class
 #

data/test/test_SiteFuelRuntime.rb

@@ -1,8 +1,8 @@
 #
-# File::        test_SiteFuelRuntime.m
-# Author::      wkm
-# Copyright::   2009
-# License::     GPL
+# File::      test_SiteFuelRuntime.m
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the SiteFuelRuntime class.
 #
@@ -91,6 +91,44 @@ class TestSiteFuelRuntime < Test::Unit::TestCase
     assert_equal warnings+1, SiteFuelLogger.instance.warn_count
 
     assert_equal Processor::HTMLProcessor, @runtime.choose_processor("foo.htm")
+  end
+
+
+  def test_repository_system_classification
+    assert_equal :git, @runtime.classify_repository_system('ssh://host/path/repo.git')
+    assert_equal :git, @runtime.classify_repository_system('SSH://host/path/repo.git')
+    assert_equal :git, @runtime.classify_repository_system('git://host/path/repo')
+    assert_equal :git, @runtime.classify_repository_system('GIT://host/path/repo')
+    assert_equal :git, @runtime.classify_repository_system('rsync://host/path/repo')
+    assert_equal :git, @runtime.classify_repository_system('RSYNC://host/path/repo')
+
+
+    assert_equal :svn, @runtime.classify_repository_system('svn+ssh://host/path/repo')
+    assert_equal :svn, @runtime.classify_repository_system('SVN+ssh://host/path/repo')
+    assert_equal :svn, @runtime.classify_repository_system('SVN://host/path/repo')
+    assert_equal :svn, @runtime.classify_repository_system('svn://host/path/repo')
+    assert_equal :svn, @runtime.classify_repository_system('FILE://path/repo')
+    assert_equal :svn, @runtime.classify_repository_system('file:///path/repo')
+
+    # if it ends with .git, it's GIT
+    assert_equal :git, @runtime.classify_repository_system('host/path/repo.git')
+    assert_equal :git, @runtime.classify_repository_system('http://host/path/repo.git')
+    assert_equal :git, @runtime.classify_repository_system('https://host/path/repo.git')
+
+    # vanilla file system deployments
+    assert_equal :filesystem, @runtime.classify_repository_system('./dir')
+    assert_equal :filesystem, @runtime.classify_repository_system('/var/www/dir')
+    assert_equal :filesystem, @runtime.classify_repository_system('dir/')
+    assert_equal :filesystem, @runtime.classify_repository_system('../.dir/')
+    assert_equal :filesystem, @runtime.classify_repository_system('../.dir/somehandle')
+
+    # these shouldn't be classified, or are ambiguous
+    assert_raises(UnknownVersioningSystem) do
+      @runtime.classify_repository_system('http://host/repo')
+    end
+    assert_raises(UnknownVersioningSystem) do
+      @runtime.classify_repository_system('https://host/repo')
+    end
 
   end
 end

data/test/test_StringFormatting.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_StringFormatting.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_StringFormatting.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for String#cabbrev, String#labbrev, and String#rabbrev
 # methods. The main thing these look for is off-by-one errors.
@@ -10,6 +10,10 @@
 
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
+require 'term/ansicolor'
+
+include Term::ANSIColor
+
 require 'test/unit'
 require 'sitefuel/extensions/StringFormatting'
 
@@ -48,4 +52,23 @@ class TestString < Test::Unit::TestCase
       }.align
     )
   end
+
+  def test_visual_length
+    assert_equal(
+      'hello world'.length,
+      'hello world'.visual_length
+    )
+
+    assert_equal(
+      'hello world'.length,
+      'hello world'.blue.visual_length
+    )
+  end
+
+  def test_visual_ljust
+    assert_equal(
+      '123'.ljust(5),
+      '123'.blue.visual_ljust(5).uncolored
+    )
+  end
 end

data/test/test_SymbolComparison.rb

@@ -1,8 +1,8 @@
 #
-# File::       test_SymbolComparisons.rb
-# Author::     wkm
-# Copyright::  2009
-# License::    GPL
+# File::      test_SymbolComparisons.rb
+# Author::    wkm
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # Unit tests for the spaceship method and hence sorting of symbols
 #

data/test/ts_all.rb

@@ -3,8 +3,8 @@
 #
 # File::      ts_all.rb
 # Author::    wkm
-# Copyright:: 2009
-# License::   GPL
+# Copyright:: 2009, Zanoccio LLC.
+# License::   GPL version 2.0 (see LICENSE.rb)
 #
 # The entirety test suite. Runs all tests.
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sitefuel
 version: !ruby/object:Gem::Version 
-  version: 0.0.0b
+  version: 0.1.0a
 platform: ruby
 authors: 
 - wkm
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -06:00
+date: 2009-12-30 00:00:00 -06:00
 default_executable: sitefuel
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,8 +53,8 @@ dependencies:
         version: "2.2"
     version: 
 description: |
-  SiteFuel is a program and lightweight Ruby API for processing the source code
-  behind  your static and dynamic websites. SiteFuel can remove comments and
+  SiteFuel is a Ruby program and lightweight API for processing the source code
+  behind your static and dynamic websites. SiteFuel can remove comments and
   unneeded whitespace from your CSS, HTML, and JavaScript files (as well as
   fragments in RHTML and PHP) files. It can also losslessly compress your PNG and
   JPEG images. SiteFuel can also deploy your website from SVN or GIT. Support for
@@ -66,75 +66,149 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
-- RELEASE_NOTES
+- README.rdoc
+- RELEASE_NOTES.rdoc
 files: 
 - bin/sitefuel
 - test/test_AbstractExternalProgram.rb
+- test/programs/versioning.rb
 - test/test_RHTMLProcessor.rb
 - test/processor_listing.rb
+- test/test_HAMLProcessor.rb
+- test/repositories/git/few_files/style.css
+- test/repositories/git/few_files/deployment.yml
+- test/repositories/git/few_files/index.html
+- test/repositories/svn/testrepo1/conf/svnserve.conf
+- test/repositories/svn/testrepo1/conf/passwd
+- test/repositories/svn/testrepo1/conf/authz
+- test/repositories/svn/testrepo1/README.txt
+- test/repositories/svn/testrepo1/hooks/start-commit.tmpl
+- test/repositories/svn/testrepo1/hooks/post-commit.tmpl
+- test/repositories/svn/testrepo1/hooks/pre-commit.tmpl
+- test/repositories/svn/testrepo1/hooks/pre-revprop-change.tmpl
+- test/repositories/svn/testrepo1/hooks/post-lock.tmpl
+- test/repositories/svn/testrepo1/hooks/pre-lock.tmpl
+- test/repositories/svn/testrepo1/hooks/pre-unlock.tmpl
+- test/repositories/svn/testrepo1/hooks/post-unlock.tmpl
+- test/repositories/svn/testrepo1/hooks/post-revprop-change.tmpl
+- test/repositories/svn/testrepo1/locks/db-logs.lock
+- test/repositories/svn/testrepo1/locks/db.lock
+- test/repositories/svn/testrepo1/format
+- test/repositories/svn/testrepo1/db/revprops/0/1
+- test/repositories/svn/testrepo1/db/revprops/0/0
+- test/repositories/svn/testrepo1/db/write-lock
+- test/repositories/svn/testrepo1/db/current
+- test/repositories/svn/testrepo1/db/format
+- test/repositories/svn/testrepo1/db/fs-type
+- test/repositories/svn/testrepo1/db/uuid
+- test/repositories/svn/testrepo1/db/fsfs.conf
+- test/repositories/svn/testrepo1/db/rep-cache.db
+- test/repositories/svn/testrepo1/db/revs/0/1
+- test/repositories/svn/testrepo1/db/revs/0/0
+- test/repositories/svn/testrepo1/db/min-unpacked-rev
+- test/repositories/svn/testrepo1/db/txn-current
+- test/repositories/svn/testrepo1/db/txn-current-lock
+- test/images/sample_png01.png
+- test/images/sample_jpg01.jpg
 - test/test_AllProcessors.rb
 - test/test_SymbolComparison.rb
+- test/test_GIT.rb
+- test/sites/sitefuelteaser/img/logo.png
+- test/sites/sitefuelteaser/img/hd.png
+- test/sites/sitefuelteaser/img/uses-sitefuel.png
+- test/sites/sitefuelteaser/deployment.yml
+- test/sites/sitefuelteaser/master.css
+- test/sites/sitefuelteaser/index.html
+- test/sites/simplehtml/style.css
+- test/sites/simplehtml/deployment.yml
+- test/sites/simplehtml/index.html
 - test/test_PNGProcessor.rb
 - test/test_CSSProcessor.rb
-- test/test_images/sample_png01.png
-- test/test_images/sample_jpg01.jpg
+- test/test_Configurable.rb
 - test/test_ArrayComparisons.rb
 - test/ts_all.rb
 - test/test_SiteFuelRuntime.rb
 - test/test_AbstractStringBasedProcessor.rb
 - test/test_SiteFuelLogging.rb
 - test/test_AbstractProcessor.rb
-- test/test_sites/simplehtml/style.css
-- test/test_sites/simplehtml/deployment.yml
-- test/test_sites/simplehtml/index.html
 - test/test_JavaScriptProcessor.rb
 - test/test_SASSProcessor.rb
-- test/test_HAMLProcessor.rb.rb
+- test/test_SVN.rb
 - test/test_FileComparisons.rb
-- test/test_programs/versioning.rb
+- test/test_ColumnPrinter.rb
 - test/test_HTMLProcessor.rb
 - test/test_StringFormatting.rb
 - test/test_PHPProcessor.rb
 - test/test_JPEGTran.rb
 - test/test_PNGCrush.rb
+- lib/sitefuel/License.rb
 - lib/sitefuel/SiteFuelRuntime.rb
 - lib/sitefuel/extensions/DynamicClassMethods.rb
 - lib/sitefuel/extensions/ArrayComparisons.rb
 - lib/sitefuel/extensions/Silently.rb
 - lib/sitefuel/extensions/SymbolComparison.rb
 - lib/sitefuel/extensions/StringFormatting.rb
+- lib/sitefuel/extensions/TerminalInfo.rb
+- lib/sitefuel/extensions/ColumnPrinter.rb
 - lib/sitefuel/extensions/FileComparison.rb
+- lib/sitefuel/extensions/FileTree.rb
 - lib/sitefuel/processors/AbstractStringBasedProcessor.rb
 - lib/sitefuel/processors/HTMLProcessor.rb
 - lib/sitefuel/processors/CSSProcessor.rb
 - lib/sitefuel/processors/JavaScriptProcessor.rb
 - lib/sitefuel/processors/PNGProcessor.rb
 - lib/sitefuel/processors/PHPProcessor.rb
+- lib/sitefuel/processors/Configurable.rb
 - lib/sitefuel/processors/AbstractProcessor.rb
 - lib/sitefuel/processors/RHTMLProcessor.rb
 - lib/sitefuel/processors/SASSProcessor.rb
 - lib/sitefuel/processors/HAMLProcessor.rb
 - lib/sitefuel/processors/AbstractExternalProgramProcessor.rb
+- lib/sitefuel/CommandLine.rb
 - lib/sitefuel/Configuration.rb
 - lib/sitefuel/external/PNGCrush.rb
 - lib/sitefuel/external/ExternalProgramTestCase.rb
+- lib/sitefuel/external/SVN.rb
 - lib/sitefuel/external/JPEGTran.rb
 - lib/sitefuel/external/AbstractExternalProgram.rb
 - lib/sitefuel/external/GIT.rb
 - lib/sitefuel/SiteFuelLogger.rb
-- README
-- RELEASE_NOTES
+- README.rdoc
+- RELEASE_NOTES.rdoc
 has_rdoc: true
 homepage: http://sitefuel.org
 licenses: []
 
 post_install_message: |
-  =======================================================
-  This is a test deployment of the SiteFuel gem. It is
-  not intended for public consumption. Specifically, only
-  the `stage` command is enabled and the documentation is
-  far from complete.
+  ======================================================
+   Thank you for installing SiteFuel 0.1.0.
+  
+   Please use caution when using this version of
+   SiteFuel to deploy your websites. This should be
+   considered an alpha release of SiteFuel and there
+   may be bugs which will destroy your code.
+  
+   To get started see http://sitefuel.org/getstarted
+  
+   SiteFuel comes as an executable program:
+  
+    $ sitefuel --help
+    $ sitefuel stage website_source
+    $ sitefuel deploy website_source webserver_directory
+  
+   And also as a Ruby library:
+  
+    require 'rubygems'
+    require 'sitefuel'
+  
+    runtime = SiteFuel::SiteFuelRuntime.new
+    # ...
+  
+   If you're installing on Ubuntu you may need to adjust
+   your $PATH environment variable for programs
+   distributed with gems to work.
+   (see http://sitefuel.org/ubuntu_installation)
+  
   =======================================================
 
 rdoc_options: []