noir 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf37cb436e6fa50b65f833bcecc28b459fc4c8f
-  data.tar.gz: b7186bffbd09eca787d78040bbbbe9f4edd823d5
+  metadata.gz: 37c60ade454a8bfe945bcdc6aa9f227675cbc191
+  data.tar.gz: 913ccc77f719e326d6a6a0624e11903ec4c9d403
 SHA512:
-  metadata.gz: 2e454b33b7edd35c77c371d645dc3e30763edea37205c8d7fd5d08094a3ba97391c05d2f500509000413160d60c1c5e1ba333c8118428bf64f629e90eaf2e255
-  data.tar.gz: 9ab600c4cecc3ebec37933465269081c58f784f4258e36c88ff139b87b1ac73c8db598004bb1f547072ee01922e269746687318f1242c8280488f5ca3dd8da6d
+  metadata.gz: b426b2c916464cde1309f7097d45b3062bdbb7de12e51da7a78755b4175a62359f389695b5600cacf588bdf99f57357a78ba9287b89b86f3773f5d971679d86d
+  data.tar.gz: abe489c1566ea84dafe714926359719a6219aa5676f82bd2e3cd102a373b21a5658741c0dbbd2867389d00a1871832bda538d0184e5c9aac4f739b7e25a14e14

data/lib/noir.rb

@@ -3,6 +3,7 @@ require 'noir/options'
 require 'noir/executer'
 require 'noir/base'
 require 'noir/base/terminal_command'
+require 'noir/util'
 require 'noir/command'
 
 module Noir

data/lib/noir/command.rb

@@ -16,3 +16,4 @@ require 'noir/command/edit'
 require 'noir/command/format'
 require 'noir/command/help'
 require 'noir/command/new'
+require 'noir/command/summarize'

data/lib/noir/command/edit/weekly_report.rb

@@ -1,47 +1,31 @@
 class Noir::Command::Edit::WeeklyReport < Noir::Base::Command
   @description = 'edit weekly report'
 
-  class << self
-    # time utilities
-
-    TimeOfADay = (24 * 60 * 60)
-    TimeFormat = '%Y%m%d'
-
-    def end_of_week_separeted separator_day_of_week, week_diff
-      check_method_name = "#{separator_day_of_week}?"
-      unless Time.instance_methods(false).include?(check_method_name.to_sym)
-        raise "a day of week name is incorrect! : #{separator_day_of_week}"
-      end
-
-      week_end = Time.now + (week_diff * 7 * TimeOfADay)
-      week_end += TimeOfADay
-      while !week_end.send(check_method_name)
-        week_end += TimeOfADay
-      end
-      week_end - TimeOfADay
-    end
-
-    def begin_of_week_separeted separator_day_of_week, week_diff
-      end_of_week_separeted(separator_day_of_week, week_diff) - (6*TimeOfADay)
-    end
+  extend Noir::Util::Weekly
+  TimeFormat = '%Y%m%d'
 
+  def self.report_name separator_day_of_week, week_diff=0
+    [begin_of_week_separeted(separator_day_of_week, week_diff).strftime(TimeFormat),
+     end_of_week_separeted(separator_day_of_week, week_diff).strftime(TimeFormat)].join('_')
+  end
 
-    # main methods
-    def edit_report separator_day_of_week, week_diff=0
-      system("vim #{report_name(separator_day_of_week, week_diff)}.txt")
-    end
+  # main method
+  def self.edit_report separator_day_of_week, week_diff=0
+    system("vim #{report_name(separator_day_of_week, week_diff)}.txt")
+  end
+end
 
-    def report_name separator_day_of_week, week_diff=0
-      [begin_of_week_separeted(separator_day_of_week, week_diff).strftime(TimeFormat),
-       end_of_week_separeted(separator_day_of_week, week_diff).strftime(TimeFormat)].join('_')
+[:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each do |day|
+  clazz = Class.new(Noir::Base::TerminalCommand)
+  clazz.class_eval do
+    @description = "edit weekly report separated by #{day}"
+    @day_of_week = day
+  end
+  clazz.class_eval do
+    def self.execute *args
+      week_diff = args.first.to_i || 0
+      Noir::Command::Edit::WeeklyReport.edit_report @day_of_week, week_diff
     end
   end
+  Noir::Command::Edit::WeeklyReport.const_set(day.capitalize, clazz)
 end
-
-require 'noir/command/edit/weekly_report/monday'
-require 'noir/command/edit/weekly_report/tuesday'
-require 'noir/command/edit/weekly_report/wednesday'
-require 'noir/command/edit/weekly_report/thursday'
-require 'noir/command/edit/weekly_report/friday'
-require 'noir/command/edit/weekly_report/saturday'
-require 'noir/command/edit/weekly_report/sunday'

data/lib/noir/command/new/note.rb

@@ -1,12 +1,13 @@
 class Noir::Command::New::Note < Noir::Base::TerminalCommand
-  @description = 'create empty txt. filename format is <serial-no>_<date>.txt'
+  @description = 'Create empty txt. filename format is <serial-no>_<date>.txt'
 
-  TimeFormat = '%Y%m%d'
+  TimeFormat   = '%Y%m%d'
+  FileNameGlob = '[0-9]*_????????.txt'
 
   class << self
 
     def create_new_note
-      note_num  = Dir.glob('[0-9]*_????????.txt').size + 1
+      note_num  = Dir.glob(FileNameGlob).size + 1
       note_name = format("%02d", note_num) + '_' + Time.now.strftime(TimeFormat) + '.txt'
       Noir::Command::New.createFile note_name
       return note_name

data/lib/noir/command/summarize.rb

@@ -0,0 +1,5 @@
+class Noir::Command::Summarize < Noir::Base::Command
+  @description = 'summarize utilities'
+end
+
+require 'noir/command/summarize/note'

data/lib/noir/command/summarize/note.rb

@@ -0,0 +1,5 @@
+class Noir::Command::Summarize::Note < Noir::Base::Command
+  @description = 'summarize notes'
+end
+
+require 'noir/command/summarize/note/weekly'

data/lib/noir/command/summarize/note/weekly.rb

@@ -0,0 +1,30 @@
+class Noir::Command::Summarize::Note::Weekly < Noir::Base::Command
+  @description = 'summarize notes weekly'
+
+  extend Noir::Util::Weekly
+  TimeFormat = '%Y%m%d'
+
+  def self.summarize_by_week separator_day_of_week, week_diff=0
+    begin_note = begin_of_week_separeted(separator_day_of_week, week_diff).strftime(TimeFormat)
+    end_note   = end_of_week_separeted(separator_day_of_week, week_diff).strftime(TimeFormat)
+
+    note_names = (begin_note..end_note).map{|n| Dir.glob("*#{n}*").first}.compact
+    puts note_names.flat_map {|name| ['-----' + name + '-----', File.read(name) ]}.join("\n")
+  end
+end
+
+# Sub commands: specific day of week
+[:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each do |day|
+  clazz = Class.new(Noir::Base::TerminalCommand)
+  clazz.class_eval do
+    @description = "summarize notes weekly separated by #{day}"
+    @day_of_week = day
+  end
+  clazz.class_eval do
+    def self.execute *args
+      week_diff = args.first.to_i || 0
+      Noir::Command::Summarize::Note::Weekly.summarize_by_week @day_of_week, week_diff
+    end
+  end
+  Noir::Command::Summarize::Note::Weekly.const_set(day.capitalize, clazz)
+end

data/lib/noir/util.rb

@@ -0,0 +1,6 @@
+module Noir
+  module Util
+  end
+end
+
+require 'noir/util/weekly'

data/lib/noir/util/weekly.rb

@@ -0,0 +1,23 @@
+module Noir::Util::Weekly
+  # utilities for calculation weeks
+
+  TimeOfADay = (24 * 60 * 60)
+
+  def end_of_week_separeted separator_day_of_week, week_diff
+    check_method_name = "#{separator_day_of_week}?"
+    unless Time.instance_methods(false).include?(check_method_name.to_sym)
+      raise "a day of week name is incorrect! : #{separator_day_of_week}"
+    end
+
+    week_end = Time.now + (week_diff * 7 * TimeOfADay)
+    week_end += TimeOfADay
+    while !week_end.send(check_method_name)
+      week_end += TimeOfADay
+    end
+    week_end - TimeOfADay
+  end
+
+  def begin_of_week_separeted separator_day_of_week, week_diff
+    end_of_week_separeted(separator_day_of_week, week_diff) - (6*TimeOfADay)
+  end
+end

data/lib/noir/version.rb

@@ -1,3 +1,3 @@
 module Noir
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/noir/command/new/note_spec.rb

@@ -11,4 +11,22 @@ describe 'Noir::Command::New::Note' do
     expect(Noir::Command::New).to receive(:createFile)
     expect{Noir::Command::New::Note.execute}.to output.to_stdout
   end
+
+  it 'is support empty directory' do
+    allow(Dir).to receive(:glob).with(anything).and_return([])
+    expect(Noir::Command::New).to receive(:createFile)
+    expect{Noir::Command::New::Note.execute}.to output(/^01_.*txt$/).to_stdout
+  end
+
+  it 'is support directory include few files' do
+    allow(Dir).to receive(:glob).with(anything).and_return(10.times.to_a)
+    expect(Noir::Command::New).to receive(:createFile)
+    expect{Noir::Command::New::Note.execute}.to output(/^11_.*txt$/).to_stdout
+  end
+
+  it 'is support directory include over 100 files' do
+    allow(Dir).to receive(:glob).with(anything).and_return(120.times.to_a)
+    expect(Noir::Command::New).to receive(:createFile)
+    expect{Noir::Command::New::Note.execute}.to output(/^121_.*txt$/).to_stdout
+  end
 end

data/spec/noir/command/summarize/note/weekly_spec.rb

@@ -0,0 +1,43 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::Summarize::Note::Weekly' do
+  include_context :dependencie_on_current_directory
+
+  it 'is inherited Noir::Base::Command' do
+    expect(Noir::Command::Summarize::Note::Weekly.superclass).to eq(Noir::Base::Command)
+  end
+
+  describe '.summarize_by_week' do
+    before do
+      File.write('01_20140401.txt', 'hoge') # 2014/04/01(Tue)
+      File.write('02_20140402.txt', 'fuga') # 2014/04/02(Wed)
+      File.write('03_20140403.txt', 'piyo') # 2014/04/03(Thu)
+    end
+
+    it 'include texts in .txt file' do
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:tuesday)}.to output(/hoge/).to_stdout
+    end
+
+    it 'include all texts in weekly range' do
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:monday)}.to output(/hoge/).to_stdout
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:monday)}.to output(/fuga/).to_stdout
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:monday)}.to output(/piyo/).to_stdout
+    end
+
+    it 'not include texts without weekly range' do
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:wednesday)}.to     output(/hoge/).to_stdout
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:wednesday)}.not_to output(/fuga/).to_stdout
+      expect{Noir::Command::Summarize::Note::Weekly.summarize_by_week(:wednesday)}.not_to output(/piyo/).to_stdout
+    end
+  end
+
+  describe 'sub commands' do
+    [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each do |day|
+      it 'is inherited Noir::Base::TerminalCommand' do
+        sub_command = Noir::Command::Summarize::Note::Weekly.const_get day.capitalize
+        expect(sub_command.superclass).to eq(Noir::Base::TerminalCommand)
+      end
+    end
+  end
+end

data/spec/noir/command/summarize/note_spec.rb

@@ -0,0 +1,9 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::Summarize::Note' do
+  it 'is inherited Noir::Base::Command' do
+    expect(Noir::Command::Summarize::Note.superclass).to eq(Noir::Base::Command)
+  end
+end
+

data/spec/noir/command/summarize_spec.rb

@@ -0,0 +1,10 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::Summarize' do
+  it 'is inherited Noir::Base::Command' do
+    expect(Noir::Command::Summarize.superclass).to eq(Noir::Base::Command)
+  end
+end
+
+

data/spec/spec_helper.rb

@@ -41,3 +41,23 @@ def stub_commands
 =end
 
 end
+
+shared_context :dependencie_on_current_directory do
+  around do |spec|
+    Dir.mktmpdir('noir-tempdir') do |dir|
+      Dir.chdir(dir) do
+        spec.run
+      end
+    end
+  end
+end
+
+# for ruby 1.9.2
+
+unless File.respond_to?(:write)
+  class File
+    def self.write filename, contents
+      open(filename, 'w'){|f| f.write(contents)}
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noir
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - atton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,13 +92,6 @@ files:
 - lib/noir/command/edit.rb
 - lib/noir/command/edit/note.rb
 - lib/noir/command/edit/weekly_report.rb
-- lib/noir/command/edit/weekly_report/friday.rb
-- lib/noir/command/edit/weekly_report/monday.rb
-- lib/noir/command/edit/weekly_report/saturday.rb
-- lib/noir/command/edit/weekly_report/sunday.rb
-- lib/noir/command/edit/weekly_report/thursday.rb
-- lib/noir/command/edit/weekly_report/tuesday.rb
-- lib/noir/command/edit/weekly_report/wednesday.rb
 - lib/noir/command/format.rb
 - lib/noir/command/format/pdf_url.rb
 - lib/noir/command/help.rb
@@ -110,8 +103,13 @@ files:
 - lib/noir/command/new/makefile.rb
 - lib/noir/command/new/makefile/tex.rb
 - lib/noir/command/new/note.rb
+- lib/noir/command/summarize.rb
+- lib/noir/command/summarize/note.rb
+- lib/noir/command/summarize/note/weekly.rb
 - lib/noir/executer.rb
 - lib/noir/options.rb
+- lib/noir/util.rb
+- lib/noir/util/weekly.rb
 - lib/noir/version.rb
 - noir.gemspec
 - spec/noir/command/calculate/time_spec.rb
@@ -138,6 +136,9 @@ files:
 - spec/noir/command/new/makefile_spec.rb
 - spec/noir/command/new/note_spec.rb
 - spec/noir/command/new_spec.rb
+- spec/noir/command/summarize/note/weekly_spec.rb
+- spec/noir/command/summarize/note_spec.rb
+- spec/noir/command/summarize_spec.rb
 - spec/noir/command_spec.rb
 - spec/noir/executer_spec.rb
 - spec/noir/noir/base/command_spec.rb
@@ -195,6 +196,9 @@ test_files:
 - spec/noir/command/new/makefile_spec.rb
 - spec/noir/command/new/note_spec.rb
 - spec/noir/command/new_spec.rb
+- spec/noir/command/summarize/note/weekly_spec.rb
+- spec/noir/command/summarize/note_spec.rb
+- spec/noir/command/summarize_spec.rb
 - spec/noir/command_spec.rb
 - spec/noir/executer_spec.rb
 - spec/noir/noir/base/command_spec.rb

data/lib/noir/command/edit/weekly_report/friday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Friday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by friday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :friday, week_diff
-    end
-  end
-end

data/lib/noir/command/edit/weekly_report/monday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Monday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by monday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :monday, week_diff
-    end
-  end
-end

data/lib/noir/command/edit/weekly_report/saturday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Saturday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by saturday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :saturday, week_diff
-    end
-  end
-end

data/lib/noir/command/edit/weekly_report/sunday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Sunday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by sunday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :sunday, week_diff
-    end
-  end
-end

data/lib/noir/command/edit/weekly_report/thursday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Thursday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by thursday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :thursday, week_diff
-    end
-  end
-end

data/lib/noir/command/edit/weekly_report/tuesday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Tuesday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by tuesday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :tuesday, week_diff
-    end
-  end
-end

data/lib/noir/command/edit/weekly_report/wednesday.rb

@@ -1,10 +0,0 @@
-class Noir::Command::Edit::WeeklyReport::Wednesday < Noir::Base::TerminalCommand
-  @description = 'edit weekly report separated by wednesday'
-
-  class << self
-    def execute *args
-      week_diff = args.first.to_i || 0
-      Noir::Command::Edit::WeeklyReport.edit_report :wednesday, week_diff
-    end
-  end
-end