sitefuel 0.1.0a → 0.1.0b

data/bin/sitefuel

@@ -15,13 +15,17 @@
 #
 # == Usage
 #
-#  sitefuel <command> [--driver=file|svn|git] <source> [<output>]
-#           [--debug] [--verbose] [--help] [--license]
+#  sitefuel <command> [--scm=file|svn|git] <source> [<output>] [--debug] \
+#           [--verbose]
+#           [--help]
+#           [--license]
 #
 # === <command>
 # Possible commands are:
+# pull:       Pulls a website from an SCM into a temporary directory.
 # stage::     Simulate a deployment of a site.
 # deploy::    Deploy a site using SiteFuel.
+# process::   Deploy a website in-place. Not recommended.
 # help::      Show this message.
 #
 # === <driver>
@@ -29,8 +33,8 @@
 # specify:
 #
 # filesystem::  deploy a directory
-# svn::   use with Subversion repositories
-# git::   use with Git repositories
+# svn::         use with Subversion repositories
+# git::         use with Git repositories
 #
 # === <source>
 # Specify the source SiteFuel is deploying from. This should accept all

data/lib/sitefuel/SiteFuelRuntime.rb

@@ -16,6 +16,7 @@ module SiteFuel
   require 'optparse'
 
   require 'term/ansicolor'
+  require 'fileutils'
 
   include Term::ANSIColor
 
@@ -34,7 +35,7 @@ module SiteFuel
   require 'sitefuel/external/GIT'
 
   # version of SiteFuel
-  VERSION = [0, 1, '0a'].freeze
+  VERSION = [0, 1, '0b'].freeze
 
   # a human readable version
   VERSION_TEXT = VERSION.join('.').freeze
@@ -247,6 +248,8 @@ module SiteFuel
 
     # pulls files out of a given repository or file system
     def pull
+      section_divider 'Pulling'
+
       if @scm_system == nil
         @scm_system = classify_repository_system!(@deploy_from)
         info "Using #{@scm_system} version control to access #{@deploy_from}"
@@ -279,6 +282,22 @@ module SiteFuel
     end
 
 
+
+    # given a file name will remove the staging directory from it and give
+    # just the base name for the resource
+    def get_base_resource_name(filename)
+      filename.gsub(Regexp.new('^'+Regexp.escape(@staging_directory)), '')
+    end
+
+
+    # given a source file name will remove the staging directory and give the
+    # fully qualified fully qualified name to which this resource is being
+    # deployed
+    def get_full_deployed_name(filename)
+      File.join(@deploy_to, get_base_resource_name(filename))
+    end
+
+
     # implements the stage command. Staging, by itself, will give statistics on
     # the deployment; how many bytes were saved by minification; etc.
     #
@@ -304,7 +323,8 @@ module SiteFuel
         if processor == nil
           @resource_processors[filename] = nil
         else
-          @resource_processors[filename] = processor.process_file(filename)
+          resource_name = get_base_resource_name(filename)
+          @resource_processors[filename] = processor.process_file(filename, :resource_name => resource_name)
         end
         
         processor = @resource_processors[filename]
@@ -404,6 +424,11 @@ module SiteFuel
         results = @resource_processors[filename]
         if results == nil
           putc '.'
+
+          # copy the file over
+          file_destination = get_full_deployed_name(filename)
+          info("Copying #{filename} to #{file_destination}")
+          FileUtils.copy(filename, file_destination)
         else
           putc results.processor_symbol
           results.save(file_tree)
@@ -418,7 +443,7 @@ module SiteFuel
     def finish
       puts ''
       puts ''
-      section_divider('Finishing')
+      section_divider('Finished')
     end
 
 
@@ -463,4 +488,4 @@ module SiteFuel
 
   # load the various processors
   SiteFuelRuntime.load_processors
-end
+end

data/lib/sitefuel/extensions/FileTree.rb

@@ -10,8 +10,9 @@
 
 class FileTree
 
-  def initialize(base_path = :automatic)
-    if base_path == :automatic
+  # creates a new FileTree data structure for a given path
+  def initialize(base_path = nil)
+    if base_path == nil
       @base_path = Dir.pwd
     else
       @base_path = base_path
@@ -27,6 +28,7 @@ class FileTree
   end
   
 
+  # rebuilds the FileTree given the #base_path
   def refresh_tree
     @directory_hash = {}
     @file_hash = {}
@@ -52,6 +54,10 @@ class FileTree
   # creates the given directory if it doesn't exist and returns a
   # FileTree for it
   def create_directory(name)
+    return if name == nil
+    return if name == '.'
+    return if name == '..'
+
     full_name = File.join(@base_path, name)
     res = @directory_hash[full_name]
     if res != nil

data/lib/sitefuel/processors/AbstractExternalProgramProcessor.rb

@@ -48,8 +48,18 @@ module SiteFuel
       end
 
       # sets the file used by this processor
-      def set_file(filename)
-        self.resource_name = filename
+      def set_file(filename, resource_name=nil)
+        case
+          when (resource_name == nil and @resource_name == nil)
+            @resource_name = filename
+
+          when @resource_name != nil
+            # just leave @resource_name be
+
+          else
+            @resource_name = resource_name
+        end
+        
         self.original_size = File.size(filename)
 
         return self

data/lib/sitefuel/processors/AbstractProcessor.rb

@@ -84,6 +84,8 @@ module SiteFuel
         self.logger = SiteFuelLogger.instance
         @execution_list = []
         @filters = []
+
+        @resource_name = nil
       end
 
 
@@ -317,7 +319,7 @@ module SiteFuel
       def execute
         setup_filters
         @execution_list.uniq.each do |filter|
-          info "    Running filter: #{filter}"
+          info "\t\tRunning filter: #{filter}"
           run_filter(filter)
         end
         finish_filters

data/lib/sitefuel/processors/AbstractStringBasedProcessor.rb

@@ -53,12 +53,24 @@ module SiteFuel
       end
 
       # opens a resource from a file
-      def open_file(filename)
+      def open_file(filename, resource_name = nil)
         info "#{self.class} opening #{filename}"
 
         self.document = File.read(filename)
         self.original_size = File.size(filename)
-        self.resource_name = filename
+
+        case
+          when (resource_name == nil and @resource_name == nil)
+            @resource_name = filename
+
+          when @resource_name != nil
+            # just leave @resource_name be
+
+          else
+            @resource_name = resource_name            
+        end
+
+        debug "\t\tOpened with resource name: '#{@resource_name}'"
 
         return self
       end
@@ -92,7 +104,7 @@ module SiteFuel
           file << @document
         end
 
-        info "Wrote document into #{file}"
+        info "Wrote document into #{file_name}"
       end
       
       attr_reader :document

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sitefuel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0a
+  version: 0.1.0b
 platform: ruby
 authors: 
 - wkm
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -06:00
+date: 2010-01-01 00:00:00 -06:00
 default_executable: sitefuel
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,9 +75,6 @@ files:
 - 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

data/test/repositories/git/few_files/index.html

@@ -1,10 +0,0 @@
-<html>
-	<head>
-		<title>Just a little test</title>
-		<link rel="stylesheet" type="text/css" href="style.css" />
-	</head>
-	<body>
-		<h1>Git Repository Test</h1>
-		<p>Ta da....</p>
-	</body>
-</html>

data/test/repositories/git/few_files/style.css

@@ -1,2 +0,0 @@
-body { font-family: sans-serif; font-size: 16pt; }
-