snipgem 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ebbe6149737de3b96d4124db961aa30e4d25b01
-  data.tar.gz: 909bc2fabd8df5b7e23ab72b129c2b6043de6cc9
+  metadata.gz: f3ac79c11e098d74ad90e8122495c7673c9731c1
+  data.tar.gz: 119b58406d5ba4a91e2541784d731930a620a572
 SHA512:
-  metadata.gz: 368b5bc4f2e2281c618f6c920cd2fc1bfce1d34dd5d0b2a7f5f50b324f1dbcffca3b7d60bd2933fae68d372ab244995383dbad4cd6df5c610d5f0bed0f88fa47
-  data.tar.gz: bd4892c06856e3c57403f10bbc3c7c66fcf14805cf2e9813d08606956e3ebe2fb9609a0bea057dd4a9a63f53c3a2ed889af23936fcc8bc4caa56a0641e24145f
+  metadata.gz: 819aa8372e1ba4c2ce909d6886a9788db4d89d3fabe55250d46349b937f7949a00f3f49a0611d7c0d15d701f99a9eacf8dd9c92ccc8b338511aaa6c0c9b535fb
+  data.tar.gz: e17304fdfae515fbd8eaf992b21a12c5a5513f6a988677fdf2d0e053bec202efd59880d65decab4b87ad619f7e33ece06525d7da21f5b7fba8a87994bd7c29b9

data/Rakefile

@@ -11,7 +11,8 @@ task :seed do
 	test_str2 = "#<$> Title ggg\ndef method\n  \"code\"\nend\n#</$>\n\n#<$> Title 2323\ndef method\n  \"code\"\nend\n#</$>\n\n#<$> Title 4\ndef method\n  \"code\"\nend\n#</$>"
 	test_str3 = "# <snip> Title of first snip\n  desc \"create the database\"\n  task :create do\n    puts \"Creating file \#{DB_PATH} if it doesn't exist...\"\n    touch DB_PATH\n  end\n# </snip>\n\n# <snip> Title of this snip\n  desc \"drop the database\"\n  task :drop do\n    puts \"Deleting \#{DB_PATH}...\"\n    rm_f DB_PATH\n  end\n# </snip>\n\n# <snip> Title of first snip\n  desc \"create the database\"\n  task :create do\n    puts \"Creating file \#{DB_PATH} if it doesn't exist...\"\n    touch DB_PATH\n  end\n# </snip>\n\n# <snip> Title of this snip\n  desc \"drop the database\"\n  task :drop do\n    puts \"Deleting \#{DB_PATH}...\"\n    rm_f DB_PATH\n  end\n# </snip>"
 	test_str_js = "//<$> Title ggg\nvar test1 = 44;\nvar test2 = 22;\n//</$>\n\n//<$>\nvar test4 = \"Hola\";\n//</$>\n\n"
-	test_str_erb = "<!-- <$> Title ggg -->\n  <% @snips.each do |snip| %>\n  <p><%= snip.title %></p> \n<% end %>\n<!-- </$> --> \n\n<!-- <$> Title ggg -->\n  <% @snips.each do |snip| %>\n  <p><%= snip.title %></p> \n<% end %>\n<!-- </$> --> \n\n"
+  test_str_erb = "<!-- <$> Title ggg -->\n  <% @snips.each do |snip| %>\n  <p><%= snip.title %></p> \n<% end %>\n<!-- </$> --> \n\n<!-- <$> Title ggg -->\n  <% @snips.each do |snip| %>\n  <p><%= snip.title %></p> \n<% end %>\n<!-- </$> --> \n\n"
+	test_str_html = "<!-- <$> Title ggg -->\n  <p>Hello world</p>\n  <h1>title</h1> \n<!-- </$> --> \n\n<!-- <$> Title ggg -->\n  <p>Hello world</p>\n  <h1>title</h1> \n<!-- </$> --> \n\n"
 
 
 	FileUtils.rm_rf('rspec/test_snip_files')
@@ -33,6 +34,9 @@ task :seed do
   File.open("rspec/test_snip_files/subfolder/test_erb.erb", "w+") do |file|
      file << test_str_erb
   end
+  File.open("rspec/test_snip_files/subfolder/test_html.html", "w+") do |file|
+     file << test_str_erb
+  end
 end
 
 desc "Run the specs"

data/lib/controllers/controller.rb

@@ -0,0 +1,28 @@
+require_relative '../models/utils/sourcefilereader'
+require_relative '../models/utils/codescanner'
+require_relative '../models/utils/destinationfilewriter'
+require_relative '../models/utils/searchfile'
+require_relative '../languages/languages'
+
+module CommandLineController
+
+  extend self
+
+  def run(file)
+    file_read = SourceFileReaderWriter.new(file)
+    to_run = file_read.convert_to_array_of_lines
+    mismatch_status = CodeScanner.run(to_run, SourceFileReaderWriter.file_to_open)
+    abort(ViewFormatter.mismatched_tags(mismatch_status)) if mismatch_status
+    file_writing
+    file_read.overwrite_existing_snips
+  end
+
+  def file_writing
+    DestinationFileWriter.run(Snippet.snippet_array)
+    Language.languages.keys.each do |lang|
+      DestinationFileWriter.run(Snippet.select_lang_snippets(lang), lang) if Snippet.select_lang_snippets(lang).any?
+    end
+    Snippet.snippet_array = []
+  end
+
+end

data/lib/languages/languages.rb

@@ -0,0 +1,19 @@
+class Language
+
+  def self.languages
+    {
+      "js" => ["//"],
+      "erb" => ["<!--", "-->"],
+      "rb" => ["#"],
+      "html" => ["<!--", "-->"],
+      "py" => ["#"],
+      "php" => ["<?php /*", "*/ ?>"],
+      "css" => ["/*", "*/"]
+    }
+  end
+
+  def self.supports?(lang)
+    self.languages.key?(lang)
+  end
+
+end

data/{app → lib}/models/snippet.rb

@@ -17,18 +17,10 @@ attr_accessor :snippet_array
     @@snippet_array = arg
   end
 
-  def self.rb_snippets
-    @@snippet_array.select {|snippet| snippet.filename.end_with?(".rb") || snippet.filename.end_with?("(.rb)")}
+  def self.select_lang_snippets(lang)
+    @@snippet_array.select {|snippet| snippet.filename.end_with?(".#{lang}") || snippet.filename.end_with?("(.#{lang})")}
   end
-
-  def self.erb_snippets
-    @@snippet_array.select {|snippet| snippet.filename.end_with?(".erb") || snippet.filename.end_with?("(.erb)") }
-  end
-
-  def self.js_snippets
-    @@snippet_array.select {|snippet| snippet.filename.end_with?(".js") || snippet.filename.end_with?("(.js)") }
-  end
-
+  
   def initialize(args = {})
     @code = args[:code]
     @title = args[:title]

data/lib/models/utils/batchprocessing.rb

@@ -0,0 +1,13 @@
+class BatchProcessing
+
+  require_relative '../../languages/languages'
+
+  def self.process(directory)
+  	directory = directory.chomp('/')
+    Dir.glob(directory + "/**/*.{#{Language.languages.keys.join(',')}}") do |file|
+      next if file == '.' or file == '..' or Dir.exist?(file)
+      CommandLineController.run(file)
+    end
+  end
+
+end

data/{app → lib}/models/utils/codescanner.rb

@@ -9,8 +9,14 @@ class CodeScanner
   def self.run(scan_array, filename)
     @scan_array = scan_array
     while @scan_array.join.include?('<snip>') || @scan_array.join.include?('<$>')
-      Snippet.new(code: array_range, title: @title, line: @line, filename: filename)
+      code = array_range
+      if code
+        Snippet.new(code: code, title: @title, line: @line, filename: filename)
+      else
+        return {filename: filename, line: @line} #in case of mismatch
+      end
     end
+    return nil
   end
 
   def self.find_begin_range
@@ -27,8 +33,12 @@ class CodeScanner
 
   def self.find_end_range
     @scan_array.each_with_index do |line, index|
+      if line.include?('<snip>') || line.include?('<$>') #mismatch before closing tag
+        return false
+      end
       if line.include?('</snip>') || line.include?('</$>')
         strip_snip_tag(index)
+        index
         return @end_scan = index
       end
     end
@@ -37,7 +47,7 @@ class CodeScanner
 
   def self.array_range
     find_begin_range
-    find_end_range
+    return false unless find_end_range
     @scan_array[@begin_scan+1..@end_scan-1].join
   end
 

data/{app → lib}/models/utils/destinationfilewriter.rb

@@ -3,6 +3,7 @@
 
 
 require_relative '../../views/viewformatter'
+require_relative '../../languages/languages'
 CONFIG_PATH = File.expand_path("../../../../config/filepath.config", __FILE__)
 LOG_PATH = File.expand_path("../../../../log/snip.log", __FILE__)
 
@@ -47,15 +48,8 @@ module DestinationFileWriter
   end
 
   def run(snippet_array, type=nil)
-    case type
-    when "rb"
-      filename = directory + "/my_snips.rb"
-      File.new(filename, 'w') unless File.exist?(filename)
-    when "js"
-      filename = directory + "/my_snips.js"
-      File.new(filename, 'w') unless File.exist?(filename)
-    when "erb"
-      filename = directory + "/my_snips.erb"
+    if Language.supports?(type)
+      filename = directory + "/my_snips.#{type}"
       File.new(filename, 'w') unless File.exist?(filename)
     else
       filename = @snip_file_name

data/lib/models/utils/searchfile.rb

@@ -0,0 +1,67 @@
+module SearchDisplay
+
+	extend self
+
+	def check_for_title(line)
+		line.match(/\*\*\*\* Snippet \d+:/)
+	end
+
+	def return_search_results(file,text=nil,ext=nil)
+    search_results = search_snips(divide_snips(file), text, ext)
+		if search_results.any?
+			 search_results
+		else
+			ViewFormatter.no_results
+		end
+	end
+
+  def divide_snips(file)
+  	snip_array = []
+  	snip_str = ""
+    File.open(file, "r").each do |line|
+    	if check_for_title(line)
+	      snip_array << snip_str
+	    	snip_str = line
+	    else
+	      snip_str << line
+	    end
+    end
+    snip_array << snip_str
+    snip_array.shift # todo: check on this
+    snip_array
+  end
+
+  def search_snips(array,text,ext)
+  	array.select do |snip|
+      if ext
+        includes_ext = (snip.include?("(.#{ext})") || snip.include?(".#{ext}:"))
+      else
+        includes_ext = true
+      end
+      # matches either clipboard or normal formatting
+      if text
+        includes_text = smart_text_search_results?(snip, text)
+      else
+        includes_text = true
+      end
+      includes_ext && includes_text
+    end
+  end
+
+  def smart_text_search_results?(snip, text)
+    snip = snip.downcase
+    words_arr = text.split(" ")
+    words_arr.each do |word|
+      unless snip.include?(word.downcase)
+        return false
+      end
+    end
+    true
+  end
+
+  def delete(file, ids)
+  	return_search_results(file).reject do |snip|
+  		ids.include?(snip.match(/\*\*\*\* Snippet (\d+):/).captures[0])
+  	end
+  end
+end

data/lib/snip.rb

@@ -1,139 +1,166 @@
 require "snip/version"
 require "clipboard"
-require_relative '../app/controllers/controller'
-require_relative '../app/models/utils/batchprocessing'
+require_relative 'controllers/controller'
+require_relative 'models/utils/batchprocessing'
+require_relative 'languages/languages'
 
+  
 module Snip
-	class Run
-		def argv_ext_check(pos)
-			if ARGV[pos]
-				(ARGV[pos] == "rb" || ARGV[pos] == "js" || ARGV[pos] == "erb")
-			else
-				false
-			end
-		end
-
-		def display_file
-			DestinationFileWriter.return_display_file
-		end
-
-		def execute
-			unless ARGV[0]
-				abort(ViewFormatter.no_args_message)
-			end
-
-			if ARGV[0] == "--help"
-				abort(ViewFormatter.terminal_help_message)
-			end
-
-			if ARGV[0] == "-f"
-				if !ARGV[1].nil?
-					if File.directory?(ARGV[1])
-						DestinationFileWriter.save_file_path_to_config_file(ARGV[1])
-						abort(ViewFormatter.new_file_path)
-					else
-						abort(ViewFormatter.need_to_specify_directory)
-					end
-				else
-					abort(ViewFormatter.specify_filename((DestinationFileWriter.snip_filepath)))
-				end
-			end
-
-			if ARGV[0] == "-l" 
-				puts ViewFormatter.show_log(DestinationFileWriter.log_filepath)
-				abort
-			end
-
-			if ARGV[0] == "-i"
-				DestinationFileWriter.reindex_all
-				abort(ViewFormatter.reindexed)
-			end
-
-			if ARGV[0] == "-w"
-				DestinationFileWriter.restore_whitespace(DestinationFileWriter.return_display_file, SearchDisplay.run(DestinationFileWriter.return_display_file))
-				abort("Whitespace restored")
-			end
-
-			if ARGV[0] == "--delete"
-				unless ARGV[1]
-					abort("Please specify which snippets you wish to delete")
-				end
-				if ARGV[1].include?(",")
-					ids = ARGV[1].split(",")
-				else
-					ids = [ARGV[1]]
-				end
-				DestinationFileWriter.rewrite_file(display_file, SearchDisplay.delete(display_file, ids))
-				DestinationFileWriter.reindex_all
-				abort("Snips #{ARGV[1]} deleted from my_snips.txt (other files must be modified manually)")
-			end
-
-			if ARGV[0] == "-d"
-				if argv_ext_check(1)
-					if ARGV[2]
-						if !ARGV[3].nil?
-							abort(ViewFormatter.display_error)
-						else
-							puts CommandLineController.display_search(ARGV[2], "." + ARGV[1])
-						end
-					else
-						puts CommandLineController.display_search("", "." + ARGV[1])
-					end
-				elsif ARGV[1] == "."
-					puts ViewFormatter.show_snips(DestinationFileWriter.snip_filepath)
-				elsif !ARGV[1].nil?
-					if !ARGV[2].nil?
-						abort(ViewFormatter.display_error)
-					else
-						puts CommandLineController.display_search(ARGV[1], "")
-				  end	
-				else
-					abort(ViewFormatter.display_error)
-				end
-				abort
-			end
-
-			DestinationFileWriter.check_config_file_for_snip_file
-
-			if ARGV[0] == "-c"
-				code = Clipboard.paste + "\n"
-				
-				if !ARGV[2].nil? && (ARGV[1] == "rb" || ARGV[1] == "js" || ARGV[1] == "erb" || ARGV[1] == "misc")
-					type = ARGV[1]
-					title = ARGV[2]
-				elsif ARGV[1].nil?
-					puts "Type of code (e.g. rb, js, erb) or press enter for misc:"
-					type = $stdin.gets.chomp
-					puts "Title:"
-				  title = $stdin.gets.chomp
-				else
-					abort(ViewFormatter.clipboard_command)
-				end
-
-				if type == "rb" || type == "js" || type == "erb"
-					origin = "clipboard (.#{type})"
-				else
-					origin = "clipboard"
-				end
-
-				Snippet.new(code: code, title: title, line: nil, filename: origin)
-				CommandLineController.file_writing
-				abort("Your code has been snipped:\n\n#{code}")
-			end
-
-			if File.directory?(ARGV[0])
-				BatchProcessing.process(ARGV[0])
-			elsif File.file?(ARGV[0])
-				if ARGV[0].end_with?(".rb") || ARGV[0].end_with?(".js") ||ARGV[0].end_with?(".erb") 
-				  CommandLineController.run(ARGV[0])
-				else
-					abort(ViewFormatter.invalid_file)
-				end
-			else
-				abort(ViewFormatter.file_not_found)
-			end
-
-			puts ViewFormatter.success_message(DestinationFileWriter.full_file_directory)
-		end
-	end
+  class Run
+
+### execution flow for ARGV
+    def execute
+      unless ARGV[0]
+        abort(ViewFormatter.no_args_message)
+      end
+
+      if ARGV[0] == "--help" || ARGV[0] == "-h"
+        abort(ViewFormatter.terminal_help_message)
+      end
+
+      # set file location
+      if ARGV[0] == "-f"
+        set_output_file_location
+      end
+
+      # show log
+      if ARGV[0] == "-l" 
+        puts ViewFormatter.show_log(DestinationFileWriter.log_filepath)
+        abort
+      end
+
+      # reindex
+      if ARGV[0] == "-i"
+        DestinationFileWriter.reindex_all
+        abort(ViewFormatter.reindexed)
+      end
+
+      # restore whitespace
+      if ARGV[0] == "-w"
+        display_file = DestinationFileWriter.return_display_file
+        DestinationFileWriter.restore_whitespace(display_file, SearchDisplay.return_search_results(display_file))
+        abort(ViewFormatter.whitespace_success)
+      end
+
+      # delete
+      if ARGV[0] == "--delete"
+        unless ARGV[1]
+          abort(ViewFormatter.delete_error)
+        end
+        delete_specified(ARGV[1])
+        abort(ViewFormatter.delete_success)
+      end
+
+      # display snips function
+      if ARGV[0] == "-a"
+        puts ViewFormatter.show_snips(DestinationFileWriter.snip_filepath)
+        abort
+      end
+
+      if ARGV[0] == "-s" || ARGV[0] == "-d"
+        search_snips
+        abort
+      end
+
+      # at this point we need to make sure config file exists - may want to refactor this check to occur before -d (handled in show_snips currently)
+      DestinationFileWriter.check_config_file_for_snip_file
+
+      # clipboard function
+      if ARGV[0] == "-c"
+        code = Clipboard.paste + "\n"
+        snip_from_clipboard(code)
+        abort(ViewFormatter.clipboard_success(code))
+      end
+
+      # no CL arguments (e.g. '-c') - straight snip
+      perform_file_or_batch_processing
+    end
+
+    # -f
+    def set_output_file_location
+      if ARGV[1]
+        check_if_valid_directory(ARGV[1])
+      else
+        abort(ViewFormatter.check_for_file((DestinationFileWriter.snip_filepath)))
+      end
+    end
+
+    def check_if_valid_directory(directory)
+      if File.directory?(directory)
+        DestinationFileWriter.save_file_path_to_config_file(directory)
+        abort(ViewFormatter.new_file_path)
+      else
+        abort(ViewFormatter.need_to_specify_a_directory)
+      end
+    end
+
+    # --delete
+    def delete_specified(items)
+      if items.include?(",")
+        items = items.split(",")
+      else
+        items = [items]
+      end
+      display_file = DestinationFileWriter.return_display_file
+      DestinationFileWriter.rewrite_file(display_file, SearchDisplay.delete(display_file, items))
+      DestinationFileWriter.reindex_all
+    end
+
+    # -d
+    def search_snips
+      if incorrect_num_of_args?(:d)
+        abort(ViewFormatter.display_error) 
+      end
+
+      if Language.supports?(ARGV[1]) # ext search
+        ext_to_search = ARGV[1]
+        string_to_search = ARGV[2]
+      else # string search only
+        string_to_search = ARGV[1]
+      end
+
+      puts SearchDisplay.return_search_results(DestinationFileWriter.return_display_file, string_to_search, ext_to_search)
+    end
+
+    def incorrect_num_of_args?(method)
+      !ARGV[1] || ARGV[3] || (!Language.supports?(ARGV[1]) && ARGV[2]) if method == :d
+    end
+
+    # -c
+    def snip_from_clipboard(code)
+      if ARGV[2] && (Language.supports?(ARGV[1]) || ARGV[1] == "misc") #ARGV[2] is title, ARGV[1] is ext
+        type = ARGV[1]
+        title = ARGV[2]
+      elsif ARGV[1].nil?
+        puts ViewFormatter.clipboard_prompts[0]
+        type = $stdin.gets.chomp
+        puts ViewFormatter.clipboard_prompts[1]
+        title = $stdin.gets.chomp
+      else
+        abort(ViewFormatter.clipboard_instructions)
+      end
+
+      origin = ViewFormatter.clipboard_origin(type)
+      Snippet.new(code: code, title: title, line: nil, filename: origin)
+      CommandLineController.file_writing
+    end
+
+    # no flags
+    def perform_file_or_batch_processing
+      if File.directory?(ARGV[0])
+        BatchProcessing.process(ARGV[0])
+      elsif File.file?(ARGV[0])
+        file_arr = ARGV[0].split('.')
+        if file_arr.length > 1 && Language.supports?(file_arr[-1])
+          CommandLineController.run(ARGV[0])
+        else
+          abort(ViewFormatter.invalid_input_file)
+        end
+      else
+        abort(ViewFormatter.input_file_not_found)
+      end
+
+      puts ViewFormatter.success_message(DestinationFileWriter.full_file_directory)
+    end
+  end
 end

data/lib/snip/version.rb

@@ -1,3 +1,3 @@
 module Snip
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/views/viewformatter.rb

@@ -0,0 +1,222 @@
+# View component for file writing operations
+require 'date'
+require_relative '../languages/languages'
+
+module ViewFormatter
+
+	extend self
+
+### utility
+  def conjunctionator(list = Language.languages, conj="or")
+    if list.class.name == "Hash"
+      list = list.keys
+    end
+    str = "#{list[0..-2].join(", ")} #{conj} #{list[-1]}"
+  end
+
+  def line_check(line)
+    line ? ':' + line.to_s : nil
+  end
+
+### file output formatting
+	def snippet_indexer(index, title, type)
+    languages = Language.languages
+    if languages.key?(type)
+		  "#{languages[type][0]} **** Snippet " + (index).to_s + ": #{title} **** #{languages[type][1]} \n"
+		else
+			"# **** Snippet " + (index).to_s + ": #{title} **** \n"
+		end
+	end
+
+  def status_line(line, type, file)
+    languages = Language.languages
+    if languages.key?(type)
+      "#{languages[type][0]} Snipped from #{file}#{line_check(line)} on #{Time.now.strftime("%m-%d-%Y")} #{languages[type][1]}"
+    else
+      "# Snipped from #{file}#{line_check(line)} on #{Time.now.strftime("%m-%d-%Y")}"
+    end
+  end
+
+### file management (based on check)config_file function in DestinationFileWriter)
+  def specify_path
+  	"Please specify where you would like to save your snippets by running 'snip -f <filepath>'"
+  end
+
+  def output_file_not_found(file)
+  	"Output file '#{file}' not found, please specify existing file location or desired location for new file by running 'snip -f <filepath>'"
+  end
+
+  def new_file(filename)
+  	"New snippet file created at #{File.absolute_path(filename)}"
+  end
+
+
+### default snip functionality reporting messages (based on files/directories)
+  def input_file_not_found
+    "File not found, please try again."
+  end
+
+  def invalid_input_file
+    "File must be a #{conjunctionator} file."
+  end
+
+  def mismatched_tags(status)
+    "Missing closing tag in #{status[:filename]} after line #{status[:line]}"
+  end
+
+  def success_message(filedir)
+    if Snippet.snippet_counter > 0
+      "Your snippet file has been successfully updated with #{Snippet.snippet_counter} new snips at: '#{filedir}'"
+    else
+      "No snips found in the specified files or directories."
+    end
+  end
+
+  def snip_terminal_status(filename, line)
+    if line
+      "#{filename}:#{line} snipped"
+    else
+      nil
+    end
+  end
+
+### ARGV command line argument-specific
+
+  # no args
+  def no_args_message
+    "Welcome to snip. Type 'snip --help' for help"
+  end
+
+  # filename set (-f)
+	def new_file_path
+		"Snippet file location saved as '#{File.absolute_path(ARGV[1])}/my_snips.txt'"
+	end
+
+	def check_for_file(filename)
+		if filename
+			"Your file is located at #{filename}"
+		else
+			"No output file found, please specify a filename after '-f'"
+		end
+	end
+
+	def need_to_specify_a_directory
+		"Please specify an existing directory to save your snippets to"
+	end
+
+  # Search (-d)
+	def show_snips(file)
+		if file
+			if File.readlines(file)[0]
+				File.readlines(file)
+			else
+				"Snippet file is empty"
+			end
+		else
+			"Snippet file doesn't exist. Specify where you would like to save your snippets by running 'snip -f <filepath>"	
+		end
+	end
+
+	def display_error
+		"Specify code type (#{conjunctionator}) and/or a search string, e.g. 'snip -d js \"event delegation\"', or snip -d .' for all snips"
+	end
+
+	def no_results
+		"No matching snippet files found"
+	end
+
+  # reindex (-i)
+  def reindexed
+    "Your snippet files have been reindexed"
+  end
+
+  # log (-l)
+  def show_log(log_file)
+    if File.readlines(log_file)[0]
+      File.readlines(log_file)
+    else
+      "Log file is empty"
+    end
+  end
+
+  # whitespace (-w)
+  def whitespace_success
+    "Whitespace restored"
+  end
+
+  # delete (--delete)
+  def delete_error
+    "Please specify which snippets you wish to delete"
+  end
+
+  def delete_success
+    "Snips #{ARGV[1]} deleted from my_snips.txt (other files must be modified manually)"
+  end
+
+  # clipboard (-c)
+  def clipboard_instructions
+    "Run 'snip -c' or specify code type (#{Language.languages.keys.join(", ") + " or misc"}) and a title string with: 
+ 'snip -c rb \"Using string interpolation\"' "
+  end
+
+  def clipboard_prompts
+    ["Type of code (e.g. #{conjunctionator}) or press enter for misc:", "Title:"]
+  end
+
+  def clipboard_origin(type)
+    type != "misc" ? type_str = " (.#{type})" : type_str = ""
+    "clipboard#{type_str}"
+  end
+
+
+  def clipboard_success(code)
+    "Your code has been snipped:\n\n#{code}"
+  end
+
+  # help (--help)
+  def terminal_help_message
+    "
+
+*** First time setup: ***
+
+  snip -f <directory>
+
+This specifies the directory where you would like to save your snippets. 'my_snips.txt' will be automatically created if it doesn't already exist. If you move your my_snips.txt file, you will need to run 'snip -f' again.
+
+Language-specific (e.g. .js, .rb) snippet files will be automatically created in the same directory as the .txt file.
+
+
+*** To add snip tags into your code: ***
+
+Ruby:
+
+  # <snip> Title goes here
+  5.times do {|x| puts x}
+  # </snip>
+
+JS:
+
+  // <snip> Title goes here
+  var test = 1234;
+  // </snip>
+
+You can alternatively use <$> and </$>. Your tags will be replaced with <*snip*> and/or <*$*> after running 'snip'.
+
+
+*** Ongoing usage: ***
+
+  snip <filename> - process a single file
+  snip <directory> - process a directory recursively
+  snip -a - display all your snips in terminal
+  snip -c - creates new snippet from clipboard contents
+  snip -s <type> '<string>' - searches your snips with type #{conjunctionator} and/or search string
+  snip -i - reindexes your snippet files (after deleting old snips, etc)
+  snip -l - view log history if you need to debug previous snips
+  snip --delete <num> - deletes the specified snippet number(s) (comma-delimited) and reindexes
+  snip --help - displays this help menu
+
+Visit https://github.com/jgerminario/snip for more information or to submit bug reports/feature requests.
+
+"
+  end
+end

data/my_snips.rb

@@ -1,198 +0,0 @@
-# **** Snippet 1: Title of first snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb:1 on 12-13-2014
-  desc "create the database"
-  task :create do
-    puts "Creating file #{DB_PATH} if it doesn't exist..."
-    touch DB_PATH
-  end
-
-
-# **** Snippet 2: Title of this snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb:9 on 12-13-2014
-  desc "drop the database"
-  task :drop do
-    puts "Deleting #{DB_PATH}..."
-    rm_f DB_PATH
-  end
-
-
-# **** Snippet 3: Title of first snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb:17 on 12-13-2014
-  desc "create the database"
-  task :create do
-    puts "Creating file #{DB_PATH} if it doesn't exist..."
-    touch DB_PATH
-  end
-
-
-# **** Snippet 4: Title of this snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb:25 on 12-13-2014
-  desc "drop the database"
-  task :drop do
-    puts "Deleting #{DB_PATH}..."
-    rm_f DB_PATH
-  end
-
-
-# **** Snippet 5: Title of this snip **** 
-# Snipped from rspec/test_snip_files/test.rb:1 on 12-13-2014
-class OrangeTree
-  attr_reader :age, :height
-  def initialize
-    @age = 0
-    @oranges = []
-  end
-
-
-# **** Snippet 6: TITLE **** 
-# Snipped from rspec/test_snip_files/test.rb:10 on 12-13-2014
-  def age!
-    @oranges += Array.new(rand(1..10)) { Orange.new } if @age > 5
-  end
-
-
-# **** Snippet 7: test **** 
-# Snipped from rspec/test_snip_files/test.rb:16 on 12-13-2014
-  def any_oranges?
-    !@oranges.empty?
-  end
-
-
-# **** Snippet 8: Title ggg **** 
-# Snipped from rspec/test_snip_files/test2.rb:1 on 12-13-2014
-def method
-  "code"
-end
-
-
-# **** Snippet 9: Title 2323 **** 
-# Snipped from rspec/test_snip_files/test2.rb:7 on 12-13-2014
-def method
-  "code"
-end
-
-
-# **** Snippet 10: Title 4 **** 
-# Snipped from rspec/test_snip_files/test2.rb:13 on 12-13-2014
-def method
-  "code"
-end
-
-
-# **** Snippet 11: sweet jesus **** 
-# Snipped from clipboard (.rb): on 12-13-2014
-["line_check(line)"]
-
-# **** Snippet 12: test **** 
-# Snipped from clipboard (.rb): on 12-13-2014
-if File.directory?(ARGV[0])
-        BatchProcessing.process(ARGV[0])
-      elsif File.file?(ARGV[0])
-        if ARGV[0].end_with?(".rb") || ARGV[0].end_with?(".js") ||ARGV[0].end_with?(".erb") 
-          CommandLineController.run(ARGV[0])
-        else
-          abort(ViewFormatter.invalid_file)
-        end
-      else
-        abort(ViewFormatter.file_not_found)
-      end
-
-      puts ViewFormatter.success_message(DestinationFileWriter.full_file_directory)
-
-# **** Snippet 13: cool catz **** 
-# Snipped from clipboard (.rb): on 12-14-2014
-      if File.directory?(ARGV[0])
-        BatchProcessing.process(ARGV[0])
-      elsif File.file?(ARGV[0])
-        if ARGV[0].end_with?(".rb") || ARGV[0].end_with?(".js") ||ARGV[0].end_with?(".erb") 
-          CommandLineController.run(ARGV[0])
-        else
-          abort(ViewFormatter.invalid_file)
-        end
-      else
-        abort(ViewFormatter.file_not_found)
-      end
-
-      puts ViewFormatter.success_message(DestinationFileWriter.full_file_directory)
-
-# **** Snippet 14: Title of first snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb::1 on 12-16-2014
-  desc "create the database"
-  task :create do
-    puts "Creating file #{DB_PATH} if it doesn't exist..."
-    touch DB_PATH
-  end
-
-
-# **** Snippet 15: Title of this snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb::9 on 12-16-2014
-  desc "drop the database"
-  task :drop do
-    puts "Deleting #{DB_PATH}..."
-    rm_f DB_PATH
-  end
-
-
-# **** Snippet 16: Title of first snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb::17 on 12-16-2014
-  desc "create the database"
-  task :create do
-    puts "Creating file #{DB_PATH} if it doesn't exist..."
-    touch DB_PATH
-  end
-
-
-# **** Snippet 17: Title of this snip **** 
-# Snipped from rspec/test_snip_files/subfolder/test3.rb::25 on 12-16-2014
-  desc "drop the database"
-  task :drop do
-    puts "Deleting #{DB_PATH}..."
-    rm_f DB_PATH
-  end
-
-
-# **** Snippet 18: Title of this snip **** 
-# Snipped from rspec/test_snip_files/test.rb::1 on 12-16-2014
-class OrangeTree
-  attr_reader :age, :height
-  def initialize
-    @age = 0
-    @oranges = []
-  end
-
-
-# **** Snippet 19: TITLE **** 
-# Snipped from rspec/test_snip_files/test.rb::10 on 12-16-2014
-  def age!
-    @oranges += Array.new(rand(1..10)) { Orange.new } if @age > 5
-  end
-
-
-# **** Snippet 20: test **** 
-# Snipped from rspec/test_snip_files/test.rb::16 on 12-16-2014
-  def any_oranges?
-    !@oranges.empty?
-  end
-
-
-# **** Snippet 21: Title ggg **** 
-# Snipped from rspec/test_snip_files/test2.rb::1 on 12-16-2014
-def method
-  "code"
-end
-
-
-# **** Snippet 22: Title 2323 **** 
-# Snipped from rspec/test_snip_files/test2.rb::7 on 12-16-2014
-def method
-  "code"
-end
-
-
-# **** Snippet 23: Title 4 **** 
-# Snipped from rspec/test_snip_files/test2.rb::13 on 12-16-2014
-def method
-  "code"
-end
-
-

data/rspec/rspec.rb

@@ -1,6 +1,6 @@
 require 'rspec'
 # require 'active_record'
-require_relative '../app/controllers/controller'
+require_relative '../lib/controllers/controller'
 # require_relative '../config/environment'
 
 describe "This program" do

data/snip.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   # spec.executables = ["snip"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib", "db", "config", "app", "log"]
+  spec.require_paths = ["lib", "db", "config", "log"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snipgem
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - jgerminario
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,18 +83,19 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - Rakefile
-- app/controllers/controller.rb
-- app/models/snippet.rb
-- app/models/utils/batchprocessing.rb
-- app/models/utils/codescanner.rb
-- app/models/utils/destinationfilewriter.rb
-- app/models/utils/searchfile.rb
-- app/models/utils/sourcefilereader.rb
-- app/views/viewformatter.rb
 - bin/snip
 - config/filepath.config
+- lib/controllers/controller.rb
+- lib/languages/languages.rb
+- lib/models/snippet.rb
+- lib/models/utils/batchprocessing.rb
+- lib/models/utils/codescanner.rb
+- lib/models/utils/destinationfilewriter.rb
+- lib/models/utils/searchfile.rb
+- lib/models/utils/sourcefilereader.rb
 - lib/snip.rb
 - lib/snip/version.rb
+- lib/views/viewformatter.rb
 - log/snip.log
 - my_snips.rb
 - rspec/rspec.rb
@@ -116,7 +117,6 @@ require_paths:
 - lib
 - db
 - config
-- app
 - log
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:

data/app/controllers/controller.rb

@@ -1,30 +0,0 @@
-require_relative '../models/utils/sourcefilereader'
-require_relative '../models/utils/codescanner'
-require_relative '../models/utils/destinationfilewriter'
-require_relative '../models/utils/searchfile'
-
-module CommandLineController
-
-  extend self
-
-  def run(file)
-    file_read = SourceFileReaderWriter.new(file)
-    to_run = file_read.convert_to_array_of_lines
-    CodeScanner.run(to_run, SourceFileReaderWriter.file_to_open)
-      file_writing
-      file_read.overwrite_existing_snips
-  end
-
-  def file_writing
-    DestinationFileWriter.run(Snippet.snippet_array)
-    DestinationFileWriter.run(Snippet.rb_snippets, "rb") if Snippet.rb_snippets.any?
-    DestinationFileWriter.run(Snippet.js_snippets, "js") if Snippet.js_snippets.any?
-    DestinationFileWriter.run(Snippet.erb_snippets, "erb") if Snippet. erb_snippets.any?
-    Snippet.snippet_array = []
-  end
-
-  def display_search(text, ext)
-    SearchDisplay.run(DestinationFileWriter.return_display_file, text, ext)
-  end
-
-end

data/app/models/utils/batchprocessing.rb

@@ -1,11 +0,0 @@
-class BatchProcessing
-
-  def self.process(directory)
-  	directory = directory.chomp('/')
-    Dir.glob(directory + "/**/*.{rb,js,erb}") do |file|
-      next if file == '.' or file == '..'
-      CommandLineController.run(file)
-    end
-  end
-
-end

data/app/models/utils/searchfile.rb

@@ -1,42 +0,0 @@
-module SearchDisplay
-
-	extend self
-
-	def check_for_title(line)
-		line.match(/\*\*\*\* Snippet \d+:/)
-	end
-
-	def run(file,text="",ext="")
-		if !search_snips(divide_snips(file), text, ext).empty?
-			 search_snips(divide_snips(file), text, ext)
-		else
-			ViewFormatter.no_results
-		end
-	end
-
-  def divide_snips(file)
-  	snip_array = []
-  	snip_str = ""
-    File.open(file, "r").each do |line|
-    	if check_for_title(line)
-	      snip_array << snip_str
-	    	snip_str = line
-	    else
-	      snip_str << line
-	    end
-    end
-    snip_array << snip_str
-    snip_array.shift
-    snip_array
-  end
-
-  def search_snips(array,text,ext)
-  	array.select{ |snip| snip.include?(text) && snip.include?(ext)}
-  end
-
-  def delete(file, ids)
-  	run(file).reject do |snip|
-  		ids.include?(snip.match(/\*\*\*\* Snippet (\d+):/).captures[0])
-  	end
-  end
-end

data/app/views/viewformatter.rb

@@ -1,169 +0,0 @@
-# View component for file writing operations and possibly terminal output
-require 'date'
-
-module ViewFormatter
-
-	extend self
-
-	def snippet_indexer(index, title, type)
-		if type == "js"
-		  "// **** Snippet " + (index).to_s + ": #{title} **** \n"
-		elsif type == "erb"
-		  "<!-- **** Snippet " + (index).to_s + ": #{title} **** -->\n"
-		else
-			"# **** Snippet " + (index).to_s + ": #{title} **** \n"
-		end
-	end
-
-	def file_not_found
-		"File not found, please try again."
-	end
-
-	def invalid_file
-		"File must be a .js, .rb or .erb file."
-	end
-
-	def success_message(filedir)
-		if Snippet.snippet_counter > 0
-			"Your snippet file has been successfully updated with #{Snippet.snippet_counter} new snips at: '#{filedir}'"
-		else
-			"No snips found in the specified files or directories."
-		end
-	end
-
-  def status_line(line, type, file)
-  	if type == "js"
-   	  "// Snipped from #{file}#{line_check(line)} on #{Time.now.strftime("%m-%d-%Y")}"
-   	elsif type == "erb"
-   	  "<!-- Snipped from #{file}#{line_check(line)} on #{Time.now.strftime("%m-%d-%Y")}-->"
-   	else
-   		"# Snipped from #{file}#{line_check(line)} on #{Time.now.strftime("%m-%d-%Y")}"
-   	end
-  end
-
-  def line_check(line)
-  	line ? ':' + line.to_s : nil
-  end
-
-  def snip_terminal_status(filename, line)
-  	if line
-  		"#{filename}:#{line} snipped"
-  	else
-  		nil
-  	end
-  end
-
-  def specify_path
-  	"Please specify where you would like to save your snippets by running 'snip -f <filepath>'"
-  end
-
-  def output_file_not_found(file)
-  	"Output file '#{file}' not found, please specify existing file location or desired location for new file by running 'snip -f <filepath>'"
-  end
-
-  def new_file(filename)
-  	"New snippet file created at #{File.absolute_path(filename)}"
-  end
-
-  def terminal_help_message
-  	"
-
-*** First time setup: ***
-
-  snip -f <directory>
-
-This specifies the directory where you would like to save your snippets. 'my_snips.txt' will be automatically created if it doesn't already exist. If you move your my_snips.txt file, you will need to run 'snip -f' again.
-
-Ruby and JavaScript snippet files will be automatically created in the same directory as the .txt file.
-
-
-*** To add snip tags into your code: ***
-
-Ruby:
-
-  # <snip> Title goes here
-  5.times do {|x| puts x}
-  # </snip>
-
-JS:
-
-  // <snip> Title goes here
-  var test = 1234;
-  // </snip>
-
-You can alternatively use <$> and </$>. Your tags will be replaced with <*snip*> and/or <*$*> after running 'snip'.
-
-
-*** Ongoing usage: ***
-
-  snip <filename> - process a single file
-  snip <directory> - process a directory recursively
-  snip -c - creates new snippet from clipboard contents
-  snip -d . - display all your snips in terminal
-  snip -d <type> '<string>' - searches your snips by type (js, rb, erb) or search string
-  snip -i - reindexes your snippet files (after deleting old snips, etc)
-  snip -l - view log history if you need to debug previous snips
-  snip --delete <num> - deletes the specified snippet number(s) (comma-delimited) and reindexes
-  snip --help - displays this help menu
-
-Visit https://github.com/jgerminario/snip for more information or to submit bug reports/feature requests.
-
-"
-	end
-
-	def new_file_path
-		"Snippet file location saved as '#{File.absolute_path(ARGV[1])}/my_snips.txt'"
-	end
-
-	def no_args_message
-		"Welcome to snip. Type 'snip --help' for help"
-	end
-
-	def specify_filename(filename)
-		if filename
-			"Your file is located at #{filename}"
-		else
-			"No output file found, please specify a filename after '-f'"
-		end
-	end
-
-	def need_to_specify_directory
-		"Please specify an existing directory to save your snippets to"
-	end
-
-	def show_log(log_file)
-		if File.readlines(log_file)[0]
-			File.readlines(log_file)
-		else
-			"Log file is empty"
-		end
-	end
-
-	def show_snips(file)
-		if file
-			if File.readlines(file)[0]
-				File.readlines(file)
-			else
-				"Snippet file is empty"
-			end
-		else
-			"Snippet file doesn't exist. Specify where you would like to save your snippets by running 'snip -f <filepath>"	
-		end
-	end
-
-	def reindexed
-		"Your snippet files have been reindexed"
-	end
-
-	def clipboard_command
-		"Run 'snip -c' or specify code type (js, rb, erb, misc) and a title string with: 
- 'snip -c rb \"Using string interpolation\"' "
-	end
-
-	def display_error
-		"Specify code type (js, rb, erb) and/or a search string, e.g. 'snip -d js \"event delegation\"', or snip -d .' for all snips"
-	end
-	def no_results
-		"No matching snippet files found"
-	end
-end