devlog 0.0.0 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c73d853e2efa2ac11ed176cba155f5becb5f42ca
-  data.tar.gz: 9637207647c3d22eb992d833ccba38bf213e2f3f
+  metadata.gz: 57d73038e69a1550073fd71d8272085ad3feb660
+  data.tar.gz: a234e808266dbcd543ec9f35f06cc2d2f3ea5729
 SHA512:
-  metadata.gz: 200ae38781dfe68f90d555ed693658b4f81218255a83e5e311cc2b7d32caa5b67c6147fbd0742b674e89f39edac70a8b120fc129a51d2de856c61f23c3c2d188
-  data.tar.gz: 047b48557381dc74e79fce46b106f92f833c09c0d23bb744a01b6e399d99633c80b37c683f738a3367d7cdb299bca21c8b887f74b6fa9566f618d67ebe01d1ae
+  metadata.gz: b8b88776ad5e576499f5915aaec0ef8c48b7490fc096cdcb217233cd711363cf48a3a8363be4b8cdad9ce31f4e2af75ddb5172f1b1cbbee6c7e865196eac1f50
+  data.tar.gz: b81742c5df67f1f985908e93a6e0db8c5fb86763dc28d3d5a6ef94b2c1a806f86f7bcd7a1796393bf66fb8babbb9c07e58f110b5b9d31169511dfc368d98a39c

data/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+#group :development, :test do
+  gem "jeweler", "~> 2.0"
+  #gem "rspec", '~> 1.3'
+  gem "activesupport", "~> 3.2"
+#end

data/Gemfile.lock

@@ -0,0 +1,58 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.5)
+    builder (3.2.2)
+    descendants_tracker (0.0.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.6)
+    github_api (0.11.2)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    i18n (0.6.9)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    mini_portile (0.5.2)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
+      json (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.2)
+  jeweler (~> 2.0)

data/README.md

@@ -2,3 +2,27 @@ devlog
 ======
 
 the headless standup programmer's development log writing tool
+
+structure
+=========
+
+a devlog consists of many coding or communication sessions. 
+
+the current session is always written on the top of the file.
+
+older sessions are towards the end of the file. 
+
+the first session is the most down, scroll down at the end of the file.
+
+sessions are separated with beginning and end "devlog DSL" entries, 
+
+these must be entered at the start of the line.
+
+
+devlog DSL
+==========
+
+#DD.MM.YYYY HH:MM:SS CodingSession::BEGIN
+
+syntax
+======

data/Rakefile

@@ -39,7 +39,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+task :test #=> :check_dependencies
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.2

data/bin/devlog

@@ -24,12 +24,28 @@ def dodo
   if @in_file
     include Devlog
     time = Benchmark.realtime do 
-      t = parse_devlog(@in_file)
-      puts "\nSession::Times:\n"
+      t = parse_devlog_now(@in_file)
+      puts "\nSession::Time:      = #{t.session_time} [h]\n"
       puts("\nCodingSession::Time = %.1f [h]" % t.coding_session_time)
       puts("\nComSession::Time    = %.1f [h]" % t.com_session_time)
-      puts("\nCharge::Time        = #{(t.coding_session_time + t.com_session_time).round} [h]")
-      puts("\nUnpayed::Time       = #{(t.coding_session_time + t.com_session_time + t.payed_time).round} [h]\n\n")
+      puts("\nCharge::Time        = #{t.charge_time} [h]")
+      puts("\nUnpayed::Time       = #{t.unpayed_time} [h]\n")
+      puts("\n")
+      puts("Num of Sessions     = #{t.devlog_sessions.size}\n")
+      puts("Hours per Day       = #{t.per_day} [h]\n")
+      puts("Hours per Week      = #{t.per_week} [h]\n")
+      puts("Hours per Month     = #{t.per_month} [h]\n")
+      puts("Hours last 7 days   = #{t.hours_for_last(7)} [h]\n")
+      puts("Hours last 14 days   = #{t.hours_for_last(14)} [h]\n")
+      puts("Hours last 28 days   = #{t.hours_for_last(28)} [h]\n")
+      puts("\n")
+      puts("Devlog Time         = #{t.devlog_days * 24} [hours]\n")
+      puts("Devlog Days         = #{t.devlog_days}  [days]\n")
+      puts("Devlog Weeks        = #{t.devlog_weeks}  [weeks]\n")
+      puts("Devlog Months       = #{t.devlog_months}  [months]\n")
+      puts("\n")
+      puts("Longest Session     = #{t.longest_session.session_time.round(2)} [hours]\n")
+      puts("Shortest Session     = #{t.shortest_session.session_time.round(2)} [hours]\n")
     end
     puts "\nRealtime used : #{time}sec"
   end

data/devlog.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devlog 0.0.0 ruby lib
+# stub: devlog 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devlog"
-  s.version = "0.0.0"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["mihael"]
-  s.date = "2014-01-19"
+  s.date = "2014-02-10"
   s.description = "devlog.markdown time&space extractor"
   s.email = "kitschmaster@gmail.com"
   s.executables = ["devlog"]
@@ -21,6 +22,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".ruby-gemset",
     ".ruby-version",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",
@@ -28,14 +31,43 @@ Gem::Specification.new do |s|
     "bin/devlog",
     "devlog.gemspec",
     "devlog.markdown",
+    "empty_devlog.markdown",
     "lib/devlog.rb",
+    "sublime_text/.DS_Store",
+    "sublime_text/devlog.tmbundle/Snippets/begin.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/combegin.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/comend.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/end.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/link.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/selfbegin.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/selfend.tmSnippet",
+    "sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet",
+    "sublime_text/devlog.tmbundle/info.plist",
+    "sublime_text/tu.py",
     "test/devlog_test.rb",
-    "test/test_helper.rb"
+    "test/test_helper.rb",
+    "test_devlog.markdown",
+    "test_single_devlog.markdown",
+    "test_stats_devlog.markdown"
   ]
   s.homepage = "http://github.com/mihael/devlog"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.1"
   s.summary = "takes devlog.markdown and gives info"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.2"])
+    else
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.2"])
+    end
+  else
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.2"])
+  end
 end
 

data/devlog.markdown

@@ -1,3 +1,104 @@
+#03.02.2014 21:02:30 CodingSession::END
+
+added some tests, and some new calculations, the devlog binary prints out better stats... 0.0.1 it is.
+
+#03.02.2014 09:37:36 CodingSession::BEGIN
+
+
+#02.02.2014 17:06:00 CodingSession::END
+
+experiencing some bad weather, which took down an optical cable and cut our village off the internet grid...
+which is always a good time to do an open source coding session. 
+
+ii added new folder "sublime_text". it will hold everything Sublime Text snippets and commands, which make working with the devlog DSL a breeze. that said, ii feel like a marketeer, haha.
+
+ii added this command "tu.py". which ii use the most, to insert a date time entry into the devlog, like this one #02.02.2014 14:03:35.
+You can attach it to Your favourite key binding, ii usually use "ctrl+alt+t".
+
+to install a command, drop it into 
+
+	/Users/You/Library/Application Suport/Sublime Text 3/Packages/User/
+
+ii added a TextMate bundle, which can be installed for Sublime Text as well. it contains these snippets:
+
+	begin+Tab : CodingSession::BEGIN
+	combegin+Tab:  ComSession::BEGIN
+	end+Tab:  CodingSession::END
+	comend+Tab:  ComSession::END
+	selfbegin+Tab:  SelfSession::BEGIN
+	selfend+Tab:  SelfSession::END
+
+and the last one should work in TextMate to insert time:
+
+	tu+Tab: #`date '+%d.%m.%Y %H:%M:%S'` 
+
+the tmbundle can be dropped in the same folder as the "tu.py" snippet.
+
+just realized, the date format could be something that one would want to configure to its liking... so how would ii code that? 
+the snippets would have to be adjusted as well, and the parsing method would have to read some setting from somewhere. which ii dislike very much at this moment, so let me postpone this idea for someone else or some other time...
+
+currently the parser is amazingly simple, written in a very very very short time. and it can stay like that, the devlog only needs to parse its own DSL entries from the devlog file. what ii want to to now is to extend the current code to load each coding session as a separate object, then ii want to see how much time per day, per week... and so on...
+
+ii am in the process of learning to test ruby code, ii started doing this some time ago on my professional projects and it definitely feels very nice, have to practice more, so let me test-code the devlog and have some fun, while the internet is down and my professional life does not exist at all in this moment :).
+
+coding... kids building lego rifles, little fast cars and minifigs...
+
+man, ii really have to think hard to not do it old school, to not simply stare at the code and stare and stare, until ii see it and simply write it down. this time, ii have to just ask questions about the functionality, then we will stare. so the first question is, what do ii want to know:
+
++ how much ii coded per day in hours (this is a sum/n(sum) value) 
++ how much ii coded per week in hours
++ how much ii coded per month in hours
+
+alright! that's nice, so let me add three test methods and write the expectations...
+
+done at #02.02.2014 14:55:46:
+
+	4 tests, 12 assertions, 0 failures, 3 errors, 0 skips
+
+now all ii need to do is make these three methods pass, easy, and no staring at the code yet :).
+kids are still playing... haha...
+
+ii added an empty devlog, to test that too... it should not give any results other than Zero...
+
+this works out of the box, 
+
+	4 tests, 15 assertions, 0 failures, 3 errors, 0 skips
+
+now let me see, how to implement per_day...
+
+ii already know, ii need to keep the whole dataset of datetimes of coding session beginnings and endings somewhere in the Mind, so that ii can ... wait let me first take a look at the code... let me imeplement those methods, before ii begin any mystical thinkings, starings and so forth, let the mystery reveal itself, without me having to think a single thought... staring is thinking, isn't it... deep thinkins are not for prograamming goods... haha...
+
+obviously the parse_devlog method returns the Tajm object, so that is where the methods belong to... for now, ... how long is now? usually not much...
+
+ii have the methods implemented at #02.02.2014 15:10:01 and am about to run the test again... the darn thing still fails!  :) and the methods are simply empty now, so let's make the tests pass by returning what, more than zero... ii would need to know exactly the hours and the some testing... so let me do something funky... 
+
+ii adedd parse_devlog_now, which will be developed as the new thing, while parse_devlog will be used as reference, to get the reference time and compare for validity.
+
+also, this morning, ii discovered ii am unable to install gems under ruby 1.8.7 after installing that with rvm on 10.9 OSX, soo ii will add some more code to the binary script, to enable me to push this devlog to a github or any git repo actually and have the summary of the devlog parse inserted before pushing. it just requires some more commands to be implemented and some more parsing... 
+
+anyway... ii don't see any other way but to code another class...
+
+ii called it Zezzion.
+
+since ii would need to store each sessions begin and end, to be able to fetch only the hours between those dates that are in a day or in a week or month...
+
+ii added class Parsing, to better express the needed calucaltions...
+
+each Parsing represents one parsing, and holds an array of sessions read from the devlog file, these are called @zezzions.
+
+and the kids are playing zombies, while the internets are still hovering somewhere, winter times came late...
+
+let me add 
+-9000h 
+
+of communication hours to this devlog, so that tests can be written...
+
+and start a new session higher up, after ii take some breaths...
+
+as text gets written down, at the end of the session ii scroll to the top again and insert the ending command like: #02.02.2014 17:05:50 CodingSession::END
+
+#02.02.2014 13:53:37 CodingSession::BEGIN
+
 #19.01.2014 13:54:16 CodingSession::END
 
 adding some simple testing :)
@@ -34,7 +135,7 @@ let me pay for all the development hours of this work in advance like this:
 -3000h
 +3000000000000$
 
-the +300...$ is an optional entry, the parser does not yet parse money, it only parses + hours and - hours, integers, ii can add two more hours like this:
+a +300$ is an optional entry, the parser does not yet parse money, it only parses + hours and - hours, integers, ii can add two more hours like this:
 +2h
 
 or subtract three:
@@ -58,4 +159,6 @@ the time has come to add these features, slowly, naturally.
 
 so here is the initial devlog entry for the development of the devlog tool writing software.
 
+"2014-01-19T10:16:08+00:00"
+
 #19.01.2014 10:16:08 CodingSession::BEGIN

data/empty_devlog.markdown

@@ -0,0 +1,5 @@
+#02.02.2014 14:59:19 keep it empty by not editing it with proper syntax,...
+
+tralala
+
+the light is one, but the lamps are many

data/lib/devlog.rb

@@ -1,4 +1,5 @@
 require "date"
+require "active_support/all"
 class String
   def red; colorize(self, "\e[1m\e[31m"); end
   def green; colorize(self, "\e[1m\e[32m"); end
@@ -53,20 +54,107 @@ module Devlog
   def self.log(txt)
     puts "#{txt}"
   end
-    
-  class Tajm
-    attr_accessor :coding_session_time, :com_session_time, :payed_time
-    def initialize
-      @coding_session_time = 0.0
-      @com_session_time = 0.0
-      @payed_time = 0.0
-    end
-  end
+
   
   def parse_datetime(line)
     parts = line[1..-1].split
     DateTime.strptime("#{parts[0]} #{parts[1]}","%d.%m.%Y %H:%M:%S")
   end
+
+  def parse_devlog_now(devlog=nil)
+    t = Parsing.new
+    return t unless devlog
+
+    timeEnd = nil
+    timeBegin = nil
+    in_session = false
+    temp_zezzion = nil
+
+    File.open(devlog, "r").each do |line|
+      if line =~ /-NOCHARGE/
+        in_session = false #do not count nocharge sessions, this is a secret feature
+      elsif line =~ /\A#/ && line =~ /CodingSession::END/
+        in_session = true
+        timeEnd = parse_datetime(line)
+        
+        #zezzion
+        temp_zezzion = Zezzion.new
+        temp_zezzion.zzend = timeEnd
+
+      elsif line =~ /\A#/ && line =~ /CodingSession::BEGIN/
+        if in_session
+          in_session = false
+          timeBegin = parse_datetime(line)
+          #cs_time += (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
+          delta = (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
+          t.coding_session_time += delta
+
+          #zezzion
+          temp_zezzion.coding_session_time += delta
+          temp_zezzion.zzbegin = timeBegin
+          t.add_zezzion temp_zezzion
+          temp_zezzion = nil
+
+        end
+      elsif line =~ /\A#/ && line =~ /ComSession::END/
+        in_session = true
+        timeEnd = parse_datetime(line)
+
+        #zezzion
+        temp_zezzion = Zezzion.new(Zezzion::COM)
+        temp_zezzion.zzend = timeEnd
+
+
+      elsif line =~ /\A#/ && line =~ /ComSession::BEGIN/
+        if in_session
+          in_session = false
+          timeBegin = parse_datetime(line)
+          delta = (timeEnd - timeBegin).to_f * 24
+          t.com_session_time += delta
+
+          #zezzion
+          temp_zezzion.coding_session_time += delta
+          temp_zezzion.zzbegin = timeBegin
+          t.add_zezzion temp_zezzion
+          temp_zezzion = nil
+
+        end
+      elsif line =~ /\A\+[0-9]+[h]/
+        delta = line.to_f
+        t.com_session_time += delta
+
+        #zezzion
+        if temp_zezzion
+          temp_zezzion.com_session_time += delta
+        else
+          puts "error adding temp_zezzion com_session_time at line: #{line}"  
+        end
+      elsif line =~ /\A\+[0-9]+[m]/
+        delta = (line.to_f / 60)
+        t.com_session_time += delta
+
+        #zezzion
+        if temp_zezzion
+          temp_zezzion.com_session_time += delta
+        else
+          puts "error adding temp_zezzion com_session_time at line: #{line}"  
+        end
+      elsif line =~ /\A\-[0-9]+[h]/
+        delta = (line.to_f)
+        t.payed_time += delta
+
+        #zezzion
+        if temp_zezzion
+          temp_zezzion.payed_time += delta 
+        else
+          puts "error adding temp_zezzion delta time at line: #{line}"
+        end
+      end
+        
+    end
+    #return the Parsing object
+    t
+  end
   
   def parse_devlog(devlog=nil)
     t = Tajm.new
@@ -107,8 +195,181 @@ module Devlog
       end
         
     end
-    #return the T object
+    #return the Tajm object
     t
   end
+
+  class Parsing
+    #this is the total time, but each sessino has these same params
+    attr_accessor :coding_session_time, :com_session_time, :payed_time #backward compatible object with Tajm, from devlog 0.0.0
+
+    attr_accessor :zezzions
+
+    def initialize(viewing_time_current_date=DateTime.now)
+      @viewing_time_current_date = viewing_time_current_date
+      @zezzions = []
+ 
+      #backward compatible object with Tajm, from devlog 0.0.0
+      @coding_session_time = 0.0
+      @com_session_time = 0.0
+      @payed_time = 0.0
+     end
+
+    def add_zezzion(zezzion)
+      @zezzions << zezzion
+    end
+
+    #gloabl devlog start, first entry
+    def devlog_begin
+      @zezzions.last.zzbegin
+    end
+
+    #global devlog end, last entry
+    def devlog_end
+      @zezzions.first.zzend
+    end
+
+    #how much time between first session begin and last session end
+    #in seconds
+    #def devlog_time
+    #  (self.devlog_end.to_time - self.devlog_begin.to_time)/60.0/60.0
+    #end
+
+    def session_time
+      @zezzions.inject(time=0){|time, zezzion| time+zezzion.session_time}.round(2)
+    end
+
+    #how many days devlog spans
+    def devlog_days
+      count_time(:days=>1)
+      #(self.devlog_end - self.devlog_begin).to_i + 1 #counting days like this, would not account for daylight saving changes
+    end
+
+    #how many weeks devlog spans
+    def devlog_weeks
+      (devlog_days/7.0).round(2)
+    end
+
+    def devlog_months
+      count_time(:months=>1)
+    end
+
+    #hours per day
+    def per_day      
+      (self.session_time/self.devlog_days).round(2)
+    end
+    def per_week
+      (self.session_time/self.devlog_weeks).round(2)
+    end
+    def per_month
+      (self.session_time/self.devlog_months).round(2)
+    end
+
+    #total charge time in hours, coding plus communication sessions
+    def charge_time
+      (coding_session_time + com_session_time).round(2)
+    end
+    
+    #total charge time in hours, coding plus communication sessions - payed hours
+    def unpayed_time
+      (coding_session_time + com_session_time + payed_time).round(2)
+    end
+
+    #return hours worked for the last X days, from beginTime
+    def hours_for_last(days, beginTime=DateTime.now)
+      endTime = beginTime.to_time - days.days
+      selected_zezzions = @zezzions.select{|z| z.zzbegin.to_time<beginTime && z.zzend>=endTime}
+      #puts("Selected sessons from #{beginTime} to #{endTime}: #{selected_zezzions.size}")
+      selected_zezzions.inject(time=0){|time, z| time+z.session_time}.round(2)
+    end
+
+    def longest_session
+      @zezzions.max_by(&:session_time)
+    end
+
+    def shortest_session
+      @zezzions.min_by(&:session_time)
+    end
+
+    #return all sessions
+    def devlog_sessions
+      @zezzions
+    end
+
+
+
+    private 
+      #count :weeks=>1, or :days=>1, or :years=>1
+      def count_time(options)
+        num = 0
+        cur = self.devlog_begin
+        while cur < self.devlog_end
+          num += 1
+          cur = cur.advance(options)
+        end
+        return num
+      end
+
+  end
+
+
+  class Zezzion
+    COM = 1
+    COD = 0
+    attr_accessor :zzbegin, :zzend, :zzbegin_title, :zzend_title, :zztype
+    attr_accessor :coding_session_time, :com_session_time, :payed_time
+
+    def initialize(zztype=COD)
+      @zztype = zztype
+      @zzbegin = nil
+      @zzend = nil
+      @zzbegin = nil
+      @zzbegin_title = nil
+      @zzend_title = nil
+      @coding_session_time = 0.0
+      @com_session_time = 0.0
+      @payed_time = 0.0
+    end
+
+    #in seconds
+    def time
+      @zzend.to_time -  @zzbegin.to_time
+    end
+
+    #zezzion_time in days
+    def days
+      min = self.time / 60
+      hours = min / 60
+      days = hours / 24
+    end
+
+    #the whole coding session time
+    def session_time
+      @coding_session_time + @com_session_time #in seconds
+    end
+
+    #hours per day
+    def per_day
+      #whole time over number of days the parsing covers      
+      session_time/days
+    end
+    def per_week
+      
+    end
+    def per_month
+
+    end
+  end
+
+  class Tajm
+    attr_accessor :coding_session_time, :com_session_time, :payed_time
+
+    def initialize
+      @coding_session_time = 0.0
+      @com_session_time = 0.0
+      @payed_time = 0.0
+    end
+
+  end
   
 end

data/sublime_text/devlog.tmbundle/Snippets/begin.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>$1 CodingSession::BEGIN</string>
+	<key>name</key>
+	<string>begin</string>
+	<key>tabTrigger</key>
+	<string>begin</string>
+	<key>uuid</key>
+	<string>4FD91A00-AC38-410F-9257-954EBC5BE925</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/combegin.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>$1 ComSession::BEGIN</string>
+	<key>name</key>
+	<string>combegin</string>
+	<key>tabTrigger</key>
+	<string>combegin</string>
+	<key>uuid</key>
+	<string>551F1E72-FF3B-417B-9D85-F3E7DF7FE8E2</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/comend.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>$1 ComSession::END</string>
+	<key>name</key>
+	<string>comend</string>
+	<key>tabTrigger</key>
+	<string>comend</string>
+	<key>uuid</key>
+	<string>2110A9F4-FF06-435E-8380-00EC6DBB4323</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/end.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>$1 CodingSession::END</string>
+	<key>name</key>
+	<string>end</string>
+	<key>tabTrigger</key>
+	<string>end</string>
+	<key>uuid</key>
+	<string>5BD1E38C-B3E3-43A4-A3DB-8416B1860A07</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/link.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>[$1](${0:http://url})</string>
+	<key>name</key>
+	<string>link</string>
+	<key>tabTrigger</key>
+	<string>link</string>
+	<key>uuid</key>
+	<string>4047CF8D-707D-478F-9B7A-0FF9CA022522</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/selfbegin.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>$1 SelfSession::BEGIN</string>
+	<key>name</key>
+	<string>selfbegin</string>
+	<key>tabTrigger</key>
+	<string>selfbegin</string>
+	<key>uuid</key>
+	<string>83D648DE-8FB0-4997-B293-29F48779BABA</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/selfend.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>$1 SelfSession::END</string>
+	<key>name</key>
+	<string>selfend</string>
+	<key>tabTrigger</key>
+	<string>selfend</string>
+	<key>uuid</key>
+	<string>931EE4CC-247D-40F3-B64A-284B19F3D15C</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>#`date '+%d.%m.%Y %H:%M:%S'`</string>
+	<key>name</key>
+	<string>tu</string>
+	<key>tabTrigger</key>
+	<string>tu</string>
+	<key>uuid</key>
+	<string>0F06AC41-635E-4686-BC21-CFCAE774F9E7</string>
+</dict>
+</plist>

data/sublime_text/devlog.tmbundle/info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>devlog</string>
+	<key>ordering</key>
+	<array>
+		<string>0F06AC41-635E-4686-BC21-CFCAE774F9E7</string>
+		<string>4FD91A00-AC38-410F-9257-954EBC5BE925</string>
+		<string>83D648DE-8FB0-4997-B293-29F48779BABA</string>
+		<string>551F1E72-FF3B-417B-9D85-F3E7DF7FE8E2</string>
+		<string>5BD1E38C-B3E3-43A4-A3DB-8416B1860A07</string>
+		<string>2110A9F4-FF06-435E-8380-00EC6DBB4323</string>
+		<string>931EE4CC-247D-40F3-B64A-284B19F3D15C</string>
+	</array>
+	<key>uuid</key>
+	<string>8AA4E4E3-64B6-4BD2-9507-FD54890DF7FA</string>
+</dict>
+</plist>

data/sublime_text/tu.py

@@ -0,0 +1,9 @@
+import datetime
+import sublime, sublime_plugin
+
+class TuCommand(sublime_plugin.TextCommand):
+	def run(self, edit):
+		tu = "#%s" % (datetime.datetime.now().strftime("%d.%m.%Y %H:%M:%S"))
+		if len(self.view.sel()) == 1:
+			region = self.view.sel()[0]
+			self.view.insert(edit, region.a, tu)

data/test/devlog_test.rb

@@ -1,11 +1,126 @@
 require 'test_helper'
 
 class DevlogTest < Test::Unit::TestCase
-  def test_devlog
-    t = parse_devlog(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
-    puts "#{t.coding_session_time} #{t.com_session_time} #{t.payed_time}"
-    assert(t.coding_session_time>0, "no time no money no love")
-    assert(t.com_session_time>0, "no selftalk")
-    assert(t.payed_time<0, "no selfpay")
-  end
+
+	def test_empty_devlog
+		@tajm = parse_devlog(File.join(File.dirname(__FILE__), '..', 'empty_devlog.markdown'))
+		puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
+		assert(@tajm.coding_session_time==0, "time is money is love")
+		assert(@tajm.com_session_time==0, "selftalk")
+		assert(@tajm.payed_time==0, "selfpay")
+	end
+
+	def test_devlog_now
+		load_devlog
+		load_devlog_now
+
+		assert(@tajm.coding_session_time==@tajm_now.coding_session_time, "not equal coding times")
+		assert(@tajm.com_session_time==@tajm_now.com_session_time, "selftalk not repeated")
+		assert(@tajm.payed_time==@tajm_now.payed_time, "selfpay not equal")
+
+		assert(@tajm_now.zezzions.size>0, "where are the seeds of zezzions?")
+		assert(@tajm_now.unpayed_time<0, "let's make sure opensource is free to develop it self")
+		assert(@tajm_now.zezzions.size>4, "at least 4 recorded sessions must there be?")
+		assert(@tajm_now.devlog_begin.to_s=="2014-01-19T10:16:08+00:00", "a historycal moment in the akashic records was deleted, what?")
+ 		assert(@tajm_now.devlog_begin.to_time.to_i == 1390126568, "or just a random number in a random dream...")
+	end
+
+	def test_devlog_test
+		load_devlog_test
+
+		assert(@tajm_test.coding_session_time== 4.5, "wrong total coding session time")
+		assert(@tajm_test.com_session_time==1.0 , "wrong com session time")
+		assert(@tajm_test.payed_time==-1, "wrong payed time")
+		assert(@tajm_test.unpayed_time==4.5, "wrong unpayed wrong")
+		assert(@tajm_test.charge_time==5.5, "wrong charge wrong")
+	end	
+
+	def test_p_session_time
+		p = Parsing.new
+		zezzion = Zezzion.new
+		zezzion.zzend = parse_datetime("#08.03.2014 11:00:00 CodingSession::END")
+		zezzion.zzbegin = parse_datetime("#08.03.2014 10:00:00 CodingSession::BEGIN")
+		zezzion.coding_session_time = 60*60 #1h
+		p.add_zezzion zezzion
+		zezzion.zzend = parse_datetime("#09.03.2014 11:00:00 CodingSession::END")
+		zezzion.zzbegin = parse_datetime("#09.03.2014 10:00:00 CodingSession::BEGIN")
+		zezzion.coding_session_time = 60*60 #1h
+		p.add_zezzion zezzion
+
+		assert(p.session_time==60*60*2, "should be 7200s but is #{p.session_time}")
+	end
+
+	def test_how_much_per_day
+		load_devlog_stat
+		assert(@tajm_stat.per_day>0, "the middle day value, not the mean")
+		assert(@tajm_stat.per_day==1.0, "per day should be 1.0 but is #{@tajm_stat.per_day}")
+	end
+
+	def test_how_much_per_week
+		load_devlog_stat
+		assert(@tajm_stat.per_week>0, "the middle week value, not the mean")
+		assert(@tajm_stat.per_week==7.02, "per week should be 7.02 but is #{@tajm_stat.per_week}")
+	end
+
+	def test_devlog_weeks
+		load_devlog_stat
+		assert(@tajm_stat.devlog_weeks==1.14, "devlog weeks should be 1.14 but is #{@tajm_stat.devlog_weeks}")
+	end
+
+	def test_how_much_per_month
+		load_devlog_stat
+		assert(@tajm_stat.per_week>0, "the middle month value, not the mean")		
+	end
+
+	def test_devlog_days_0
+		load_devlog_test
+		assert(@tajm_test.devlog_days==33, "should be 33 devlog days")
+	end
+
+	def test_devlog_days_1
+		load_devlog_stat
+		assert(@tajm_stat.devlog_days==8, "should be 8 devlog days")
+	end
+
+	def test_devlog_days_2
+		load_devlog_single
+		assert(@tajm_single.devlog_days==1, "should be 1 devlog day")
+	end
+
+	def test_devlog_begin
+		load_devlog_stat
+		assert(@tajm_stat.devlog_begin.to_s=="2014-03-01T10:00:00+00:00", "devlog begin is wrong")
+	end
+
+	def test_devlog_end
+		load_devlog_stat
+		assert(@tajm_stat.devlog_end.to_s=="2014-03-08T11:00:00+00:00", "devlog end is wrong")
+	end
+
+	def test_hours_for_last7
+		load_devlog_stat
+		hours = @tajm_stat.hours_for_last(0, parse_datetime("#09.03.2014 11:00:00"))
+		assert(hours==0, "should be 0, but is #{hours}")
+	end
+	def test_hours_for_last7
+		load_devlog_stat
+		hours = @tajm_stat.hours_for_last(7, parse_datetime("#09.03.2014 11:00:00"))
+		assert(hours==7, "should be 7, but is #{hours}")
+	end
+	def test_hours_for_last1
+		load_devlog_stat
+		hours = @tajm_stat.hours_for_last(1, parse_datetime("#09.03.2014 11:00:00"))
+		assert(hours==1, "should be 1, but is #{hours}")
+		
+	end
+	def test_hours_for_last7
+		load_devlog_stat
+		hours = @tajm_stat.hours_for_last(7, parse_datetime("#20.03.2014 11:00:00"))
+		assert(hours==0, "should be 0, but is #{hours}")
+	end
+
+	def test_session_count
+		load_devlog_stat
+		assert(@tajm_stat.devlog_sessions.size==8, "should be 8, but is #{@tajm_stat.devlog_sessions.size}")
+	end
 end

data/test/test_helper.rb

@@ -8,3 +8,35 @@ require 'devlog'
 class Test::Unit::TestCase
   include Devlog
 end
+
+def load_devlog
+	@tajm = parse_devlog(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
+	puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
+	assert(@tajm.coding_session_time>0, "no time no money no love")
+	assert(@tajm.com_session_time>0, "no selftalk")
+	assert(@tajm.payed_time<0, "no selfpay")
+end
+
+def load_devlog_now
+	@tajm_now = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
+	puts "#{@tajm_now.coding_session_time} #{@tajm_now.com_session_time} #{@tajm_now.payed_time}"
+	assert(@tajm_now.coding_session_time>0, "no time no money no love")
+	assert(@tajm_now.com_session_time>0, "no selftalk")
+	assert(@tajm_now.payed_time<0, "no selfpay")
+end
+
+def load_devlog_test
+	@tajm_test = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_devlog.markdown'))
+	puts "#{@tajm_test.coding_session_time} #{@tajm_test.com_session_time} #{@tajm_test.payed_time}"
+	assert(@tajm_test.coding_session_time>0, "no time no money no love")
+	assert(@tajm_test.com_session_time>0, "no selftalk")
+	assert(@tajm_test.payed_time<0, "no selfpay")
+end
+
+def load_devlog_stat
+	@tajm_stat = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_stats_devlog.markdown'))
+end
+
+def load_devlog_single
+	@tajm_single = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_single_devlog.markdown'))
+end

data/test_devlog.markdown

@@ -0,0 +1,30 @@
+#02.02.2014 16:50:03 CodingSession::END
+
+bla bla... and much more!
+
+exactly 0.5 hours
+
+#02.02.2014 16:20:03 CodingSession::BEGIN
+
+
+#02.02.2014 11:10:10 ComSession::END
+
+a shiny text...
+
+this is 1 hour...
+
+a payment of one hour:
+-1h
+
+#02.02.2014 10:10:10 ComSession::BEGIN
+
+
+#01.01.2014 20:20:20 CodingSession::END
+
+need to create a test dev log as well...
+
+test_devlog.markdown
+
+this session is exactly 4 hours
+
+#01.01.2014 16:20:20 CodingSession::BEGIN

data/test_single_devlog.markdown

@@ -0,0 +1,6 @@
+#08.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#08.03.2014 10:00:00 CodingSession::BEGIN

data/test_stats_devlog.markdown

@@ -0,0 +1,62 @@
+#08.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#08.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#07.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#07.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#06.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#06.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#05.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#05.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#04.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#04.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#03.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#03.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#02.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#02.03.2014 10:00:00 CodingSession::BEGIN
+
+
+#01.03.2014 11:00:00 CodingSession::END
+
+coding session 1h
+.
+
+#01.03.2014 10:00:00 CodingSession::BEGIN

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: devlog
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.2
 platform: ruby
 authors:
 - mihael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
-dependencies: []
+date: 2014-02-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: devlog.markdown time&space extractor
 email: kitschmaster@gmail.com
 executables:
@@ -21,6 +49,8 @@ extra_rdoc_files:
 files:
 - .ruby-gemset
 - .ruby-version
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -28,9 +58,24 @@ files:
 - bin/devlog
 - devlog.gemspec
 - devlog.markdown
+- empty_devlog.markdown
 - lib/devlog.rb
+- sublime_text/.DS_Store
+- sublime_text/devlog.tmbundle/Snippets/begin.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/combegin.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/comend.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/end.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/link.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/selfbegin.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/selfend.tmSnippet
+- sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet
+- sublime_text/devlog.tmbundle/info.plist
+- sublime_text/tu.py
 - test/devlog_test.rb
 - test/test_helper.rb
+- test_devlog.markdown
+- test_single_devlog.markdown
+- test_stats_devlog.markdown
 homepage: http://github.com/mihael/devlog
 licenses:
 - MIT
@@ -51,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: takes devlog.markdown and gives info