nikki 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59f7ffb21026af9fae2f5fe8fc398306b35e37e0
-  data.tar.gz: dcfd25dbed1cb084cd42f04f72d143a8b82861f9
+  metadata.gz: bfaba939a9d1ab7eb954a7754a33e6d8c2a84d6a
+  data.tar.gz: df88a5fe6e5a501c95e4ce08eecee69ad627cd41
 SHA512:
-  metadata.gz: be1b9d0a368b04ed6a016ec0e7abc5528d2fe4e34c95a1e95e8662c6749e4d3f47fd53144084b199efef994a6ed5d90ba3adeaa0c7a965506a1dc275b52f06cd
-  data.tar.gz: 21afd9c5caa97b5864f250b62ca86c4e2c7e9f88931b1553c705708eb85e03ddaf2c7ce46d354dac70925b32e2492d31ec326a255c6a184bab0d2f262fdddda9
+  metadata.gz: 5fa450eb8394858b22cf2da1f1048e02ea1430ac90a20d28284788f444b3db4e8cab33137ffadcc133a56073ddb0263511cf846ed4efef0d4b38200fd524ddbf
+  data.tar.gz: b947019300adc5c52985db99e1e6c88e6cc3f6e9231971f41c841e5eb1492aacdc81aed0019788bc483df779c56ceca40b5da148615bc6ef11cb6f59f6ab316a

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/nikki.png)](http://badge.fury.io/rb/nikki) [![Build Status](https://travis-ci.org/brandonpittman/nikki.png?branch=master)](https://travis-ci.org/brandonpittman/nikki)
+[![Gem Version](https://badge.fury.io/rb/nikki.png)](http://badge.fury.io/rb/nikki)
 
 # nikki
 
@@ -24,8 +24,10 @@ Or install it yourself as:
 
 ## Usage
 
-- nikki help [COMMAND]  # Describe available commands or one specific command
-- nikki new ENTRY       # Creates a new entry in the Nikki journal.
+    nikki config          # Change Nikki's settings.
+    nikki help [COMMAND]  # Describe available commands or one specific command
+    nikki new ENTRY       # Creates a new entry in the Nikki journal.
+    nikki open            # Opens current year's journal file in editor.
 
 ## Contributing
 

data/features/initialize_journal.feature

@@ -1,3 +1,4 @@
+@file_creation
 Feature: Initialize a new config file
   I want more information about exactly when last a journal was updated
   And I want to have a place to save a custom journal location

data/features/new_entry.feature

@@ -1,3 +1,4 @@
+@entry_creation
 Feature: Add a new entry to the journal
 
   Because I'm keeping a daily one-line journal, I want to be able to be able to save a new line with the day of the month next to it.
@@ -5,6 +6,7 @@ Feature: Add a new entry to the journal
 Background:
   Given I have a journal file
 
+@file_creation
 Scenario: I haven't created a journal file
   When the journal file can't be found
   Then a file should be created
@@ -19,6 +21,7 @@ Scenario: I have a journal file and it's *not* the first of the month
   When it's not the first of the month
   Then my entry should be appended along with the day of the month
 
+@missed_day
 Scenario: I didn't update the journal yesterday
   When the mtime of the journal isn't yesterday
   Then the journal should open in my editor

data/lib/nikki/version.rb

@@ -1,3 +1,3 @@
 module Nikki
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/nikki.rb

@@ -7,32 +7,42 @@ module Nikki
   class Generator < Thor
 
     desc "new ENTRY", "Creates a new entry in the Nikki journal."
-    def new(entry)
+    def new(*args)
       settings = read_config
       settings[:updated] = today
+      entry = args.join(" ")
       file.open('a') { |file| file.puts text(entry)}
       open unless updated_yesterday?
       write_config(settings)
     end
 
-    desc "open", "Opens current year's journal file in editor."
+    desc "open", "Open current year's journal file in editor."
+    option :marked, :aliases => :m, :type => :boolean
     def open
-      %x{open -a "#{editor}" #{file}}
+      if options[:marked]
+        %x{open -a Marked #{file}}
+      else
+        %x{open -a "#{editor}" #{file}}
+      end
     end
 
     desc "config", "Change Nikki's settings."
     option :editor, :aliases => :e
+    option :yesterday, :aliases => :y, :type => :boolean
+    option :today, :aliases => :t, :type => :boolean
+    option :display, :aliases => :d, :type => :boolean
     def config
       settings = read_config
-      settings[:editor] = options[:editor] || 'TextEdit'
+      settings[:editor] = options[:editor] || read_config[:editor]
+      settings[:updated] = Date.today-1 if options[:yesterday]
+      settings[:updated] = Date.today if options[:today]
+      puts settings.to_yaml
       write_config(settings)
     end
 
     no_commands do
       def path
-        dropbox = Pathname.new("#{ENV['HOME']}/Dropbox/")
         home = Pathname.new("#{ENV['HOME']}/")
-        path = dropbox.exist? ? dropbox : home
       end
 
       def config_file
@@ -80,6 +90,10 @@ module Nikki
         FileUtils.touch(file)
       end
 
+      def marked
+        Pathname.new("/Applications/Marked.app")
+      end
+
       def today
         Date.today
       end
@@ -109,4 +123,4 @@ module Nikki
       end
     end
   end
-end
+end

data/test/tc_nikki.rb

@@ -7,6 +7,10 @@ class NikkiTest < MiniTest::Unit::TestCase
 
   include Nikki
 
+  nikki = Generator.new
+  FileUtils.rm(nikki.file) if nikki.file_exist?
+  FileUtils.rm(nikki.config_file) if nikki.config_file_exist?
+
   def test_file_exist?
     nikki = Generator.new
     assert_equal(true,nikki.file_exist?)
@@ -19,7 +23,10 @@ class NikkiTest < MiniTest::Unit::TestCase
 
   def test_updated_yesterday?
     nikki = Generator.new
-    assert(nikki.updated_yesterday?)
+    settings = nikki.read_config
+    settings[:updated] = nikki.today-1
+    nikki.write_config(settings)
+    assert(nikki.updated_yesterday?,"Journal wasn't updated last yesterday.")
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nikki
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Pittman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple one-line-a-day journaling app.