noteable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8cf71ad4289e2427528c62f709b001e0ef7800d
-  data.tar.gz: 27b014519ef7a6d0d3d639e940cfe1a0fc4b0083
+  metadata.gz: 3fbdf3ea4b695379ccc54d452d7e0e3a49147329
+  data.tar.gz: 51ff77fcc8de6e6bf70465d0a5a79aad90315222
 SHA512:
-  metadata.gz: a43997ade3fce43456abccdf4d5901e5e4f5c84ea0582501e7034317f6d74645627697ba395d951edc2b768093724775a70996feffaead6498899b898cd6d16a
-  data.tar.gz: ba008cec301eb009ff2117945039ecdf70e153d95c7d361e2b4da3e9a3f9589d17b5f4375afb72c16de901b1e168c44d25fab93a5d48b58e013ee4630b172145
+  metadata.gz: 3dc02104a98ff7af0f8521a1c7bc4e38d2befa459cb5c9b9651d4d3e5dc687b5378ff29404b79f1d9c1a333a212ab6bc2ec2f1037aadec410b781817899e912f
+  data.tar.gz: bfd3fd8862254e464d98cea6b8ed06d62f2722b170431224bd94522043377982c8c29211c00874c17b45672809f9345f657e353cdb9d8f5c372f06d460158228

data/bin/noteable

@@ -4,4 +4,21 @@ require_relative '../lib/noteable'
 
 $pattern = /(.*)(##note##)(.+)(##note##.*)/
 
-NoteAble.find_all_and_print
+# Possible routes
+routes = {
+  find_all_and_print: [nil],
+  open: [/\d/],
+  help: [/-h/, /--help/],
+  version: [/-v/,/--version/],
+  tag: [/-t/ , /--tag/]
+  }
+
+# Match route and call controller method
+  routes.each do |method, inputs|
+    if inputs.select { |input| ARGV[0] =~ input }.length > 0
+      NoteAble.send(method, ARGV.join)
+    elsif ARGV.length < 1
+      NoteAble.find_all_and_print
+      break
+    end
+  end

data/bin/whatsnoteable

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/noteable'
+
+
+ARGV.length == 0 ? NoteAble.find_all_and_print : NoteAble.send(ARGV.shift, ARGV.join)

data/lib/filepath.rb

@@ -0,0 +1,19 @@
+class FilePath
+	@@count = 0
+	attr_reader :filepath, :id
+	def initialize filepath 
+		@id = get_id
+		@filepath = filepath
+	end
+
+	def get_id
+		@id = @@count
+		@@count += 1
+	end
+
+	def to_s
+		str = ""
+		str << "#{@id}. "
+		str << "#{@filepath}".rjust(5) + ": "
+	end
+end

data/lib/note.rb

@@ -1,5 +1,5 @@
 class Note
-  attr_reader :filepath, :note, :line
+  attr_reader :filepath, :note, :line, :id
 
   def initialize args
     @filepath = args[:filepath]
@@ -8,8 +8,8 @@ class Note
   end
 
   def to_s
-    str = ''
-    str << "#{@line}".rjust(5) + ': '
+    str = ""
+    str << "#{@line}".rjust(5) + ": "
     str << "#{note}"
   end
 end

data/lib/noteable.rb

@@ -1,31 +1,54 @@
 require_relative 'note'
+require_relative 'filepath'
 require_relative 'parser'
 require_relative 'view'
 require 'pathname'
 
 module NoteAble
-  def self.find_all_and_print
-    View.render_page { return_notes parse_files }
-  end
+	def self.find_all_and_print
+		View.render_page { render_notes group_by_file(parse_files) }
+	end
+
+	def self.open id
+		exec "subl #{parse_files.find { |note| note.filepath.id == id.to_i }.filepath.filepath}"
+	end
 
-  private
+	private
 
   def self.parse_files notes = []
     Dir['**/*'].each do |file|
-      notes << (Parser.parse file).map! { |note| Note.new(note) } unless Pathname.new(file).directory?
+      notes << (Parser.parse file).map! { |note| build_note note } unless Pathname.new(file).directory?
     end
+    filter_empty_notes notes
+  end
+
+  def self.filter_empty_notes notes = []
+    notes.reject! { |file_notes| file_notes.length == 0 }.flatten
+  end
+
+  def self.group_by_file notes
+    notes.group_by { |note| note.filepath }
+  end
+
+  def self.build_note note
+  	Note.new note: note[:note], line: note[:line], filepath: FilePath.new(note[:filepath])
+  end
+
+  def self.version args
+    View.version
+  end
 
-    filter_notes notes
+  def self.help args
+    View.help
   end
 
-  def self.filter_notes notes = []
-    notes.reject! { |file_notes| file_notes.length == 0 }
-    notes.flatten.group_by { |note| note.filepath }
+  def self.tag tag
+    $pattern = /(.*)(##"#{tag}"##)(.+)(##"#{tag}"##.*)/ if /^[a-zA-Z]+$/ =~ tag
   end
 
-  def self.return_notes notes
+  def self.render_notes notes
     notes.each do |filepath, notes|
-      View.render_file filepath
+      View.render_file filepath.to_s
       notes.each { |note| View.render_note note.to_s }
     end
   end

data/lib/view.rb

@@ -1,19 +1,19 @@
+require 'colorize'
+
 class View
   @width = 70
 
   def self.render_page
     system 'clear'
+    header
+    puts
+    puts
+    puts "To open file in Sublime: '$ notable #'".center(@width).light_magenta
     puts
-    puts '-' * @width
-    puts 'You have some NoteAble comments in your file...'.center(@width)
-    puts '-' * @width
-
     yield
-    
     puts
-    puts '-' * @width
-    puts 'Made with <3.. by Carolyn Phil James Aaron'.center(@width)
-    puts '-' * @width
+    puts
+    footer
   end
 
   def self.render_file(file)
@@ -25,4 +25,37 @@ class View
     str = ' ' * 5 + "#{note}".rjust(5)
     puts str.length > @width ? str.slice(0, @width - 4) + '...' : str
   end
+
+  def self.help
+    puts
+    puts ('-' * @width).yellow
+    puts 'The following commands work with NoteAble'.center(@width).green
+    puts ('-' * @width).yellow
+    puts <<-eos
+      -h, --help
+      -s, --settings                   Alter settings
+      -v, --version                    Display version
+      -t, --tag TAG                    Personalize tag message
+    eos
+    puts
+  end
+
+  def self.version
+    puts 'Version: 0.0.3'
+  end
+
+  def self.header
+    puts
+    puts ('-' * @width).yellow
+    puts 'You have some NoteAble comments in your file...'.center(@width).green
+    puts ('-' * @width).yellow
+  end
+
+  def self.footer
+    puts ('-' * @width).yellow
+    puts 'Made with <3.. by Carolyn Phil James Aaron'.center(@width)
+    puts ('-' * @width).yellow
+    puts
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noteable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Carolyn,Phil,James,Aaron
@@ -18,6 +18,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/noteable
+- bin/whatsnoteable
+- lib/filepath.rb
 - lib/note.rb
 - lib/noteable.rb
 - lib/parser.rb