nikki 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9095ed9114a29ee556f7bdcfe72151f6c5edc79f
-  data.tar.gz: b3bf286f987f69057f127a39d3803c3c4432f154
+  metadata.gz: bad525c6509fa646d2ec49341ddd01243eed11ff
+  data.tar.gz: 8e027f08280c4b92885f57c513a62cf63b5f5e53
 SHA512:
-  metadata.gz: f85104c04cf8466163cdf791693c5637d89fe4132e67a23dfb8dddcc220c6b4d2dd4a8837a69944b0ba0d2b97c435347589ec99b274716b1f71951758d6f3e3d
-  data.tar.gz: 40304f691b4540f3717064caf6b8c2a85cb8225f4e27f3b095413a2af5c585a15c2c0a2e7e5bd490773b46901523c2003ffd7abd529fffb19a21f28089b23a38
+  metadata.gz: 9f2cc4f9a14519dfcec0290e8c51afde64c78910c38d6212ca7c3491d2baa321811240cee78bb8704198b8902b1a4b4d8c2d307c9e67420eb67b243f191234e2
+  data.tar.gz: 92200e97291888ede9f6899bc5b29aad71325bcd35d17dffae08a2cac77a728aa91288ca3daf6b295e907a91539cc54ad9fd22be3d67d69358df970a8a4eae4b

data/.gitignore

@@ -11,3 +11,4 @@ pkg
 spec/reports
 tmp
 .DS_STORE
+/doc

data/lib/nikki/version.rb

@@ -1,5 +1,5 @@
 # Sets version for RubyGems
 module Nikki
   # Sets version for RubyGems
-  VERSION = "0.5.3"
+  VERSION = '0.5.4'
 end

data/lib/nikki.rb

@@ -1,15 +1,16 @@
 require 'thor'
-require "pathname"
-require "yaml"
-require "date"
+require 'pathname'
+require 'yaml'
+require 'date'
 require 'fileutils'
+require 'stickynotifications'
 
 # @author Brandon Pittman
 # This is the main class that interfaces with Thor's methods and does all the
 # heavy lifting for Nikki.  It's a bit of a "God" object. Sorries.
 class Generator < Thor
-
-  desc "setup", "Creates new Nikki and config files."
+  # @!group Initial Setup
+  desc 'setup', 'Creates new Nikki and config files.'
   # This methods creates the ".nikki" directory, config file and journal file.
   def setup
     create_path
@@ -17,7 +18,10 @@ class Generator < Thor
     create_config_file
   end
 
-  desc "new ENTRY", "Creates a new entry in the Nikki journal."
+  # @!endgroup
+
+  # @!group Data entry
+  desc 'new ENTRY', 'Creates a new entry in the Nikki journal.'
   # Add entry to journal
   # @param entry [String] entry to add to the journal
   # @param update [String] International date for update
@@ -45,31 +49,41 @@ class Generator < Thor
     write_file(journal)
     open unless updated_yesterday?
     write_config(settings)
-    add_to_omnifocus
     puts latest
   end
 
-  desc "missed", "Create new entry for yesterday"
+  desc 'missed', 'Create new entry for yesterday'
   # Creates a new entry for yesterday
   # @param entry [String]
+  # @since 0.5.3
   def missed(entry)
-    new(entry, (Date.today-1).to_s)
+    new(entry, (Date.today - 1).to_s)
   end
+  # @!endgroup
 
-  desc "open", "Open current year's journal file in editor."
+  desc 'open', "Open current year's journal file in editor."
   # Open Nikki journal in configured text editor
   def open
-    %x{open -a "#{editor}" #{file}}
+    `open -a "#{editor}" #{file}`
   end
 
-  desc "ls", "Displays latest Nikki entries."
+  desc 'ls', 'Displays latest Nikki entries.'
+  # option :sticky,
+  #        aliases: :s,
+  #        type: :string,
+  #        banner: 'Notify if not updated today'
   # Display Nikki's latest entires
   # @return [String]
+  # @option options :sticky [String]
+  #   Display Sticky Notification if Nikki hasn't been updated
   def ls
     puts latest
+    # StickyNotifications::Note.new.create(
+    #   "Nikki hasn't been updated today!", 'Nikki'
+    # )
   end
 
-  desc "config", "Change Nikki's settings."
+  desc 'config', "Change Nikki's settings."
   option :editor, :aliases => :e, :banner => "Set default editor to open journal file in."
   option :yesterday, :aliases => :y, :type => :boolean, :banner => "Set nikki's \"updated\" date to yesterday."
   option :today, :aliases => :t, :type => :boolean, :banner => "Set nikki's \"updated\" date to today."
@@ -85,22 +99,21 @@ class Generator < Thor
   def config
     settings = read_config
     settings[:editor] = options[:editor] || read_config[:editor]
-    settings[:updated] = Date.today-1 if options[:yesterday]
-    settings[:updated] = Date.today if options[:today]
+    settings[:updated] = options[:yesterday] ? Date.today - 1 : Date.today
     write_config(settings)
     puts settings.to_yaml if options[:print]
     puts latest if options[:latest]
   end
 
-  desc "publish YEAR", "Save Nikki journal from YEAR as Markdown"
+  desc 'publish YEAR', 'Save Nikki journal from YEAR as Markdown'
   # @param [String] year of journal entries you wish to pubish as Markdown This
   # method calls the `markdown` method and creates a MultiMarkdown document
   # with one big description list.  This format is subject to change, but for
   # now, it seems good enough.
-  def publish(year)
-    md_path = "#{path}nikki_markdown_#{Date.today}.md"
-    IO.write(md_path, markdown(read_file, year.to_i))
-    puts "Markdown saved to \"#{md_path}\"."
+  def export(year)
+    export_path = "#{path}nikki_export_#{year}.yml"
+    IO.write(export_path, yamlize(read_file, year.to_i))
+    puts "Markdown saved to \"#{export_path}\"."
   end
 
   no_commands do
@@ -113,7 +126,7 @@ class Generator < Thor
     end
 
     def config_file
-      path.join("nikki.config.yaml")
+      path.join('nikki.config.yaml')
     end
 
     def read_config
@@ -141,19 +154,19 @@ class Generator < Thor
     end
 
     def file
-      path.join("nikki.yaml")
+      path.join('nikki.yaml')
     end
 
     def config_file_exist?
       return true if config_file.exist?
       create_config_file
-      return true
+      true
     end
 
     def file_exist?
       return true if file.exist?
       create_file
-      return true
+      true
     end
 
     def create_config_file
@@ -167,31 +180,12 @@ class Generator < Thor
       FileUtils.touch(file)
     end
 
-    def marked
-      Pathname.new("/Applications/Marked.app")
-    end
-
     def today
       Date.today
     end
 
     def yesterday
-      Date.today-1
-    end
-
-    def months_with_names
-      {1=>{:name=>"January"},
-       2=>{:name=>"February"},
-       3=>{:name=>"March"},
-       4=>{:name=>"April"},
-       5=>{:name=>"May"},
-       6=>{:name=>"June"},
-       7=>{:name=>"July"},
-       8=>{:name=>"August"},
-       9=>{:name=>"September"},
-       10=>{:name=>"October"},
-       11=>{:name=>"November"},
-       12=>{:name=>"December"}}
+      Date.today - 1
     end
 
     def leap_year?
@@ -203,36 +197,38 @@ class Generator < Thor
     end
 
     def updated_yesterday?
-      last_updated == Date.today-1
+      last_updated == Date.today - 1
     end
 
     def latest
       list = []
       (0..3).each do |n|
-        list << "#{today-n}: #{read_file[today-n]}"
+        list << "#{today - n}: #{read_file[today - n]}"
       end
       list.reverse!
     end
 
-    def markdown(hash, year)
-      string = ""
+    def yamlize(hash, year)
+      string = "---\n"
       hash.each_pair do |date, sentence|
-        if date.year == year
-          string += "#{date}\n:  #{sentence}\n"
-        end
+        string += "#{date}: #{sentence}\n" if date.year == year
       end
       string
     end
 
     def add_to_omnifocus
-      %x{osascript <<-APPLESCRIPT
-        tell application "OmniFocus"
-          tell default document
-            set nikki_task to first remaining task of flattened context "Home" whose name is "Record what I learned today"
-            set completed of nikki_task to true
-          end tell
-        end tell
-      APPLESCRIPT}
+      `osascript <<-APPLESCRIPT
+tell application "OmniFocus"
+  tell default document
+    set nikki_task to first remaining task of flattened context "Home" whose name is "Record what I learned today"
+    set deferDate to defer date of nikki_task
+    if weekday of (deferDate) is weekday of (current date) then
+      set completed of nikki_task to true
+    end if
+  end tell
+  synchronize
+end tell
+APPLESCRIPT`
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nikki
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Brandon Pittman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -111,29 +111,6 @@ files:
 - README.md
 - Rakefile
 - bin/nikki
-- doc/Generator.html
-- doc/Nikki.html
-- doc/_index.html
-- doc/class_list.html
-- doc/css/common.css
-- doc/css/cucumber.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/feature_list.html
-- doc/file.README.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/js/app.js
-- doc/js/cucumber.js
-- doc/js/full_list.js
-- doc/js/jquery.js
-- doc/method_list.html
-- doc/requirements.html
-- doc/requirements/step_transformers.html
-- doc/requirements/tags.html
-- doc/tag_list.html
-- doc/top-level-namespace.html
 - features/new_entry.feature
 - features/random.feature
 - features/step_definitions/new_entry.steps.rb
@@ -165,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A simple one-line-a-day journaling app.