retter 0.2.2 → 0.2.3

data/retter.gemspec

@@ -1,55 +1,46 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "retter/version"
-
-Gem::Specification.new do |s|
-  s.name        = "retter"
-  s.version     = Retter::VERSION
-  s.authors     = ["hibariya", "uzura29"]
-  s.email       = ["celluloid.key@gmail.com"]
-  s.homepage    = "https://github.com/hibariya/retter"
-  s.summary     = %q{Flyweight diary workflow}
-  s.description = %q{Flyweight diary workflow. ruby-1.9.2 or later is required.}
-
-
-  s.post_install_message = <<-EOM
-    -- Thanks for flying Retter :-> --
-
-    Pygments syntax highlight is now available.
-    To use, add a following line to Retterfile.
-
-    ```ruby
-    renderer Retter::Renderers::PygmentsRenderer
-    ```
-  EOM
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_runtime_dependency 'thor', ['>= 0.14.6']
-  s.add_runtime_dependency 'builder', ['>= 3.0.0']
-  s.add_runtime_dependency 'redcarpet', ['>= 2.0.0b3']
-  s.add_runtime_dependency 'coderay', ['>= 0.9.8']
-  s.add_runtime_dependency 'pygments.rb', ['>= 0.2.7']
-  s.add_runtime_dependency 'nokogiri', ['>= 1.5.0']
-  s.add_runtime_dependency 'launchy', ['>= 2.0.5']
-  s.add_runtime_dependency 'haml', ['>= 3.1.3']
-  s.add_runtime_dependency 'tilt', ['>= 1.1.3']
-  s.add_runtime_dependency 'bundler', ['>= 1.0']
-  s.add_runtime_dependency 'grit', ['>= 2.4.1']
-  s.add_runtime_dependency 'chronic', ['>= 0.6.7']
-  s.add_runtime_dependency 'activesupport', ['>= 3.1.0']
-
-  # XXX for ActiveSupport dependency
-  s.add_runtime_dependency 'rack', ['>= 1.4.1']
-  s.add_runtime_dependency 'i18n', ['>= 0.6.0']
-
-  s.add_development_dependency 'rake', ['>= 0.9.2']
-  s.add_development_dependency 'ir_b', ['>= 1.4.0']
-  s.add_development_dependency 'tapp', ['>= 1.1.0']
-  s.add_development_dependency 'rspec', ['>= 2.6.0']
-  s.add_development_dependency 'fuubar', ['>= 0.0.6']
-  s.add_development_dependency 'simplecov', ['>= 0.5.3']
+$:.push File.expand_path('../lib', __FILE__)
+require 'retter/version'
+
+Gem::Specification.new do |gem|
+  gem.name        = 'retter'
+  gem.version     = Retter::VERSION
+  gem.authors     = ['hibariya', 'uzura29']
+  gem.email       = ['celluloid.key@gmail.com']
+  gem.homepage    = 'https://github.com/hibariya/retter'
+  gem.summary     = %q{Flyweight diary workflow}
+  gem.description = %q{Flyweight diary workflow. ruby-1.9.2 or later is required.}
+
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ['lib']
+
+  gem.required_ruby_version = '>= 1.9.1'
+
+  gem.add_runtime_dependency 'thor',          ['>= 0.15.2']
+  gem.add_runtime_dependency 'builder',       ['>= 3.0.0']
+  gem.add_runtime_dependency 'redcarpet',     ['>= 2.1.1']
+  gem.add_runtime_dependency 'coderay',       ['>= 1.0.7']
+  gem.add_runtime_dependency 'pygments.rb',   ['>= 0.2.13']
+  gem.add_runtime_dependency 'nokogiri',      ['>= 1.5.3']
+  gem.add_runtime_dependency 'launchy',       ['>= 2.1.0']
+  gem.add_runtime_dependency 'haml',          ['>= 3.1.6']
+  gem.add_runtime_dependency 'tilt',          ['>= 1.3.3']
+  gem.add_runtime_dependency 'bundler',       ['>= 1.1.4']
+  gem.add_runtime_dependency 'grit',          ['>= 2.5.0']
+  gem.add_runtime_dependency 'chronic',       ['>= 0.6.7']
+  gem.add_runtime_dependency 'activesupport', ['>= 3.2.5']
+
+  # XXX for ActiveSupport dependencies
+  gem.add_runtime_dependency 'rack',          ['>= 1.4.1']
+  gem.add_runtime_dependency 'i18n',          ['>= 0.6.0']
+
+  gem.add_development_dependency 'rake',      ['>= 0.9.2']
+  gem.add_development_dependency 'ir_b',      ['>= 1.5.0']
+  gem.add_development_dependency 'tapp',      ['>= 1.3.1']
+  gem.add_development_dependency 'rspec',     ['>= 2.10.0']
+  gem.add_development_dependency 'fuubar',    ['>= 1.0.0']
+  gem.add_development_dependency 'simplecov', ['>= 0.6.4']
+  gem.add_development_dependency 'delorean',  ['>= 2.0.0']
 end

data/spec/command/callback_spec.rb

@@ -3,15 +3,25 @@
 require 'spec_helper'
 
 describe 'Retter::Command#callback', clean: :all do
-  before do
-    Retter.config.after(:edit) { commit }
+  context 'invoke with proc' do
+    specify 'callback should called' do
+      command.should_receive(:commit)
 
-    command.stub!(:options) { {after: :edit} }
+      invoke_command :callback, after: :edit do |config|
+        config.after :edit do
+          commit
+        end
+      end
+    end
   end
 
-  specify 'callback should called' do
-    command.should_receive(:commit)
+  context 'invoke with symbol' do
+    specify 'callback should called' do
+      command.should_receive(:commit)
 
-    command.callback
+      invoke_command :callback, after: :edit do |config|
+        config.after :edit, :commit
+      end
+    end
   end
 end

data/spec/command/clean_spec.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+describe 'Retter::Command#clean', clean: :all do
+  let(:cache_path) { %(#{Retter::Site.config.cache.cache_path}/*) }
+
+  before do
+    write_to_wip_file 'hi'
+
+    invoke_command :rebind
+    flunk if Dir.glob(cache_path).empty?
+
+    invoke_command :clean
+  end
+
+  subject { Dir.glob(cache_path) }
+
+  it { should be_empty }
+end

data/spec/command/commit_spec.rb

@@ -4,22 +4,25 @@ require 'spec_helper'
 require 'grit'
 
 describe 'Retter::Command#commit', clean: :all do
-  let(:repo) { Grit::Repo.new(Retter.config.retter_home) }
+  let(:retter_home) { Retter::Site.config.retter_home }
+  let(:repo) { Grit::Repo.new(retter_home) }
   let(:article) { '今日の記事' }
 
   before do
     command.stub!(:say) { true }
-    wip_file.open('w') {|f| f.puts article }
-    command.rebind
 
-    Grit::Repo.init Retter.config.retter_home.to_path
+    write_to_wip_file article
+
+    invoke_command :rebind
+
+    Grit::Repo.init retter_home.to_path
   end
 
   context 'with no options' do
     before do
-      command.should_receive(:invoke_after).with(:commit)
+      command.should_receive(:after_callback).with(:commit)
 
-      command.commit
+      invoke_command :commit
     end
 
     subject { repo.commits.first }
@@ -28,14 +31,10 @@ describe 'Retter::Command#commit', clean: :all do
   end
 
   context 'with silent option' do
-    before do
-      command.stub!(:options) { {silent: true} }
-    end
-
     specify 'callback should not called' do
-      command.should_not_receive(:invoke_after)
+      command.should_not_receive(:after_callback).with(:commit)
 
-      command.commit
+      invoke_command :commit, silent: :true
     end
   end
 end

data/spec/command/edit_spec.rb

@@ -5,23 +5,25 @@ require 'spec_helper'
 describe 'Retter::Command#edit', clean: :all do
   context 'no options' do
     before do
-      command.should_receive(:invoke_after).with(:edit)
-      command.edit
+      command.should_receive(:after_callback).with(:edit)
+
+      invoke_command :edit
     end
 
     it { wip_file.should written }
   end
 
   context 'after edit and rebind (no options)' do
-    let(:today) { '20110101' }
-    let(:today_entry) { Retter.entries.detect_by_string(today) }
+    let(:date_str)    { '2011/01/01' }
+    let(:today_entry) { find_entry_by_string(date_str) }
 
     before do
-      stub_time today
-      today_entry.pathname.open('w') { |f| f.puts 'written' }
-      command.rebind
+      time_travel_to date_str
+
+      today_entry.path.open('w') { |f| f.puts 'written' }
 
-      command.edit
+      invoke_command :rebind
+      invoke_command :edit
     end
 
     specify 'wip file should not be written' do
@@ -30,17 +32,14 @@ describe 'Retter::Command#edit', clean: :all do
   end
 
   context 'with date (YYYYMMDD) option' do
-    let(:date_str) { '20110101' }
-    let(:date) { Date.parse(date_str) }
-
     before do
-      command.edit date_str
+      invoke_command :edit, '20110101'
     end
 
     it { wip_file.should_not written }
 
     describe 'date file' do
-      subject { Retter.entries.retter_file(date) }
+      subject { markdown_file('20110101' ) }
 
       it { should written }
     end
@@ -48,15 +47,13 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'with date (1.day.ago) option' do
     before do
-      stub_time '2011/04/02'
+      time_travel_to '2011/04/02'
 
-      command.edit '1.day.ago'
+      invoke_command :edit, '1.day.ago'
     end
 
     describe 'target date file' do
-      let(:one_day_ago) { Date.parse('2011/04/01') }
-
-      subject { Retter.entries.retter_file(one_day_ago) }
+      subject { markdown_file('2011/04/01') }
 
       it { should written }
     end
@@ -64,33 +61,29 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'with date (yesterday) option' do
     before do
-      stub_time '2011/04/02'
+      time_travel_to '2011/04/02'
 
-      command.edit 'yesterday'
+      invoke_command :edit, 'yesterday'
     end
 
     describe 'target date file' do
-      let(:yesterday) { Date.parse('2011/04/01') }
-
-      subject { Retter.entries.retter_file(yesterday) }
+      subject { markdown_file('2011/04/01') }
 
       it { should written }
     end
   end
 
   context 'with filename (20110401.md) option' do
-    let(:a_day) { Date.parse('20110401') }
-
     before do
-      FileUtils.touch Retter.entries.retter_file(a_day)
+      FileUtils.touch markdown_file('20110401')
 
-      Retter.reset! # XXX
+      Retter::Site.reset! # XXX
 
-      command.edit '20110401.md'
+      invoke_command :edit, '20110401.md'
     end
 
     describe 'target date file' do
-      subject { Retter.entries.retter_file(a_day) }
+      subject { markdown_file('20110401') }
 
       it { should written }
     end
@@ -98,30 +91,27 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'with no exist filename option' do
     it {
-      -> { command.edit '19850126.md' }.should raise_error(Retter::EntryLoadError)
+      -> { invoke_command :edit, '19850126.md' }.should raise_error(Retter::EntryLoadError)
     }
   end
 
   context 'with filename (today.md) option' do
     before do
-      FileUtils.touch Retter.config.wip_file.to_path
+      FileUtils.touch wip_file.to_path
 
-      command.edit 'today.md'
+      invoke_command :edit, 'today.md'
     end
 
     describe 'target file' do
-      subject { Retter.config.wip_file }
-
-      it { should written }
+      it { wip_file.should written }
     end
   end
 
   context 'with silent option' do
     before do
-      command.stub!(:options) { {silent: true} }
+      command.should_not_receive(:after_callback)
 
-      command.should_not_receive(:invoke_after)
-      command.edit
+      invoke_command :edit, silent: true
     end
 
     it { wip_file.should written }

data/spec/command/list_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'Retter::Command#list', clean: :all do
   context 'happy case' do
     before do
-      Retter.entries.retter_file(Date.parse('20110101')).open('w') do |f|
+      markdown_file('20110101').open('w') do |f|
         f.puts <<-EOM
 # 朝11時
 
@@ -17,7 +17,7 @@ describe 'Retter::Command#list', clean: :all do
         EOM
       end
 
-      Retter.entries.retter_file(Date.parse('20110222')).open('w') do |f|
+      markdown_file('20110222').open('w') do |f|
         f.puts <<-EOM
 # 朝11時30分
 
@@ -29,10 +29,10 @@ describe 'Retter::Command#list', clean: :all do
         EOM
       end
 
-      Retter.reset! # XXX
+      Retter::Site.reset! # XXX
     end
 
-    subject { capture(:stdout) { command.list }.split(/\n+/) }
+    subject { capture(:stdout) { invoke_command :list }.split(/\n+/) }
 
     its([0]) { should match /\[e0\]\s+2011\-02\-22/ }
     its([1]) { should match /朝11時30分, 夜1時30分/ }

data/spec/command/open_spec.rb

@@ -5,8 +5,8 @@ require 'launchy'
 
 describe 'Retter::Command#open', clean: :all do
   specify 'should be open application' do
-    Launchy.should_receive(:open).with(Retter.config.retter_home.join('index.html').to_path)
+    Launchy.should_receive(:open).with(generated_file('index.html').to_path)
 
-    command.open
+    invoke_command :open
   end
 end

data/spec/command/preview_spec.rb

@@ -4,9 +4,7 @@ require 'spec_helper'
 require 'launchy'
 
 describe 'Retter::Command#preview', clean: :all do
-  def preview_html
-    Retter.config.retter_home.join('.preview.html').read
-  end
+  let(:preview_html) { generated_file('.preview.html').read }
 
   before do
     Launchy.should_receive(:open).with(anything)
@@ -14,9 +12,9 @@ describe 'Retter::Command#preview', clean: :all do
 
   context 'no options' do
     before do
-      wip_file.open('w') {|f| f.puts 'w00t!' }
+      write_to_wip_file 'w00t!'
 
-      command.preview
+      invoke_command :preview
     end
 
     subject { texts_of(preview_html, 'article p') }
@@ -25,21 +23,18 @@ describe 'Retter::Command#preview', clean: :all do
   end
 
   context 'with date option' do
-    let(:date_str) { '20110101' }
-    let(:date_file) { Retter.entries.retter_file(Date.parse(date_str)) }
+    let(:date_file) { markdown_file('20110101') }
 
     before do
-      wip_file.open('w') {|f| f.puts 'w00t!' }
+      write_to_wip_file 'w00t!'
       date_file.open('w') {|f| f.puts 'preview me' }
 
-      command.stub!(:options) { {date: date_str} }
-
-      command.preview
+      invoke_command :preview, date: '20110101'
     end
 
     subject { texts_of(preview_html, 'article p') }
 
     it { should_not include 'w00t!' }
-    it { should include 'preview me' }
+    it { should     include 'preview me' }
   end
 end