fewald-worklog 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1bb6e2ee81700ee384981acfa68bfde33ba9d2e5e7d0af30b0c08c392bde042
-  data.tar.gz: ac0fa2e1c558f97bc11cdcb145e5a1b8eb12fd0ca661dd932f545108b0386732
+  metadata.gz: 190a52d7236e8befad053e79f9fbba8f32f149e354695148a73b732b21172e6b
+  data.tar.gz: 5bbd3f3a1200119a20288eb59889bd7498c8d08a01e6ebbc1506b95dd8233e38
 SHA512:
-  metadata.gz: 5dcae260eadbe46143a35b2dab7a6c3e780104d5b95dbeef0b439f52613e2dcc4ffa014d2963947715700feca90a88ec9c814fa5a7b90bea56068262b8bd8891
-  data.tar.gz: a4eedd1a9d6e7395fdfd7a758c90548e1eccc62195c80fb6475433500c4a376b67b3ba1e6ab857f9048234b643670f9b814908941093f9881be3d8d4aedb31b3
+  metadata.gz: a2a075eeda5349c0190ce4a6420c5bd6b34759ffdf11845227f9c4fc89d2b522ba095c5059abb19b8c4508c7eaf0a2faf72ac6a980844bd89e6d5dde7d982052
+  data.tar.gz: 8af5b16a3b3288f5c124d59442d76e83a0d6743ad5a34de5d4c930d3217c0277809082c8fe9c4b2045bf77311c03617b4fb9d5c4b9f495045b737d9a21345efc

data/.version

@@ -1 +1 @@
-0.2.11
+0.2.13

data/bin/wl

@@ -6,12 +6,13 @@
 if ENV['WL_PATH']
   # Import the worklog CLI from the path specified in the WL_PATH environment variable
   # This is used during development to avoid having to rely on the order of the $PATH.
-  puts "Loading worklog from #{ENV['WL_PATH']}. This should only be used during development."
-  puts 'To use the installed worklog, unset the WL_PATH environment variable.'
+  warn "Loading worklog from #{ENV['WL_PATH']}. This should only be used during development."
+  warn 'To use the installed worklog, unset the WL_PATH environment variable.'
   $LOAD_PATH.unshift File.join(ENV['WL_PATH'], 'lib')
   require 'cli'
 else
   require_relative '../lib/cli'
 end
 
+# Start the Worklog CLI application (Thor application)
 WorklogCLI.start

data/lib/cli.rb

@@ -30,7 +30,7 @@ class WorklogCLI < Thor
 
   # Initialize the CLI with the given arguments, options, and configuration
   def initialize(args = [], options = {}, config = {})
-    @config = load_configuration
+    @config = Worklog::Configuration.load
     @storage = Storage.new(@config)
     super
   end

data/lib/configuration.rb

@@ -3,32 +3,37 @@
 require 'worklogger'
 require 'yaml'
 
-# Configuration class for the application.
-class Configuration
-  attr_accessor :storage_path, :log_level, :webserver_port
+module Worklog
+  # Configuration class for the application.
+  class Configuration
+    attr_accessor :storage_path, :log_level, :webserver_port
 
-  def initialize(&block)
-    block.call(self) if block_given?
+    def initialize(&block)
+      block.call(self) if block_given?
 
-    # Set default values if not set
-    @storage_path ||= File.join(Dir.home, '.worklog')
-    @log_level ||= :info
-    @webserver_port ||= 3000
-  end
-end
+      # Set default values if not set
+      @storage_path ||= File.join(Dir.home, '.worklog')
+      @log_level = log_level || :info
+      @log_level = @log_level.to_sym if @log_level.is_a?(String)
+      @webserver_port ||= 3000
+    end
+
+    # Load configuration from a YAML file in the user's home directory.
+    # If the file does not exist, it will use default values.
+    # @return [Configuration] the loaded configuration
+    def self.load
+      file_path = File.join(Dir.home, '.worklog.yaml')
+      config = Configuration.new
+      if File.exist?(file_path)
+        file_cfg = YAML.load_file(file_path)
+        config.storage_path = file_cfg['storage_path'] if file_cfg['storage_path']
+        config.log_level = file_cfg['log_level'].to_sym if file_cfg['log_level']
+        config.webserver_port = file_cfg['webserver_port'] if file_cfg['webserver_port']
+      else
+        WorkLogger.debug "Configuration file does not exist in #{file_path}, using defaults."
+      end
 
-# Load configuration from a YAML file.
-# The file should be located at ~/.worklog.yaml.
-def load_configuration
-  file_path = File.join(Dir.home, '.worklog.yaml')
-  if File.exist?(file_path)
-    file_cfg = YAML.load_file(file_path)
-    Configuration.new do |cfg|
-      cfg.storage_path = file_cfg['storage_path'] if file_cfg['storage_path']
-      cfg.log_level = file_cfg['log_level'].to_sym if file_cfg['log_level']
-      cfg.webserver_port = file_cfg['webserver_port'] if file_cfg['webserver_port']
+      config
     end
-  else
-    WorkLogger.debug "Configuration file does not exist in #{file_path}"
   end
 end

data/lib/editor.rb

@@ -7,7 +7,7 @@ require 'tempfile'
 module Editor
   EDITOR_PREAMBLE = ERB.new <<~README
     # Edit the content below, then save the file and quit the editor.
-    # The update content will be saved. The content MUST be valid YAML
+    # The updated content will be saved. The content MUST be valid YAML
     # in order for the application to be able to update the records.
 
     <%= content %>

data/lib/worklog.rb

@@ -5,6 +5,7 @@ require 'optparse'
 require 'rainbow'
 require 'yaml'
 
+require 'configuration'
 require 'hash'
 require 'daily_log'
 require 'date_parser'
@@ -332,6 +333,7 @@ module Worklog
       rescue Errno::ENOENT
         raise ProjectNotFoundError, 'No projects found. Please create a project first.'
       end
+      WorkLogger.debug "Project with key '#{project_key}' exists."
       return if projects.key?(project_key)
 
       raise ProjectNotFoundError, "Project with key '#{project_key}' does not exist."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fewald-worklog
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Friedrich Ewald