daily-txt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58310eaa20bad02e40d646d7b63ec7dfd89fc18
-  data.tar.gz: 3040a40fab8dea081dcacf0a8cd8ad68430cfd3e
+  metadata.gz: 82fcae4cad96930a6289dde3fb38395fa441c9c3
+  data.tar.gz: b0bd112322c56f42246876be2f02f79c75870542
 SHA512:
-  metadata.gz: 340e4c00f07099687ced37e5c6c057e79fb8a57c860fbeecf522f9cb5f331e9bb1756e484a283ba7afa099715037385dc949df27571247a8461bd500a5dca32e
-  data.tar.gz: 048b5855fc258fa3ad94a34e24cb8fe93dee9139ae06c5a7c5c1dca6ed9c991c2d183f84164ba0a68a2f926ff839ec30277f71e1f4e7fff2501965257852c751
+  metadata.gz: f9a49e690e5d6cf0a4f1880913d38f91b2ca39c13c628d4c81657f14684c12348ac91ae20a3ed51234d58c4751770152cce1a96b990428e387a4ce86f3f71e2d
+  data.tar.gz: 2c2f36efaadcf09782f57dbfce0470f3bc9b6043ee37cccd189cbc25fc8c770ec9f9b1682e9a13b0abfe980d2d409b1307934b6b290a9bb1c75b1087b6e61361

data/README.md

@@ -8,12 +8,12 @@ daily-txt is command line script for creating and listing text files that has a
 $ daily-txt
 ```
 
-A command above creates text file at /${ROOT}/text/{$YYYY}/{$MM}/${YYYY}_${MM}_${DD}.txt
-and open it with default editor. If it already exists, just open it for appending.
+The command above creates text file at /${ROOT}/text/{$YYYY}/{$MM}/${YYYY}_${MM}_${DD}.txt
+and open it with default editor. If it already exists, just open it for editing.
 
 ### Initialize
 
-daily-txt command asks ROOT directory and default editor at initial startup, and stores
+At initial startup, daily-txt command asks ROOT directory and default editor. And it stores
 setting to ~/.daily-txt.rc.
 
 ```
@@ -25,6 +25,14 @@ Default Editor? (/usr/bin/vim):
 Setting stored to ~/.daily-txt.rc
 ```
 
+### Open past file
+
+-p 1 for yesterday, -p 2 for the day before yesterday.
+
+```
+$ daily-txt -p 1
+```
+
 ### Listing
 
 List text files
@@ -37,6 +45,12 @@ $ daily-txt -l
 /your/root/text/2016/04/2016_05_04.txt
 ```
 
+### Search files with text
+
+```
+$ daily-txt -s "search query"
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/daily/txt/cli.rb

@@ -3,6 +3,8 @@ require "daily/txt/path_builder"
 require 'date'
 require 'optparse'
 require 'file/visitor'
+require 'term/ansicolor'
+include Term::ANSIColor
 
 class Daily::Txt::CLI
 
@@ -15,12 +17,23 @@ class Daily::Txt::CLI
       parser.on('-f PATH', 'config file path') do |path|
         option[:config_path] = path
       end
+      parser.on('-s VAL', '--search VAL', 'search file including VAL') do |query|
+        option[:mode]  = :search
+        option[:query] = query
+      end
       parser.on('-l', '--list', 'list text files') do |path|
         option[:mode] = :list
       end
       parser.on('--ascending', 'make list order ascending') do
         option[:asc] = true
       end
+      parser.on('-p VAL', 'open file for VAL day(s) ago') do |day|
+        past = day.to_i
+        if past <= 0
+          abort "invalid value for -p: #{day}"
+        end
+        option[:past] = past
+      end
 
       begin
         parser.parse!(argv)
@@ -55,8 +68,10 @@ class Daily::Txt::CLI
       case option[:mode]
       when :list
         list(config, option)
+      when :search
+        search(config, option[:query])
       else
-        open_today(config)
+        open_today(config, option[:past])
       end
     end
 
@@ -75,9 +90,33 @@ class Daily::Txt::CLI
       end
     end
 
-    def open_today(config)
+    def search(config, query)
+      visitor = File::Visitor.new
+      visitor.add_filter(:ext, Daily::Txt::PathBuilder::DEFAULT_EXT)
+      visitor.set_direction(:desc)
+
+      hilighted_query = "#{yellow}#{query}#{reset}"
+      visitor.visit(config["home"]) do |path|
+        header_printed = false
+        File.open(path) do |file|
+          header_printed = false
+          file.each_line do |line|
+            if line.match(/#{query}/)
+              unless header_printed
+                print "\n", green, path, reset, "\n"
+                header_printed = true
+              end
+              line = line.gsub(query, hilighted_query)
+              puts line
+            end
+          end
+        end
+      end
+    end
+
+    def open_today(config, past)
       path = Daily::Txt::PathBuilder.by_date(
-        config["home"], Date.today)
+        config["home"], (Date.today - (past || 0)))
       Daily::Txt::PathBuilder.prepare_basedir(path)
       Daily::Txt::System.exec(config["editor"], path)
     end

data/lib/daily/txt/version.rb

@@ -1,5 +1,5 @@
 module Daily
   module Txt
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daily-txt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - bonar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: command line tool for daily text file memo