BxMS 0.0.18 → 0.0.22

data/src/bxms/context.rb

@@ -19,13 +19,10 @@ module BxMS
     end
 
     def load_file( file_name )
-      local_file = state.get_local_file( file_name )
-      return IO.read( local_file ) if File.exists? local_file
-
-      root_file = state.get_root_file( file_name )
-      return IO.read( root_file ) if File.exists? root_file
-
-      raise "Unable to find #{file_name}"
+      file_path = state.get_file file_name
+      raise "Unable to find #{file_name}" unless file_path
+      state.remembered_files << file_path
+      IO.read file_path
     end
 
     def run_erb_on( template, file_name )

data/src/bxms/state.rb

@@ -15,6 +15,8 @@ module BxMS
     attr_reader :rules
     attr_reader :tags
 
+    attr_reader :remembered_files
+
     def initialize( parent, directory = nil )
       @parent = parent
 
@@ -29,6 +31,8 @@ module BxMS
       @rules = Rules.new parent.rules
       @tags = Tags.new parent.tags
 
+      @remembered_files = []
+
       load_local @functions, '.functions/*.{rb}'
       load_local @tags, '.tags/*'
       load_local @rules, '.rules'
@@ -44,6 +48,14 @@ module BxMS
       @parent.target_dir
     end
 
+    def get_file( file_name )
+      local_file = get_local_file file_name
+      return local_file if File.exist?(local_file)
+      root_file = get_root_file file_name
+      return root_file if File.exist?(root_file)
+      nil
+    end
+
     def get_root_file( file_name )
       File.join source_dir, file_name
     end

data/src/net/transport.rb

@@ -0,0 +1,46 @@
+require 'net/transport_wrapper'
+
+module Net
+
+  class Transport
+
+    def self.create(deploy_config_path, &block)
+      require 'yaml'
+      deploy_config = YAML::load(File.read('deploy.yml'))
+      Transport.new(deploy_config).open &block
+    end
+
+    def initialize(config_hash)
+      @configuration = config_hash
+    end
+
+    def open(&block)
+      require 'net/ftp'
+      Net::FTP.open(host) do |ftp|
+        ftp.login user, password
+        ftp.chdir folder
+        yield TransportWrapper.new(folder, ftp)
+      end
+    end
+
+    private
+
+    def host
+      @configuration['host']
+    end
+
+    def user
+      @configuration['user']
+    end
+
+    def password
+      @configuration['password']
+    end
+
+    def folder
+      @configuration['folder']
+    end
+
+  end
+
+end

data/src/net/transport_wrapper.rb

@@ -0,0 +1,36 @@
+module Net
+
+  class TransportWrapper
+
+    def initialize(folder, ftp)
+      @folder = folder
+      @ftp = ftp
+    end
+
+    def chdir(subfolder)
+      remote_folder = File.join @folder, subfolder
+      puts "chdir #{remote_folder}"
+      @ftp.chdir remote_folder
+    end
+
+    def update(localfile, remotefile)
+      puts "update #{localfile} to #{remotefile}"
+      localtime = File.mtime(localfile).getutc
+      remotetime = mtime(remotefile).getutc
+      changed = localtime > remotetime
+      @ftp.putbinaryfile localfile, remotefile if changed
+      return changed
+    end
+
+    def mtime(remotefile)
+      @ftp.mtime remotefile, MTIME_UTC
+    rescue
+      nil
+    end
+
+    private
+
+    MTIME_UTC = false # see Net::FTP#mtime
+  end
+
+end

data/src/rules/base.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 
 module Rules
 
@@ -11,6 +12,34 @@ module Rules
       name.sub! /Rule\Z/, ''
     end
 
+    def update(data, to_file, from_file_list)
+      uptodate = uptodate? to_file, from_file_list
+      content_matches = compare data, to_file if uptodate and data
+      unless uptodate and content_matches
+        store data, to_file if data
+        copy from_file_list.first, to_file unless data
+      else
+        puts "skipped unchanged #{to_file}" if @verbose
+      end
+    end
+
+    def store(data, to_file)
+      File.open(to_file, 'w' ) { |file| file.write data }
+    end
+
+    def copy(from_file, to_file)
+      FileUtils.cp from_file, to_file, :preserve => true
+    end
+
+    def uptodate?(target_file, source_file_list)
+      FileUtils.uptodate? target_file, source_file_list
+    end
+
+    def compare(data, target_file)
+      target = IO.read target_file
+      data == target
+    end
+
   end
 
 end

data/src/rules/copy.rb

@@ -7,9 +7,9 @@ module Rules
   class CopyRule < BaseRule
 
     def apply_to( file, state )
-      puts "copy #{file} to #{state.output_dir}" if @verbose
       FileUtils.mkdir_p state.output_dir unless File.directory? state.output_dir
-      FileUtils.cp file, state.output_dir
+      target_file = File.join state.output_dir, File.basename(file)
+      update nil, target_file, [file]
     end
 
   end

data/src/rules/process.rb

@@ -15,7 +15,8 @@ module Rules
       output = context.run_erb_on file_contents, input_file
 
       output_file = state.get_output_file_for input_file
-      File.open( output_file, 'w' ) { |file| file.write output }
+
+      update output, output_file, [input_file]
     end
 
   end

data/src/rules/process_page.rb

@@ -10,6 +10,9 @@ module Rules
     def apply_to( input_file, state )
       puts "process page #{input_file} to #{state.output_dir}" if @verbose
 
+      state.remembered_files.clear
+      state.remembered_files << input_file
+
       collector = PartCollector.new input_file
       parts = collector.load_and_scan input_file
 
@@ -36,9 +39,7 @@ module Rules
       output_file = state.get_output_file_for input_file
       output_file.sub! /\.page$/, '.html'
 
-      File.open( output_file, 'w' ) do |file|
-        file.write output
-      end
+      update output, output_file, state.remembered_files
     end
 
   end

data/src/util/folder_scanner.rb

@@ -0,0 +1,46 @@
+module Util
+
+  class FolderScanner
+
+    def self.traverse(folderpath, &block)
+      FolderScanner.new(folderpath).list &block
+    end
+
+    def initialize(rootpath, currentpath = nil)
+      @rootpath = rootpath
+      @currentpath = currentpath
+    end
+
+    def list(&block)
+      Dir.entries(current_folder).sort.each do |filename|
+        next if filename == '.' or filename == '..'
+        filepath = path_to filename
+        is_folder = File.directory? File.join(rootpath, filepath)
+        if is_folder
+          yield filepath, :folder
+          FolderScanner.new(rootpath, filepath).list &block
+          yield path_to('.'), :folder
+        else
+          yield filepath, :file
+        end
+      end
+    end
+
+    def path_to(filename)
+      return filename unless currentpath
+      File.join currentpath, filename
+    end
+
+    def current_folder
+      return rootpath unless currentpath
+      File.join rootpath, currentpath
+    end
+
+    private
+
+    attr_reader :rootpath
+    attr_reader :currentpath
+
+  end
+
+end

metadata

@@ -1,116 +1,128 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: BxMS
 version: !ruby/object:Gem::Version 
-  version: 0.0.18
-date: 2006-05-04 00:00:00 +02:00
-summary: Simple offline CMS framework based on ERB, 'tags' and 'functions'.
-require_paths: 
-- src
-email: bxms {AT} intensicode {DOT} com
-homepage: bxms.rubyforge.org.
-rubyforge_project: bxms
-description: "Please see the Wiki found at: http://bxms.rubyforge.org/wiki/wiki.pl"
-autorequire: 
-default_executable: bxms
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.22
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - The.French.DJ
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-07-17 00:00:00 +02:00
+default_executable: bxms
+dependencies: []
+
+description: "Please see the Wiki found at: http://bxms.rubyforge.org/wiki/wiki.pl"
+email: bxms {AT} intensicode {DOT} com
+executables: 
+- bxms
+- bxms.rb
+- bxms.bat
+- bxms.sh
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - bin/bxms
-- bin/bxms.bat
 - bin/bxms.rb
+- bin/bxms.bat
 - bin/bxms.sh
 - examples/www.berlinfactor.com
+- examples/www.berlinfactor.com/Section.Bx
+- examples/www.berlinfactor.com/Section.Bx/index.page
 - examples/www.berlinfactor.com/Bx.css
-- examples/www.berlinfactor.com/Bx.js
 - examples/www.berlinfactor.com/favicon.ico
-- examples/www.berlinfactor.com/images
-- examples/www.berlinfactor.com/index.page
+- examples/www.berlinfactor.com/Section.Contact
+- examples/www.berlinfactor.com/Section.Contact/index.page
 - examples/www.berlinfactor.com/news.page
+- examples/www.berlinfactor.com/index.page
+- examples/www.berlinfactor.com/Bx.js
 - examples/www.berlinfactor.com/news.txt
-- examples/www.berlinfactor.com/Section.Books
-- examples/www.berlinfactor.com/Section.Bx
-- examples/www.berlinfactor.com/Section.Contact
-- examples/www.berlinfactor.com/Section.Links
-- examples/www.berlinfactor.com/images/background.png
-- examples/www.berlinfactor.com/images/logo_above.gif
-- examples/www.berlinfactor.com/images/logo_below.gif
-- examples/www.berlinfactor.com/images/logo_clickable.gif
-- examples/www.berlinfactor.com/images/no_section_name.gif
-- examples/www.berlinfactor.com/images/section_books.gif
-- examples/www.berlinfactor.com/images/section_books_hover.gif
-- examples/www.berlinfactor.com/images/section_books_name.gif
-- examples/www.berlinfactor.com/images/section_bx.gif
-- examples/www.berlinfactor.com/images/section_bx_hover.gif
+- examples/www.berlinfactor.com/images
 - examples/www.berlinfactor.com/images/section_bx_name.gif
-- examples/www.berlinfactor.com/images/section_contact.gif
 - examples/www.berlinfactor.com/images/section_contact_hover.gif
+- examples/www.berlinfactor.com/images/section_books_name.gif
+- examples/www.berlinfactor.com/images/no_section_name.gif
+- examples/www.berlinfactor.com/images/logo_below.gif
+- examples/www.berlinfactor.com/images/section_bx_hover.gif
 - examples/www.berlinfactor.com/images/section_contact_name.gif
-- examples/www.berlinfactor.com/images/section_links.gif
-- examples/www.berlinfactor.com/images/section_links_hover.gif
-- examples/www.berlinfactor.com/images/section_links_name.gif
+- examples/www.berlinfactor.com/images/logo_clickable.gif
+- examples/www.berlinfactor.com/images/background.png
 - examples/www.berlinfactor.com/images/section_tfdj.gif
-- examples/www.berlinfactor.com/images/section_tfdj_hover.gif
 - examples/www.berlinfactor.com/images/section_tfdj_name.gif
+- examples/www.berlinfactor.com/images/section_books_hover.gif
+- examples/www.berlinfactor.com/images/section_links.gif
+- examples/www.berlinfactor.com/images/section_tfdj_hover.gif
+- examples/www.berlinfactor.com/images/section_contact.gif
+- examples/www.berlinfactor.com/images/section_books.gif
+- examples/www.berlinfactor.com/images/section_bx.gif
+- examples/www.berlinfactor.com/images/section_links_name.gif
+- examples/www.berlinfactor.com/images/section_links_hover.gif
+- examples/www.berlinfactor.com/images/logo_above.gif
+- examples/www.berlinfactor.com/Section.Books
 - examples/www.berlinfactor.com/Section.Books/books.txt
 - examples/www.berlinfactor.com/Section.Books/index.page
-- examples/www.berlinfactor.com/Section.Bx/index.page
-- examples/www.berlinfactor.com/Section.Contact/index.page
+- examples/www.berlinfactor.com/Section.Links
+- examples/www.berlinfactor.com/Section.Links/Tools.and.Utilities.txt
 - examples/www.berlinfactor.com/Section.Links/Game.Development.txt
+- examples/www.berlinfactor.com/Section.Links/Software.Development.txt
 - examples/www.berlinfactor.com/Section.Links/index.page
 - examples/www.berlinfactor.com/Section.Links/News.and.Stuff.txt
-- examples/www.berlinfactor.com/Section.Links/Software.Development.txt
 - examples/www.berlinfactor.com/Section.Links/Symbian.Development.txt
-- examples/www.berlinfactor.com/Section.Links/Tools.and.Utilities.txt
 - src/bxms
-- src/bxms.rb
-- src/page
-- src/rules
-- src/util
 - src/bxms/context.rb
-- src/bxms/functions.rb
 - src/bxms/processor.rb
+- src/bxms/variables.rb
 - src/bxms/root_state.rb
-- src/bxms/rules.rb
 - src/bxms/state.rb
 - src/bxms/tags.rb
-- src/bxms/variables.rb
-- src/page/part.rb
+- src/bxms/rules.rb
+- src/bxms/functions.rb
+- src/net
+- src/net/transport_wrapper.rb
+- src/net/transport.rb
+- src/page
 - src/page/part_collector.rb
+- src/page/part.rb
+- src/bxms.rb
+- src/rules
 - src/rules/base.rb
-- src/rules/copy.rb
-- src/rules/ignore.rb
 - src/rules/process.rb
 - src/rules/process_page.rb
+- src/rules/copy.rb
+- src/rules/ignore.rb
+- src/util
+- src/util/folder_scanner.rb
 - src/util/chained_hash.rb
-- src/util/logger.rb
 - src/util/system_logger.rb
-test_files: []
-
+- src/util/logger.rb
+has_rdoc: true
+homepage: bxms.rubyforge.org.
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- bxms
-- bxms.bat
-- bxms.rb
-- bxms.sh
-extensions: []
-
+require_paths: 
+- src
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: bxms
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Simple offline CMS framework based on ERB, 'tags' and 'functions'.
+test_files: []