condom 1.0.0 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.0.1
+
+* Added fixes for 1.9.* Ruby versions:
+  * Added a workaround for instance_variables method (see set_options in base.rb)
+  * Used RUBY_PLATFORM instead of PLATFORM (removed in 1.9.1)
+* Renamed main.tex.erb to document.tex.erb
+* Renamed lst-conf.tex.erb to listings.tex.erb
+* Cleaned generated LaTeX code indentation
+
 == 1.0.0
 
 * Rewrote the executable, it is now simpler and allow user to change every fields (see the README).

data/README.rdoc

@@ -1,6 +1,6 @@
 = Condom
 
-A Ruby lib to create a skeleton for a LaTeX document.
+== A Ruby lib to prepare the skeleton of a LaTeX document
 
 This lib requires that you know the LaTeX language.
 
@@ -121,7 +121,7 @@ may result the creation of these folders/files:
   ├── inc
   │   ├── colors.tex
   │   ├── commands.tex
-  │   ├── lst-conf.tex
+  │   ├── listings.tex
   │   └── packages.tex
   ├── main.tex
   ├── Makefile
@@ -134,7 +134,7 @@ This is the folder where you should put your images.
 This folder has all configuration tex files:
 * colors.tex - customized colors
 * commands.tex - customized commands
-* lst-conf.tex - configuration file for the listings package
+* listings.tex - configuration file for the listings package
 * packages - all needed packages
 
 === main.tex

data/bin/condom

@@ -26,7 +26,7 @@ ARGV.options do |o|
   o.on("-p", "--package=PACKAGE",      String, "Add another package")         { |v| ops[:other_packages].push v }
   o.on("-o", "--directory=DIRECTORY",  String, "Define the output directory") { |v| ops[:directory] = v }
   o.on("-q", "--quiet",                        "Don't ask any question")      { quiet = true }
-  o.on("-v", "--version",                      "Print Condom version")        { puts "Condom lib: version #{Condom::VERSION}" ; exit }
+  o.on("-v", "--version",                      "Print Condom version")        { puts "Condom: version #{Condom::VERSION}" ; exit }
 end
 
 begin
@@ -57,7 +57,7 @@ begin
     puts "Enter the new value, or press ENTER for the default"
 
     doc_type = doc.class.to_s.split('::').last.downcase
-    printf "    type [%s]: ", doc_type
+    printf "    %-17s [%s]: ", "type", doc_type
     type = STDIN.gets.strip
     doc = case type
           when 'document' then Condom::Document.new(ops)

data/lib/condom.rb

@@ -12,7 +12,7 @@ require "etc"
 
 module Condom
   # Lib version
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   # Constant views directory
   VIEWS_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 'views')

data/lib/condom/base.rb

@@ -55,7 +55,10 @@ module Condom
     def set_options(hash)
       hash.keys.each do |key|
         var = '@' << key.to_s
-        raise("Key #{key} not supported.") unless instance_variables.include? var
+        # = 1.9.* Fix
+        # The map method applied on instance_variables is used to force elements to be String
+        # because on 1.9.* Ruby versions, these elements are Symbol (i.e. :@directory).
+        raise("Key #{key} not supported.") unless instance_variables.map {|v| v.to_s}.include? var
         instance_variable_set(var, hash[key])
       end
     end

data/lib/condom/document.rb

@@ -37,7 +37,8 @@ module Condom
     def create
       in_directory do
         # Create files
-        build "main.tex"
+        build "document.tex"
+        File.rename("document.tex", "main.tex")
         build "Makefile"
         if @graphics
           build "fig.tex"
@@ -49,7 +50,7 @@ module Condom
           build "packages.tex"
           build "commands.tex"
           build "colors.tex"
-          build "lst-conf.tex" if @listings
+          build "listings.tex" if @listings
           build "flyleaf.tex" if @document_class == "report"
         end
       end

data/lib/condom/presentation.rb

@@ -50,7 +50,7 @@ module Condom
           build "packages.tex"
           build "commands.tex"
           build "colors.tex"
-          build "lst-conf.tex" if @listings
+          build "listings.tex" if @listings
           build "flyleaf.tex" if @document_class == "report"
         end
       end

data/lib/views/{main.tex.erb → document.tex.erb}

@@ -14,27 +14,27 @@
 \input{inc/colors}
 \input{inc/commands}
 <% if @listings %>
-    \input{inc/lst-conf}                        % fichier de config du paquet listings
+\input{inc/listings}                        % fichier de config du paquet listings
 <% end %>
 
 \geometry{top=2.5cm, bottom=2.5cm, left=2cm, right=2cm}
 <% if @graphics %>
-    \graphicspath{{fig/}}                 % chemins vers les images
+\graphicspath{{fig/}}                 % chemins vers les images
 <% end %>
 
 % informations du document
 \author{<%= @author %>}
-\date{Le <%= @date %>}
+\date{<%= @date %>}
 \title{<%= @title %>}
 
 <% if @document_class == "report" %>
-    %\input{inc/flyleaf.tex} % page de garde personnalisee
-    %\location{}
-    %\blurb{}
+%\input{inc/flyleaf.tex} % page de garde personnalisee
+%\location{}
+%\blurb{}
 <% end %>
 
 <% if @pdf %>
-    \hypersetup{%
+\hypersetup{%
     pdftitle    = {<%= @title %>},
     pdfauthor   = {<%= @author %>}
     pdfcreator  = {Texlive},
@@ -43,28 +43,28 @@
     linkcolor   = black,
     citecolor   = black,
     urlcolor    = black
-    }                                                   % informations du pdf
+}                                                   % informations du pdf
 <% end %>
 
 <% if @fancyhdr %>
-    \pagestyle{fancy}
-    \lhead{<%= @title %>}
-    \chead{}
-    \rhead{\thepage/\pageref{LastPage}}
-    \lfoot{}
-    \cfoot{}
-    \rfoot{\footnotesize <%= @author %>}
-    %\renewcommand{\headrulewidth}{0pt}
-    %\renewcommand{\footrulewidth}{0.4pt}
-    \fancypagestyle{plain}{%                        % style des pages de titres
+\pagestyle{fancy}
+\lhead{<%= @title %>}
+\chead{}
+\rhead{\thepage/\pageref{LastPage}}
+\lfoot{}
+\cfoot{}
+\rfoot{\footnotesize <%= @author %>}
+%\renewcommand{\headrulewidth}{0pt}
+%\renewcommand{\footrulewidth}{0.4pt}
+\fancypagestyle{plain}{%                        % style des pages de titres
     \fancyhf{}
     \renewcommand{\headrulewidth}{0pt}
     \renewcommand{\footrulewidth}{0pt}
-    }
+}
 <% end %>
 
 <% if @document_class == "report" %>
-    \renewcommand{\thesection}{\Roman{part}.\arabic{section}} % redefinir la numerotation des sections (ex: I.2)
+\renewcommand{\thesection}{\Roman{part}.\arabic{section}} % redefinir la numerotation des sections (ex: I.2)
 <% end %>
 
 \makeatletter
@@ -83,20 +83,22 @@
 
 \maketitle % afficher le titre
 
+<% unless @document_class == "book" %>
 % resume
 \begin{abstract}
 \end{abstract}
+<% end %>
 
 \tableofcontents % table des matieres
 
 <% if @listings %>
-    \lstlistoflistings % tables des listings
+\lstlistoflistings % tables des listings
 <% end %>
 
 <% if @document_class == "article" %>
-    \newpage
+\newpage
 <% elsif @document_class == "report" %>
-    \unnumpart{Introduction}
+\unnumpart{Introduction}
 <% end %>
 
 \end{document} % fin du document

data/lib/views/letter.tex.erb

@@ -6,7 +6,7 @@
 
 \documentclass[11pt]{letter}
 \usepackage[<%= @language %>]{babel}  % langue
-\usepackage[<%= (PLATFORM.include? 'linux') ? 'utf8' : 'latin1' %>]{inputenc}
+\usepackage[<%= (RUBY_PLATFORM.include? 'linux') ? 'utf8' : 'latin1' %>]{inputenc}
 \usepackage{graphicx}
 \usepackage{geometry}
 

data/lib/views/packages.tex.erb

@@ -6,44 +6,44 @@
 
 \usepackage[T1]{fontenc}      % codage des caracteres
 
-\usepackage[<%= (PLATFORM.include? 'linux') ? 'utf8' : 'latin1' %>]{inputenc}   % encodage du fichier (utf8 ou latin1)
+\usepackage[<%= (RUBY_PLATFORM.include? 'linux') ? 'utf8' : 'latin1' %>]{inputenc}   % encodage du fichier (utf8 ou latin1)
 \usepackage[<%= @language %>]{babel}  % langue
 \usepackage{mathpazo}         % selection de la police
 \usepackage{geometry}         % mise en page
 \usepackage{xcolor}           % pour colorer des elements
 
 <% if @graphics %>
-    \usepackage{graphicx}         % pour inserer des images
+\usepackage{graphicx}         % pour inserer des images
 <% end %>
 
 <% if @math %>
-    % math
-    \usepackage{amssymb}          % symboles mathematiques
-    %\usepackage{amsmath}         % commandes mathematiques
+% math
+\usepackage{amssymb}          % symboles mathematiques
+%\usepackage{amsmath}         % commandes mathematiques
 <% end %>
 
 <% if @pdf %>
-    % pdf
-    \usepackage{url}              % permet l'insertion d'url
-    \usepackage[pdftex]{hyperref} % permet l'hypertexte (rend les liens cliquables)
+% pdf
+\usepackage{url}              % permet l'insertion d'url
+\usepackage[pdftex]{hyperref} % permet l'hypertexte (rend les liens cliquables)
 <% end %>
 
 <% if @listings %>
-    % listings
-    \usepackage{listings}         % permet d'inserer du code (multi-langage)
-    \usepackage{courier}
-    \usepackage{caption}
+% listings
+\usepackage{listings}         % permet d'inserer du code (multi-langage)
+\usepackage{courier}
+\usepackage{caption}
 <% end %>
 
 <% if @fancyhdr %>
-    % fancyhdr
-    \usepackage{lastpage}         % derniere page
-    \usepackage{fancyhdr}         % en-tete et pied de page
+% fancyhdr
+\usepackage{lastpage}         % derniere page
+\usepackage{fancyhdr}         % en-tete et pied de page
 <% end %>
 
 \usepackage{multicol}
 
 <% for package in @other_packages do %>
-    \usepackage{<%= package %>}
+\usepackage{<%= package %>}
 <% end %>
 

data/lib/views/presentation.tex.erb

@@ -18,7 +18,7 @@
 \input{inc/colors}
 \input{inc/commands}
 <% if @listings %>
-\input{inc/lst-conf}                        % fichier de config du paquet listings
+\input{inc/listings}                        % fichier de config du paquet listings
 <% end %>
 
 <% if @graphics %>

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: condom
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Vivien Didelot
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +10:00
+date: 2010-08-20 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -29,10 +28,10 @@ extra_rdoc_files: []
 
 files: 
 - lib/views/flyleaf.tex.erb
-- lib/views/main.tex.erb
-- lib/views/lst-conf.tex.erb
+- lib/views/document.tex.erb
 - lib/views/presentation.tex.erb
 - lib/views/packages.tex.erb
+- lib/views/listings.tex.erb
 - lib/views/fig.tex.erb
 - lib/views/letter.tex.erb
 - lib/views/colors.tex.erb
@@ -60,7 +59,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -69,7 +67,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"