hackademic 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e2b1841bdc6508424f5c79886a3ecb6cbce4b1
-  data.tar.gz: e19c545b50617ddf53fb597cfacec420f93082a5
+  metadata.gz: 003e23e04013e7abdb74cedeb8014af0815e3159
+  data.tar.gz: 356a094e0979d0a45cf3bf436bbcdf4df35ec9c2
 SHA512:
-  metadata.gz: d0fe70cfd3f2b28c9994386344fe0804adfa4c91c455bbe482ea4b07d9a4064c0d3786ef68a675427d3db835e964c58a10e39d7fbcb0bd2ee07a16d095d2713e
-  data.tar.gz: e7d02fc4c4d42749c4e65ada5a3fc10e8c8de92c9994a9991773548b4bf7d9a686920f8295f89f8fa1e70c2e8cab266cfa581c087b3fa34a731b8b92d7661e4f
+  metadata.gz: 975a228e6566621d7e64cfb35ce979957a911c6f37eca4f11f8b2842c484b8503861f910f3c13fb088c09a81a2d27404d875b558c8baf45b54a9633ee5b6aaa9
+  data.tar.gz: 1264be8502dcb3465ec2a316995dbca51b523d8ee61900ec2f3ee78181e86f450e5ad11b23d1cc4c2b3bd105fab05d8aad6bd7610e714b4905db4f6539084cd4

data/hackademic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'hackademic'
-  s.version       = '0.2.5'
+  s.version       = '0.2.6'
   s.date          = '2016-01-03'
   s.summary       = "Create and manage your academic workflow"
   s.description   = "Hackademic manages your plain-text academic workflow."

data/lib/hackademic.rb

@@ -3,14 +3,53 @@ require "yaml"
 require "thor"
 require 'active_support'
 require_relative 'hackademy/sync'
+require_relative 'hackademy/compile'
 
 class Hackademic < Thor
 
   include Thor::Actions
 
-  Hackademic.source_root('$HOME/Dropbox')
+  HACKADEMIC_DIRECTORY = File.open("#{ENV['HOME']}/.hackademic", "r").read.chomp
+  source_root "#{Pathname.new(__FILE__).dirname}"
 
   register Sync, :sync, "sync [subcommand]", "Synchronize!"
+  register Hackademy::New, :new, "new [PROJECT]", "Create something new!"
+
+  desc 'compile [FORMAT]', 'Type "hackademic help compile" to see choices'
+  subcommand 'compile', ::Hackademy::Compile
+
+  desc "list", "List the current projects in #{HACKADEMIC_DIRECTORY}"
+  def list
+    say ""
+    say "  ❡ hackademic ➤➤➤", :magenta
+    say ""
+    say "    Listing projects found in #{HACKADEMIC_DIRECTORY}/Projects/", :cyan
+    say ""
+    say "    " + %x[ls -1 #{HACKADEMIC_DIRECTORY}/Projects].gsub!("\n","\n    "), :blue
+  end
+
+  desc "update_pandoc", "Update to latest pandoc and pandoc-citeproc"
+  def update_pandoc(args)
+    if !pandoc_is_current
+      run "brew unlink pandoc"
+      run "brew install pandoc"
+      run "brew link pandoc"
+      run "brew unlink pandoc-citeproc"
+      run "brew install pandoc-citeproc"
+      run "brew link pandoc-citeproc"
+    end
+  end
+
+  desc "install_templates", "Install latest pandoc templates"
+  def install_templates(args)
+    if !Dir.exists?(ENV["HOME"]+"/.pandoc/templates")
+      empty_directory ENV["HOME"]+"/.pandoc"
+      empty_directory ENV["HOME"]+"/.pandoc/templates"
+    end
+    template "../templates/default.asciidoc", ENV["HOME"] + "/.pandoc/templates/default.asciidoc"
+    template "../templates/default.html5", ENV["HOME"] + "/.pandoc/templates/default.html5"
+    template "../templates/default.latex", ENV["HOME"] + "/.pandoc/templates/default.latex"
+  end
 
   desc "setup [FOLDER]", "Setup a new Hackademic repository at [FOLDER]"
   def setup(root_directory)
@@ -29,6 +68,15 @@ class Hackademic < Thor
 
     empty_directory "#{directory}/Meta"
 
+    if system("which brew")
+      run "brew update"
+    else
+      run 'ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"'
+    end
+
+    invoke :update_pandoc
+    invoke :install_templates
+
     say "⫸⫸⫸ Initializing version control (git) for Notes database:", :yellow
     empty_directory "#{directory}/Notes"
     create_file "#{directory}/Notes/SampleNote.md"
@@ -47,74 +95,43 @@ class Hackademic < Thor
 
   end
 
-  desc "new [PROJECTNAME]", "Setup a new Hackademic project called [PROJECTNAME]"
-  def new(project_name)
-    say "--------------------------------------------------------------", :cyan
-    say "⫸⫸⫸⫸ Setting up project #{project_name}!", :cyan
-
-    project = "#{hackademic_directory}/Projects/#{project_name}"
-    empty_directory(project)
-
-    say "»»»»» Creating *_WORKING_* directory:", :green
-    empty_directory("#{project}/_WORKING_")
-    template '../templates/DRAFT.md.tt', "#{project}/_WORKING_/DRAFT.md"
-
-    say "»»»»» Creating *Archive* directory:", :green
-    empty_directory("#{project}/Archive")
-    create_file "#{project}/Archive/.gitkeep"
-
-    say "»»»»» Creating *To-Process* directory:", :green
-    empty_directory("#{project}/To-Process")
-    create_file "#{project}/To-Process/.gitkeep"
-
-    say "»»»»» Creating *Project Notes* directory:", :green
-    empty_directory("#{project}/Resources/Notes")
-    create_file "#{project}/Resources/Notes/.gitkeep"
-
-    say "»»»»» Creating *Resources* directory:", :green
-    empty_directory("#{project}/Resources")
-    template '../templates/Config.yml.tt', "#{project}/Resources/Config.yml"
+  no_tasks {
 
-    empty_directory("#{project}/Resources/Figures")
-    create_file "#{project}/Resources/Figures/.gitkeep"
+    def pandoc_is_current
+      if system("which pandoc")
+        current = `pandoc --version`[/.*\n/].strip.split(" ").last
+        latest = `brew info pandoc`[/\w+:\s\w+\s[\d+\.]*/].split(" ").last
+        current_status = semantic_version_checker(current, latest)
+        current_status
+      else
+        false
+      end
+    end
 
-    empty_directory("#{project}/Resources/Data")
-    create_file "#{project}/Resources/Data/.gitkeep"
+    def semantic_version_checker(current, latest)
+      return true if current == latest
 
-    empty_directory("#{project}/Resources/templates")
-    create_file "#{project}/Resources/templates/.gitkeep"
+      latest = latest.split(".")
+      current = current.split(".")
 
-    say "»»»»» Creating *Versions* directory:", :green
-    empty_directory("#{project}/Versions")
-    create_file "#{project}/Versions/.gitkeep"
+      if current.length < latest.length
+        current = "#{current.join(".")}" + (".0" * (latest.length - current.length))
+        current = current.split(".")
+      end
 
-    say "»»»»» Creating final files:", :green
-    @project_name = project_name
-    template "../templates/README.md.tt", "#{project}/README.md"
-    template '../templates/CHANGELOG.md.tt', "#{project}/CHANGELOG.md"
-    template '../templates/TODO.txt.tt', "#{project}/TODO.txt"
+      # return true if current.length > latest.length
+      versionator = []
+      current.each_with_index do |v, index|
+        version = v.to_i
+        latest_version = latest[index].to_i
 
-    say "»»»»» Initializing version control (git) for project...", :green
-    inside "#{project}" do
-      run "git init .", {:capture => true}
-      run "git add .", {:capture => true}
-      run "git commit -m 'Initial commit of #{project_name}'", {:capture => true}
+        return true if version > latest_version
+        versionator << (version >= latest_version)
+        # versionator << (v.to_i >= latest[index].to_i)
+      end
+      versionator.all?{|v| v == true }
     end
 
-    say "⫸⫸⫸⫸ DONE!", :cyan
-    say "⫸⫸⫸⫸ Project created at #{project}", :cyan
-    say "--------------------------------------------------------------", :cyan
-  end
-
-  def self.source_root
-    File.dirname(__FILE__)
-  end
-
-  no_tasks {
-
-    def hackademic_directory
-      @hackademic_directory ||= File.open("#{ENV['HOME']}/.hackademic", "r").read.chomp
-    end
   }
 
 end

data/lib/hackademy/compile.rb

@@ -0,0 +1,149 @@
+require_relative "hackademy"
+
+module Hackademy
+  class Compile < Thor
+
+    include Thor::Actions
+
+    desc "all", "compile pdf, word doc, and latex file"
+    def all
+      latex
+      docx
+      pdf
+    end
+
+    desc "pdf", "compile a pdf"
+    def pdf
+      check_installation
+      read_draft_file
+      write_master_markdown_file
+      system(pdf_command)
+      say "Writing out PDF file: #{config.output_directory}/#{config.transcluded_draft.gsub(/\..*$/, '')}.pdf"
+    end
+
+    desc "show_pdf_command", "Show the pandoc command for pdf generation"
+    def show_pdf_command
+      say pdf_command, :blue
+    end
+
+    desc "docx", "compile a docx"
+    def docx
+      check_installation
+      read_draft_file
+      write_master_markdown_file
+      %x[pandoc #{config.output_directory}/#{config.transcluded_draft} --from=markdown+#{pandoc_from_options.join("+")} --filter pandoc-citeproc --bibliography=#{config.bibliography} --csl=#{config.citation_style} --reference-docx=#{config.docx_template} -s -o "#{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.docx"]
+      say "Writing out DOCX file: #{config.output_directory}/#{config.draft_name.gsub(/\..*$/, '')}.docx"
+    end
+
+    desc "latex", "compile a latex document"
+    def latex
+      check_installation
+      read_draft_file
+      write_master_markdown_file
+      %x[pandoc #{config.output_directory}/#{config.transcluded_draft} --from=markdown+#{pandoc_from_options.join("+")} --filter pandoc-citeproc --bibliography=#{config.bibliography} --csl=#{config.citation_style} --latex-engine=xelatex --template=#{config.latex_template} -s -o "#{latex_file}"]
+      say "Writing out LaTeX file: #{config.output_directory}/#{config.draft_name.gsub(/\..*$/, '')}.tex"
+    end
+
+    no_commands {
+
+      def latex_file
+        "#{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.tex"
+      end
+
+      def pdf_command
+        # %{pandoc \
+        #   --bibliography=#{config.bibliography} \
+        #   --csl=#{config.citation_style} \
+        #   --template=#{config.latex_template} \
+        #   --latex-engine=xelatex \
+        #   -s -o "#{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.pdf" \
+        #   #{config.output_directory}/#{config.transcluded_draft}
+        # }.gsub(/\s+/, ' ')
+        %{pandoc \
+          -t html5 \
+          --bibliography=#{config.bibliography} \
+          --csl=#{config.citation_style} \
+          -s \
+          -o "#{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.pdf" \
+          #{config.output_directory}/#{config.transcluded_draft}
+        }.gsub(/\s+/, ' ')
+      end
+
+      # TODO: Move to Hackademy::Setup
+      def check_installation
+        check_versions_directory
+        check_latex_installation
+        # check pandoc installation
+        # check python3 installation (panzer dependency)
+        # check panzer installation
+      end
+
+      def check_latex_installation
+        # TODO: Make sure user has latex/xetex/etc.
+      end
+
+      def check_versions_directory
+        begin
+          if !Dir.open('versions')
+            File.mkdir("versions")
+            # %x[mkdir versions]
+          end
+        rescue => exception
+          FileUtils.mkdir("versions") unless Dir.exists?('versions')
+          puts exception
+          say "Something went wrong. Make sure versions isn't a plan old file!", :red
+        end
+      end
+
+      def transclude(file)
+        file = "#{config.drafts_dir}/#{file}" unless file[Regexp.compile("^#{config.drafts_dir}")]
+        if File.exists?(file)
+          contents = File.open(file, 'r').read
+          contents.scan(/{{(.*)}}/).flatten.each do |f|
+            original_f = f
+            f = f[config.drafts_dir] ? f.gsub(config.drafts_dir, '') : "#{config.drafts_dir}/#{f}"
+            Hackademic.new.say "...Including #{f}...", :cyan
+            if File.exists?(f)
+              content = File.open(f).read + "\n"
+              @draft = @draft.gsub("{{#{original_f}}}", content)
+              transclude(f)
+            end
+          end
+        end
+      end
+
+      def read_draft_file
+        @draft = File.open("#{config.drafts_dir}/#{config.draft_name}", "r").read
+        say "...Generating the *TRANSCLUDED* source...", :blue
+        transclude(config.draft_name)
+        # @draft.gsub!("__VERSION__", "v#{version}") if @draft[/__VERSION__/]
+        # @draft.gsub!("__DATETIME__", timestamp) if @draft[/__DATETIME__/]
+      end
+
+      def write_master_markdown_file
+        File.open("#{config.output_directory}/#{config.transcluded_draft}", "w") {|f| f << @draft.to_s }
+      end
+
+      def pandoc_from_options
+        %w[
+          yaml_metadata_block
+          raw_html
+          fenced_code_blocks
+          auto_identifiers
+          backtick_code_blocks
+          pipe_tables
+          markdown_in_html_blocks
+          grid_tables
+          multiline_tables
+          simple_tables
+          header_attributes
+          implicit_header_references
+        ]
+      end
+
+      def config; Hackademy.config; end
+    }
+
+  end
+
+end

data/lib/hackademy/hackademy.rb

@@ -1,33 +1,32 @@
-require_relative 'setup'
+require_relative 'new'
 
 module Hackademy
 
-  # class Config
-  #
-  #   def self.config
-  #     @@config ||= Config.new
-  #   end
-  #
-  #   def initialize
-  #     raw_config = File.read("Resources/config.yml")
-  #     erb_config = ERB.new(raw_config).result
-  #     settings = YAML.load(erb_config)["hackademic"]
-  #     if settings
-  #       settings.each { |name, value|
-  #         instance_variable_set("@#{name}", ENV[name.upcase] || value)
-  #         self.class.class_eval { attr_reader name.intern }
-  #       }
-  #     end
-  #   end
-  #
-  # end
-  #
-  # def self.config; Hackademy::Config.config; end
-  #
-  # def self.master_file
-  #   file = "#{config.output_directory}/#{config.transcluded_draft}"
-  #   FileUtils.touch(file) unless File.exists?(file)
-  #   file
-  # end
+  def self.config;
+    @config ||= Config.new
+  end
+
+   class Config
+
+    def initialize
+      if File.exists?("Resources/Config.yml")
+        raw_config = File.read("Resources/Config.yml")
+        erb_config = ERB.new(raw_config).result
+        settings = YAML.load(erb_config)["hackademic"]
+        if settings
+          settings.each { |name, value|
+            instance_variable_set("@#{name}", ENV[name.upcase] || value)
+            self.class.class_eval { attr_reader name.intern }
+          }
+        end
+      end
+
+      def method_missing(method)
+        ""
+      end
+
+    end
+
+  end
 
 end

data/lib/hackademy/new.rb

@@ -0,0 +1,89 @@
+require 'pathname'
+
+module Hackademy
+
+  class New < Thor
+
+    include Thor::Actions
+
+    source_root "#{Pathname.new(__FILE__).dirname}/templates"
+
+    desc "project [PROJECTNAME]", "Setup a new Hackademic project called [PROJECTNAME]"
+    def project(project_name)
+      say "--------------------------------------------------------------", :cyan
+      say "⫸⫸⫸⫸ Setting up project #{project_name}!", :cyan
+
+      project = "#{hackademic_directory}/Projects/#{project_name}"
+      empty_directory(project)
+
+      templates = "#{Pathname.new(__FILE__).dirname}/templates"
+
+      say "»»»»» Creating *_WORKING_* directory:", :green
+      empty_directory("#{project}/_WORKING_")
+      template "../../templates/DRAFT.md.tt", "#{project}/_WORKING_/DRAFT.md"
+
+      say "»»»»» Creating *Archive* directory:", :green
+      empty_directory("#{project}/Archive")
+      create_file "#{project}/Archive/.gitkeep"
+
+      say "»»»»» Creating *To-Process* directory:", :green
+      empty_directory("#{project}/To-Process")
+      create_file "#{project}/To-Process/.gitkeep"
+
+      say "»»»»» Creating *Project Notes* directory:", :green
+      empty_directory("#{project}/Resources/Notes")
+      create_file "#{project}/Resources/Notes/.gitkeep"
+
+      say "»»»»» Creating *Resources* directory:", :green
+      empty_directory("#{project}/Resources")
+      template '../../templates/Config.yml.tt', "#{project}/Resources/Config.yml"
+
+      empty_directory("#{project}/Resources/Figures")
+      create_file "#{project}/Resources/Figures/.gitkeep"
+
+      empty_directory("#{project}/Resources/Data")
+      create_file "#{project}/Resources/Data/.gitkeep"
+
+      empty_directory("#{project}/Resources/templates")
+      template '../../templates/pandoc-word-template.docx', "#{project}/Resources/templates/pandoc-word-template.docx"
+      template '../../templates/xelatex.template', "#{project}/Resources/xelatex.template"
+
+      empty_directory("#{project}/Resources/csl")
+      template '../../templates/apa.csl', "#{project}/Resources/csl/apa.csl"
+
+      say "»»»»» Creating *Versions* directory:", :green
+      empty_directory("#{project}/Versions")
+      create_file "#{project}/Versions/.gitkeep"
+
+      say "»»»»» Creating final files:", :green
+      @project_name = project_name
+      template "../../templates/README.md.tt", "#{project}/README.md"
+      template '../../templates/CHANGELOG.md.tt', "#{project}/CHANGELOG.md"
+      template '../../templates/TODO.txt.tt', "#{project}/TODO.txt"
+
+      say "»»»»» Initializing version control (git) for project...", :green
+      inside "#{project}" do
+        run "git init .", {:capture => true}
+        run "git add .", {:capture => true}
+        run "git commit -m 'Initial commit of #{project_name}'", {:capture => true}
+      end
+
+      say "⫸⫸⫸⫸ DONE!", :cyan
+      say "⫸⫸⫸⫸ Project created at #{project}", :cyan
+      say "--------------------------------------------------------------", :cyan
+    end
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    no_tasks {
+
+      def hackademic_directory
+        @hackademic_directory ||= File.open("#{ENV['HOME']}/.hackademic", "r").read.chomp
+      end
+    }
+
+  end
+
+end

data/templates/Config.yml.tt

@@ -0,0 +1,11 @@
+---
+hackademic:
+  bibliography: Resources/References.bib
+  drafts_dir: "_WORKING_"
+  draft_name: DRAFT.md
+  transcluded_draft: DRAFT-COMPLETE.md
+  output_directory: Versions
+  citation_style: Resources/csl/american-sociological-association.csl
+  docx_template: Resource/templates/pandoc-word-template.docx
+  latex_template: Resources/templates/xelatex.template
+  support_directory: Resources

data/templates/apa.csl

@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+  <!-- This style was edited with the Visual CSL Editor (http://steveridout.com/csl/visualEditor/) -->
+  <info>
+    <title>American Psychological Association 6th Edition</title>
+    <id>http://www.zotero.org/styles/apa</id>
+    <link href="http://www.zotero.org/styles/apa" rel="self"/>
+    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+    <author>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </author>
+    <contributor>
+      <name>Bruce D'Arcus</name>
+    </contributor>
+    <contributor>
+      <name>Curtis M. Humphrey</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2013-02-26T04:33:40+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">
+        <single>trans.</single>
+        <multiple>trans.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=", " text-case="title" suffix=""/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text macro="title"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </else-if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="archive" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="doi:"/>
+          </if>
+          <else>
+            <choose>
+              <if type="webpage">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <group>
+                    <date variable="accessed" form="text" suffix=", "/>
+                  </group>
+                  <text term="from"/>
+                  <text variable="URL"/>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <text term="from" suffix=" "/>
+                  <text variable="URL"/>
+                </group>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="No. "/>
+        </group>
+      </if>
+      <else-if type="book graphic  motion_picture report song manuscript speech" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <choose>
+            <if variable="event" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="article-journal article-magazine" match="none">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="genre" match="none">
+            <text term="presented at" text-case="capitalize-first" suffix=" "/>
+            <text variable="event"/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text term="presented at"/>
+              <text variable="event"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <choose>
+          <if variable="issued">
+            <group prefix=" (" suffix=")">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </group>
+          </if>
+          <else>
+            <group prefix=" (" suffix=")">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="book graphic motion_picture report song chapter paper-conference" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+          </group>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legal_case">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <date variable="issued" form="text"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <date variable="issued" prefix=" (" suffix=")">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <group>
+      <choose>
+        <if type="chapter paper-conference entry-encyclopedia" match="any">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </if>
+      </choose>
+      <text macro="container-contributors"/>
+      <text macro="secondary-contributors"/>
+      <text macro="container-title"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+      <else>
+        <group delimiter=" " prefix=", ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <choose>
+                <if type="legal_case">
+                  <text variable="number" prefix="No. "/>
+                </if>
+                <else>
+                  <text variable="number" prefix="Pub. L. No. "/>
+                  <group delimiter=" ">
+                    <!--change to label variable="section" as that becomes available -->
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <text macro="issued"/>
+          <text macro="title" prefix=" "/>
+          <text macro="container"/>
+        </group>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackademic
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Matthew Petty
@@ -23,14 +23,18 @@ files:
 - bin/hackademic
 - hackademic.gemspec
 - lib/hackademic.rb
+- lib/hackademy/compile.rb
 - lib/hackademy/hackademy.rb
-- lib/hackademy/setup.rb
+- lib/hackademy/new.rb
 - lib/hackademy/sync.rb
 - templates/CHANGELOG.md.tt
 - templates/Config.yml.tt
 - templates/DRAFT.md.tt
 - templates/README.md.tt
 - templates/TODO.txt.tt
+- templates/apa.csl
+- templates/pandoc-word-template.docx
+- templates/xelatex.template
 homepage: http://github.com/kizmeta/hackademic
 licenses:
 - MIT

data/lib/hackademy/setup.rb

@@ -1,36 +0,0 @@
-module Hackademy
-  class Setup < Thor
-
-    namespace :setup
-
-    include Thor::Actions
-
-    # desc "set_environment_path!", "setup shell $PATH variable to allow running \"hackademic\" commands"
-    # def set_environment_path!
-    #   answer = ask("Set your environment $PATH to include bin? This is important and allows you to just run \"hackademic\" commands more easily.\nSetup? [Y/n]", :green)
-    #   if !answer
-    #     say "Updating your shell to find writing commands...", :green
-    #     config_files = ["#{ENV['HOME']}/.zshrc", "#{ENV['HOME']}/.bash_profile"]
-    #     config_files.each do |config_file|
-    #       append_to_file config_file, "export PATH=.bin:$PATH\n"
-    #     end
-    #     say "Updated shell config files!"
-    #   else
-    #     say "Skipping $PATH setup..."
-    #   end
-    # end
-
-    # desc "install_git_hooks!", "install a git hook to auto-compile master draft before committing to repository"
-    # def install_git_hooks!
-    #   if !no?("Install the git pre-commit hook?\nThis automatically compiles a fresh pdf upon commits. [y/N]", :green)
-    #     say "Installing git pre-commit..."
-    #     copy_file ".config/git/pre-commit", ".git/hooks/pre-commit"
-    #     say "Done!"
-    #   else
-    #     say "Skipping git hooks..."
-    #   end
-    #   say "--------------------------------------------------------------", :blue
-    # end
-
-  end
-end