fyodor 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d872937f2af8449f6858977455d787a4eee86a4c18d53c32eca0e66476d03fec
-  data.tar.gz: 5450a2700766580a2ca8df55b1d6135fa22ff368c1536dae891727bee09186bc
+  metadata.gz: e6be6cab905375c4a8adfb19399fa61bbdfdb15379544a9db64bff916c646d05
+  data.tar.gz: bfc78376508d68b62f97659e819b4ddfe1f14cb8a512036bd5e8eabad2fdbb83
 SHA512:
-  metadata.gz: a74ab203ef2bdbdcb6aa69cd62be47c24d21592f891e9eade4935a61351432c788efdcf1bb87ceed287928334f781a4b1fc21c700c63983466cbc1812a0fa1be
-  data.tar.gz: 96928dac9ae5c258fccb4ca0f2258238daf1ae01208086ccd1f79df590c54a4aa1306ed5645d58df8e82410dba626e6ebdfd31efcf04cf2d6d76bf0c6eef419d
+  metadata.gz: 0db8ca71d80e837939ac0d40165eaade2b08671e816e2e3ca81ead4830f56efe88ede3849557b4355f307edf4e2119235ed15e8fc9f6fb4558d2a98d4cd4feff
+  data.tar.gz: ef6eafa1e8006b73f0316cb60efb684846ba9c14cacaefcfc1851969be2302a3b303044d977e18f865f7231b6c558f5aedd064d99c7eb84e71e6660bf09b6911

data/bin/fyodor

@@ -2,9 +2,14 @@
 
 require "fyodor/cli"
 
-# Supress stack trace
-begin
+# Pass --trace to get the stack trace
+if ARGV.include?("--trace")
+  ARGV.delete("--trace")
   Fyodor::CLI.new.main
-rescue StandardError => e
-  abort(e.message)
+else
+  begin
+    Fyodor::CLI.new.main
+  rescue StandardError => e
+    abort(e.message)
+  end
 end

data/lib/fyodor/cli.rb

@@ -1,12 +1,14 @@
-require_relative "config_getter"
-require_relative "stats_printer"
-require_relative "library"
-require_relative "clippings_parser"
-require_relative "output_writer"
+require "fyodor/config_getter"
+require "fyodor/stats_printer"
+require "fyodor/library"
+require "fyodor/clippings_parser"
+require "fyodor/output_writer"
 require "pathname"
 
 module Fyodor
   class CLI
+    USAGE = "Usage: #{File.basename($0)} my_clippings_path [output_dir]"
+
     def initialize
       get_args
       @config = ConfigGetter.new.config
@@ -23,10 +25,7 @@ module Fyodor
     private
 
     def get_args
-      if ARGV.count != 1 && ARGV.count != 2
-        puts "Usage: #{File.basename($0)} my_clippings_path [output_dir]"
-        exit 1
-      end
+      abort(USAGE) if ARGV.count != 1 && ARGV.count != 2
 
       @clippings_path = get_path(ARGV[0])
       @output_dir = ARGV[1].nil? ? default_output_dir : get_path(ARGV[1])

data/lib/fyodor/config_getter.rb

@@ -1,11 +1,9 @@
-require_relative "core_extensions/hash/merging"
+require "fyodor/core_extensions/hash/merging"
 require "pathname"
 require "toml"
 
 module Fyodor
   class ConfigGetter
-    PATHS = [Pathname.new(__FILE__).dirname + "../fyodor.toml",
-             Pathname.new("~/.config/fyodor.toml").expand_path]
     DEFAULT = {
       "parser" => {
         "highlight" => "Your Highlight",
@@ -30,14 +28,22 @@ module Fyodor
 
     def get_config
       Hash.include CoreExtensions::Hash::Merging
-
       print_path
+
       user_config = path.nil? ? {} : TOML.load_file(path)
       DEFAULT.deep_merge(user_config)
     end
 
     def path
-      @path ||= PATHS.find { |path| path.exist? }
+      @path ||= paths.find { |path| path.exist? }
+    end
+
+    def paths
+      return @paths unless @paths.nil?
+
+      @paths = []
+      @paths << Pathname.new(ENV["XDG_CONFIG_HOME"]) + "fyodor.toml" unless ENV["XDG_CONFIG_HOME"].nil?
+      @paths << Pathname.new("~/.config/fyodor.toml").expand_path
     end
 
     def print_path

data/lib/fyodor/entry_parser.rb

@@ -1,4 +1,4 @@
-require_relative "entry"
+require "fyodor/entry"
 
 module Fyodor
   class EntryParser

data/lib/fyodor/library.rb

@@ -1,4 +1,4 @@
-require_relative "book"
+require "fyodor/book"
 require "forwardable"
 
 module Fyodor

data/lib/fyodor/md_generator.rb

@@ -1,4 +1,4 @@
-require_relative "strings"
+require "fyodor/strings"
 
 module Fyodor
   class MdGenerator

data/lib/fyodor/output_writer.rb

@@ -1,4 +1,4 @@
-require_relative "md_generator"
+require "fyodor/md_generator"
 
 module Fyodor
   class OutputWriter

data/lib/fyodor/stats_printer.rb

@@ -1,4 +1,4 @@
-require_relative "strings"
+require "fyodor/strings"
 
 module Fyodor
   class StatsPrinter

data/lib/fyodor/strings.rb

@@ -1,4 +1,4 @@
-require_relative "entry"
+require "fyodor/entry"
 
 module Fyodor
   module Strings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fyodor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rafael Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.1'
 description: Parse Kindle clippings into markdown files
 email: code@rafaelc.org
 executables: