til-rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d7142e1a89db2641e1d6da0699c13ee4a4da511331c9822deaef61ca9d546b
-  data.tar.gz: 29eedc188aa255a16d0cb9734412594013b1b2a18ae2836c5194cc0a3ae827e5
+  metadata.gz: 36329998af769fde62b800136de45304100925992f85d14463a127070da4b66d
+  data.tar.gz: e0283b08a1145176a3e6b7ea6e77dc65f4030f86571d7db3f6b475a3085213fa
 SHA512:
-  metadata.gz: d58c4a7620cfd20fc9901fa3bc10526662a6eea6c0393d58334976cf67a002a871bfad747c6b8ddd95190e824a9f98d2cd81548eebab2811cccefdda7a0d6aa6
-  data.tar.gz: c8f88bf4d8a0336efafcbcb4d0add65a8979845fbea4e34cca19e29a2563e06668335c94d22a3af1003f5eb35782db1329de158685a7518b84131276a0ea6486
+  metadata.gz: '092def75bd54793b9318dc91a0b58bf3a6b09a488100daa0320bf97882f6fa94c6b84686aaf54c12e5bf51b662cc322b41de9a0a62c7e2fd2bd66732d3e80780'
+  data.tar.gz: 3d241da839314e320055bf5c2e717017f57deafdf2a9f3463a8174ccd4a846df3afa68c9f2601669ab5b54cd8aa034c0d864a68dff6d0a7e0136c0d48d199953

data/lib/til-rb.rb

@@ -1,2 +1,3 @@
 require 'til/core'
+require 'til/readme_updater'
 require 'til/version'

data/lib/til/core.rb

@@ -1,5 +1,6 @@
 require 'octokit'
 require 'tempfile'
+require 'readline'
 
 module Til
   class Core
@@ -37,6 +38,9 @@ module Til
         check_environment_variables
         existing_categories = fetch_existing_categories
         selected_category = prompt_fzf(existing_categories)
+        if @new_category
+          selected_category = prompt_for_new_category
+        end
         prepopulate_tempfile(selected_category)
         open_editor
         til_content = read_file
@@ -99,6 +103,10 @@ module Til
       throw :exit
     end
 
+    def prompt_for_new_category
+      Readline.readline("New category > ").downcase
+    end
+
     def prepopulate_tempfile(selected_category, title = 'Title Placeholder')
       @tempfile = Tempfile.new('til.md')
       @tempfile.write("# #{title}")
@@ -155,28 +163,12 @@ module Til
     end
 
     def update_readme_content(category, commit_title, filename, readme_content)
-      beginning = readme_content.index('### Categories') + '### Categories'.length
-      eend = readme_content.index('---', readme_content.index('---') + 1) - 1
-
-      # [["[Git](#git)", "Git", "git"], ["[Qux](#qux)", "Qux", "qux"]]
-      categories = readme_content[beginning..eend].scan(/(\[(\w+)\]\(#(\w+)\))/)
+      updater = Til::ReadmeUpdater.new(readme_content)
 
       if @new_category
+        updater.add_item_for_new_category(category, commit_title, filename)
       else
-        existing_cat = categories.find { |c| c[2] == category }
-
-        loc_in_page = readme_content.index("### #{existing_cat[1]}")
-        next_cat_location = readme_content.index('###', loc_in_page + 1)
-
-        new_line = "- [#{commit_title}](#{category}/#{filename})"
-        new_readme_content = ''
-        if next_cat_location
-          breakpoint = next_cat_location - 2
-          new_readme_content = readme_content[0..breakpoint] + new_line + readme_content[breakpoint..]
-        else
-          new_readme_content = readme_content + new_line + '\n'
-        end
-        new_readme_content
+        updater.add_item_for_existing_category(category, commit_title, filename)
       end
     end
 

data/lib/til/readme_updater.rb

@@ -0,0 +1,85 @@
+module Til
+  class ReadmeUpdater
+
+    def initialize(initial_content)
+      @initial_content = initial_content
+    end
+
+    def add_item_for_existing_category(category, item_title, filename)
+      beginning = @initial_content.index('### Categories') + '### Categories'.length
+      eend = @initial_content.index('---', @initial_content.index('---') + 1) - 1
+
+      # [["[Git](#git)", "Git", "git"], ["[Qux](#qux)", "Qux", "qux"]]
+      categories = @initial_content[beginning..eend].scan(/(\[(\w+)\]\(#(\w+)\))/)
+
+      existing_cat = categories.find { |c| c[2] == category }
+
+      loc_in_page = @initial_content.index("### #{existing_cat[1]}")
+      next_cat_location = @initial_content.index('###', loc_in_page + 1)
+
+      new_line = "- [#{item_title}](#{category}/#{filename})"
+      new_readme_content = ''
+      if next_cat_location
+        breakpoint = next_cat_location - 2
+        new_readme_content = @initial_content[0..breakpoint] + new_line + @initial_content[breakpoint..]
+      else
+        new_readme_content = @initial_content + new_line + "\n"
+      end
+      new_readme_content
+    end
+
+    def add_item_for_new_category(category, item_title, filename)
+      # TODO: We'll need some form of validation on the category name
+      beginning = @initial_content.index('### Categories') + '### Categories'.length
+      first_dashdashdash = @initial_content.index('---')
+      eend = @initial_content.index('---', first_dashdashdash + 1) - 1
+
+      # [["[Git](#git)", "Git", "git"], ["[Qux](#qux)", "Qux", "qux"]]
+      categories = @initial_content[beginning..eend].scan(/(\[(\w+)\]\(#(\w+)\))/)
+
+      insert_at = categories.bsearch_index do |category_triplet|
+        category_triplet[2] >= category
+      end
+
+      if insert_at.nil?
+        # It's the last category
+        insert_at = categories.length
+      end
+
+      categories.insert(insert_at, ["[#{category.capitalize}](\##{category})", category.capitalize, category])
+
+      new_categories_formatted = categories.map do |category|
+        "* #{category[0]}"
+      end.join("\n")
+
+      new_categories_formatted.prepend("### Categories\n\n")
+
+      category_sections_found = 0
+      current_search_index = eend + 1 + 3
+
+      while category_sections_found < insert_at
+        current_search_index = @initial_content.index('###', current_search_index + 1)
+        category_sections_found += 1
+      end
+
+      next_bound = @initial_content.index('###', current_search_index + 1)
+
+      new_line = "- [#{item_title}](#{category}/#{filename})"
+
+      if next_bound
+        new_readme_content = @initial_content[0..(first_dashdashdash + 2)] \
+                             + "\n\n#{new_categories_formatted}\n" \
+                             + @initial_content[eend..(next_bound - 2)] \
+                             + "\n### #{category.capitalize}\n\n#{new_line}\n\n" \
+                             + @initial_content[next_bound..]
+      else
+        new_readme_content = @initial_content[0..(first_dashdashdash + 2)] \
+                             + "\n\n#{new_categories_formatted}\n" \
+                             + @initial_content[eend..] \
+                             + "\n### #{category.capitalize}\n\n#{new_line}\n"
+      end
+
+      new_readme_content
+    end
+  end
+end

data/lib/til/version.rb

@@ -1,5 +1,5 @@
 module Til
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: til-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pierre Jambet
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.2
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: til-rb helps you manage a repo of TILs similar to https://github.com/jbranchaud/til
 email: hello@pjam.me
 executables:
@@ -50,6 +64,7 @@ files:
 - bin/til
 - lib/til-rb.rb
 - lib/til/core.rb
+- lib/til/readme_updater.rb
 - lib/til/version.rb
 homepage: https://rubygems.org/gems/til-rb
 licenses: