hackademic 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9dc2e329f95c94dce330f01ec5f4bcebdd23ed
-  data.tar.gz: 7aed02ebdfe1f94e1ed93a685d31700a6b53abd1
+  metadata.gz: 9797fad4827578428d909f7ade74e838a60585ff
+  data.tar.gz: b6d5c4c2039641a685177411fec2320489d0e673
 SHA512:
-  metadata.gz: 2d1b3c3b9e987bf8ddb5558e130030d98c70a3aeb1dcc2726836b4537faf61ff95b0dc2579d527d1c02f7a58c2361ad272f5bbe36493fab244c53d3777668edd
-  data.tar.gz: e50b1368db7426679b6108482b899468bb7eb66cce13d98805bc5a4c29953be37f30f6521cedb1af5edde16b03e712bee15630ec1bf7de0112df6f6289dd124b
+  metadata.gz: f3a696e53aa11382118190b829e5d883b0ab3d4088f5796c9ffc3aabfbefdec5401917f0768bfee56f111a84b6100b6e3db96c2f3e1c02e84ab2b02da1dc72f3
+  data.tar.gz: e06041fb2b62df207c54df0559a03eec0d6373d5857aea1f107a1c781bec11b153b488c8debad68d57ac6390568a8fa474da6ebaf7ddea3386d11ac935ac1d12

data/bin/hackademic

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 require_relative '../lib/hackademic'
 
-HackademicCLI.start
+if ARGV.first == "--version"
+  print "0.3.1"
+else
+  HackademicCLI.start
+end

data/hackademic.gemspec

@@ -1,6 +1,8 @@
+require_relative "lib/hackademic/version"
+
 Gem::Specification.new do |s|
   s.name          = 'hackademic'
-  s.version       = '0.3.1'
+  s.version       = Hackademic::VERSION
   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.rb

@@ -5,7 +5,8 @@ require 'active_support'
 require_relative 'hackademic/config'
 require_relative 'hackademic/sync'
 require_relative 'hackademic/compile'
-require_relative 'hackademic/new'
+require_relative 'hackademic/project'
+require_relative 'hackademic/setup'
 
 # TODO: Un-spaghetti-fy this project
 # TODO: Handle missing Config.yml variables nicely
@@ -17,127 +18,11 @@ class HackademicCLI < Thor
   HACKADEMIC_DIRECTORY = File.open("#{ENV['HOME']}/.hackademic", "r").read.chomp
   source_root "#{Pathname.new(__FILE__).dirname}"
 
-  register Sync, :sync, "sync [subcommand]", "Synchronize!"
-  register Hackademic::New, :new, "new [PROJECT]", "Create something new!"
+  register Hackademic::Sync, :sync, "sync [SUBCOMMAND]", "Synchronize!"
+  register Hackademic::Project, :project, "project [SUBCOMMAND]", "Work with projects!"
+  register Hackademic::Setup, :setup, "setup [SUBCOMMAND]", "Set up and maintenance!"
 
   desc 'compile [FORMAT]', 'Type "hackademic help compile" to see choices'
-  subcommand 'compile', ::Hackademic::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"
-    template "../templates/default.odt", ENV["HOME"] + "/.pandoc/templates/default.odt"
-  end
-
-  desc "setup [FOLDER]", "Setup a new Hackademic repository at [FOLDER]"
-  def setup(root_directory)
-
-    say "--------------------------------------------------------------", :cyan
-    say "Hackademic Setup:", :green
-    say "⫸⫸⫸ Setting up main Hackademic folder structure:", :yellow
-
-    directory = "#{root_directory}/Hackademic"
-    empty_directory(directory)
-    File.open("#{ENV['HOME']}/.hackademic", "w+"){|config| config << directory }
-
-    empty_directory "#{directory}/Libraries"
-    empty_directory "#{directory}/Libraries/My-Library"
-    create_file "#{directory}/Libraries/My-Library/References.bib"
-
-    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"
-    unless File.exists? "#{directory}/Notes/.git"
-      inside "#{directory}/Notes" do
-        run "git init ."
-        run "git add ."
-        run "git commit -m 'Initial commit of Notes Database'"
-      end
-    end
-
-    empty_directory "#{directory}/Projects"
-
-    say "»»»»» Done!", :green
-    say "--------------------------------------------------------------", :cyan
-
-  end
-
-  no_tasks {
-
-    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
-
-    def semantic_version_checker(current, latest)
-      return true if current == latest
-
-      latest = latest.split(".")
-      current = current.split(".")
-
-      if current.length < latest.length
-        current = "#{current.join(".")}" + (".0" * (latest.length - current.length))
-        current = current.split(".")
-      end
-
-      # 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
-
-        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
-
-  }
+  subcommand 'compile', Hackademic::Compile
 
 end

data/lib/hackademic/{new.rb → project.rb}

@@ -2,14 +2,15 @@ require 'pathname'
 
 module Hackademic
 
-  class New < Thor
+  class Project < Thor
 
     include Thor::Actions
 
-    source_root "#{Pathname.new(__FILE__).dirname}/templates"
+    # source_root "#{Pathname.new(__FILE__).dirname}/templates"
+    source_root "#{Pathname.new(__FILE__).dirname}"
 
-    desc "project [PROJECTNAME]", "Setup a new Hackademic project called [PROJECTNAME]"
-    def project(project_name)
+    desc "create [PROJECTNAME]", "Setup a new Hackademic project called [PROJECTNAME]"
+    def create(project_name)
       say "--------------------------------------------------------------", :cyan
       say "⫸⫸⫸⫸ Setting up project #{project_name}!", :cyan
 
@@ -36,7 +37,7 @@ module Hackademic
 
       say "»»»»» Creating *Resources* directory:", :green
       empty_directory("#{project}/Resources")
-      template '../../templates/Config.yml.tt', "#{project}/Resources/Config.yml"
+      template '../../templates/project/Resources/Config.yml.tt', "#{project}/Resources/Config.yml"
 
       empty_directory("#{project}/Resources/Figures")
       create_file "#{project}/Resources/Figures/.gitkeep"
@@ -44,9 +45,7 @@ module Hackademic
       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"
+      install_templates(project)
 
       empty_directory("#{project}/Resources/csl")
       template '../../templates/apa.csl', "#{project}/Resources/csl/apa.csl"
@@ -77,6 +76,28 @@ module Hackademic
       File.dirname(__FILE__)
     end
 
+    desc "install_templates [PROJECTNAME]", "installs the latest templates into a project directory"
+    def install_templates(project)
+      project = "#{hackademic_directory}/Projects/#{project}"
+      empty_directory("#{project}/Resources/templates")
+      template '../../templates/project/Resources/templates/pandoc-word-template.docx', "#{project}/Resources/templates/pandoc-word-template.docx"
+      template '../../templates/project/Resources/templates/default.asciidoc', "#{project}/Resources/templates/default.asciidoc"
+      template '../../templates/project/Resources/templates/default.html5', "#{project}/Resources/templates/default.html5"
+      template '../../templates/project/Resources/templates/default.latex', "#{project}/Resources/templates/default.latex"
+      template '../../templates/project/Resources/templates/default.odt', "#{project}/Resources/templates/default.odt"
+      say "Installed latest hackademic/pandoc templates into #{project}", :blue
+    end
+
+    desc "list", "List the current projects"
+    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
+
     no_tasks {
 
       def hackademic_directory

data/lib/hackademic/setup.rb

@@ -0,0 +1,118 @@
+module Hackademic
+  class Setup < Thor
+
+    include Thor::Actions
+    HACKADEMIC_DIRECTORY = File.open("#{ENV['HOME']}/.hackademic", "r").read.chomp
+    source_root "#{Pathname.new(__FILE__).dirname}"
+
+    default_task :folder
+
+    desc "update_pandoc", "Update to latest pandoc and pandoc-citeproc"
+    def update_pandoc(args=nil)
+      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_pandoc_templates", "Install latest pandoc templates"
+    def install_pandoc_templates(args=nil)
+      if !Dir.exists?(ENV["HOME"]+"/.pandoc/templates")
+        empty_directory ENV["HOME"]+"/.pandoc"
+        empty_directory ENV["HOME"]+"/.pandoc/templates"
+      end
+      template "../../templates/project/Resources/templates/default.asciidoc", ENV["HOME"] + "/.pandoc/templates/default.asciidoc"
+      template "../../templates/project/Resources/templates/default.html5", ENV["HOME"] + "/.pandoc/templates/default.html5"
+      template "../../templates/project/Resources/templates/default.latex", ENV["HOME"] + "/.pandoc/templates/default.latex"
+      template "../../templates/project/Resources/templates/default.odt", ENV["HOME"] + "/.pandoc/templates/default.odt"
+    end
+
+    desc "folder [FOLDER]", "Setup a new Hackademic skeleton at [FOLDER]"
+    def folder(root_directory)
+
+      say "--------------------------------------------------------------", :cyan
+      say "Hackademic Setup:", :green
+      say "⫸⫸⫸ Setting up main Hackademic folder structure:", :yellow
+
+      directory = "#{root_directory}/Hackademic"
+      empty_directory(directory)
+      File.open("#{ENV['HOME']}/.hackademic", "w+"){|config| config << directory }
+
+      empty_directory "#{directory}/Libraries"
+      empty_directory "#{directory}/Libraries/My-Library"
+      create_file "#{directory}/Libraries/My-Library/References.bib"
+
+      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_pandoc_templates
+
+      say "⫸⫸⫸ Initializing version control (git) for Notes database:", :yellow
+      empty_directory "#{directory}/Notes"
+      create_file "#{directory}/Notes/SampleNote.md"
+      unless File.exists? "#{directory}/Notes/.git"
+        inside "#{directory}/Notes" do
+          run "git init ."
+          run "git add ."
+          run "git commit -m 'Initial commit of Notes Database'"
+        end
+      end
+
+      empty_directory "#{directory}/Projects"
+
+      say "»»»»» Done!", :green
+      say "--------------------------------------------------------------", :cyan
+
+    end
+
+    no_tasks {
+
+      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
+
+      def semantic_version_checker(current, latest)
+        return true if current == latest
+
+        latest = latest.split(".")
+        current = current.split(".")
+
+        if current.length < latest.length
+          current = "#{current.join(".")}" + (".0" * (latest.length - current.length))
+          current = current.split(".")
+        end
+
+        # 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
+
+          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
+
+    }
+  end
+
+end

data/lib/hackademic/sync.rb

@@ -1,34 +1,36 @@
-class Sync < Thor
-  desc "notes", "longer desc"
-  def notes
-    begin
+module Hackademic
+  class Sync < Thor
+    desc "notes", "longer desc"
+    def notes
+      begin
 
-      notes_database_directory_path = "#{ENV['HOME']}/Dropbox/Hackademic/Notes"
-      notes_database_files = `ls -1 #{notes_database_directory_path}`.split("\n")
+        notes_database_directory_path = "#{ENV['HOME']}/Dropbox/Hackademic/Notes"
+        notes_database_files = `ls -1 #{notes_database_directory_path}`.split("\n")
 
-      # project_directory_root_path = "/Users/lodestone/Sync/Code/overall-linking-example/001-DISS"
-      # for every directory in the projects folder, do this stuff:
-      # p notes_database_directory_path
-      Dir.glob("#{ENV['HOME']}/Dropbox/Hackademic/Projects/*").each do |dir|
+        # project_directory_root_path = "/Users/lodestone/Sync/Code/overall-linking-example/001-DISS"
+        # for every directory in the projects folder, do this stuff:
+        # p notes_database_directory_path
+        Dir.glob("#{ENV['HOME']}/Dropbox/Hackademic/Projects/*").each do |dir|
 
-        project_directory_root_path = dir
-        referenced_files = `grep -a -h -r -o -G "{{.*}}" #{project_directory_root_path}`.split("\n").map{|f| f.gsub("{{", "").gsub("}}", "") }
+          project_directory_root_path = dir
+          referenced_files = `grep -a -h -r -o -G "{{.*}}" #{project_directory_root_path}`.split("\n").map{|f| f.gsub("{{", "").gsub("}}", "") }
 
-        referenced_files.each do |file|
-          if notes_database_files.include? file
-            `unison -silent #{notes_database_directory_path}/#{file} #{project_directory_root_path}/Resources/Notes/#{file}`
+          referenced_files.each do |file|
+            if notes_database_files.include? file
+              `unison -silent #{notes_database_directory_path}/#{file} #{project_directory_root_path}/Resources/Notes/#{file}`
+            end
           end
-        end
 
-        project_notes = `ls -1 #{project_directory_root_path}/Resources/Notes`.split("\n")
-        project_notes.each do |file|
-          `unison -silent #{project_directory_root_path}/Resources/Notes/#{file} #{notes_database_directory_path}/#{file}`
+          project_notes = `ls -1 #{project_directory_root_path}/Resources/Notes`.split("\n")
+          project_notes.each do |file|
+            `unison -silent #{project_directory_root_path}/Resources/Notes/#{file} #{notes_database_directory_path}/#{file}`
+          end
         end
+
+      rescue => ex
+        File.open("#{ENV['HOME']}/Library/Logs/hackademic-error.log", "a"){|file| file << ex }
       end
 
-    rescue => ex
-      File.open("#{ENV['HOME']}/Library/Logs/hackademic-error.log", "a"){|file| file << ex }
     end
-
   end
 end

data/lib/hackademic/version.rb

@@ -0,0 +1,3 @@
+module Hackademic
+  VERSION = "0.3.2"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackademic
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Matthew Petty
@@ -25,23 +25,24 @@ files:
 - bin/hackademic
 - hackademic.gemspec
 - lib/hackademic.rb
-- lib/hackademic/.compile.rb.swp
 - lib/hackademic/compile.rb
 - lib/hackademic/config.rb
-- lib/hackademic/new.rb
+- lib/hackademic/project.rb
+- lib/hackademic/setup.rb
 - lib/hackademic/sync.rb
+- lib/hackademic/version.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/default.asciidoc
-- templates/default.html5
-- templates/default.latex
-- templates/default.odt
-- templates/pandoc-word-template.docx
-- templates/xelatex.template
+- templates/project/Resources/Config.yml.tt
+- templates/project/Resources/templates/default.asciidoc
+- templates/project/Resources/templates/default.html5
+- templates/project/Resources/templates/default.latex
+- templates/project/Resources/templates/default.odt
+- templates/project/Resources/templates/pandoc-word-template.docx
+- templates/project/Resources/templates/xelatex.template
 - test/Resources/Config.yml
 homepage: http://github.com/kizmeta/hackademic
 licenses: