hackademic 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ddbab38fc0b8902f15efa0443042b5b7553a2c
-  data.tar.gz: f227c94397e739676433b066a110439f8898335d
+  metadata.gz: 6b9dc2e329f95c94dce330f01ec5f4bcebdd23ed
+  data.tar.gz: 7aed02ebdfe1f94e1ed93a685d31700a6b53abd1
 SHA512:
-  metadata.gz: d08c72bb63e5e53fd4f615316b21f07b538e22da437794b1ad734c598bd708ebe81a962f19633d790e7b745da7fc75e17ae4471bfad5aae5bb983304773ab837
-  data.tar.gz: deea42467d8169c25b6305a6c91635b0156c43c735b6d59c907bfd498ee6705daabb52b5766514bfb974da5f8b48b9977cb0f54f8518d5af950efdb738b10abf
+  metadata.gz: 2d1b3c3b9e987bf8ddb5558e130030d98c70a3aeb1dcc2726836b4537faf61ff95b0dc2579d527d1c02f7a58c2361ad272f5bbe36493fab244c53d3777668edd
+  data.tar.gz: e50b1368db7426679b6108482b899468bb7eb66cce13d98805bc5a4c29953be37f30f6521cedb1af5edde16b03e712bee15630ec1bf7de0112df6f6289dd124b

data/hackademic.gemspec

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

data/lib/hackademic/compile.rb

@@ -12,10 +12,9 @@ module Hackademic
 
     desc "pdf", "compile a pdf"
     def pdf
-      check_installation
       read_draft_file
       write_master_markdown_file
-      system(pdf_command)
+      system pdf_command
       say "Writing out PDF file: #{config.output_directory}/#{config.transcluded_draft.gsub(/\..*$/, '')}.pdf"
     end
 
@@ -31,7 +30,6 @@ module Hackademic
 
     desc "docx", "compile a docx"
     def docx
-      check_installation
       read_draft_file
       write_master_markdown_file
       system docx_command
@@ -40,7 +38,6 @@ module Hackademic
 
     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}"]
@@ -54,14 +51,33 @@ module Hackademic
       end
 
       def libre_office_binary
+        # TODO: Check/Test this works as intended
         config.libre_office_binary || "/Applications/LibreOffice.app/Contents/MacOS/soffice"
       end
 
+      def add_extra_pandoc_variables(command)
+        if config.pandoc_variables.is_a? Hash
+          config.pandoc_variables.each do |key, val|
+            command << %{ -V #{key}="#{val}" }
+          end
+        end
+        command
+      end
+
       def docx_command
         if File.exists?(libre_office_binary)
           command = ""
           # Use pandoc to create an ODT file"
-          command << %[pandoc #{config.output_directory}/#{config.transcluded_draft} --from=markdown+#{pandoc_from_options.join("+")} --filter pandoc-citeproc --bibliography=#{config.bibliography} --csl=#{config.citation_style} -s -o temp.odt]
+          command << %[pandoc \
+                      --template=#{config.odt_template} \
+                      --from=markdown+#{pandoc_from_options.join("+")} \
+                      --filter pandoc-citeproc \
+                      --bibliography=#{config.bibliography} \
+                      --csl=#{config.citation_style} \
+                      -o temp.odt \
+                      #{config.output_directory}/#{config.transcluded_draft} \
+                     ]
+          command = add_extra_pandoc_variables(command)
           command << " && "
           # Use LibreOffice to create a DOCX file"
           command << "#{libre_office_binary} --invisible --convert-to docx temp.odt"
@@ -70,56 +86,31 @@ module Hackademic
           command << "rm temp.odt"
           command << " && "
           # Rename the temp.docx and move it into the Versions directory
-          command << "mv temp.docx #{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.docx"
-        else
-          %[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"]
+          command << "cp temp.docx #{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.docx"
+          command << " && "
+          command << "rm temp.docx"
+        else # Run without LibreOffice
+          command = %[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"]
+          command = add_extra_pandoc_variables(command)
         end
+        command.gsub(/\s+/, ' ')
       end
 
       def pdf_command
         cmd = %{pandoc \
           --template=#{config.pdf_template} \
           -t html5 \
+          --from=markdown+#{pandoc_from_options.join("+")} \
           --bibliography=#{config.bibliography} \
           --csl=#{config.citation_style} \
           -s \
           -o "#{config.output_directory}/#{config.draft_name.gsub(/\..*$/,'')}.pdf" \
           #{config.output_directory}/#{config.transcluded_draft} \
         }
-        if config.pandoc_variables.is_a? Hash
-          config.pandoc_variables.each do |key, val|
-            cmd << %{-V #{key}="#{val}"}
-          end
-        end
+        cmd = add_extra_pandoc_variables(cmd)
         cmd.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)
@@ -141,8 +132,6 @@ module Hackademic
         @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

data/test/Resources/Config.yml

@@ -13,5 +13,6 @@ hackademic:
   latex_template: Resources/templates/xelatex.template
   html_template: Resources/templates/default.html5
   pdf_template: Resources/templates/default.html5
+  odt_template: Resources/templates/default.odt
   support_directory: Resources
   libre_office_binary: /Applications/LibreOffice.app/Contents/MacOS/soffice

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackademic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matthew Petty