diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..b1b25a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.2.2 diff --git a/docbook-xsl/fo.xsl b/docbook-xsl/fo.xsl index 99fa754..e9a2f6f 100644 --- a/docbook-xsl/fo.xsl +++ b/docbook-xsl/fo.xsl @@ -49,6 +49,78 @@ + + + + my-titlepage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + my-titlepage + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/git-scribe.rb b/lib/git-scribe.rb index 627c8aa..14aa379 100644 --- a/lib/git-scribe.rb +++ b/lib/git-scribe.rb @@ -20,15 +20,20 @@ class GitScribe attr_accessor :subcommand, :args, :options attr_reader :info + #Allow overrides of the config files so we let the user have multiple versions of the book + #maybe multiple languages or different formats + OVERRIDE_NAME = ENV["GITSCRIBE_BOOK_FILE"] || "" BOOK_FILE = 'book.asc' - OUTPUT_TYPES = ['docbook', 'html', 'pdf', 'epub', 'mobi', 'site'] + OUTPUT_TYPES = ['docbook', 'html', 'pdf', 'epub', 'mobi', 'site', 'ebook'] SCRIBE_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) def initialize @subcommand = nil @args = [] @options = {} - @config = YAML::parse(File.open(local('.gitscribe'))).transform rescue {} + configfilename = ENV["GITSCRIBE_CONFIG_FILE"] + configfilename ||= '.gitscribe' + @config = YAML::parse(File.open(local(configfilename))).transform rescue {} end ## COMMANDS ## diff --git a/lib/git-scribe/generate.rb b/lib/git-scribe/generate.rb index 397181e..df26b0b 100644 --- a/lib/git-scribe/generate.rb +++ b/lib/git-scribe/generate.rb @@ -38,7 +38,7 @@ def prepare_output_dir end def a2x(type) - "a2x -f #{type} -d book " + "a2x -f #{type} -d book --no-xmllint " end def a2x_wss(type) @@ -331,6 +331,10 @@ def liquid_template(file) def gather_and_process files = Dir.glob("book/*") FileUtils.cp_r files, 'output', :remove_destination => true + + if OVERRIDE_NAME != "" + FileUtils.mv "output/#{OVERRIDE_NAME}", "output/book.asc" + end end def ex(command)