morning-pages 0.2.1 → 0.2.2

data/bin/morning-pages

@@ -2,13 +2,13 @@
 $: << File.dirname(__FILE__) + '/../lib'
 
 require 'trollop'
-require 'fileutils'
 require 'morning-pages'
 
 opts = Trollop.options do
   opt :dir, "Words directory", :required => false, :type => :string, :default => "~/words"
 end
 
+opts[:dir] = File.expand_path(opts[:dir])
 MorningPages.setup(opts)
 
 path = MorningPages.today_path(opts[:dir])

data/features/step_definitions/steps.rb

@@ -9,7 +9,7 @@ Then /^I should be able to write my words$/ do
   check_exact_file_content "#{@dir}/#{Time.now.strftime("%Y\-%m\-%d")}", "fake editor output"
 end
 
-Then /^I see my current word count after I finish$/ do
+Then /^I see my current word stats after I finish$/ do
   all_output.should match(/3 words/)
 end
 

data/features/writing_words.feature

@@ -6,4 +6,4 @@ Feature: writing words
   Scenario:
     When I run 'morning-pages'
     Then I should be able to write my words
-    And I see my current word count after I finish
+    And I see my current word stats after I finish

data/lib/morning-pages/version.rb

@@ -1,3 +1,3 @@
 module MorningPages
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/morning-pages.rb

@@ -1,9 +1,14 @@
 require "morning-pages/version"
+require 'fileutils'
 
 class Array
   def mean
     inject(0, &:+) / count.to_f
   end
+
+  def average_length
+    map(&:length).mean
+  end
 end
 
 module MorningPages
@@ -12,11 +17,22 @@ module MorningPages
   end
 
   def self.stats_for_today(dir)
-    words = File.read(today_path(dir)).split(" ")
-    "You have written #{words.count} words today. Average word length: %.2f" % [ words.map(&:length).mean ]
+    words = get_words_for(today_path(dir)).split(" ")
+    [
+      "You have written #{words.count} words today.",
+      average_word_length(words)
+    ].join(" ")
+  end
+
+  def self.average_word_length(words)
+    words.empty? ? "" : "Average word length: %.2f" % [ words.average_length ]
   end
 
   def self.today_path(dir)
     File.expand_path([dir, Time.now.strftime("%Y\-%m\-%d")].join('/'))
   end
+
+  def self.get_words_for(path)
+    File.exists?(path) ? File.read(path) : ""
+  end
 end

data/morning-pages.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Command line helper to write your morning pages}
   s.description = %q{I've long been fascinated by the morning pages habit of writing three pages (or about 750 words) of whatever comes into your head each day - it's like taking a mental showers and helps to clear your head, ready for the day. There are great sites out there like http://750words.com, but I live on the command line and like to keep my words on my own computer.
   
-  When installed, type `morning-pages help` for more info.}
+  When installed, type `morning-pages -h` for more info.}
 
   s.rubyforge_project = "morning-pages"
 

data/spec/stats_spec.rb

@@ -3,14 +3,31 @@ require 'morning-pages'
 module MorningPages
   describe 'stats' do
     context 'for today' do
+      before(:each) do
+        File.stub(:exists? => true)
+        File.stub(:read => "foo ba")
+      end
+
       it 'prints out the word count' do
-        File.stub(:read => "foo bar")
-        MorningPages.stats_for_today("/tmp").should match(/2 words/)
+        MorningPages.stats_for_today("foo").should match(/2 words/)
       end
 
       it 'prints the average word length' do
-        File.stub(:read => "foo ba")
-        MorningPages.stats_for_today("/tmp").should match(/2\.5/)
+        MorningPages.stats_for_today("foo").should match(/2\.5/)
+      end
+
+      context 'when today has no words yet' do
+        before do
+          File.stub(:exists? => false)
+        end
+
+        it "shows a message to that effect" do
+          MorningPages.stats_for_today("foo").should match(/0 words/)
+        end
+
+        it "does not show average" do
+          MorningPages.stats_for_today("foo").should_not match(/NaN/)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morning-pages
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -96,7 +96,7 @@ description: ! "I've long been fascinated by the morning pages habit of writing
   taking a mental showers and helps to clear your head, ready for the day. There are
   great sites out there like http://750words.com, but I live on the command line and
   like to keep my words on my own computer.\n  \n  When installed, type `morning-pages
-  help` for more info."
+  -h` for more info."
 email:
 - chris.p@rsons.org
 executables: