til_cli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a773142db2255fa70087ca8a5a83e936fa752cd6
-  data.tar.gz: 3a7eebc35359898b06464a1f63e8d24823bae401
+  metadata.gz: 8571a5af0ee187a3b0bc6156467bc6b0059f946f
+  data.tar.gz: ab777a8ab74f8c3d614e12acfdc3c91b8ced403b
 SHA512:
-  metadata.gz: 5a1d87ae67ab833e3e27c144af2fbdb2a6668eea9eaac035a0b2cff1ad4251ae93fa9e24a1a0210f6c151a43cbfda04954b9ef719ad04f7f3b2e0ae308437c34
-  data.tar.gz: 5171ce6bb23ce82e7ecee813e5e075e31c5a38e72bc6c2ecba91a4f929fa1cb3a305b7f0522da1dd498948e4a5543790bc3d1af81a9c092e977d2fa6d02f89dc
+  metadata.gz: 5b45f55fd8e8c8ca524d202db891b0137b8bc7fb3bf4ed4aff5a22adac11554ce3eb4138969b75cc38c7dd8c2c175f077689ceadba44153990bcd7fc0d5bf8d6
+  data.tar.gz: b4a562bde54b96dc139bdffdf371e1c4d809fded1af998833fe77633a4ab1e3e15a7b8224ffb44481d78463ae7e73265c7fc086518b6d3751b6c8cf4378bb2bf

data/lib/til.rb

@@ -1,16 +1,15 @@
-require "til/version"
 require 'til/cli'
-require 'til/settings'
-require 'til/note'
-require 'til/directory'
-require 'til/note_writer'
-require 'til/note_list'
-require 'til/note_editor'
-require 'til/note_deleter'
-require 'til/initializer'
+require 'til/version'
+require 'til/models/settings'
+require 'til/models/note'
+require 'til/models/directory'
+require 'til/models/note_list'
+require 'til/services/note_writer'
+require 'til/services/note_editor'
+require 'til/services/note_deleter'
+require 'til/services/initializer'
 
 module Til
-  EDITOR = ENV["VISUAL"] || ENV["EDITOR"] || "vim"
   HIGHLIGHT_COLORS = {
       0 => :yellow,
       1 => :light_blue,
@@ -21,10 +20,10 @@ module Til
       6 => :light_magenta,
     }
 
-  def self.init_settings_file_and_notes_repo
-    Initializer.new.create_settings_file unless Settings.settings_file_configured?
+  def self.config_settings_file_and_notes_repo
+    Initializer.new.create_settings_file
     Initializer.new.create_notes_directory
-    puts "Your settings file is at `#{Settings.settings_file_path}`. Your notes are at `#{Settings.load.directory}`."
+    puts "Your settings file is at `#{Settings.load.settings_file_path}`. Your notes are at `#{Settings.load.directory}`."
   end
 
   def self.print_working_directory
@@ -54,7 +53,6 @@ module Til
     NoteWriter.new(title).call(if_modified, if_unmodified)
   end
 
-
   def self.search_results_for(search_terms)
     matches = NoteList.new
     Directory.root.notes.each do |note|
@@ -68,14 +66,14 @@ module Til
 
   def self.edit_file(search_term, options)
     if options[:last] 
-      system(EDITOR, Directory.root.notes.most_recent.path)
+      system(Settings.load.editor, Directory.root.notes.most_recent.path)
       return
     end
     matches = Til.search_results_for(search_term)
     if matches.length < 1
       puts "no matches"
     else
-      system(EDITOR, matches.filter.path)
+      system(Settings.load.editor, matches.filter.path)
     end
   end
 

data/lib/til/cli.rb

@@ -6,10 +6,17 @@ require 'json'
 
 module Til
   class Cli < Thor
-    
-    desc "init", "Generate a settings file if one doesn't already exist."
-    def init
-      Til.init_settings_file_and_notes_repo
+    map "-v" => :version, "-V" => :version
+
+    desc "version", "Show TIL version"
+    def version
+      require "til/version.rb"
+      say "til_cli #{Til::VERSION}"
+    end
+
+    desc "config", "Generate a settings file if one doesn't already exist."
+    def config
+      Til.config_settings_file_and_notes_repo
     end
 
     desc "github", "If your notes have a remote repository on Github, open it."

data/lib/til/{directory.rb → models/directory.rb}

@@ -1,5 +1,3 @@
-require 'til/note'
-
 module Til
   class Directory
     attr_reader :path

data/lib/til/models/settings.rb

@@ -0,0 +1,36 @@
+require 'pathname'
+
+module Til
+  class Settings
+    attr_reader :settings, :settings_file_path
+
+    def self.load
+      @settings_file_path = File.expand_path("~/.til.config")
+      if File.exist?(@settings_file_path)
+        self.new(@settings_file_path)
+      else
+        puts "You don't appear to have a settings file! Configuring one now.".red
+        Initializer.new.create_settings_file(@settings_file_path)
+        self.new(@settings_file_path)
+      end
+    end
+
+    def directory
+      File.expand_path(settings["directory"])
+    end
+
+    def github_repo
+      settings["github_repo"]
+    end
+
+    def editor
+      settings["editor"] || ENV["VISUAL"] || ENV["EDITOR"] || "vim"
+    end
+
+    private
+
+    def initialize(config_file)
+      @settings = JSON.parse(File.read(config_file))
+    end
+  end
+end

data/lib/til/{initializer.rb → services/initializer.rb}

@@ -5,11 +5,17 @@ module Til
     include Thor::Base
     include Thor::Actions
 
-    def create_settings_file
-      notes_directory = ask("What directory do you want your TIL notes to live in? (If you have no preference, press return to default to `~/til`.)\n>")
-      github_repo = ask("Do you have a GitHub repo for your TIL notes? Paste the URL here if so; otherwise, press return.\n>")
-      File.open(Settings.settings_file_path, "w") do |f|
-        f.write(settings_hash(notes_directory, github_repo).to_json)
+    def create_settings_file(settings_file_path=File.expand_path("~/.til.config"))
+      begin
+        notes_directory = ask("What directory do you want your TIL notes to live in? (If you have no preference, press return to default to `~/til`.)\n>")
+        github_repo = ask("Do you have a GitHub repo for your TIL notes? Paste the URL here if so; otherwise, press return.\n>")
+
+        File.open(settings_file_path, "w") do |f|
+          f.write(settings_hash(notes_directory, github_repo).to_json)
+        end
+      rescue Interrupt
+        puts "Aborted!"
+        abort
       end
     end
 

data/lib/til/{note_deleter.rb → services/note_deleter.rb}

@@ -12,8 +12,9 @@ module Til
       begin
         choice = ask("Really delete \"#{note.title.bold}\" (in #{note.subject.bold})? (y/n)")
         if (choice == "y") || (choice == "yes")
+          deleted_note_title = note.title
           File.delete(note.path)
-          puts "\"#{note.title.bold}\" deleted.".green
+          puts "\"#{deleted_note_title.bold}\" deleted.".green
         else
           puts "\"#{note.title.bold}\" not deleted.".red
         end

data/lib/til/version.rb

@@ -1,3 +1,3 @@
 module Til
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/til.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency "thor", "~> 0.19.1"
-  spec.add_dependency "colorize", "~> 0.7.5"
+  spec.add_dependency "colorize", "~> 0.7.7"
   spec.add_dependency "json", "1.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: til_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kevin Litchfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -96,15 +96,15 @@ files:
 - bin/til
 - lib/til.rb
 - lib/til/cli.rb
-- lib/til/directory.rb
-- lib/til/initializer.rb
-- lib/til/note.rb
-- lib/til/note_deleter.rb
-- lib/til/note_editor.rb
-- lib/til/note_finder.rb
-- lib/til/note_list.rb
-- lib/til/note_writer.rb
-- lib/til/settings.rb
+- lib/til/models/directory.rb
+- lib/til/models/note.rb
+- lib/til/models/note_list.rb
+- lib/til/models/settings.rb
+- lib/til/services/initializer.rb
+- lib/til/services/note_deleter.rb
+- lib/til/services/note_editor.rb
+- lib/til/services/note_finder.rb
+- lib/til/services/note_writer.rb
 - lib/til/version.rb
 - til.gemspec
 homepage: ''

data/lib/til/settings.rb

@@ -1,33 +0,0 @@
-require 'pathname'
-
-module Til
-  class Settings
-    attr_reader :settings
-
-    SETTINGS_FILE_PATH = File.expand_path("~/.til.config")
-
-    def initialize(config_file)
-      @settings = JSON.parse(File.read(config_file))
-    end
-
-    def self.load
-      self.new(SETTINGS_FILE_PATH)
-    end
-
-    def self.settings_file_path
-      SETTINGS_FILE_PATH
-    end
-
-    def self.settings_file_configured?
-      File.exist?(SETTINGS_FILE_PATH)
-    end
-
-    def directory
-      File.expand_path(settings["directory"])
-    end
-
-    def github_repo
-      settings["github_repo"]
-    end
-  end
-end