nikki 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dddfb4c9074d96caa42c2eaeaa2d3ff6751865d
-  data.tar.gz: ee874e4d063a1154fa9d3da67c6a07e9add48a32
+  metadata.gz: df96721c6f7e903e772be3b0bcb13e0d350d2d7c
+  data.tar.gz: 0f2cd93c62189cc99dd68c17840b9d7d7c77f50e
 SHA512:
-  metadata.gz: 9a342012f40e2f2943b188c22a2f86bd6cc64288ca2e31f2a29f65e5ad82ff400c95dc88ae0f09b11d62795b9a7c3cfbdd3547d4101bac48d67b450870798396
-  data.tar.gz: 0c319bd24ee8f75e0bd92f20ccde68e7f79d10c9806a7c63b2d82274ef43602d4c43869cd5f4b7a17b414f758ed0d9d547d8e927144b6cdbb0fa400ff8902efa
+  metadata.gz: 28c5cb7d185cf27818f601becdfca46929f60a1759e8c1eea89aa888614244fcf02b238a9e6ff559d0f02753b061b9619060ff5c66cce74d8668dad318b1775f
+  data.tar.gz: fe47682a4916ed1983e81f68c9f520473bb4b0d116da1561165d2cd7e8dbc248df41d63d342e3cf5f007a68bf3aba7b056eab5cecc9356d542b18fcbb0f0f3e2

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/lib/nikki/version.rb

@@ -1,5 +1,5 @@
 # Sets version for RubyGems
 module Nikki
   # Sets version for RubyGems
-  VERSION = '0.5.7'
+  VERSION = '0.6.0'
 end

data/lib/nikki.rb

@@ -1,6 +1,6 @@
 require 'thor'
 require 'pathname'
-require 'yaml'
+require 'yaml/store'
 require 'date'
 require 'fileutils'
 
@@ -8,16 +8,8 @@ require 'fileutils'
 # 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
-  # @!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
-    create_file
-    create_config_file
-  end
-
-  # @!endgroup
+  NIKKI_PATH = Pathname.new("#{ENV['HOME']}/.nikki")
+  NIKKI_FILE = Pathname.new("#{ENV['HOME']}/.nikki/nikki.yaml")
 
   # @!group Data entry
   desc 'new ENTRY', 'Creates a new entry in the Nikki journal.'
@@ -30,21 +22,12 @@ class Generator < Thor
   # Reads the settings in from the config YAML file and changes the
   # date updated.  It does the same with the journal file, reading in the YAML
   # and merging the hash of entries, and then saves the YAML back again.
-  def new(entry, update=nil)
-    settings = read_config
-    if update
-      date = Date.parse(update)
-      settings[:updated] = date
-    else
-      date = today
-      settings[:updated] = today
+  def new(entry, date = Date.today)
+    YAML::Store.new("#{ENV['HOME']}/.nikki/nikki.yaml").transaction do |store|
+      store['entries'] << { date => entry.strip }
     end
-    entry_hash = { date => "\"#{entry}\""}
-    journal = read_file.merge(entry_hash)
-    write_file(journal)
-    open unless updated_yesterday?
-    write_config(settings)
-    puts latest
+
+    ls
   end
 
   desc 'missed', 'Create new entry for yesterday'
@@ -52,14 +35,14 @@ class Generator < Thor
   # @param entry [String]
   # @since 0.5.3
   def missed(entry)
-    new(entry, (Date.today - 1).to_s)
+    new(entry, (Date.today - 1))
   end
   # @!endgroup
 
   desc 'open', "Open current year's journal file in editor."
   # Open Nikki journal in configured text editor
   def open
-    system(ENV['EDITOR'], file.to_s)
+    system(ENV['EDITOR'], NIKKI_FILE.to_s)
   end
 
   desc 'ls', 'Displays latest Nikki entries.'
@@ -67,137 +50,22 @@ class Generator < Thor
   # @return [String]
   # @option options :sticky [String]
   def ls
-    puts latest
-  end
-
-  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."
-  option :print, :aliases => :p, :type => :boolean, :banner => "Prints nikki's config settings."
-  option :latest, :aliases => :l, :type => :boolean, :banner => "Prints latest journal entries."
-  # Configure Nikki's settings
-  # @param [Hash] options The options for configuring Nikki
-  # @option options :editor [String] (read_config[:editor]) Sets Nikki's editor to open journal file
-  # @option options :yesterday [Boolean] Set `settings[:updated]` to yesterday
-  # @option options :today [Boolean] Set `settings[:updated]` to today
-  # @option options :print [Boolean] Prints Nikki's configuration settings to STDOUT
-  # @option options :latest [Boolean] Prints Nikki's latest entries to STDOUT
-  def config
-    settings = read_config
-    settings[:editor] = options[:editor] || read_config[:editor]
-    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 'export YEAR', 'Export Nikki journal from YEAR as YAML'
-  # @param [String] year of journal entries you wish to export
-  def export(year)
-    export_path = "#{path}nikki_export_#{year}.yml"
-    IO.write(export_path, yamlize(read_file, year.to_i))
-    puts "YAML saved to \"#{export_path}\"."
-  end
-
-  no_commands do
-    def path
-      Pathname.new("#{ENV['HOME']}/.nikki/")
-    end
-
-    def create_path
-      path.mkdir unless path.exist?
-    end
-
-    def config_file
-      path.join('nikki.config.yaml')
-    end
-
-    def read_config
-      create_path
-      config_file_exist?
-      YAML.load(config_file.read)
-    end
-
-    def write_config(hash)
-      config_file.open('w') { |t| t << hash.to_yaml }
-    end
-
-    def read_file
-      create_path
-      file_exist?
-      YAML.load(file.read)
-    end
-
-    def write_file(hash)
-      file.write(hash.to_yaml)
-    end
-
-    def editor
-      read_config[:editor]
-    end
-
-    def file
-      path.join('nikki.yaml')
-    end
-
-    def config_file_exist?
-      return true if config_file.exist?
-      create_config_file
-      true
-    end
-
-    def file_exist?
-      return true if file.exist?
-      create_file
-      true
-    end
-
-    def create_config_file
-      settings = {}
-      settings[:updated] = today
-      settings[:editor] = 'TextEdit'
-      write_config(settings)
-    end
-
-    def create_file
-      FileUtils.touch(file)
-    end
-
-    def today
-      Date.today
-    end
-
-    def yesterday
-      Date.today - 1
-    end
-
-    def leap_year?
-      Date.today.leap?
-    end
-
-    def last_updated
-      read_config[:updated]
-    end
-
-    def updated_yesterday?
-      last_updated == Date.today - 1
-    end
-
-    def latest
-      list = []
-      (0..3).each do |n|
-        list << "#{today - n}: #{read_file[today - n]}"
-      end
-      list.reverse!
-    end
-
-    def yamlize(hash, year)
-      string = "---\n"
-      hash.each_pair do |date, sentence|
-        string += "#{date}: \"#{sentence}\"\n" if date.year == year
+    YAML::Store.new(NIKKI_FILE).transaction do |store|
+      entries = store['entries'].last(5)
+      entries.each do |entry|
+        entry.each do |date, text|
+          puts "#{date.to_s}: #{text}"
+        end
       end
-      string
     end
   end
+
+  # desc 'export YEAR', 'Export Nikki journal from YEAR as YAML'
+  # @param [String] year of journal entries you wish to export
+  # def export(year)
+    # TODO Fix this export command
+    # export_path = "#{NIKKI_PATH}/nikki_export_#{year}.yml"
+    # IO.write(export_path, yamlize(read_file, year.to_i))
+    # puts "YAML saved to \"#{export_path}\"."
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nikki
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Brandon Pittman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -76,8 +76,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".tags"
-- ".travis.yml"
 - Gemfile
 - License.txt
 - README.md
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A simple one-line-a-day journaling app.

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.1