fewald-worklog 0.3.12 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6beefb947c146666fb68e4a32a2da2ae567d78297e30fc5e76e9a39f81d28df
-  data.tar.gz: 2ff616ff8c4eb3eef62089842c6cd8d6efc05b694053b9f249cf00821dbb1533
+  metadata.gz: ab7a9c5136dd285ee57cfe1331f6890c244bd99ec989e0c6a48ff19f57c8a0b0
+  data.tar.gz: 7b5fb34ba1ef5dfe6292b0eccf85b3148f0e7de3d2d6406f3d19e5f5633fca50
 SHA512:
-  metadata.gz: eed18a21ea6c2059d18f7f94ed48d66b6b5718af10e7d052ebc1ec4425975d3ed2e8a1abd74e879ad7cd077b56e7fd5ceb05badec9065bb3d2db176b008547df
-  data.tar.gz: 7c3521ca9cf4227fd68cabe92b3142d23f65e0225b25378d38661beb1dd666ba493e95c977a5cd0d68f97ae0248fedc2a1b27ddb43f0d57c8e3ee079ac492bc6
+  metadata.gz: 46d5f939c05647cc241c084528b9508fb4abac538484e65576d53558a81bcd4efb6229ea8efb86654d4f2ecb8eb472bb75eba73c045a9a38edd45892eae9adaf
+  data.tar.gz: 1244216988115f3c18d8fffadb19b1908f5e95e2d4eebfc7bd942b1bb009ea79415e9e11e16900174d7b03bf764926687fb760eea4c67931138d6055cdc65fee

data/.version

@@ -1 +1 @@
-0.3.12
+0.3.14

data/lib/cli.rb

@@ -200,4 +200,5 @@ class WorklogCLI < Thor
   map 'statistics' => :stats
   map 'serve' => :server
   map 'project' => :projects
+  map 'rm' => :remove
 end

data/lib/github/repository.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Worklog
+  # Functions related to Github repositories
+  module Github
+    # Represents a GitHub repository with an owner and name.
+    Repository = Struct.new(:owner, :name, keyword_init: true) do
+      # Extracts the repository name and owner from a GitHub repository URL.
+      # @param url [String] The GitHub repository URL or owner/repository string.
+      # @return [Hash, nil] A hash with :owner and :repository keys, or nil if the URL is invalid.
+      # @example
+      #   repo = Worklog::Github::Repository.new
+      #   repo.repository_from_url('https://github.com/owner/repository')
+      #   # => <# owner: 'owner', repository: 'repository' }
+      # @example
+      #   repo.repository_from_url('owner/repository')
+      #   # => #<struct Worklog::Github::Repository owner="owner", name="repository">
+      def self.from_url(url)
+        match = url.match(%r{github\.com[:/](?<owner>[^/]+)/(?<repo>[^/]+)(?:\.git)?$})
+        match = url.match(%r{^(?<owner>[^/]+)/(?<repo>[^/]+)$}) if match.nil?
+        return nil if match.nil?
+
+        Repository.new(owner: match[:owner], name: match[:repo])
+      end
+
+      # Returns a string representation of the repository in the format "owner/name".
+      # @return [String] The string representation of the repository.
+      def to_s
+        "#{owner}/#{name}"
+      end
+    end
+  end
+end

data/lib/project.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'github/repository'
+
 module Worklog
   # Represents a project. A project is a longer running task or initiative.
   # Single log entries can be associated with a project.
@@ -17,6 +19,10 @@ module Worklog
   #   @return [String, nil] The status of the project, can be nil
   #   Possible values: 'active', 'completed', 'archived', etc.
   #   Indicates the current state of the project.
+  # @!attribute [rw] repositories
+  #   @return [Array<String>] An array of repository URLs associated with the project.
+  #   These repositories are used for linking the Github commits to the project.
+  #   At the moment, only Github repositories are supported.
   # @!attribute [rw] entries
   #   These entries are related to the work done on this project.
   #   Entries are populated dynamically when processing daily logs.
@@ -28,7 +34,7 @@ module Worklog
   #   It represents the most recent log entry time for this project.
   #   @return [Date, nil] The last activity date or nil if not set.
   class Project
-    attr_accessor :key, :name, :description, :start_date, :end_date, :status, :entries, :last_activity
+    attr_accessor :key, :name, :description, :start_date, :end_date, :status, :repositories, :entries, :last_activity
 
     # Creates a new Project instance from a hash of attributes.
     # @param hash [Hash] A hash containing project attributes
@@ -41,15 +47,23 @@ module Worklog
     # @return [Project] A new Project instance
     def self.from_hash(hash)
       project = new
+
+      # Protect against nil hash
+      raise ArgumentError, 'Project hash cannot be nil' if hash.nil?
+
       # Ensure that at least the key is present
       raise ArgumentError, 'Project key is required' unless hash[:key] || hash['key']
 
-      project.key = hash[:key] || hash['key']
-      project.name = hash[:name] || hash['name']
-      project.description = hash[:description] || hash['description']
-      project.start_date = hash[:start_date] || hash['start_date']
-      project.end_date = hash[:end_date] || hash['end_date']
-      project.status = hash[:status] || hash['status']
+      hash.each do |key, value|
+        instance_var = "@#{key}"
+        project.instance_variable_set(instance_var, value) if project.respond_to?("#{key}=")
+      end
+      # Set default values for repositories if not provided
+      project.repositories ||= []
+      project.repositories.map! do |repo|
+        Github::Repository.from_url(repo)
+      end
+
       project
     end
 
@@ -68,6 +82,28 @@ module Worklog
       !end_date.nil? && end_date < Date.today
     end
 
+    # Returns true if the project contains the given repository URL.
+    # @param repository [Worklog::Github::Repository] The repository to check
+    # @return [Boolean] true if the project contains the repository URL, false otherwise
+    def contains_repository?(repository)
+      repositories.include? repository
+    end
+
+    # Returns a string with project metadata.
+    # @return [String] A string containing project metadata.
+    def project_metadata
+      m = String.new
+      m << "#{Rainbow(name).gold} (#{key})\n"
+      m << "  Description: #{description}\n" if description
+      m << "  Start date: #{start_date.strftime('%b %d, %Y')}\n" if start_date
+      m << "  End date: #{end_date.strftime('%b %d, %Y')}\n" if end_date
+      m << "  Status: #{status}\n" if status
+      m << "  Repositories: #{repositories.map(&:to_s).join(', ')}\n" unless repositories.empty?
+      m << "  Last activity: #{last_activity.strftime('%b %d, %Y')}\n" if last_activity
+      m << "  #{activity_graph}"
+      m
+    end
+
     # Generate an ASCII activity graph for the project.
     # The graph shows activity over time, with each character representing a day.
     # More active days are represented with a different character.

data/lib/project_storage.rb

@@ -32,6 +32,9 @@ module Worklog
       #   start_date: <start_date>
       #   end_date: <end_date>
       #   status: <status>
+      #   repositories:
+      #     - <repository_url_1>
+      #     - <repository_url_2>
       #   --- Define your projects below this line ---
     YAML
 

data/lib/worklog.rb

@@ -304,18 +304,14 @@ module Worklog
         # Sort entries by descending time
         project.entries.sort_by!(&:time).reverse!
 
-        puts "#{Rainbow(project.name).gold} (#{project.key})"
-        puts "  Description: #{project.description}" if project.description
-        puts "  Start date: #{project.start_date.strftime('%b %d, %Y')}" if project.start_date
-        puts "  End date: #{project.end_date.strftime('%b %d, %Y')}" if project.end_date
-        puts "  Status: #{project.status}" if project.status
-        puts "  Last activity: #{project.last_activity.strftime('%b %d, %Y')}" if project.last_activity
-        puts "  #{project.activity_graph}"
+        # Print project details/metadata
+        puts project.project_metadata
 
+        # TODO: Refactor into project metadata
         next unless project.entries && !project.entries.empty?
 
         puts "  Last #{[project.entries&.size, 3].min} entries:"
-        puts "    #{project.entries.last(3).map do |e|
+        puts "    #{project.entries.first(3).map do |e|
           "#{e.time.strftime('%b %d, %Y')} #{e.message_string(@people)}"
         end.join("\n    ")}"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fewald-worklog
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.14
 platform: ruby
 authors:
 - Friedrich Ewald
@@ -146,6 +146,7 @@ files:
 - lib/github/pull_request_event.rb
 - lib/github/pull_request_review_event.rb
 - lib/github/push_event.rb
+- lib/github/repository.rb
 - lib/hash.rb
 - lib/hasher.rb
 - lib/log_entry.rb