latex-project-template 0.0.2 → 0.0.3

data/Gemfile

@@ -6,11 +6,11 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", ">= 2.5.0"
-  gem "yard", ">= 0.6.0"
+  gem "rspec", ">= 2.6.0"
+  gem "yard", ">= 0.7.2"
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.2"
+  gem "jeweler", ">= 1.6.4"
   gem "rcov", ">= 0"
   gem "filename", ">= 0.1.0"
-  gem "user_config", ">= 0.0.1"
+  gem "user_config", ">= 0.0.2"
 end

data/Rakefile

@@ -23,8 +23,7 @@ Jeweler::Tasks.new do |gem|
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   gem.add_runtime_dependency 'git', '>= 1.2.5'
   gem.add_runtime_dependency 'filename', '>= 0.1.0'
-  gem.add_runtime_dependency 'user_config', '>= 0.0.1'
-  gem.add_development_dependency 'rspec', '>= 2.5.0'
+  gem.add_runtime_dependency 'user_config', '>= 0.0.2'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/latex-project-template

@@ -10,7 +10,7 @@ Usage: #{File.basename(__FILE__)} project [template]
 
 HELP
 
-Version = '0.0.2'
+Version = '0.0.3'
 
 options = {
   :mode => :create

data/initial_files/component/math_preamble.tex

@@ -0,0 +1,3 @@
+\usepackage{amsmath, amsfonts, amsthm}
+
+\newtheorem{theorem}{Theorem}[section]

data/initial_files/component/rakefile_common.erb

@@ -0,0 +1,6 @@
+MAIN_TEX_FILE = "<%= project_name %>.tex"
+
+# * Set environmental variables
+# ENV['BIBINPUTS'] = ".:#{File.join(ENV["HOME"], "bibtex")}"
+
+require 'latex_project_template/task'

data/{template → initial_files/template}/default/Rakefile.erb

@@ -1,9 +1,4 @@
-MAIN_TEX_FILE = "<%= @project_name %>.tex"
-
-# * Set environmental variables
-# ENV['BIBINPUTS'] = ".:#{File.join(ENV["HOME"], "bibtex")}"
-
-require 'latex_project_template/task'
+<%= component('rakefile_common.erb') %>
 
 LaTeXProjectTemplate::Task.new(MAIN_TEX_FILE) do |task|
   # * Set the path of latexmk

data/{template → initial_files/template}/default/__PROJECT__.tex.erb

@@ -1,7 +1,8 @@
 \documentclass[a4paper]{article}
-\usepackage{amsmath, amsfonts, amsthm}
 
-\author{<%= @profile[:name] %>}
+<%= component('math_preamble.tex') %>
+
+\author{<%= profile[:name] %>}
 \date{}
 
 \begin{document}

data/initial_files/template/japanese/Rakefile.erb

@@ -0,0 +1,13 @@
+<%= component('rakefile_common.erb') %>
+
+LaTeXProjectTemplate::Task.new(MAIN_TEX_FILE) do |task|
+  # * Set the path of latexmk
+  # task.latexmk.path = '/usr/bin/latexmk'
+  # 
+  # * Add patterns to clean temporary files
+  # task.clean.include("#*#")
+  # 
+  # * Default task to compile tex file. You can set :dvi, :ps, :pdf, :pdfdvi, or :pdfps.
+  #   The default is :pdf.
+  task.default = :pdfdvi
+end

data/initial_files/template/japanese/__IMPORT__

@@ -0,0 +1 @@
+default/__DOT__gitignore

data/initial_files/template/japanese/__PROJECT__.tex.erb

@@ -0,0 +1,12 @@
+\documentclass[a4paper]{jsarticle}
+
+<%= component('math_preamble.tex') %>
+
+\author{<%= profile[:name] %>}
+\date{}
+
+\begin{document}
+
+\section{}
+
+\end{document}

data/initial_files/variable/profile.yaml

@@ -0,0 +1,2 @@
+---
+:name: "Your Name"

data/latex-project-template.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{latex-project-template}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2011-07-07}
+  s.date = %q{2011-07-08}
   s.default_executable = %q{latex-project-template}
   s.description = %q{Create LaTeX project with git from template, which uses latexmk.}
   s.email = %q{d@ytak.info}
@@ -27,17 +27,22 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/latex-project-template",
+    "initial_files/component/math_preamble.tex",
+    "initial_files/component/rakefile_common.erb",
+    "initial_files/template/default/Rakefile.erb",
+    "initial_files/template/default/__DOT__gitignore",
+    "initial_files/template/default/__PROJECT__.tex.erb",
+    "initial_files/template/japanese/Rakefile.erb",
+    "initial_files/template/japanese/__IMPORT__",
+    "initial_files/template/japanese/__PROJECT__.tex.erb",
+    "initial_files/template/japanese/latexmkrc",
+    "initial_files/variable/profile.yaml",
     "latex-project-template.gemspec",
     "lib/latex_project_template.rb",
     "lib/latex_project_template/task.rb",
     "spec/latex_project_template_spec.rb",
     "spec/spec_helper.rb",
-    "spec/task_spec.rb",
-    "template/default/Rakefile.erb",
-    "template/default/__DOT__gitignore",
-    "template/default/__PROJECT__.tex.erb",
-    "template/japanese/__IMPORT__",
-    "template/japanese/latexmkrc"
+    "spec/task_spec.rb"
   ]
   s.homepage = %q{http://github.com/ytaka/latex-project-template}
   s.licenses = ["GPLv3"]
@@ -49,42 +54,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.6.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_development_dependency(%q<yard>, [">= 0.7.2"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<filename>, [">= 0.1.0"])
-      s.add_development_dependency(%q<user_config>, [">= 0.0.1"])
+      s.add_development_dependency(%q<user_config>, [">= 0.0.2"])
       s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
       s.add_runtime_dependency(%q<filename>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<user_config>, [">= 0.0.1"])
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_runtime_dependency(%q<user_config>, [">= 0.0.2"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_dependency(%q<yard>, [">= 0.6.0"])
+      s.add_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_dependency(%q<yard>, [">= 0.7.2"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<filename>, [">= 0.1.0"])
-      s.add_dependency(%q<user_config>, [">= 0.0.1"])
+      s.add_dependency(%q<user_config>, [">= 0.0.2"])
       s.add_dependency(%q<git>, [">= 1.2.5"])
       s.add_dependency(%q<filename>, [">= 0.1.0"])
-      s.add_dependency(%q<user_config>, [">= 0.0.1"])
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_dependency(%q<user_config>, [">= 0.0.2"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
-    s.add_dependency(%q<yard>, [">= 0.6.0"])
+    s.add_dependency(%q<rspec>, [">= 2.6.0"])
+    s.add_dependency(%q<yard>, [">= 0.7.2"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<filename>, [">= 0.1.0"])
-    s.add_dependency(%q<user_config>, [">= 0.0.1"])
+    s.add_dependency(%q<user_config>, [">= 0.0.2"])
     s.add_dependency(%q<git>, [">= 1.2.5"])
     s.add_dependency(%q<filename>, [">= 0.1.0"])
-    s.add_dependency(%q<user_config>, [">= 0.0.1"])
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
+    s.add_dependency(%q<user_config>, [">= 0.0.2"])
   end
 end
 

data/lib/latex_project_template.rb

@@ -13,16 +13,21 @@ class LaTeXProjectTemplate
   class Configuration
     TEMPLATE_DIRECTORY = 'template'
     VARIABLE_DIRECTORY = 'variable'
+    COMPONENT_DIRECTORY = 'component'
     DEFAULT_PROFILE_YAML = { :name => "Your Name" }
 
     def self.create_new_config(home_path = nil)
-      config = LPTConfig.new(DEFAULT_CONFIG, :home => home_path)
-      dir = config.directory
-      FileUtils.cp_r("#{File.expand_path(File.join(File.dirname(__FILE__), '../template/'))}", dir)
-      vars_dir = File.join(dir, VARIABLE_DIRECTORY)
-      FileUtils.mkdir_p(vars_dir)
-      open(File.join(vars_dir, 'profile.yaml'), 'w') do |f|
-        f.print DEFAULT_PROFILE_YAML.to_yaml
+      begin
+        config = LPTConfig.new(DEFAULT_CONFIG, :home => home_path, :new_directory => true)
+        dir = config.directory
+        Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), '../initial_files/*'))).each do |path|
+          FileUtils.cp_r(path, dir)
+        end
+        git = Git.init(dir)
+        git.add
+        git.commit("Create initial template.")
+      rescue UserConfig::DirectoryExistenceError
+        $stderr.puts "Can not new configuration directory."
       end
     end
 
@@ -68,6 +73,32 @@ class LaTeXProjectTemplate
       end
       vars
     end
+
+    def component(name)
+      if path = @user_config.exist?(File.join(COMPONENT_DIRECTORY, name))
+        return LaTeXProjectTemplate::Component.new(path)
+      end
+      nil
+    end
+  end
+
+  class Component
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def evaluate(erb_obj)
+      if /\.erb$/ =~ @path
+        erb_obj.instance_exec(@path) do |path|
+          erb = ERB.new(File.read(path))
+          erb.result(binding)
+        end
+      else
+        File.read(@path)
+      end
+    end
   end
 
   class Directory
@@ -162,10 +193,22 @@ class LaTeXProjectTemplate
   class ErbObject
     attr_reader :project_name
 
-    def initialize(project_name, variables)
+    def initialize(project_name, variables, config)
       @project_name = project_name
+      @__config = config
       variables.each do |key, val|
         instance_variable_set("@#{key}", val)
+        self.class.class_eval do
+          attr_reader key.intern
+        end
+      end
+    end
+
+    def component(name)
+      if c = @__config.component(name)
+        c.evaluate(self)
+      else
+        ''
       end
     end
   end
@@ -183,7 +226,7 @@ class LaTeXProjectTemplate
   end
 
   def create_files
-    erb_obj = LaTeXProjectTemplate::ErbObject.new(@project_name, @config.user_variables)
+    erb_obj = LaTeXProjectTemplate::ErbObject.new(@project_name, @config.user_variables, @config)
     created_files = @template.copy_to_directory(@target_dir, erb_obj)
     @template.files_to_import.each do |name, files|
       if template_to_import = @config.template_exist?(name)

data/spec/latex_project_template_spec.rb

@@ -13,6 +13,10 @@ describe LaTeXProjectTemplate::Configuration do
   it "should create directory." do
     LaTeXProjectTemplate::Configuration.create_new_config(@home_directory)
     File.directory?(@home_directory).should be_true
+    dir = File.join(@home_directory_absolute, '.latex_project_template')
+    File.exist?(File.join(dir, 'template')).should be_true
+    File.exist?(File.join(dir, 'variable')).should be_true
+    File.exist?(File.join(dir, 'component')).should be_true
   end
 
   it "should return config directory." do

metadata

@@ -2,7 +2,7 @@
 name: latex-project-template
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +09:00
+date: 2011-07-08 00:00:00 +09:00
 default_executable: latex-project-template
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: *id001
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: *id004
@@ -86,7 +86,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.1
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -119,21 +119,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *id011
 description: Create LaTeX project with git from template, which uses latexmk.
 email: d@ytak.info
 executables: 
@@ -152,17 +141,22 @@ files:
 - Rakefile
 - VERSION
 - bin/latex-project-template
+- initial_files/component/math_preamble.tex
+- initial_files/component/rakefile_common.erb
+- initial_files/template/default/Rakefile.erb
+- initial_files/template/default/__DOT__gitignore
+- initial_files/template/default/__PROJECT__.tex.erb
+- initial_files/template/japanese/Rakefile.erb
+- initial_files/template/japanese/__IMPORT__
+- initial_files/template/japanese/__PROJECT__.tex.erb
+- initial_files/template/japanese/latexmkrc
+- initial_files/variable/profile.yaml
 - latex-project-template.gemspec
 - lib/latex_project_template.rb
 - lib/latex_project_template/task.rb
 - spec/latex_project_template_spec.rb
 - spec/spec_helper.rb
 - spec/task_spec.rb
-- template/default/Rakefile.erb
-- template/default/__DOT__gitignore
-- template/default/__PROJECT__.tex.erb
-- template/japanese/__IMPORT__
-- template/japanese/latexmkrc
 has_rdoc: true
 homepage: http://github.com/ytaka/latex-project-template
 licenses: 
@@ -177,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1327005119075032685
+      hash: -691823316385091189
       segments: 
       - 0
       version: "0"

data/template/japanese/__IMPORT__

@@ -1,3 +0,0 @@
-default/__PROJECT__.tex
-default/Rakefile.erb
-default/__DOT__gitignore