nikki 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a4942b6497d674f4f13d34edfaf921c16c83b3
-  data.tar.gz: 8405b9f8aee38bbe34ad0b2166679b092df21d1e
+  metadata.gz: 22e9ec05ef7c2c6377e09a369737484738e16977
+  data.tar.gz: 8c2394c8acf04ac17db101331f156757cb1e19b9
 SHA512:
-  metadata.gz: 8774c8bb643a5896c88394b72acbaa19345f4c196f3e41d257cccc44114d6625b5c282c6069f4377f3d16fc0f72093d250c496cd084adb773b389acf9599cc4a
-  data.tar.gz: 0f80bc207652527b4e8abf25750e67c88558b14fd3587cba7c41549daf868eb714555b6da2a1b70ca7eb1ae20dfe38ed97c2dda7ad2334c7fe9179be5b3d1660
+  metadata.gz: 590970d7ce10dc01d2e2521e4fa0f7ea44a192bb7a7fb4db656ad41b8ed82e8de85773aabb09ffc8cdd046524c18b18e444a5bb67b57333610e327da63b1812d
+  data.tar.gz: 4b231dd0bda49aa1db7ca63c09830384cbb550810ef1e1d8fabaf770fbe54059787d37715cd0a54b73f1703cf45ff9fd46cd7e3f67bb7d7e89f69ceb2611e594

data/lib/nikki/version.rb

@@ -1,3 +1,3 @@
 module Nikki
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/nikki.rb

@@ -2,19 +2,17 @@ require 'thor'
 require "pathname"
 require "yaml"
 require "date"
-require 'time'
 
 module Nikki
   class Generator < Thor
-    @@config = nil
 
     desc "new ENTRY", "Creates a new entry in the Nikki journal."
     def new(entry)
       file.open('a') { |file| file.puts text(entry)}
       open unless updated_yesterday?
-      @@config = config
-      @@config[:updated] = Date.today
-      config_file.open('w') { |t| t << @@config.to_yaml }
+      settings = read_config
+      settings[:updated] = today
+      write_config(settings)
     end
 
     desc "open", "Opens current year's journal file in editor."
@@ -22,12 +20,12 @@ module Nikki
       %x{open -a "#{editor}" #{file}}
     end
 
-    desc "setup", "Change Nikki's settings."
+    desc "config", "Change Nikki's settings."
     option :editor, :aliases => :e
-    def setup
-      @@config = config
-      @@config[:editor] = options[:editor] || 'TextEdit'
-      config_file.open('w') { |t| t << @@config.to_yaml }
+    def config
+      settings = read_config
+      settings[:editor] = options[:editor] || 'TextEdit'
+      write_config(settings)
     end
 
     no_commands do
@@ -41,13 +39,17 @@ module Nikki
         path.join(".nikki.config.yaml")
       end
 
-      def config
+      def read_config
         config_file_exist?
         YAML.load(config_file.read)
       end
 
+      def write_config(hash)
+        config_file.open('w') { |t| t << hash.to_yaml }
+      end
+
       def editor
-        config[:editor]
+        read_config[:editor]
       end
 
       def file
@@ -91,7 +93,7 @@ module Nikki
       end
 
       def updated_yesterday?
-        config[:updated] == Date.today-1
+        read_config[:updated] == Date.today-1
       end
 
       def text(entry)

data/nikki.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = ['nikki']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
   spec.add_dependency "thor", "~> 0.18"
 
   spec.add_development_dependency "bundler", "~> 1.5"

data/test/tc_nikki.rb

@@ -1,6 +1,7 @@
 require "minitest/autorun"
 require "minitest/unit"
 require "nikki"
+require 'fileutils'
 
 class NikkiTest < MiniTest::Unit::TestCase
 
@@ -11,10 +12,13 @@ class NikkiTest < MiniTest::Unit::TestCase
     assert_equal(true,nikki.file_exist?)
   end
 
+  def test_read_config
+    nikki = Generator.new
+    assert(nikki.read_config.class == Hash)
+  end
+
   def test_updated_yesterday?
     nikki = Generator.new
-    file = nikki.file
-    FileUtils.touch(file, :mtime => Time.now-86000)
     assert(nikki.updated_yesterday?)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nikki
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brandon Pittman
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A simple one-line-a-day journaling app.