woli 0.0.1.pre1 → 0.0.1

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# woli changelog
+
+## v0.0.1
+
+* First kinda usable version.

data/README.md

@@ -4,13 +4,13 @@ Geek's diary keeper, currently in pre-alpha state :)
 
 ## Why would a grown person keep a diary?
 
-*   The ability to recall why a particular time of our life was worth living is crucial for your
+*   The ability to recall why a particular time of your life was worth living is crucial for your
     long term happiness. Can you recall what you did during this week four years ago? If you can't,
     it doesn't mean the week was not worth living, but it does mean that you can't derive a feeling
     of happiness and satisfaction from knowing *why* it was worth living. Keeping a diary helps you
     recall. You won't lose memories that are worth keeping.
 
-*   A diary helps you reflect on how you spent your time. In a long run, keeping a diary increases
+*   A diary helps you reflect on how you spent your time. In the long run, keeping a diary increases
     your ability to recognize what's really important for you, what makes you happy. You will be
     able to shape your days to contain more of those happy moments and important stuff. You will
     be able to point your life in a direction that will bring you satisfaction and happiness.

data/bin/woli

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems" # ruby1.9 doesn't "require" it though
 
-require 'woli/cli'
+require 'woli/cli/runner'
 
-Woli::Cli.start
+Woli::Cli::Runner.start

data/lib/woli.rb

@@ -9,7 +9,7 @@ require "woli/repositories/files"
 
 module Woli
   def self.config
-    @config ||= Woli::Config.load_user_config
+    @config ||= Woli::Config.load_config
   end
 
   def self.diary

data/lib/woli/cli/date_parser.rb

@@ -0,0 +1,44 @@
+module Woli
+  module Cli
+    module DateParser
+      def self.parse_date_long_desc
+        <<-END
+          Specifying DAY:
+
+          1) Implicitly: If no date is given, 'today' is assumed.
+
+          2) Via a keyword: woli edit DAYNAME
+          (Where DAYNAME can be:
+          'today' or 't';
+          'yesterday' or 'y')
+
+          3) Via a date: woli edit DD[-MM[-YYYY]]
+          (Use hyphens, dots or slashes to separate day/month/year.
+          If year or month is not given, current year / current month is assumed.)
+
+          4) Via days ago: woli edit ^DAYS
+          (Where DAYS is a number of days ago. ^1 is yesterday, ^7 is a week ago etc.)
+        END
+      end
+
+      def self.parse_date(fuzzy_date)
+        case fuzzy_date
+        when 'today', 't'
+          Date.today
+        when 'yesterday', 'y'
+          Date.today - 1
+        when /\A\^(?<days_ago>\d+)/
+          Date.today - Integer($~[:days_ago])
+        when /\A(?<day>\d+)([-\.\/](?<month>\d+)([-\.\/](?<year>\d+))?)?\Z/
+          today = Date.today
+          year = $~[:year] ? Integer($~[:year]) : today.year
+          month = $~[:month] ? Integer($~[:month]) : today.month
+          day = $~[:day] ? Integer($~[:day]) : today.day
+          Date.new(year, month, day)
+        else
+          raise Thor::MalformattedArgumentError, "'#{fuzzy_date}' is not a valid way to specify a date."
+        end
+      end
+    end
+  end
+end

data/lib/woli/cli/runner.rb

@@ -0,0 +1,16 @@
+require 'woli'
+require 'woli/cli/date_parser'
+require 'thor'
+
+module Woli
+  module Cli
+    class Runner < Thor
+    end
+  end
+end
+
+require 'woli/cli/runner_edit'
+require 'woli/cli/runner_init'
+require 'woli/cli/runner_list'
+require 'woli/cli/runner_notify'
+require 'woli/cli/runner_status'

data/lib/woli/cli/runner_edit.rb

@@ -0,0 +1,45 @@
+module Woli
+  module Cli
+    class Runner
+      desc 'edit DAY', 'Edit a diary entry for a given day.'
+      long_desc <<-END
+        Edit a diary entry for a given day.
+
+        #{DateParser.parse_date_long_desc}
+      END
+      def edit(fuzzy_date = 'today')
+        date = DateParser.parse_date(fuzzy_date)
+        entry = Woli.diary.load_or_create_entry(date)
+
+        temp_file_name = generate_temp_file_name(entry)
+        save_text_to_temp_file(entry, temp_file_name)
+        edit_file_in_editor(temp_file_name)
+        load_text_from_temp_file(entry, temp_file_name)
+
+        entry.persist
+      rescue ConfigError => e
+        raise Thor::Error, e.message
+      end
+
+      private
+
+      def save_text_to_temp_file(entry, temp_file_name)
+        File.write(temp_file_name, entry.text)
+      end
+
+      def load_text_from_temp_file(entry, temp_file_name)
+        entry.text = File.read(temp_file_name)
+        File.delete(temp_file_name)
+      end
+
+      def generate_temp_file_name(entry)
+        "/tmp/woli_edit_entry_#{entry.date.strftime('%Y_%m_%d')}.#{Woli.config['edit_entry_extension']}"
+      end
+
+      def edit_file_in_editor(file_name)
+        tty = `tty`.strip
+        `#{Woli.editor} < #{tty} > #{tty} #{file_name}`
+      end
+    end
+  end
+end

data/lib/woli/cli/runner_init.rb

@@ -0,0 +1,18 @@
+module Woli
+  module Cli
+    class Runner
+      desc 'init', 'Initialize Woli for this user.'
+      long_desc <<-END
+        Creates a ~/.woli directory with Woli configuration.
+      END
+      def init
+        created_config_file_path = Woli::Config.create_config_file_from_template
+        if created_config_file_path
+          say "Default config file created at #{created_config_file_path}."
+        else
+          say "Config file already exists."
+        end
+      end
+    end
+  end
+end

data/lib/woli/cli/runner_list.rb

@@ -0,0 +1,14 @@
+module Woli
+  module Cli
+    class Runner
+      desc 'list', 'List dates for which there are entries in the diary.'
+      def list
+        Woli.diary.all_entries_dates.each do |date|
+          say date.strftime('%d-%m-%Y')
+        end
+      rescue ConfigError => e
+        raise Thor::Error, e.message
+      end
+    end
+  end
+end

data/lib/woli/cli/runner_notify.rb

@@ -0,0 +1,16 @@
+module Woli
+  module Cli
+    class Runner
+      desc 'notify', 'Get notified when you forget to write entries.'
+      def notify
+        notify_config = Woli.config['notification']['missing_entries']
+
+        if Woli.diary.missing_entries_count >= notify_config['days']
+          `#{notify_config['command']}`
+        end
+      rescue ConfigError => e
+        raise Thor::Error, e.message
+      end
+    end
+  end
+end

data/lib/woli/cli/runner_status.rb

@@ -0,0 +1,26 @@
+module Woli
+  module Cli
+    class Runner
+      desc 'status', 'Print basic information about the diary.'
+      def status
+        entries_dates = Woli.diary.all_entries_dates
+        date_format = '%d-%m-%Y'
+
+        say "Woli Diary Status"
+        say "================="
+
+        if entries_dates.count > 0
+          coverage = entries_dates.count / Float(entries_dates.last - entries_dates.first + 1)
+          say "First entry: #{entries_dates.first.strftime(date_format)}"
+          say "Last entry: #{entries_dates.last.strftime(date_format)}"
+          say "Coverage: %2d %" % (coverage * 100).round
+          say "Missing entries since the last one: #{Woli.diary.missing_entries_count}"
+        else
+          say "Diary is empty. Run 'woli help edit' to learn how to create entries."
+        end
+      rescue ConfigError => e
+        raise Thor::Error, e.message
+      end
+    end
+  end
+end

data/lib/woli/config.rb

@@ -1,19 +1,30 @@
 require 'yaml'
 
 module Woli
-  class Config
+  module Config
     CONFIG_FILE_NAME = "#{ENV['HOME']}/.woli/config.yml"
-    DEFAULT_CONFIG_FILE_NAME = File.join(File.dirname(__FILE__),
+    CONFIG_TEMPLATE_FILE_NAME = File.join(File.dirname(__FILE__),
                                          '../../templates/default_config.yml')
 
-    def self.load_user_config
-      create_default_config_file(CONFIG_FILE_NAME) unless File.exists?(CONFIG_FILE_NAME)
-      YAML.load_file(CONFIG_FILE_NAME)
+    def self.load_config
+      if File.exists?(CONFIG_FILE_NAME)
+        YAML.load_file(CONFIG_FILE_NAME)
+      else
+        raise ConfigError, "Woli not yet initialized. Run 'woli help init' for more info."
+      end
     end
 
-    def self.create_default_config_file(file_name)
-      FileUtils.mkdir_p(File.dirname(file_name))
-      FileUtils.cp(DEFAULT_CONFIG_FILE_NAME, file_name)
+    def self.create_config_file_from_template
+      unless File.exists?(CONFIG_FILE_NAME)
+        FileUtils.mkdir_p(File.dirname(CONFIG_FILE_NAME))
+        FileUtils.cp(CONFIG_TEMPLATE_FILE_NAME, CONFIG_FILE_NAME)
+        CONFIG_FILE_NAME
+      else
+        nil
+      end
     end
   end
+
+  class ConfigError < RuntimeError
+  end
 end

data/lib/woli/diary.rb

@@ -24,7 +24,7 @@ module Woli
     def missing_entries_count
       last_entry_date = @repository.all_entries_dates.last
       return 0 unless last_entry_date
-      Date.today - last_entry_date
+      Integer(Date.today - last_entry_date)
     end
   end
 end

data/lib/woli/version.rb

@@ -1,3 +1,3 @@
 module Woli
-  VERSION = "0.0.1.pre1"
+  VERSION = "0.0.1"
 end

data/spec/woli/{date_parser_spec.rb → cli/date_parser_spec.rb}

@@ -1,9 +1,10 @@
-require_relative '../spec_helper'
-require 'woli/date_parser'
+require_relative '../../spec_helper'
+require 'woli/cli/date_parser'
+require 'thor'
 
-describe Woli::DateParser do
+describe Woli::Cli::DateParser do
   before do
-    @parser = Woli::DateParser
+    @parser = Woli::Cli::DateParser
     @today = Date.new(2012, 7, 15)
     Timecop.freeze(@today)
   end
@@ -12,10 +13,6 @@ describe Woli::DateParser do
     Timecop.return
   end
 
-  it "parses nil as today" do
-    @parser.parse_date(nil).must_equal @today
-  end
-
   it "parses 't' and 'today' as today" do
     @parser.parse_date('t').must_equal @today
     @parser.parse_date('today').must_equal @today
@@ -65,4 +62,8 @@ describe Woli::DateParser do
     date1.must_equal date3
     date1.must_equal date4
   end
+
+  it "raises error for nil" do
+    proc { @parser.parse_date(nil) }.must_raise Thor::MalformattedArgumentError
+  end
 end

data/spec/woli/cli/runner_init_spec.rb

@@ -0,0 +1,22 @@
+require_relative '../../spec_helper'
+require 'woli/cli/runner'
+
+describe Woli::Cli::Runner do
+  before do
+    module Woli::Config ; end
+    @runner = Woli::Cli::Runner.new
+  end
+  describe "init task" do
+    it "creates configuration for the user and informs them" do
+      Woli::Config.expects(:create_config_file_from_template).returns('/home/woli/.woli/config.yml')
+      @runner.expects(:say).with { |text| text =~ %r{created at /home/woli/\.woli/config\.yml} }
+      @runner.init
+    end
+
+    it "informs the user if the config file is already present" do
+      Woli::Config.expects(:create_config_file_from_template).returns(nil)
+      @runner.expects(:say).with { |text| text =~ %r{already exists} }
+      @runner.init
+    end
+  end
+end

data/spec/woli/cli/runner_list_spec.rb

@@ -0,0 +1,35 @@
+require_relative '../../spec_helper'
+require 'woli/cli/runner'
+
+describe Woli::Cli::Runner do
+  before do
+    @diary = mock 'diary'
+    Woli.stubs(:diary).returns(@diary)
+    @runner = Woli::Cli::Runner.new
+  end
+
+  describe "list task" do
+    it "prints dates for all diary entries" do
+      @diary.expects(:all_entries_dates).returns([
+        Date.new(2012, 7, 4),
+        Date.new(2012, 7, 5),
+        Date.new(2012, 7, 6)
+      ])
+      expected_output = [
+        '04-07-2012',
+        '05-07-2012',
+        '06-07-2012'
+      ]
+      @runner.expects(:say).times(3).with do |output|
+        output == expected_output.shift
+      end
+      @runner.list
+    end
+
+    it "doesn't print anything if the diary is empty" do
+      @diary.expects(:all_entries_dates).returns([])
+      @runner.expects(:say).never
+      @runner.list
+    end
+  end
+end

data/spec/woli/cli/runner_status_spec.rb

@@ -0,0 +1,44 @@
+require_relative '../../spec_helper'
+require 'woli/cli/runner'
+
+describe Woli::Cli::Runner do
+  before do
+    @diary = mock 'diary'
+    @diary.stubs(:all_entries_dates).returns([
+      Date.new(2012, 7, 4),
+      Date.new(2012, 7, 6),
+      Date.new(2012, 7, 7)
+    ])
+    @diary.stubs(:missing_entries_count).returns(2)
+    Woli.stubs(:diary).returns(@diary)
+
+    @runner = Woli::Cli::Runner.new
+
+    @output = ''
+    @runner.stubs(:say).with do |to_print|
+      @output << to_print << "\n"
+    end
+  end
+
+  it "prints first and last entry dates" do
+    @runner.status
+    @output.must_match /first entry: 04-07-2012/i
+    @output.must_match /last entry: 07-07-2012/i
+  end
+
+  it "prints entry/day coverage" do
+    @runner.status
+    @output.must_match /coverage: 75 %/i
+  end
+
+  it "prints the number of missing entries since the last one" do
+    @runner.status
+    @output.must_match /missing entries[^:]*: 2/i
+  end
+
+  it "informs of empty diary" do
+    @diary.stubs(:all_entries_dates).returns([])
+    @runner.status
+    @output.must_match /diary is empty/i
+  end
+end

data/spec/woli/diary_spec.rb

@@ -48,6 +48,12 @@ describe Woli::Diary do
   end
 
   describe "#missing_entries_count" do
+    it "returns an Integer" do
+      Timecop.freeze(@repository.all_entries_dates.last + 1) do
+        @diary.missing_entries_count.must_be_kind_of Integer
+      end
+    end
+
     it "returns 0 when the last entry is for today" do
       Timecop.freeze(@repository.all_entries_dates.last) do
         @diary.missing_entries_count.must_equal 0

data/spec/woli_spec.rb

@@ -0,0 +1,116 @@
+require_relative 'spec_helper'
+require 'woli'
+
+describe Woli do
+  describe ".config" do
+    after do
+      module Woli
+        @config = nil
+      end
+    end
+
+    it "returns config when already loaded" do
+      module Woli
+        @config = :fake_config
+      end
+      Woli.config.must_equal :fake_config
+    end
+
+    it "loads config if not loaded yet" do
+      Woli::Config.expects(:load_config).returns(:fake_config)
+      Woli.config.must_equal :fake_config
+    end
+  end
+
+  describe ".diary" do
+    before do
+      module Woli
+        @repository = :fake_repository
+      end
+    end
+
+    after do
+      module Woli
+        @diary = nil
+        @repository = nil
+      end
+    end
+
+    it "returns a diary when already created" do
+      module Woli
+        @diary = :fake_diary
+      end
+      Woli.diary.must_equal :fake_diary
+    end
+
+    it "creates a diary if not created yet" do
+      Woli::Diary.expects(:new).with(:fake_repository).returns(:fake_diary)
+      Woli.diary.must_equal :fake_diary
+    end
+  end
+
+  describe ".editor" do
+    before do
+      @old_env_editor = ENV['EDITOR']
+      module Woli
+        @config = { 'editor' => nil }
+      end
+    end
+
+    after do
+      module Woli
+        @config = nil
+      end
+      ENV['EDITOR'] = @old_env_editor
+    end
+
+    it "returns an editor set in the config file if present" do
+      module Woli
+        @config = { 'editor' => 'strange_editor' }
+      end
+      Woli.editor.must_equal 'strange_editor'
+    end
+
+    it "returns an editor set via environment variable if not set via config file" do
+      ENV['EDITOR'] = 'emacs'
+      Woli.editor.must_equal 'emacs'
+    end
+
+    it "returns vim if no environment variable or config file sets the editor" do
+      ENV['EDITOR'] = nil
+      Woli.editor.must_equal 'vim'
+    end
+  end
+
+  describe ".repository" do
+    before do
+      module Woli
+        @config = {
+          'repository_class' => 'Woli::FakeRepository',
+          'repository_config' => :fake_config
+        }
+
+        class FakeRepository ; end
+      end
+    end
+
+    after do
+      module Woli
+        @config = nil
+        @repository = nil
+      end
+    end
+
+    it "returns repository if already created" do
+      module Woli
+        @repository = :fake_repository
+      end
+      Woli.repository.must_equal :fake_repository
+    end
+
+    it "creates a new repository if not yet created" do
+      Woli::FakeRepository.expects(:new).with(:fake_config).returns(:fake_repository)
+      Woli.repository.must_equal :fake_repository
+    end
+  end
+end

data/woli.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Woli::VERSION
 
-  gem.add_dependency 'thor', '~> 0.15.2'
+  gem.add_dependency 'thor', '>= 0.15'
 
   # == DEVELOPMENT DEPENDENCIES ==
+  gem.add_development_dependency 'rake'
+
   # Smart irb
   gem.add_development_dependency 'pry'
 

metadata

@@ -1,30 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: woli
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre1
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Jiří Stránský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &16096140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *16096140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &16095460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16095460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &16094260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16094260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &16093600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16093600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &16092680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16092680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &16091900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16091900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &16091300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16091300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &16106680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16106680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &16106120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16106120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &16105220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +181,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16105220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    Woli (as in WOrth LIving) helps you record your memories. Write\n
   \   a short note about every day you live and make sure your days are worth\n    living.
   Later, review your notes to bring back the memories.\n    Change your life if you
@@ -133,6 +199,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -140,22 +207,27 @@ files:
 - Rakefile
 - bin/woli
 - lib/woli.rb
-- lib/woli/cli.rb
-- lib/woli/cli/edit.rb
-- lib/woli/cli/list.rb
-- lib/woli/cli/notify.rb
-- lib/woli/cli/status.rb
+- lib/woli/cli/date_parser.rb
+- lib/woli/cli/runner.rb
+- lib/woli/cli/runner_edit.rb
+- lib/woli/cli/runner_init.rb
+- lib/woli/cli/runner_list.rb
+- lib/woli/cli/runner_notify.rb
+- lib/woli/cli/runner_status.rb
 - lib/woli/config.rb
-- lib/woli/date_parser.rb
 - lib/woli/diary.rb
 - lib/woli/diary_entry.rb
 - lib/woli/repositories/files.rb
 - lib/woli/version.rb
 - spec/spec_helper.rb
-- spec/woli/date_parser_spec.rb
+- spec/woli/cli/date_parser_spec.rb
+- spec/woli/cli/runner_init_spec.rb
+- spec/woli/cli/runner_list_spec.rb
+- spec/woli/cli/runner_status_spec.rb
 - spec/woli/diary_entry_spec.rb
 - spec/woli/diary_spec.rb
 - spec/woli/repositories/files_spec.rb
+- spec/woli_spec.rb
 - templates/default_config.yml
 - woli.gemspec
 homepage: http://github.com/jistr/woli
@@ -172,22 +244,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2448595754877266534
+      hash: 218247984176523748
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 218247984176523748
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Woli, the diary keeper.
 test_files:
 - spec/spec_helper.rb
-- spec/woli/date_parser_spec.rb
+- spec/woli/cli/date_parser_spec.rb
+- spec/woli/cli/runner_init_spec.rb
+- spec/woli/cli/runner_list_spec.rb
+- spec/woli/cli/runner_status_spec.rb
 - spec/woli/diary_entry_spec.rb
 - spec/woli/diary_spec.rb
 - spec/woli/repositories/files_spec.rb
+- spec/woli_spec.rb

data/lib/woli/cli.rb

@@ -1,13 +0,0 @@
-require 'woli'
-require 'woli/date_parser'
-require 'thor'
-
-module Woli
-  class Cli < Thor
-  end
-end
-
-require 'woli/cli/edit'
-require 'woli/cli/list'
-require 'woli/cli/notify'
-require 'woli/cli/status'

data/lib/woli/cli/edit.rb

@@ -1,41 +0,0 @@
-module Woli
-  class Cli
-    desc 'edit DAY', 'Edit a diary entry for a given day.'
-    long_desc <<-END
-      Edit a diary entry for a given day.
-
-      #{DateParser.parse_date_long_desc}
-    END
-    def edit(fuzzy_date = 'today')
-      date = DateParser.parse_date(fuzzy_date)
-      entry = Woli.repository.load_entry(date) || DiaryEntry.new(date, '', Woli.repository)
-
-      temp_file_name = generate_temp_file_name(entry)
-      save_text_to_temp_file(entry, temp_file_name)
-      edit_file_in_editor(temp_file_name)
-      load_text_from_temp_file(entry, temp_file_name)
-
-      entry.persist
-    end
-
-    private
-
-    def save_text_to_temp_file(entry, temp_file_name)
-      File.write(temp_file_name, entry.text)
-    end
-
-    def load_text_from_temp_file(entry, temp_file_name)
-      entry.text = File.read(temp_file_name)
-      File.delete(temp_file_name)
-    end
-
-    def generate_temp_file_name(entry)
-      "/tmp/woli_edit_entry_#{entry.date.strftime('%Y_%m_%d')}.#{Woli.config['edit_entry_extension']}"
-    end
-
-    def edit_file_in_editor(file_name)
-      tty = `tty`.strip
-      `#{Woli.editor} < #{tty} > #{tty} #{file_name}`
-    end
-  end
-end

data/lib/woli/cli/list.rb

@@ -1,10 +0,0 @@
-module Woli
-  class Cli
-    desc 'list', 'List dates for which there are entries in the diary.'
-    def list
-      Woli.diary.all_entries_dates.each do |date|
-        puts date.strftime('%d-%m-%Y')
-      end
-    end
-  end
-end

data/lib/woli/cli/notify.rb

@@ -1,12 +0,0 @@
-module Woli
-  class Cli
-    desc 'notify', 'Get notified when you forget to write entries.'
-    def notify
-      notify_config = Woli.config['notification']['missing_entries']
-
-      if Woli.diary.missing_entries_count >= notify_config['days']
-        `#{notify_config['command']}`
-      end
-    end
-  end
-end

data/lib/woli/cli/status.rb

@@ -1,17 +0,0 @@
-module Woli
-  class Cli
-    desc 'status', 'Print basic information about the diary.'
-    def status
-      entries_dates = Woli.diary.all_entries_dates
-      date_format = '%d-%m-%Y'
-      coverage = entries_dates.count / Float(entries_dates.last - entries_dates.first + 1)
-
-      puts "Woli Diary Status"
-      puts "================="
-      puts "First entry: #{entries_dates.first.strftime(date_format)}"
-      puts "Last entry: #{entries_dates.last.strftime(date_format)}"
-      puts "Coverage: %2d %" % (coverage * 100).round
-      puts "Missing entries since the last one: #{Woli.diary.missing_entries_count}"
-    end
-  end
-end

data/lib/woli/date_parser.rb

@@ -1,44 +0,0 @@
-module Woli
-  module DateParser
-    def self.parse_date_long_desc
-      <<-END
-        Specifying DAY:
-
-        1) Implicitly: If no date is given, 'today' is assumed.
-
-        2) Via a keyword: woli edit DAYNAME
-        (Where DAYNAME can be:
-        'today' or 't';
-        'yesterday' or 'y')
-
-        3) Via a date: woli edit DD[-MM[-YYYY]]
-        (Use hyphens, dots or slashes to separate day/month/year.
-        If year or month is not given, current year / current month is assumed.)
-
-        4) Via days ago: woli edit ^DAYS
-        (Where DAYS is a number of days ago. ^1 is yesterday, ^7 is a week ago etc.)
-      END
-    end
-
-    def self.parse_date(fuzzy_date)
-      case fuzzy_date
-      when 'today', 't', nil
-        Date.today
-      when 'yesterday', 'y'
-        Date.today - 1
-      when /\A\^(?<days_ago>\d+)/
-        Date.today - Integer($~[:days_ago])
-      when /\A(?<day>\d+)([-\.\/](?<month>\d+)([-\.\/](?<year>\d+))?)?\Z/
-        today = Date.today
-        year = $~[:year] ? Integer($~[:year]) : today.year
-        month = $~[:month] ? Integer($~[:month]) : today.month
-        day = $~[:day] ? Integer($~[:day]) : today.day
-        Date.new(year, month, day)
-      else
-        self.class.task_help(shell, 'edit')
-        puts
-        raise MalformattedArgumentError, "'#{fuzzy_date}' is not a valid way to specify a date."
-      end
-    end
-  end
-end