moft 1.0.0 → 1.0.1

data/bin/moft

@@ -80,4 +80,26 @@ command :serve do |c|
 end
 alias_command :server, :serve
 
+command :import do |c|
+  c.syntax = 'moft import <platform> [options]'
+  c.description = 'Import your old blog to Moft'
 
+  c.option '--source STRING', 'Source file or URL to migrate from'
+  c.option '--file STRING', 'File to migrate from'
+  c.option '--dbname STRING', 'Database name to migrate from'
+  c.option '--user STRING', 'Username to use when migrating'
+  c.option '--pass STRING', 'Password to use when migrating'
+  c.option '--host STRING', 'Host address to use when migrating'
+
+  c.action do |args, options|
+    begin
+      require 'moft-import'
+    rescue LoadError
+      msg  = "You must install the 'moft-import' gem before continuing.\n"
+      msg += "* Do this by running `gem install moft-import`.\n"
+      msg += "* Or if you need root privileges, run `sudo gem install moft-import`."
+      abort msg
+    end
+    Moft::Commands::Import.process(args.first, options)
+  end
+end

data/lib/moft.rb

@@ -56,7 +56,7 @@ require_all 'moft/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Moft
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   # Public: Generate a Moft configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/moft/configuration.rb

@@ -25,6 +25,7 @@ module Moft
       'permalink'     => 'date',
       'baseurl'       => '/',
       'include'       => ['.htaccess'],
+      'static_includes' => [],
       'exclude'       => [],
       'paginate_path' => 'page:num',
 

data/lib/moft/site.rb

@@ -3,7 +3,7 @@ require 'set'
 module Moft
   class Site
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
-                  :categories, :exclude, :include, :source, :dest, :lsi, :pygments,
+                  :categories, :exclude, :include, :static_includes, :source, :dest, :lsi, :pygments,
                   :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts,
                   :show_drafts, :keep_files, :baseurl
 
@@ -13,6 +13,7 @@ module Moft
     #
     # config - A Hash containing site configuration details.
     def initialize(config)
+      # puts YAML::dump(config)
       self.config          = config.clone
 
       self.safe            = config['safe']
@@ -29,6 +30,7 @@ module Moft
       self.show_drafts     = config['show_drafts']
       self.limit_posts     = config['limit_posts']
       self.keep_files      = config['keep_files']
+      self.static_includes = config['static_includes']
 
       self.reset
       self.setup
@@ -108,9 +110,16 @@ module Moft
     #
     # Returns nothing.
     def read
+      self.read_static_includes
       self.read_layouts
       self.read_directories
     end
+    
+    def read_static_includes
+      self.static_includes.each do |s|
+        self.read_directories(s)
+      end
+    end
 
     # Read all the files in <source>/<layouts> and create a new Layout object
     # with each one.
@@ -127,7 +136,7 @@ module Moft
         self.layouts[name] = Layout.new(self, base, f)
       end
     end
-
+    
     # Recursively traverse directories to find posts, pages and static files
     # that will become part of the site according to the rules in
     # filter_entries.
@@ -136,6 +145,8 @@ module Moft
     #
     # Returns nothing.
     def read_directories(dir = '')
+      puts "read_redirectories(%s)" % [dir]
+      
       base = File.join(self.source, dir)
       entries = Dir.chdir(base) { filter_entries(Dir.entries('.')) }
 
@@ -152,7 +163,7 @@ module Moft
         limit = self.posts.length < limit_posts ? self.posts.length : limit_posts
         self.posts = self.posts[-limit, limit]
       end
-
+      
       entries.each do |f|
         f_abs = File.join(base, f)
         f_rel = File.join(dir, f)
@@ -357,8 +368,25 @@ module Moft
     # Returns the Array of filtered entries.
     def filter_entries(entries)
       entries.reject do |e|
+        if (e.include?("javascript") == true)
+          puts "Entry check"
+          puts e
+          puts "glob_include()"
+          puts self.include.glob_include?(e)
+          puts "starting char check"
+          puts ['.','_', '#'].include?(e[0..0])
+          puts "tilde check"
+          puts e[-1..-1] == '~'
+          puts "exclude glob_include"
+          puts self.exclude.glob_include?(e)
+          puts "symlink?"
+          puts (File.symlink?(e) && self.safe)
+          puts " ------- "
+      else
+        puts e
+      end    
         unless self.include.glob_include?(e)
-          ['.', '_', '#'].include?(e[0..0]) ||
+          ['.','_', '#'].include?(e[0..0]) ||
           e[-1..-1] == '~' ||
           self.exclude.glob_include?(e) ||
           (File.symlink?(e) && self.safe)

data/lib/moft/static_file.rb

@@ -27,7 +27,11 @@ module Moft
     #
     # Returns destination file path.
     def destination(dest)
-      File.join(dest, @dir, @name)
+      if (@dir[0..1] == '..')
+        File.join(dest, @dir[3..-1], @name)
+      else
+        File.join(dest, @dir, @name)
+      end
     end
 
     # Returns last modification time for this file.

data/moft.gemspec

@@ -4,16 +4,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'moft'
-  s.version           = '1.0.0'
+  s.version           = '1.0.1'
   s.license           = 'MIT'
-  s.date              = '2013-05-02'
+  s.date              = '2013-05-08'
   s.rubyforge_project = 'moft'
 
-  s.summary     = "A simple, blog aware, static site generator."
-  s.description = "Moft is a simple, blog aware, static site generator."
+  s.summary     = "A simple, static site generator that is based off of Jekyll."
+  s.description = "Moft is a simple, static site generator. A fork of jekyll, designed for greater simplicity and less blog-related features."
 
   s.authors  = ["Alex Dowgailenko"]
-  s.email    = 'v0idnull@psikon.com'
+  s.email    = 'alex.dowgailenko@gmail.com'
   s.homepage = 'http://www.psikon.com/'
 
   s.require_paths = %w[lib]

metadata

@@ -1,333 +1,334 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: moft
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Alex Dowgailenko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: liquid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: directory_watcher
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: directory_watcher
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: kramdown
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 14
-        version: "0.14"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: commander
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 4
-        - 1
-        - 3
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 4.1.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: safe_yaml
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: colorator
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: colorator
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 73
-        segments: 
-        - 10
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 3
-        - 11
-        version: "3.11"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.11'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: redgreen
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 3.3.2
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.2.1
-    - - "!="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 2
-        - 4
+    - - ! '!='
+      - !ruby/object:Gem::Version
         version: 1.2.4
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 4
-        - 2
-        version: "4.2"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: simplecov-gem-adapter
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov-gem-adapter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
-  version_requirements: *id019
-description: Moft is a simple, blog aware, static site generator.
-email: v0idnull@psikon.com
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+description: Moft is a simple, static site generator. A fork of jekyll, designed for
+  greater simplicity and less blog-related features.
+email: alex.dowgailenko@gmail.com
+executables:
 - moft
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - LICENSE
 - bin/moft
@@ -376,37 +377,28 @@ files:
 - lib/site_template/images/rss.png
 - lib/site_template/index.html
 homepage: http://www.psikon.com/
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: moft
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
-summary: A simple, blog aware, static site generator.
+summary: A simple, static site generator that is based off of Jekyll.
 test_files: []
-