devlog 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d71d5f7886292ce279efe60c29e61dbf73b25d9
-  data.tar.gz: a06319a20bdc514b36260a3437c56e447c6f85cf
+  metadata.gz: 7493b2bbd6d4cffb285aa30469f67c7fe6f73111
+  data.tar.gz: 1eb62c36e3c51d93d259c6152d3177b44be57539
 SHA512:
-  metadata.gz: 2e99cc92a045dc1e01dab7adb87d190444a2ce543047853b13c0593ee7d4e85fe3b297291937c6a2c851fd83b0927f8ec13815fbf7c8363225024fd73d6dddfd
-  data.tar.gz: 1c2add6d4bd48bbe54864deec0cee8b8cfd99bef52681513b5892ad1f4af4e741b6df9d713d503544265f7e21f999cc825ce4e902b8be27f16fd9a50052aa10e
+  metadata.gz: 011975f73976cd54a868d7e7f9d61c0a1058f6a5804d54e6cd26907336b3f5e2865cc873f509e55556d5222ba5901d044f079514f97debf711fea90c0a2f814b
+  data.tar.gz: 1b74fd0683516915ffe226ac12168fa99f7ce36678b4289b9910564bac47f987eb1458e1a39dabf7f5146b6a41f39add1d72cb70a66182cba0502e5f76826d09

data/Gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 gem "activesupport", ">= 4.1"
 
 group :development, :test do
+  gem "test-unit"
   gem "jeweler", "~> 2.0"
 end

data/Gemfile.lock

@@ -49,10 +49,13 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    power_assert (0.2.2)
     rack (1.5.2)
     rake (10.1.1)
     rdoc (4.1.1)
       json (~> 1.4)
+    test-unit (3.0.8)
+      power_assert
     thread_safe (0.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -63,3 +66,4 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 4.1)
   jeweler (~> 2.0)
+  test-unit

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/devlog

@@ -3,11 +3,11 @@ require 'benchmark'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib devlog.rb]))
 USAGE= <<-EOF
 #{Devlog.display_version}
-This software is intended to parse and present information within devlog.markdown development logs.
+This software is intended to parse and present information within devlog.markdown development logs. It also helps You to write the devlog.
 
 #{'Use it as You'.green} #{'dodo'.pur}.
 
-Using with a file:
+Using with a file, for parsing and seeing the information summary:
 
   #{'devlog'.red} /path/to/devlog.markdown
 
@@ -15,12 +15,14 @@ or in a folder with a 'devlog.markdown' file in it:
 
   #{'devlog'.green} 
 
-commands for the current folder:
+write commands for the current folder, the top three:
 
   #{'devlog'.green} b ~ starts coding session
   #{'devlog'.green} e ~ stops coding session
+  #{'devlog'.green} save ~ save info.markdown, commit & push git repo
+
+  #{'devlog'.green} i ~ save info.markdown
   #{'devlog'.green} s ~ status of coding session
-  #{'devlog'.green} save ~ commit & push git repo
   #{'devlog'.green} commit ~ commit git repo
   #{'devlog'.green} push ~ push git repo
 
@@ -50,6 +52,9 @@ def dodo
     elsif @in_file_or_cmd == 'e'
       puts "CodingSession::END"
       stop_coding_session("devlog.markdown")
+    elsif @in_file_or_cmd == 'i'
+      puts "Save info.markdown"
+      save_info("devlog.markdown")
     elsif @in_file_or_cmd == 'commit'
       puts "Commit git"
       `git commit -am "devlog"`
@@ -57,7 +62,8 @@ def dodo
       puts "Push git"
       `git push`
     elsif @in_file_or_cmd == 'save'
-      puts "Commit and push git"
+      puts "Save info.markdown and Commit and push git"
+      save_info("devlog.markdown")
       `git commit -am "devlog" && git push`
     elsif @in_file_or_cmd == 's'
       puts is_session_open("devlog.markdown") ? "Session is open..." : "No open session."

data/devlog.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devlog 0.1.2 ruby lib
+# stub: devlog 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devlog"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["mihael"]
-  s.date = "2015-02-06"
+  s.date = "2015-02-17"
   s.description = "devlog.markdown time&space extractor"
   s.email = "kitschmaster@gmail.com"
   s.executables = ["devlog"]
@@ -62,13 +62,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 4.1"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 4.1"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 4.1"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end
 end

data/devlog.markdown

@@ -1,3 +1,21 @@
+#16.02.2015 23:09:06 CodingSession::END
+
+who's got time...not to sweet dream. still did not get rid of active support... well, let's keep it until, after all, it's active, reactive uppsort... and maybe someday You would dare work without it.
+
+let's see, if ii comment out active_support and run rake test:
+
+23 tests, 53 assertions, 0 failures, 10 errors, 0 pendings, 0 omissions, 0 notifications
+
+just 10 errors, not failures, but what is the difference between the two, 0 is not 1.
+
+#16.02.2015 23:08:38 CodingSession::BEGIN
+
+#09.02.2015 15:41:16 CodingSession::END
+
+aha... no comment haha...
+
+#09.02.2015 15:41:09 CodingSession::BEGIN
+
 
 #02.02.2015 17:53:20 CodingSession::END
 
@@ -100,7 +118,7 @@ obviously the parse_devlog method returns the Tajm object, so that is where the
 
 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.
+ii added parse_devlog_now, which will be developed as the new thing, (LOL back at this record at #16.02.2015 22:59:10) 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... 
 

data/lib/devlog.rb

@@ -240,6 +240,17 @@ module Devlog
   #close the current session, if any
   def stop_coding_session(devlog_file='devlog.markdown')
     prepend_string(devlog_session_entry('Coding', 'END'), devlog_file)
+    save_info(devlog_file)
+  end
+
+  def save_info(devlog_file='devlog.markdown', info_file='info.markdown')
+    info = parse_devlog_now(devlog_file)
+    if info.has_info?
+      File.open(File.join(File.dirname(devlog_file), info_file), 'w') {|f| f.write(info.to_info_string(short=true)) }
+      `cp #{devlog_file} #{File.join(File.dirname(devlog_file), 'README.markdown')}`
+    else
+      puts "No info present.".red
+    end
   end
 
   #if the first non empty line is not and END entry then session is open (or malformed file)
@@ -278,7 +289,11 @@ module Devlog
       @payed_time = 0.0
 
       @devlog_file = ""
-     end
+    end
+
+    def has_info?
+      @zezzions.any?
+    end
 
     def add_zezzion(zezzion)
       @zezzions << zezzion
@@ -391,38 +406,41 @@ module Devlog
       vs << (File.exist?(self.devlog_file) ? '' : "No such file #{self.devlog_file}...\n".red)
     end
 
-    def to_info_string
+    def to_info_string(short=false)
       s = ""
       s <<  "\nSession::Time:      = #{self.session_time} [h]\n"
-      s << ("\nCodingSession::Time = %.1f [h]" % self.coding_session_time)
-      s << ("\nComSession::Time    = %.1f [h]" % self.com_session_time)
-      s << ("\nCharge::Time        = #{self.charge_time} [h]")
-      s << ("\nUnpayed::Time       = #{self.unpayed_time.to_s.green} [h]\n")
-      s << ("\n")
-      s << ("Num of Sessions     = #{self.devlog_sessions.size}\n")
-      s << ("Hours per Day       = #{self.per_day} [h]\n")
-      s << ("Hours per Week      = #{self.per_week} [h]\n")
-      s << ("Hours per Month     = #{self.per_month} [h]\n")
-      s << ("Hours last 7 days   = #{self.hours_for_last(7)} [h]\n")
-      s << ("Hours last 14 days  = #{self.hours_for_last(14)} [h]\n")
-      s << ("Hours last 28 days  = #{self.hours_for_last(28)} [h]\n")
+      s << ("\nCodingSession::Time = %.1f [h]\n" % self.coding_session_time)
+      s << ("\nComSession::Time    = %.1f [h]\n" % self.com_session_time)
+      s << ("\nCharge::Time        = #{self.charge_time} [h]\n")
+      s << ("\nUnpayed::Time       = #{self.unpayed_time.to_s} [h]\n")
       s << ("\n")
-      s << ("Devlog Time         = #{self.devlog_days * 24} [h]\n")
-      s << ("Devlog Days         = #{self.devlog_days}  [days]\n")
-      s << ("Devlog Weeks        = #{self.devlog_weeks}  [weeks]\n")
-      s << ("Devlog Months       = #{self.devlog_months}  [months]\n")
-      if self.negative_sessions.any?
+      unless short
+        s << ("Num of Sessions     = #{self.devlog_sessions.size}\n")
+        s << ("Hours per Day       = #{self.per_day} [h]\n")
+        s << ("Hours per Week      = #{self.per_week} [h]\n")
+        s << ("Hours per Month     = #{self.per_month} [h]\n")
+        s << ("Hours last 7 days   = #{self.hours_for_last(7)} [h]\n")
+        s << ("Hours last 14 days  = #{self.hours_for_last(14)} [h]\n")
+        s << ("Hours last 28 days  = #{self.hours_for_last(28)} [h]\n")
         s << ("\n")
-        s << ("#{'Negative Sessions'.red}   = #{self.negative_sessions_to_s}\n")
-      end
-      if self.zero_sessions.any?
+        s << ("Devlog Time         = #{self.devlog_days * 24} [h]\n")
+        s << ("Devlog Days         = #{self.devlog_days}  [days]\n")
+        s << ("Devlog Weeks        = #{self.devlog_weeks}  [weeks]\n")
+        s << ("Devlog Months       = #{self.devlog_months}  [months]\n")
+        if self.negative_sessions.any?
+          s << ("\n")
+          s << ("#{'Negative Sessions'.red}   = #{self.negative_sessions_to_s}\n")
+        end
+        if self.zero_sessions.any?
+          s << ("\n")
+          s << ("#{'Zero Sessions'.blue}       = #{self.zero_sessions_to_s}\n")
+        end
         s << ("\n")
-        s << ("#{'Zero Sessions'.blue}       = #{self.zero_sessions_to_s}\n")
+        s << ("Longest Session     = #{self.longest_session.to_s}\n")
+        s << ("Shortest Session    = #{self.shortest_session.to_s}\n")
+        s << ("Last Session        = #{self.devlog_end.ago_in_words}, duration: #{self.last_session.session_time.round(3)} [h]")
       end
-      s << ("\n")
-      s << ("Longest Session     = #{self.longest_session.to_s}\n")
-      s << ("Shortest Session    = #{self.shortest_session.to_s}\n")
-      s << ("Last Session        = #{self.devlog_end.ago_in_words}, duration: #{self.last_session.session_time.round(3)} [h]")
+      s
     end
 
     private 

data/test/devlog_test.rb

@@ -136,8 +136,8 @@ class DevlogTest < Test::Unit::TestCase
   end
 
   def test_start_coding_session
-    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp_devlog.markdown')
-    File.new(@empty_devlog, 'w').puts('empty')
+    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp1_devlog.markdown')
+    File.open(@empty_devlog, 'w') {|f| f.puts('empty')}
     start_coding_session(@empty_devlog)
     assert(File.readlines(@empty_devlog).grep(/CodingSession::BEGIN/).size>0, "should insert CodingSession::BEGIN at top of file")
     assert(is_session_open(@empty_devlog)==true, "should be true, session should be open after starting")
@@ -145,12 +145,35 @@ class DevlogTest < Test::Unit::TestCase
   end 
 
   def test_stop_coding_session
-    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp_devlog.markdown')
-    File.new(@empty_devlog, 'w').puts('empty')
+    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp2_devlog.markdown')
+    File.delete(@empty_devlog) if File.exist?(@empty_devlog)
+    File.open(@empty_devlog, 'w') {|f| f.puts('empty')}
     stop_coding_session(@empty_devlog)
     assert(File.readlines(@empty_devlog).grep(/CodingSession::END/).size>0, "should insert CodingSession::END at top of file")
     assert(is_session_open(@empty_devlog)==false, "should be false, session should be closed after stopping")
-    File.delete(@empty_devlog)
+    File.delete(@empty_devlog) if File.exist?(@empty_devlog)
+  end 
+
+  def test_save_info_after_stop_coding_session
+    @devlog_info  = File.join(File.dirname(__FILE__), '..', 'info.markdown')
+    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp3_devlog.markdown')
+    #File.delete(@empty_devlog) if File.exist?(@empty_devlog)
+    File.new(@empty_devlog, 'w').puts('\n')
+    start_coding_session(@empty_devlog)
+    assert(File.readlines(@empty_devlog).grep(/CodingSession::BEGIN/).size>0, "should insert CodingSession::BEGIN at top of file")
+    assert(is_session_open(@empty_devlog)==true, "should be true, session should be open after starting")
+    prepend_string('+1h', @empty_devlog)
+    sleep(1)
+    stop_coding_session(@empty_devlog)
+    assert(File.readlines(@empty_devlog).grep(/CodingSession::END/).size>0, "should insert CodingSession::END at top of file")
+    assert(is_session_open(@empty_devlog)==false, "should be false, session should be closed after stopping")
+    assert(File.exists?(@devlog_info)==true, "should exist")
+    hasinfo = parse_devlog_now(@empty_devlog).has_info?
+    assert(hasinfo==true, 'should have info')
+    assert(File.readlines(@devlog_info).grep(/Session::Time/).size>0, "should have info about Session::Time")
+    assert(File.readlines(@devlog_info).grep(/Unpayed::Time/).size>0, "should have info about Session::Time")
+    assert(File.readlines(@devlog_info).grep(/Num of Sessions/).size==0, "should not include full info")
+    #File.delete(@empty_devlog) if File.exist?(@empty_devlog)
   end 
 
   def test_is_session_open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devlog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - mihael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement