noter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f6fe54a4f2f67331927a21e0ea69f8dffb6f04
-  data.tar.gz: e45c54aef26210f5b3a05c1c73467527717cc557
+  metadata.gz: c87786d868ea352b1cba38c7cc11531c8a438cc8
+  data.tar.gz: 27bc6a124918df8f115aac6ec4dd35669191ae13
 SHA512:
-  metadata.gz: 452aff5b4e6a9ee30d831ab11b640dbdb9fedea44fecf12043a3bcd3a7a0d84d845546a679034ee93027149e678df3f092cd750798aaca17421b17d22cca674e
-  data.tar.gz: 21ce2e5cf5db5677077f8e66157a3621a30ffcd35b5660a22c59eb3c80a254ee4ac29a522b0687640ff271c120546ab91ebe3d80eb9f85f2296cdaf980783c97
+  metadata.gz: e460c85a77f5e210dd9e1b44e85ea61e57dfc00f12955679cfd5de90f15a34d681090afcfd18691996073fa8a02fd4555ae8e0c81fc69c95870e0c79940d31d6
+  data.tar.gz: fa88760035b1659513e3846802b91eac0c80751f87e4cd42f0d0c2abcb3c8f633657a2402967f34acda8e6191c2b9d6aad28ae1a77bd2609000b836a8e89a15a

data/bin/noter

@@ -4,22 +4,63 @@ require "noter"
 require "optparse"
 
 class NoteRunner
+  def initialize
+    @paging = true
+  end
+
   def run(args)
+    run_parser
+    run_command
+  end
+
+  def run_command
+    case @command
+    when :make_from_file
+      Noter::FileMaker.new.make_from_file(@filename)
+    when :show_first_lines
+      Noter::Viewer.new(:paging => @paging).show_first_lines(:with_filename => @show_names)
+    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)
+    end
+  end
+
+  def run_parser
     parser = OptionParser.new do |opts|
       opts.on("-f", "--file FILE", "Create a note using the given file") do |filename|
-        Noter::FileMaker.new.make_from_file(filename)
+        @command = :make_from_file
+        @filename = filename
       end
 
       opts.on("-l", "--one-line", "Show first line of each note file") do
-        Noter::Viewer.new.show_first_lines
+        @command = :show_first_lines
       end
 
-      opts.on("-n", "--name", "Show first line of each note file, with filename") do
-        Noter::Viewer.new.show_first_lines(with_filename: true)
+      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|
-        Noter::FileMaker.new(message).save_file
+        @command = :create_from_string
+        @message = message
+      end
+
+      opts.on("-t", "--tail COUNT", "the last n files") do |count|
+        @command = :show_last_n_files
+        @count = count
+      end
+
+      opts.on("-s", "--show INDEX", "Show a file with the given index") do |index|
+        @command = :show_file_from_index
+        @index = index
+      end
+
+      opts.on("-u", "--unpaged", "Don't page the output") do |count|
+        @paging = false
       end
     end
     parser.parse!

data/lib/noter/version.rb

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

data/lib/noter/viewer.rb

@@ -1,9 +1,18 @@
 require "noter/note_file"
+require "pager"
 
 module Noter
   class Viewer
+    include Pager
+
+    attr_reader :do_paging
+
+    def initialize(options = {})
+      @do_paging = options[:paging].nil? ? true : options[:paging]
+    end
+
     def existing_files
-      Dir.glob("#{NoteFile.dir}/*")
+      @existing_files ||= Dir.glob("#{NoteFile.dir}/*")
     end
 
     def show_first_lines(options = {})
@@ -16,5 +25,26 @@ module Noter
         puts "#{file.formatted_time}: #{filename_string}#{file.first_line}"
       end
     end
+
+    def filename_from_index(index)
+      existing_files[index.to_i]
+    end
+
+    def show_file_from_index(index)
+      show_file(filename_from_index(index))
+    end
+
+    def show_file(filename)
+      contents = File.read(filename)
+      page if @do_paging
+      puts contents
+    end
+
+    def show_last_n_files(num_files)
+      existing_files.last(num_files.to_i).each do |filename|
+        puts "\n\n#{filename}"
+        show_file(filename)
+      end
+    end
   end
 end

data/noter.gemspec

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

data/spec/lib/noter/viewer_spec.rb

@@ -5,11 +5,16 @@ require "noter/viewer"
 module Noter
   describe Viewer do
     let(:viewer) { Noter::Viewer.new }
+    let(:file_1_name)     { "#{NoteFile.dir}/2014_09_21_18_20_22.txt" }
+    let(:file_2_name)     { "#{NoteFile.dir}/2014_09_21_19_20_22.txt" }
+    let(:file_1_contents) { "file 1\nline 2" }
+    let(:file_2_contents) { "file 2\nline 2" }
 
     before do
       FileUtils.mkdir_p NoteFile.dir
-      File.write("#{NoteFile.dir}/2014_09_21_18_20_22.txt", "file 1\nline 2")
-      File.write("#{NoteFile.dir}/2014_09_21_19_20_22.txt", "file 2\nline 2")
+      File.write(file_1_name, file_1_contents)
+      File.write(file_2_name, file_2_contents)
+      allow(viewer).to receive(:puts)
     end
 
     describe "#existing_files" do
@@ -31,6 +36,63 @@ module Noter
         viewer.show_first_lines(with_filename: true)
       end
     end
+
+    describe "#show_file" do
+      it "puts the file" do
+        expect(viewer).to receive(:puts).with(file_1_contents)
+        viewer.show_file(file_1_name)
+      end
+    end
+
+    describe "#show_file_from_index" do
+      it "puts the file" do
+        expect(viewer).to receive(:puts).with(file_1_contents)
+        viewer.show_file_from_index(0)
+      end
+    end
+
+    describe "when paging is enabled" do
+      let(:viewer) { Noter::Viewer.new({:paging => false}) }
+
+      it "doesn't page" do
+        expect(viewer).to_not receive(:page)
+        viewer.show_file_from_index(0)
+      end
+    end
+
+    describe "when paging is not enabled" do
+      let(:viewer) { Noter::Viewer.new }
+
+      it "doesn't page" do
+        expect(viewer).to receive(:page)
+        viewer.show_file_from_index(0)
+      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)
+      end
+
+      it "converts string args to int" do
+        expect {
+        viewer.show_last_n_files("2")
+        }.to_not raise_error
+      end
+    end
+
+    describe "#filename_from_index" do
+      it "returns the filename associated with the index" do
+        expect(viewer.filename_from_index(0)).to eql(file_1_name)
+      end
+
+      it "converts the index from string to int" do
+        expect(viewer.filename_from_index("0")).to eql(file_1_name)
+      end
+    end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeff Roush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: pager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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: