noir 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08cf16499d9bd42ed7c3167d5fc969d56b8a99a7c5275bc129045792de1a4492'
-  data.tar.gz: 28adf26d590ba3632242c64847cfb40cf649f913c256cb67fd014b84f9eb6d80
+  metadata.gz: 1344b645923c638c0e9485530afdcd8ef2c632b2ff1f4a3b8c28e44f60534b0f
+  data.tar.gz: 5ffc5a08a587f99df13c7afdedbda2dce7a76a44515b4fe51d3279e1e1a1040e
 SHA512:
-  metadata.gz: e788d6c3693d8eb361d6d7efa5cea2104d7bcaf74fec931e5c33b223140ae231c2fa3f9b35a27a857f2664b3424762b38986585eb8c459494b44aa69d8b994c5
-  data.tar.gz: 5f05aab4771ba667af938c89b4c1c0d66843b3ee23511d1cd47771560d2128bb402c57a98e10158f44eb475a686407a51cb9931fd977773c1236c9f77af1dd5b
+  metadata.gz: 673cafea79abc0a967566e674923feb0a7bc5a6fe37b6c234222fbfdf9b336d9870c285fb706c147adace84ce5e2903daaa772f975f83ca4d586298801d8e901
+  data.tar.gz: a9d4ea04e57a6cab8bd3b26aac60388a58443d032fc8e7b8c2b06948e4f52f45b88d72c1e4cc1abc20e8ad53dda114fa6c313f39cafc324bd0599b6238ad926e

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.5

data/.travis.yml

@@ -1,17 +1,32 @@
 language: ruby
 rvm:
+  - 2.6.4
+  - 2.6.3
+  - 2.6.2
+  - 2.6.1
+  - 2.6.0
+  - 2.5.6
+  - 2.5.5
+  - 2.5.4
+  - 2.5.3
+  - 2.5.2
   - 2.5.1
   - 2.5.0
+  - 2.4.6
+  - 2.4.5
   - 2.4.4
   - 2.4.3
   - 2.4.2
   - 2.4.1
   - 2.4.0
+  - 2.3.8
+  - 2.3.7
   - 2.3.6
   - 2.3.5
   - 2.3.4
   - 2.3.3
   - 2.3.2
+  - 2.2.10
   - 2.2.9
   - 2.2.8
   - 2.2.7
@@ -22,18 +37,14 @@ rvm:
   - 2.2.2
   - 2.2.1
   - 2.2.0
+  - 2.1.10
   - 2.1.9
   - 2.1.8
   - 2.1.7
   - 2.1.6
   - 2.1.5
-  - 2.1.4
-  - 2.1.3
-  - 2.1.2
-  - 2.1.1
-  - 2.0.0
-before_install:
-  - gem update bundler
+  - 2.1.0
+  - 2.0.0-p648
 notifications:
   email: false
   slack:

data/lib/noir/command.rb

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

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

@@ -3,12 +3,26 @@ class Noir::Command::New::Note < Noir::Base::TerminalCommand
 
   TimeFormat   = '%Y%m%d'
   FileNameGlob = '[0-9]*_????????.txt'
+  SerialDigitRange = 1..3
 
   class << self
 
+    def serial_format number
+      digit_from_env = ENV['NOIR_NOTE_SERIAL_DIGIT']
+
+      # default digit is 2
+      digit = digit_from_env.nil? ? 2 : digit_from_env.to_i
+      if SerialDigitRange.cover?(digit)
+        return format("%0#{digit}d", number)
+      else
+        raise ["Invalid NOIR_NOTE_SERIAL_DIGIT=#{digit_from_env}.",
+               "supported digits are [#{SerialDigitRange.to_a.join(', ')}]."].join("\n")
+      end
+    end
+
     def create_new_note
       note_num  = Dir.glob(FileNameGlob).size + 1
-      note_name = format("%02d", note_num) + '_' + Time.now.strftime(TimeFormat) + '.txt'
+      note_name = serial_format(note_num) + '_' + Time.now.strftime(TimeFormat) + '.txt'
       Noir::Command::New.createFile note_name
       return note_name
     end

data/lib/noir/version.rb

@@ -1,3 +1,3 @@
 module Noir
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/noir.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency 'bundler',        '~> 1.6'
-  spec.add_development_dependency 'rake',           '12.3.1'
-  spec.add_development_dependency 'rspec',          '3.8.0'
-  spec.add_development_dependency 'rspec-temp_dir', '1.0.0'
-  spec.add_development_dependency 'pry',            '0.11.3'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-temp_dir'
+  spec.add_development_dependency 'pry'
 end

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

@@ -12,21 +12,79 @@ describe 'Noir::Command::New::Note' do
     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
+  describe 'supports empty directory' do
+    it 'default digit = 2' 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 'can set digit(1) using ENV' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('1')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect(Noir::Command::New).to receive(:createFile)
+      expect{Noir::Command::New::Note.execute}.to output(/^1_.*txt$/).to_stdout
+    end
+
+    it 'can set digit(3) using ENV' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('3')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect(Noir::Command::New).to receive(:createFile)
+      expect{Noir::Command::New::Note.execute}.to output(/^001_.*txt$/).to_stdout
+    end
   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
+  describe 'supports directory has' do
+    it '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 'few files with digit config' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('3')
+      allow(Dir).to receive(:glob).with(anything).and_return(15.times.to_a)
+      expect(Noir::Command::New).to receive(:createFile)
+      expect{Noir::Command::New::Note.execute}.to output(/^016_.*txt$/).to_stdout
+    end
+
+    it '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
 
-  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
+  describe 'has validation for NOIR_NOTE_SERIAL_DIGIT' do
+    it 'if set 0, raise error' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('0')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect{Noir::Command::New::Note.execute}.to raise_error(RuntimeError, /DIGIT.*0.*/)
+    end
+
+    it 'if set -1, raise error' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('-1')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect{Noir::Command::New::Note.execute}.to raise_error(RuntimeError, /DIGIT.*-1.*/)
+    end
+
+    it 'if set 4, raise error' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('4')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect{Noir::Command::New::Note.execute}.to raise_error(RuntimeError, /DIGIT.*4.*/)
+    end
+
+    it 'if set string, raise error' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('abc')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect{Noir::Command::New::Note.execute}.to raise_error(RuntimeError, /DIGIT.*abc.*/)
+    end
+
+    it 'if raise error, not create file' do
+      allow(ENV).to receive(:[]).with('NOIR_NOTE_SERIAL_DIGIT').and_return('hogehoge')
+      allow(Dir).to receive(:glob).with(anything).and_return([])
+      expect(Noir::Command::New).to_not receive(:createFile)
+      expect{Noir::Command::New::Note.execute}.to raise_error(RuntimeError, /DIGIT.*hoge.*/)
+    end
   end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: noir
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - atton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-temp_dir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '0'
 description: Untility commands with completion for atton.
 email:
 - e115763@gmail.com
@@ -119,9 +119,6 @@ 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
@@ -153,9 +150,6 @@ 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
@@ -183,8 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Utilities for atton.
@@ -214,9 +207,6 @@ 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/summarize.rb

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

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

@@ -1,5 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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/spec/noir/command/summarize/note/weekly_spec.rb

@@ -1,44 +0,0 @@
-require 'noir'
-require 'spec_helper'
-
-describe 'Noir::Command::Summarize::Note::Weekly' do
-  include_context :dependencie_on_current_directory
-  dependent_time_now
-
-  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

@@ -1,9 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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
-
-