noter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c87786d868ea352b1cba38c7cc11531c8a438cc8
-  data.tar.gz: 27bc6a124918df8f115aac6ec4dd35669191ae13
+  metadata.gz: 24a405e2ffe8fc73d6315ce36bec44d2a67b621a
+  data.tar.gz: a3603bbc7dbbbf662501c5f69e73f85b3fec538d
 SHA512:
-  metadata.gz: e460c85a77f5e210dd9e1b44e85ea61e57dfc00f12955679cfd5de90f15a34d681090afcfd18691996073fa8a02fd4555ae8e0c81fc69c95870e0c79940d31d6
-  data.tar.gz: fa88760035b1659513e3846802b91eac0c80751f87e4cd42f0d0c2abcb3c8f633657a2402967f34acda8e6191c2b9d6aad28ae1a77bd2609000b836a8e89a15a
+  metadata.gz: 4b79b72a1c8a004dcbb7ce8dde204b9402b3a9fc66731d395b750a9d14336a8903c9649f51af7e060cc3a72782abbb033ca9e7a1d1bd065d88efd3b89ba48acf
+  data.tar.gz: 3a7f667891072910ee06345eb365ef4c851da02b1b6fc2d12a859986b060a21968471b8c562f94f5e96dcea9b0046742d48794efcc9aaca098c0f3c3aad50a98

data/bin/noter

@@ -5,7 +5,7 @@ require "optparse"
 
 class NoteRunner
   def initialize
-    @paging = true
+    @options = {:paging => true}
   end
 
   def run(args)
@@ -15,16 +15,16 @@ class NoteRunner
 
   def run_command
     case @command
-    when :make_from_file
-      Noter::FileMaker.new.make_from_file(@filename)
+    when :show_file_from_index
+      Noter::Viewer.new(@options).show_file_from_index(@index)
     when :show_first_lines
-      Noter::Viewer.new(:paging => @paging).show_first_lines(:with_filename => @show_names)
+      Noter::Viewer.new(@options).show_first_lines(:with_filename => @show_names)
+    when :show_files
+      Noter::Viewer.new(@options).show_files
     when :create_from_string
       Noter::FileMaker.new(@message).save_file
-    when :show_last_n_files
-      Noter::Viewer.new(:paging => @paging).show_last_n_files(@count)
-    when :show_file_from_index
-      Noter::Viewer.new(:paging => @paging).show_file_from_index(@index)
+    when :make_from_file
+      Noter::FileMaker.new.make_from_file(@filename)
     end
   end
 
@@ -35,32 +35,46 @@ class NoteRunner
         @filename = filename
       end
 
+      opts.on("-g", "--grep STRING", "Only show files that contain a specific string") do |grep_string|
+        @options[:grep_string] = grep_string
+      end
+
       opts.on("-l", "--one-line", "Show first line of each note file") do
         @command = :show_first_lines
       end
 
+      opts.on("-m", "--message MESSAGE", "Create a note using the given string") do |message|
+        @command = :create_from_string
+        @message = message
+      end
+
       opts.on("-n", "--name", "Include names when showing files") do
         @command = :show_first_lines
         @show_names = true
       end
 
-      opts.on("-m", "--message MESSAGE", "Create a note using the given string") do |message|
-        @command = :create_from_string
-        @message = message
+      opts.on("--no-color", "Don't colorize output") do
+        @options[:colorize] = false
+      end
+
+      opts.on("-s", "--search STRING", "Show a file with the given index") do |grep_string|
+        @options[:tail_count] = 100 unless @options[:tail_count]
+        @options[:grep_string] = grep_string
+        @command = :show_files
       end
 
       opts.on("-t", "--tail COUNT", "the last n files") do |count|
-        @command = :show_last_n_files
-        @count = count
+        @command = :show_files
+        @options[:tail_count] = count
       end
 
-      opts.on("-s", "--show INDEX", "Show a file with the given index") do |index|
-        @command = :show_file_from_index
-        @index = index
+      opts.on("-u", "--unpaged", "Don't page the output") do
+        @options[:paging] = false
       end
 
-      opts.on("-u", "--unpaged", "Don't page the output") do |count|
-        @paging = false
+      opts.on("-v", "--view INDEX", "View a file with the given index") do |index|
+        @command = :show_file_from_index
+        @index = index
       end
     end
     parser.parse!

data/lib/noter/version.rb

@@ -1,3 +1,3 @@
 module Noter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/noter/viewer.rb

@@ -1,5 +1,6 @@
 require "noter/note_file"
 require "pager"
+require "colorize"
 
 module Noter
   class Viewer
@@ -9,10 +10,23 @@ module Noter
 
     def initialize(options = {})
       @do_paging = options[:paging].nil? ? true : options[:paging]
+      @do_colors = options[:colorize].nil? ? true : options[:colorize]
+      @grep_string = options[:grep_string]
+      @tail_count = options[:tail_count].nil? ? false : options[:tail_count].to_i
     end
 
     def existing_files
-      @existing_files ||= Dir.glob("#{NoteFile.dir}/*")
+      return @existing_files if @existing_files
+
+      if @grep_string
+        @existing_files = `grep -l #{@grep_string} #{NoteFile.dir}/*`.split("\n")
+      else
+        @existing_files = Dir.glob("#{NoteFile.dir}/*")
+      end
+      if @tail_count
+        @existing_files = @existing_files.last(@tail_count)
+      end
+      @existing_files
     end
 
     def show_first_lines(options = {})
@@ -40,9 +54,13 @@ module Noter
       puts contents
     end
 
-    def show_last_n_files(num_files)
-      existing_files.last(num_files.to_i).each do |filename|
-        puts "\n\n#{filename}"
+    def show_files
+      existing_files.each do |filename|
+        if @do_colors
+          puts "\n\n#{filename}".colorize(:red)
+        else
+          puts "\n\n#{filename}"
+        end
         show_file(filename)
       end
     end

data/noter.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_development_dependency "pry-nav", "~> 0.2"
   spec.add_dependency "pager", "~> 1.0"
+  spec.add_dependency "colorize"
 end

data/spec/lib/noter/viewer_spec.rb

@@ -21,6 +21,21 @@ module Noter
       it "returns the names of all the existing files" do
         expect(viewer.existing_files).to eql(%W{#{NoteFile.dir}/2014_09_21_18_20_22.txt  #{NoteFile.dir}/2014_09_21_19_20_22.txt})
       end
+
+      describe "when grepping" do
+        let(:viewer) { Noter::Viewer.new(:grep_string => "foo") }
+        let(:grep_result) { "line 1\nline 2" }
+
+        it "shells out to grep to get matching filenames" do
+          expect(viewer).to receive(:`).with("grep -l foo #{NoteFile.dir}/*").and_return(grep_result)
+          viewer.existing_files
+        end
+
+        it "splits the lines returned by grep" do
+          allow(viewer).to receive(:`).and_return(grep_result)
+          expect(viewer.existing_files).to eql(["line 1", "line 2"])
+        end
+      end
     end
 
     describe "#show_first_lines" do
@@ -69,18 +84,30 @@ module Noter
       end
     end
 
-    describe "#show_last_n_files" do
-      it "puts the last two files" do
-        expect(viewer).to receive(:puts).with("\n\n#{file_1_name}")
-        expect(viewer).to receive(:puts).with(file_1_contents)
-        expect(viewer).to receive(:puts).with("\n\n#{file_2_name}")
-        expect(viewer).to receive(:puts).with(file_2_contents)
-        viewer.show_last_n_files(2)
+    describe "#show_files" do
+      describe "without colors" do
+        let(:viewer) { Noter::Viewer.new(:colorize => false, :tail_count => "2") }
+
+        it "puts the last two files" do
+          expect(viewer).to receive(:puts).with("\n\n#{file_1_name}")
+          expect(viewer).to receive(:puts).with(file_1_contents)
+          expect(viewer).to receive(:puts).with("\n\n#{file_2_name}")
+          expect(viewer).to receive(:puts).with(file_2_contents)
+          viewer.show_files
+        end
+      end
+
+      describe "with colors" do
+        it "adds color to the filename" do
+          expect(viewer).to receive(:puts).with("\n\n#{file_1_name}".colorize(:red))
+          expect(viewer).to receive(:puts).with("\n\n#{file_2_name}".colorize(:red))
+          viewer.show_files
+        end
       end
 
       it "converts string args to int" do
         expect {
-        viewer.show_last_n_files("2")
+        viewer.show_files
         }.to_not raise_error
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeff Roush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Inspired (read: stolen) from the ''journal'' and ''jrnl'' python progrsm.
   At the moment, those are more developed; use them instead of this.'
 email: