repo_timetracker 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 320e7525f476d8a4105039e1f8a9c5f121d120ca
-  data.tar.gz: 30609d49d892ecb278a1ae2b318e7d4141ee0a71
+  metadata.gz: 2be9275c576a355976273807b2fd2aae0680d3da
+  data.tar.gz: bed12f1336ed446f55ba3de9a9d8c84a3c2f9730
 SHA512:
-  metadata.gz: e36b0b328586aac5042fb9fe98f4a3e62d62f871d9287ff16c97fbd49a9727b8dda71f5e85cb421ee3382d387a421910499a7f24ef05be81f9d7ca26aca1f949
-  data.tar.gz: 3d6b58d883f1879bb508104f68522719dd42f604003c6354044e4bbacc6b251592bea5785480014872f7d223c801f8e22748c96801ea4fee40668de7b2bed211
+  metadata.gz: 32e3472f8ecbd22e20b595f980fb2c2ec854558e1950759d7f6c3bf51817aa1360e1c77968725ff56c5fd8a169ea7f3fcc4bf1a5278452b20078d994640f8ead
+  data.tar.gz: 13dba9ed9c8778b185abcea189f13b537fe5dc2681e197c1c2779eb0775b177bb3df8d258834ed1ec94b880f98fd79d04450e62455750fc10e1b9e8c17dfb651

data/lib/repo_timetracker/repo_timeline.rb

@@ -11,7 +11,6 @@ class RepoTimeline
 
     @timeline_directory = initialize_timeline_directory_for(@repo_directory)
     @commit_records = load_commit_records
-    watch_for_file_change_events
   end
 
   def add_event(event_string)
@@ -38,6 +37,19 @@ class RepoTimeline
     }
   end
 
+  def watch_for_file_change_events
+    if defined? Process.daemon
+      kill_previous_commit_timeline_process
+      
+      Process.daemon
+      
+      FileWatcher.new([@repo_directory]).watch do |filename|
+        staging.generate_new_event("File changed: #{filename}")
+      end
+    end
+  end
+
+
 
   private
 
@@ -81,8 +93,9 @@ class RepoTimeline
   def initialize_timeline_directory_for(repo_directory)
     timeline_directory = "#{repo_directory}/.repo_timeline"
     gitignore_path = "#{repo_directory}.gitignore"
-
+    
     ensure_gitignored(timeline_directory)
+    FileUtils.mkdir_p(timeline_directory) unless File.directory?(timeline_directory)
 
     timeline_directory
   end
@@ -102,22 +115,9 @@ class RepoTimeline
     commit_filenames = dir_filenames.select { |f| f.include? '__commit__' }
     commit_filenames.map { |fn| "#{@timeline_directory}/#{fn}" }
   end
-
-
-  def watch_for_file_change_events
-    if defined? Process.daemon
-      kill_previous_commit_timeline_process
-
-      Process.daemon
-      
-      FileWatcher.new([@repo_directory]).watch do |filename|
-        staging.generate_new_event("File changed: #{filename}")
-      end
-    end
-  end
-
+  
   def kill_previous_commit_timeline_process
-    similar_processes = `ps -ax | grep repo_timetracker.rb`.split("\n")
+    similar_processes = `ps -ax | grep ruby.*repo_timetracker/bin/rpt`.split("\n")
 
     if previous_commit_timeline_process = similar_processes.find { |p| not p.include? 'grep' }
       previous_commit_timeline_pid = previous_commit_timeline_process.match(/\d+/)[0]

data/lib/repo_timetracker/repo_timeline_class.rb

@@ -2,15 +2,14 @@ class RepoTimeline
   class << self
 
     def load_or_initialize_for(directory_called_from)
-      directory = find_in_or_above(directory)
-      timeline_directory = "#{directory}/.repo_timeline"
-
-      return 'No repo found.' if directory.nil?
+      directory = find_in_or_above(directory_called_from)
+      return nil if directory.nil?
 
       RepoTimeline.new(directory)
     end
 
     def find_in_or_above(directory)
+      return nil if directory.nil?
 
       if contains_repo? directory
         directory

data/lib/repo_timetracker/version.rb

@@ -1,3 +1,3 @@
 module RepoTimetracker
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/repo_timetracker.rb

@@ -5,23 +5,35 @@ module RepoTimetracker
   class << self
     def record(event_string, directory)
       repo_timeline = RepoTimeline.load_or_initialize_for(directory)
-      repo_timeline.add_event(event_string)
+
+      if repo_timeline.nil?
+        'Error: no repo found.'
+      else
+        repo_timeline.add_event(event_string)
+        repo_timeline.watch_for_file_change_events
+      end
     end
 
     def current_commit_time(directory)
       repo_timeline = RepoTimeline.load_or_initialize_for(directory)
-
-      time = repo_timeline.current_commit_time
-
-      Time.at(time).utc.strftime("%H:%M:%S")
+      
+      if repo_timeline.nil?
+        'Error: no repo found.'
+      else
+        time = repo_timeline.current_commit_time
+        Time.at(time).utc.strftime("%H:%M:%S")
+      end
     end
 
     def project_time(directory)
       repo_timeline = RepoTimeline.load_or_initialize_for(directory)
 
-      time = repo_timeline.project_time
-      
-      Time.at(time).utc.strftime("%H:%M:%S")
+      if repo_timeline.nil?
+        'Error: no repo found.'
+      else
+        time = repo_timeline.project_time
+        Time.at(time).utc.strftime("%H:%M:%S")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repo_timetracker
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - neurodynamic