jekyll-import 0.1.0.beta4 → 0.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe997aa363075c0bba1d699dd1b4ccbcd29f080
-  data.tar.gz: 6856676d49ecf6a8c64eebd4f85bd846696e63f4
+  metadata.gz: cb0a7bbe8aca1585023f14fd2c866837814187a3
+  data.tar.gz: 03d0d027aed6b677d10f4a29abbdb15baa6dbe13
 SHA512:
-  metadata.gz: 303be81dcf7b40d878d25153ced30e8865602c8fe0b6b8f57111c021accd27ce3b6e5df2cb95290a2f23fa66fbdcdf791fa79cbdc527ba2851435a4d142902cf
-  data.tar.gz: 5812ffbedffcf64ce640c8af5d1140347d71406e2020e75fece71797b4f744b7e8ab29702a29d52ca27dbd11eda12a58698b36015dde65e287b869c41eb859ee
+  metadata.gz: 74f2d5907720b4e013bba9edc05ea0bf12247e8015ea03c5fc8254d696eb3f0811cbf1a3c41cbd864888edecc466d07503f05119e4de8264530a0cfd88e088b2
+  data.tar.gz: 1c422eee36df10b8b7458bb3fcc205e6e9af79d610442a228ea88b9b9e2cc92f630dc3158f56fdf4782ea0600fe152cef178e45d32be9c9282ed1022f213610f

data/History.markdown

@@ -22,6 +22,8 @@
   * Improve the handling of tags in the Drupal 6 importer. Tags with
     spaces are handled now and the importer doesn't eat tags anymore. (#42)
   * Upgrade to `jekyll ~> 1.3` and `safe_yaml ~> 0.9.7` 
+  * Add license to gemspec (#83)
+  * Add an `Importer.run` method for easy invocation (#88)
 
 ### Bug Fixes
   * Remove usage of `Hash#at` in Tumblr importer (#14)
@@ -39,8 +41,11 @@
   * Fix bug where post date in `MT` importer was not imported for older versions
     of MT sites (#62)
   * Fix interface of importers' `#process` method (#69)
+  * RSS importer should specify `--source` option (#81)
+  * Fix fetching of parameters from options hash (#86)
 
 ### Site Enhancements
+  * Add the site (#87)
 
 ### Development Fixes
   * Update usage docs in RSS importer (#35)

data/Rakefile

@@ -9,7 +9,9 @@
 
 require 'rubygems'
 require 'rake'
+require 'rdoc'
 require 'date'
+require 'yaml'
 
 #############################################################################
 #
@@ -46,6 +48,39 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
+def normalize_bullets(markdown)
+  markdown.gsub(/\s{2}\*{1}/, "-")
+end
+
+def linkify_prs(markdown)
+  markdown.gsub(/#(\d+)/) do |word|
+    "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
+  end
+end
+
+def linkify_users(markdown)
+  markdown.gsub(/(@\w+)/) do |username|
+    "[#{username}](https://github.com/#{username.delete("@")})"
+  end
+end
+
+def linkify(markdown)
+  linkify_users(linkify_prs(markdown))
+end
+
+def liquid_escape(markdown)
+  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
+end
+
+def remove_head_from_history(markdown)
+  index = markdown =~ /^##\s+\d+\.\d+\.\d+/
+  markdown[index..-1]
+end
+
+def converted_history(markdown)
+  remove_head_from_history(liquid_escape(linkify(normalize_bullets(markdown))))
+end
+
 #############################################################################
 #
 # Standard tasks
@@ -76,22 +111,90 @@ end
 
 #############################################################################
 #
-# Custom tasks (add your own tasks here)
+# Site tasks - http://import.jekyllrb.com
 #
 #############################################################################
 
-namespace :migrate do
-  desc "Migrate from mephisto in the current directory"
-  task :mephisto do
-    sh %q(ruby -r './lib/jekyll/migrators/mephisto' -e 'Jekyll::Mephisto.postgres(:database => "#{ENV["SERVER"]}", "#{ENV["DB"]}")')
+namespace :site do
+  desc "Generate and view the site locally"
+  task :preview do
+    require "launchy"
+
+    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
+    # then open it in a browser. Someday we can do better than this, I hope.
+    Thread.new do
+      sleep 4
+      puts "Opening in browser..."
+      Launchy.open("http://localhost:4000")
+    end
+
+    # Generate the site in server mode.
+    puts "Running Jekyll..."
+    Dir.chdir("site") do
+      sh "jekyll serve --watch"
+    end
   end
-  desc "Migrate from Movable Type in the current directory"
-  task :mt do
-    sh %q(ruby -r './lib/jekyll/migrators/mt' -e 'Jekyll::MT.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
+
+  desc "Update normalize.css library to the latest version and minify"
+  task :update_normalize_css do
+    Dir.chdir("site/css") do
+      sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
+      sh 'sass "normalize.scss":"normalize.css" --style compressed'
+      sh 'rm "normalize.scss"'
+    end
   end
-  desc "Migrate from Typo in the current directory"
-  task :typo do
-    sh %q(ruby -r './lib/jekyll/migrators/typo' -e 'Jekyll::Typo.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
+
+  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+  task :publish => [:history] do
+    sh "git subtree push --prefix site origin gh-pages"
+  end
+
+  desc "Create a nicely formatted history page for the jekyll site based on the repo history."
+  task :history do
+    if File.exist?("History.markdown")
+      history_file = File.read("History.markdown")
+      front_matter = {
+        "layout" => "docs",
+        "title" => "History",
+        "permalink" => "/docs/history/",
+        "prev_section" => "contributing"
+      }
+      Dir.chdir('site/docs/') do
+        File.open("history.md", "w") do |file|
+          file.write("#{front_matter.to_yaml}---\n\n")
+          file.write(converted_history(history_file))
+        end
+      end
+      sh "git add site/docs/history.md"
+      sh "git commit -m 'Updated generated history.md file in the site.'"
+    else
+      abort "You seem to have misplaced your History.markdown file. I can haz?"
+    end
+  end
+
+  namespace :releases do
+    desc "Create new release post"
+    task :new, :version do |t, args|
+      raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
+      today = Time.new.strftime('%Y-%m-%d')
+      release = args.version.to_s
+      filename = "site/_posts/#{today}-jekyll-import-#{release.split('.').join('-')}-released.markdown"
+
+      File.open(filename, "wb") do |post|
+        post.puts("---")
+        post.puts("layout: news_item")
+        post.puts("title: 'jekyll-import #{release} Released'")
+        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
+        post.puts("author: ")
+        post.puts("version: #{version}")
+        post.puts("categories: [release]")
+        post.puts("---")
+        post.puts
+        post.puts
+      end
+
+      puts "Created #{filename}"
+    end
   end
 end
 

data/jekyll-import.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.name              = 'jekyll-import'
-  s.version           = '0.1.0.beta4'
-  s.date              = '2013-11-09'
+  s.version           = '0.1.0.rc1'
+  s.date              = '2013-11-18'
   s.rubyforge_project = 'jekyll-import'
 
   s.summary     = "Import command for Jekyll (static site generator)."
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.authors  = ["Tom Preston-Werner"]
   s.email    = 'tom@mojombo.com'
   s.homepage = 'http://github.com/jekyll/jekyll-import'
+  s.license  = 'MIT'
 
   s.require_paths = %w[lib]
 
@@ -76,6 +77,70 @@ Gem::Specification.new do |s|
     lib/jekyll-import/importers/wordpress.rb
     lib/jekyll-import/importers/wordpressdotcom.rb
     lib/jekyll/commands/import.rb
+    site/.gitignore
+    site/CNAME
+    site/README
+    site/_config.yml
+    site/_includes/analytics.html
+    site/_includes/docs_contents.html
+    site/_includes/docs_contents_mobile.html
+    site/_includes/docs_option.html
+    site/_includes/docs_ul.html
+    site/_includes/footer.html
+    site/_includes/header.html
+    site/_includes/news_contents.html
+    site/_includes/news_contents_mobile.html
+    site/_includes/news_item.html
+    site/_includes/primary-nav-items.html
+    site/_includes/section_nav.html
+    site/_includes/top.html
+    site/_layouts/default.html
+    site/_layouts/docs.html
+    site/_layouts/news.html
+    site/_layouts/news_item.html
+    site/_posts/2013-11-09-jekyll-import-0-1-0-beta4-release.markdown
+    site/_posts/2013-11-18-jekyll-import-0-1-0-rc1-released.markdown
+    site/css/gridism.css
+    site/css/normalize.css
+    site/css/pygments.css
+    site/css/style.css
+    site/docs/contributing.md
+    site/docs/csv.md
+    site/docs/drupal6.md
+    site/docs/drupal7.md
+    site/docs/enki.md
+    site/docs/google_reader.md
+    site/docs/history.md
+    site/docs/index.md
+    site/docs/installation.md
+    site/docs/joomla.md
+    site/docs/jrnl.md
+    site/docs/marley.md
+    site/docs/mephisto.md
+    site/docs/mt.md
+    site/docs/posterous.md
+    site/docs/rss.md
+    site/docs/s9y.md
+    site/docs/textpattern.md
+    site/docs/third-party.md
+    site/docs/tumblr.md
+    site/docs/typo.md
+    site/docs/usage.md
+    site/docs/wordpress.md
+    site/docs/wordpressdotcom.md
+    site/favicon.png
+    site/feed.xml
+    site/img/article-footer.png
+    site/img/footer-arrow.png
+    site/img/footer-logo.png
+    site/img/logo-2x.png
+    site/img/octojekyll.png
+    site/img/tube.png
+    site/img/tube1x.png
+    site/index.html
+    site/js/modernizr-2.5.3.min.js
+    site/news/index.html
+    site/news/releases/index.html
     test/helper.rb
     test/test_jrnl_importer.rb
     test/test_mt_importer.rb

data/lib/jekyll-import.rb

@@ -8,7 +8,7 @@ require 'jekyll-import/importer'
 require 'jekyll-import/importers'
 
 module JekyllImport
-  VERSION = '0.1.0.beta4'
+  VERSION = '0.1.0.rc1'
 
   def self.logger
     @logger ||= Jekyll::Stevenson.new
@@ -27,10 +27,8 @@ module JekyllImport
       cmd.command(name.to_sym) do |c|
         c.syntax "jekyll import #{name} [options]"
         importer.specify_options(c)
-        c.action do |args, options|
-          importer.require_deps
-          importer.validate(options) if importer.respond_to?(:validate)
-          importer.process(options)
+        c.action do |_, options|
+          importer.run(options)
         end
       end
     end

data/lib/jekyll-import/importer.rb

@@ -7,5 +7,11 @@ module JekyllImport
     def self.subclasses
       @subclasses ||= []
     end
+
+    def self.run(options = {})
+      self.require_deps
+      self.validate(options) if self.respond_to?(:validate)
+      self.process(options)
+    end
   end
 end

data/lib/jekyll-import/importers/rss.rb

@@ -12,7 +12,7 @@ module JekyllImport
   module Importers
     class RSS < Importer
       def self.specify_options(c)
-        c.option 'file', '--file NAME', 'The RSS file to import'
+        c.option 'source', '--source NAME', 'The RSS file or URL to import'
       end
 
       def self.validate(options)
@@ -37,7 +37,7 @@ module JekyllImport
       #
       # Returns nothing.
       def self.process(options)
-        source = options.fetch('file')
+        source = options.fetch('source')
 
         content = ""
         open(source) { |s| content = s.read }

data/lib/jekyll-import/importers/s9y.rb

@@ -28,7 +28,7 @@ module JekyllImport
       end
 
       def self.process(options)
-        source = options.fetch(:source)
+        source = options.fetch('source')
 
         FileUtils.mkdir_p("_posts")
 

data/lib/jekyll-import/importers/textpattern.rb

@@ -39,7 +39,7 @@ module JekyllImport
       def self.process(options)
         dbname = options.fetch('dbname')
         user   = options.fetch('user')
-        pass   = options.fetch('password')
+        pass   = options.fetch('password', "")
         host   = options.fetch('host', "localhost")
 
         db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')

data/site/.gitignore

@@ -0,0 +1,4 @@
+_site/
+*.swp
+pkg/
+test/

data/site/CNAME

@@ -0,0 +1 @@
+import.jekyllrb.com

data/site/README

@@ -0,0 +1 @@
+Jekyll's awesome website.

data/site/_config.yml

@@ -0,0 +1,7 @@
+title: "jekyll-import • Import your old & busted site to Jekyll"
+pygments: true
+relative_permalinks: false
+permalink: /news/:year/:month/:day/:title/
+excerpt_separator: ""
+repository: https://github.com/jekyll/jekyll-import
+latest_release: 0.1.0.beta4

data/site/_includes/analytics.html

@@ -0,0 +1,32 @@
+{% if site.gauges_id %}
+  <!-- Gauges (http://gaug.es/) -->
+  <script type="text/javascript">
+    var _gauges = _gauges || [];
+    (function() {
+      var t   = document.createElement('script');
+      t.type  = 'text/javascript';
+      t.async = true;
+      t.id    = 'gauges-tracker';
+      t.setAttribute('data-site-id', '{{ site.gauges_id }}');
+      t.src = '//secure.gaug.es/track.js';
+      var s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(t, s);
+    })();
+  </script>
+{% endif %}
+
+{% if site.google_analytics_id %}
+  <!-- Google Analytics (http://google.com/analytics) -->
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '{{ site.google_analytics_id }}']);
+    _gaq.push(['_setDomainName', '{{ site.url }}']); // Multiple sub-domains
+    _gaq.push(['_setAllowLinker', true]); // Multiple TLDs
+    _gaq.push(['_trackPageview']);
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+{% endif %}

data/site/_includes/docs_contents.html

@@ -0,0 +1,10 @@
+<div class="unit one-fifth hide-on-mobiles">
+  <aside>
+    <h4>Getting Started</h4>
+    {% include docs_ul.html items='home installation usage' %}
+    <h4>Importers</h4>
+    {% include docs_ul.html items='csv drupal6 drupal7 enki google_reader joomla jrnl marley mephisto mt posterous rss s9y textpattern tumblr typo wordpress wordpressdotcom' %}
+    <h4>Meta</h4>
+    {% include docs_ul.html items='third-party contributing history' %}
+  </aside>
+</div>

data/site/_includes/docs_contents_mobile.html

@@ -0,0 +1,14 @@
+<div class="docs-nav-mobile unit whole show-on-mobiles">
+  <select onchange="if (this.value) window.location.href=this.value">
+    <option value="">Navigate the docs…</option>
+    <optgroup label="Getting started">
+      {% include docs_option.html items='home installation usage' %}
+    </optgroup>
+    <optgroup label="Importers">
+      {% include docs_option.html items='csv drupal6 drupal7 enki google_reader joomla jrnl marley mephisto mt posterous rss s9y textpattern tumblr typo wordpress wordpressdotcom' %}
+    </optgroup>
+    <optgroup label="Meta">
+      {% include docs_option.html items='third-party contributing history' %}
+    </optgroup>
+  </select>
+</div>

data/site/_includes/docs_option.html

@@ -0,0 +1,11 @@
+{% assign items = include.items | split: ' ' %}
+
+{% for item in items %}
+  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+
+  {% for p in site.pages %}
+    {% if p.url == item_url %}
+      <option value="{{ site.url }}{{ p.url }}">{{ p.title }}</option>
+    {% endif %}
+  {% endfor %}
+{% endfor %}