nanoc 2.2.2 → 3.0.0a1

data/bin/nanoc

@@ -1,15 +1,33 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-# Add lib to load path
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+# Find version
+version_file_path = File.expand_path('~/.nanoc-select-version')
+if !File.exist?(version_file_path)
+  warn 'WARNING: No nanoc version has been selected; using nanoc 3.x by default. Select a version using `nanoc-select` to make this warning go away.'
+  version = 3
+else
+  version = File.read(version_file_path).to_i
+end
 
-# Load nanoc
-require 'nanoc'
-require 'nanoc/cli'
+# Determine nanoc executable name
+VERSION_MAP = {
+  2 => 'nanoc2',
+  3 => 'nanoc3'
+}
+name = VERSION_MAP[version]
+if name.nil?
+  $stderr.puts "Unsupported nanoc version number: #{version}. Supported versions: #{VERSION_MAP.keys.join(', ')}."
+  exit 1
+end
 
-# Load custom code that can't be load later
-Dir['lib/commands/*.rb'].each     { |f| require f }
-Dir['lib/data_sources/*.rb'].each { |f| require f }
-
-# Run base
-Nanoc::CLI::Base.new.run(ARGV)
+# Run nanoc
+begin
+  exec name, *ARGV
+rescue Errno::ENOENT
+  $stderr.puts "Could not execute #{name}, which is your selected nanoc version. Make sure that #{name} is installed and that it is in your $PATH."
+  $stderr.puts
+  $stderr.puts "* To install #{name}, run `gem install #{name}`."
+  $stderr.puts "* To select a different version of nanoc, run `nanoc-select`."
+  exit 1
+end

data/bin/nanoc-select

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'nanoc-select'
+require 'getoptlong'
+
+def version(io)
+  io.puts "nanoc-select #{NanocSelect::VERSION} (c) 2010 Denis Defreyne."
+  io.puts "Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) running on #{RUBY_PLATFORM}"
+end
+
+def usage(io, option_definitions)
+  io.puts "usage: #{$0} version"
+  io.puts
+  io.puts <<-EOS
+Since nanoc 3.x is not backwards compatible with nanoc 2.x, it can be useful
+to have multiple versions of nanoc installed simultaneously. In order to avoid
+having to type `nanoc2` or `nanoc3`, the `nanoc-select` tool can be used to
+make `nanoc` invoke either `nanoc2` or `nanoc3`.
+EOS
+  io.puts
+  io.puts "Options:"
+  io.puts
+  option_definitions.each do |opt_def|
+    io.puts "    #{opt_def[1]} #{format '%-10s', opt_def[0]} #{opt_def[-1]}"
+  end
+end
+
+def list(io)
+  io.puts 'Available nanoc versions:'
+  io.puts
+  NanocSelect::VERSIONS.each do |v|
+    io.puts "    #{v} -- nanoc #{v}.x"
+  end
+end
+
+# Parse options
+begin
+  option_definitions = [
+    [ '--help',    '-h', GetoptLong::NO_ARGUMENT, 'show this help and exit'           ],
+    [ '--version', '-v', GetoptLong::NO_ARGUMENT, 'show version information and exit' ],
+    [ '--list',    '-l', GetoptLong::NO_ARGUMENT, 'list available versions and exit'  ]
+  ]
+  options = GetoptLong.new(*option_definitions.map { |od| od[0..-2] })
+  options.each do |opt, arg|
+    case opt
+    when '--help'
+      usage($stdout, option_definitions)
+      exit 0
+
+    when '--version'
+      version($stdout)
+      exit 0
+
+    when '--list'
+      list($stdout)
+      exit 0
+    end
+  end
+rescue GetoptLong::InvalidOption
+  $stderr.puts
+  usage($stderr, option_definitions)
+  exit 1
+end
+
+# Get version argument
+if ARGV.size != 1
+  usage($stderr, option_definitions)
+  exit 1
+end
+version_raw = ARGV[0]
+version     = version_raw.to_i
+if !NanocSelect::VERSIONS.include?(version)
+  $stderr.puts "There is no nanoc version #{version_raw}!"
+  $stderr.puts
+  list($stderr)
+  exit 1
+end
+
+# Switch
+version_file_path = File.expand_path('~/.nanoc-select-version')
+File.open(version_file_path, 'w') { |io| io.write(version.to_s + "\n") }
+puts "Switched to nanoc version #{version}."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 3.0.0a1
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,192 +9,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 +02:00
+date: 2010-02-20 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
-description: a tool that runs on your local computer and compiles Markdown, Textile, Haml, ... documents into static web pages
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: nanoc3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+    version: 
+description: a web publishing system written in Ruby for building small to medium-sized websites.
 email: denis.defreyne@stoneship.org
 executables: 
 - nanoc
+- nanoc-select
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- README
-- LICENSE
-- ChangeLog
-- Rakefile
 - bin/nanoc
-- lib/nanoc/base/asset.rb
-- lib/nanoc/base/asset_defaults.rb
-- lib/nanoc/base/asset_rep.rb
-- lib/nanoc/base/binary_filter.rb
-- lib/nanoc/base/code.rb
-- lib/nanoc/base/compiler.rb
-- lib/nanoc/base/core_ext/hash.rb
-- lib/nanoc/base/core_ext/string.rb
-- lib/nanoc/base/core_ext.rb
-- lib/nanoc/base/data_source.rb
-- lib/nanoc/base/defaults.rb
-- lib/nanoc/base/filter.rb
-- lib/nanoc/base/layout.rb
-- lib/nanoc/base/notification_center.rb
-- lib/nanoc/base/page.rb
-- lib/nanoc/base/page_defaults.rb
-- lib/nanoc/base/page_rep.rb
-- lib/nanoc/base/plugin.rb
-- lib/nanoc/base/proxies/asset_proxy.rb
-- lib/nanoc/base/proxies/asset_rep_proxy.rb
-- lib/nanoc/base/proxies/layout_proxy.rb
-- lib/nanoc/base/proxies/page_proxy.rb
-- lib/nanoc/base/proxies/page_rep_proxy.rb
-- lib/nanoc/base/proxies.rb
-- lib/nanoc/base/proxy.rb
-- lib/nanoc/base/router.rb
-- lib/nanoc/base/site.rb
-- lib/nanoc/base/template.rb
-- lib/nanoc/base.rb
-- lib/nanoc/binary_filters/image_science_thumbnail.rb
-- lib/nanoc/binary_filters.rb
-- lib/nanoc/cli/base.rb
-- lib/nanoc/cli/commands/autocompile.rb
-- lib/nanoc/cli/commands/compile.rb
-- lib/nanoc/cli/commands/create_layout.rb
-- lib/nanoc/cli/commands/create_page.rb
-- lib/nanoc/cli/commands/create_site.rb
-- lib/nanoc/cli/commands/create_template.rb
-- lib/nanoc/cli/commands/help.rb
-- lib/nanoc/cli/commands/info.rb
-- lib/nanoc/cli/commands/switch.rb
-- lib/nanoc/cli/commands/update.rb
-- lib/nanoc/cli/commands.rb
-- lib/nanoc/cli/logger.rb
-- lib/nanoc/cli.rb
-- lib/nanoc/data_sources/filesystem.rb
-- lib/nanoc/data_sources/filesystem_combined.rb
-- lib/nanoc/data_sources.rb
-- lib/nanoc/extra/auto_compiler.rb
-- lib/nanoc/extra/context.rb
-- lib/nanoc/extra/core_ext/hash.rb
-- lib/nanoc/extra/core_ext/time.rb
-- lib/nanoc/extra/core_ext.rb
-- lib/nanoc/extra/file_proxy.rb
-- lib/nanoc/extra/vcs.rb
-- lib/nanoc/extra/vcses/bazaar.rb
-- lib/nanoc/extra/vcses/dummy.rb
-- lib/nanoc/extra/vcses/git.rb
-- lib/nanoc/extra/vcses/mercurial.rb
-- lib/nanoc/extra/vcses/subversion.rb
-- lib/nanoc/extra/vcses.rb
-- lib/nanoc/extra.rb
-- lib/nanoc/filters/bluecloth.rb
-- lib/nanoc/filters/erb.rb
-- lib/nanoc/filters/erubis.rb
-- lib/nanoc/filters/haml.rb
-- lib/nanoc/filters/markaby.rb
-- lib/nanoc/filters/maruku.rb
-- lib/nanoc/filters/old.rb
-- lib/nanoc/filters/rainpress.rb
-- lib/nanoc/filters/rdiscount.rb
-- lib/nanoc/filters/rdoc.rb
-- lib/nanoc/filters/redcloth.rb
-- lib/nanoc/filters/relativize_paths.rb
-- lib/nanoc/filters/relativize_paths_in_css.rb
-- lib/nanoc/filters/relativize_paths_in_html.rb
-- lib/nanoc/filters/rubypants.rb
-- lib/nanoc/filters/sass.rb
-- lib/nanoc/filters.rb
-- lib/nanoc/helpers/blogging.rb
-- lib/nanoc/helpers/capturing.rb
-- lib/nanoc/helpers/filtering.rb
-- lib/nanoc/helpers/html_escape.rb
-- lib/nanoc/helpers/link_to.rb
-- lib/nanoc/helpers/render.rb
-- lib/nanoc/helpers/tagging.rb
-- lib/nanoc/helpers/text.rb
-- lib/nanoc/helpers/xml_sitemap.rb
-- lib/nanoc/helpers.rb
-- lib/nanoc/routers/default.rb
-- lib/nanoc/routers/no_dirs.rb
-- lib/nanoc/routers/versioned.rb
-- lib/nanoc/routers.rb
-- lib/nanoc.rb
-- vendor/cri/ChangeLog
-- vendor/cri/lib/cri/base.rb
-- vendor/cri/lib/cri/command.rb
-- vendor/cri/lib/cri/core_ext/string.rb
-- vendor/cri/lib/cri/core_ext.rb
-- vendor/cri/lib/cri/option_parser.rb
-- vendor/cri/lib/cri.rb
-- vendor/cri/LICENSE
-- vendor/cri/NEWS
-- vendor/cri/Rakefile
-- vendor/cri/README
-- vendor/cri/test/test_base.rb
-- vendor/cri/test/test_command.rb
-- vendor/cri/test/test_core_ext.rb
-- vendor/cri/test/test_option_parser.rb
+- bin/nanoc-select
 has_rdoc: true
 homepage: http://nanoc.stoneship.org/
 licenses: []
 
-post_install_message: |-
-  ------------------------------------------------------------------------------
-  Thanks for installing nanoc 2.2! Here are some resources to help you get started:
-  
-  * The tutorial at <http://nanoc.stoneship.org/help/tutorial/>
-  * The manual at <http://nanoc.stoneship.org/help/manual/>
-  * The discussion group at <http://groups.google.com/group/nanoc>
-  
-  Be sure to check out the nanoc blog at <http://nanoc.stoneship.org/blog/> for
-  details about this release.
-  
-  Enjoy!
-  ------------------------------------------------------------------------------
-rdoc_options: 
-- --title
-- nanoc
-- --main
-- README
-- --charset
-- utf-8
-- --exclude
-- lib/nanoc/cli/commands
-- --exclude
-- lib/nanoc/binary_filters
-- --exclude
-- lib/nanoc/extra/vcses
-- --exclude
-- lib/nanoc/filters
-- --exclude
-- doc
-- --exclude
-- test
-- --exclude
-- vendor
-- --line-numbers
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.5
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: nanoc
-rubygems_version: 1.3.3
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: a tool that runs on your local computer and compiles Markdown, Textile, Haml, ... documents into static web pages
+summary: a web publishing system written in Ruby for building small to medium-sized websites.
 test_files: []
 

data/ChangeLog

@@ -1,3 +0,0 @@
-For a list of all changes, please see the changelog on the project repository
-instead (http://projects.stoneship.org/hg/shared/nanoc/shortlog). For release
-notes, please see the NEWS file.

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2007-2008 Denis Defreyne and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

data/README

@@ -1,75 +0,0 @@
-== Overview
-
-nanoc is a simple but very flexible static site generator written in Ruby.
-It operates on local files, and therefore does not run on the server. nanoc
-"compiles" the local source files into HTML (usually), by evaluating eRuby,
-Markdown, etc.
-
-== Documentation
-
-nanoc's web site, which can be found at http://nanoc.stoneship.org, contains a
-few useful resources to help you get started with nanoc:
-
-* The tutorial at http://nanoc.stoneship.org/help/tutorial
-* The manual at http://nanoc.stoneship.org/help/manual
-
-It is probably also worth checking out and perhaps subscribing to the
-discussion groups:
-
-* The discussion group in English at http://groups.google.com/group/nanoc
-* The discussion group in Spanish at http://groups.google.com/group/nanoc-es
-
-=== Source Code Documentation
-
-The source code is structured in a few directories:
-
-* *bin* contains the commandline tool aptly named +nanoc+
-* *lib*
-  * *nanoc*
-    * *base* contains the bare essentials necessary for nanoc to function
-    * *binary_filters* contains the standard binary filters
-      (Nanoc::BinaryFilter subclasses) such as the thumbnail filter
-    * *cli* contains the commandline interface
-    * *data_sources* contains the standard data sources (Nanoc::DataSource
-      subclasses), such as the filesystem data source
-    * *helpers* contains helpers, which provide functionality some sites
-      may find useful, such as the blogging and tagging helpers
-    * *extra* contains stuff that is not needed by nanoc itself, but which may
-      be used by helpers, data sources, filters or routers.
-    * *filters* contains the standard filters (Nanoc::Filter subclasses) such
-      as ERB, Markdown, Haml, ...
-    * *routers* contains the standard routers (Nanoc::Router subclasses)
-* *test* contains test fixtures as well as testing code, structured in the
-  same way as lib/nanoc
-
-The namespaces (modules) are organised like this:
-
-* *Nanoc* is the namespace for everything nanoc-related (obviously). The
-  classes in 'lib/nanoc/base' are part of this module (not Nanoc::Base which
-  does not exist)
-  * *BinaryFilters* contains the binary filters
-  * *CLI* containing everything related to the commandline tool.
-  * *DataSources* contains the data sources
-  * *Helpers* contains the helpers
-  * *Extra* contains useful stuff not needed by nanoc itself
-  * *Filters* contains the (textual) filters
-  * *Routers* contains the routers
-
-The central class in nanoc is Nanoc::Site, so you should start there if you
-want to explore nanoc from a technical perspective.
-
-== Contributors
-
-(In alphabetical order)
-
-* Colin Barrett
-* Dmitry Bilunov
-* Šime Ramov
-* "Soryu"
-* Dennis Sutch
-
-Special thanks to Ale Muñoz.
-
-== Contact
-
-You can reach me at <denis.defreyne@stoneship.org>.