logtime 0.0.2

data/lib/logtime.rb

@@ -0,0 +1,68 @@
+require_relative '../config/initialisation'
+
+# require models
+models = File.expand_path(File.join('..', 'models'), __FILE__)
+if Dir.exists?(models)
+    Dir.entries(models).each do |file|
+        require File.join(models, file) if file =~ /^(.*)\.rb$/
+    end
+end
+
+# require helpers
+helpers = File.expand_path(File.join('..', 'helpers'), __FILE__)
+if Dir.exists?(helpers)
+    Dir.entries(helpers).each do |file|
+        next unless file =~ /^(.*)\.rb$/
+
+        require File.join(helpers, file)
+
+        # helper name
+        load = file.split '_'
+        load = load.each { |h| h.capitalize! }
+        load = load.join
+        load = load[0..-4] # '.rb'
+        load = load + "Helper"
+
+        # load helper
+        begin
+            send(:include, load.constantize)
+
+            rescue
+                ActiveRecord::Base.logger.warn "Failed to load " + load
+        end
+    end
+end
+
+# require commands
+commands = File.expand_path(File.join('..', 'commands'), __FILE__)
+if Dir.exists?(commands)
+    Dir.entries(commands).each do |file|
+        require_relative File.join(commands, file) if file =~ /^(.*)\.rb$/
+    end
+end
+
+# require subcommands
+subcommands = File.expand_path(File.join('..', 'subcommands'), __FILE__)
+if Dir.exists?(subcommands)
+    Dir.entries(subcommands).each do |file|
+        require_relative File.join(subcommands, file) if file =~ /^(.*)\.rb$/
+    end
+end
+
+# Application
+class LogTime < Thor
+
+    # commands
+    include ::Commands::List
+    include ::Commands::Add
+    include ::Commands::Start
+    include ::Commands::Stop
+    include ::Commands::Version
+
+    # subcommands
+    desc "series", ""
+    subcommand "series", SubCommands::Series
+
+    desc "tags", ""
+    subcommand "tags", SubCommands::Tags
+end

data/lib/models/log.rb

@@ -0,0 +1,47 @@
+#
+# Logs
+#
+
+class Log < ActiveRecord::Base
+	scope :active, -> { where(active: true) }
+	scope :inactive, -> { where(active: false) }
+	scope :tagged, ->(tag) { where(tags: { tag: tag }) }
+	scope :estimated, -> { where("estimation is not null") }
+
+	validates :name, uniqueness: true
+
+	has_many :series
+	has_and_belongs_to_many :tags
+
+	def tag(tags)
+		tags.split(',').each do |t|
+			self.tags << Tag.where(tag: t).first_or_create
+		end
+
+		return self
+	end
+
+	def tagged(tag)
+
+	end
+
+	def activate
+		self.active = true
+		self.save
+	end
+
+	def deactivate
+		self.active = false
+		self.save
+	end
+
+	def total
+		difference = 0
+		self.series.each do |s|
+			ending = s.end || Time.now
+			# next unless s.start and s.end
+			difference = difference + s.start.difference(ending)
+		end
+		difference
+	end
+end

data/lib/models/series.rb

@@ -0,0 +1,35 @@
+#
+# Series
+#
+
+class Series < ActiveRecord::Base
+	belongs_to :log
+
+	def self.begin(options = {})
+		attributes = {
+			start: Time.now
+		}.merge! options
+
+		create(attributes)
+	end
+
+	def begin
+		self.start = Time.now
+		self.save
+	end
+
+	def stop
+		self.end = Time.now
+		self.save
+	end
+
+	def finished?
+		!self.end.blank?
+	end
+
+	def total
+		return false if self.end.blank? or self.start.blank?
+
+		self.start.difference(self.end)
+	end
+end

data/lib/models/tag.rb

@@ -0,0 +1,9 @@
+#
+# Tags
+#
+
+class Tag < ActiveRecord::Base
+	validates :tag, uniqueness: true
+	validates_format_of :tag, :with => /[-a-z]+/
+	has_and_belongs_to_many :logs
+end

data/lib/subcommands/keyword.rb

@@ -0,0 +1,214 @@
+class Keywords < Thor
+    # desc "add <account> <keyword>", "Add a new <keyword> to an <account>"
+    # option :interactive, :type => :boolean, :alias => :i
+    # def add(account, keyword=nil)
+    #     account = Account.find_by(:name => account)
+
+    #     if account.blank?
+    #         say 'no account found', :red
+    #     else
+    #         if options[:interactive]
+    #             say "To stop adding keywords type exit", :cyan
+    #             while true
+    #                 keyword = ask ':'
+    #                 break if keyword == 'exit'
+    #                 if Keyword.new(:keyword => keyword, :account_id => account.id).save
+    #                     say 'added', :green
+    #                 else
+    #                     say 'failed', :red
+    #                 end
+    #             end
+    #         else
+    #             keyword.split(',').each do |k|
+    #                 k = Keyword.new(:keyword => k, :account_id => account.id)
+
+    #                 if k.save
+    #                     say k.keyword + ' keyword added', :green
+    #                 else
+    #                     say 'could not add keyword!', :red
+    #                     error k.errors.first[0].to_s + ' ' + k.errors.first[1]
+    #                 end
+    #             end
+    #         end
+    #     end
+    # end
+
+    # desc "delete <account> <keyword>", "Removes <keyword> on an <account>"
+    # def delete(account, keyword)
+    #     account = Account.search(account)
+
+    #     if account.blank?
+    #         say 'no account found', :red
+    #     else
+    #         keyword.split(',').each do |k|
+    #             k = Keyword.search(k)
+
+    #             if k.blank?
+    #                 say 'could not find keyword!', :red
+    #             else
+    #                 say k.keyword + ' removed', :green if k.destroy
+    #             end
+    #         end
+    #     end
+    # end
+
+    # desc "list", "Lists keywords belonging to an <account>"
+    # option :account
+    # def list(account=nil)
+    #     if account.nil?
+    #         keywords = Keyword.all
+
+    #         table = [['# Keyword', '# Position', '']] # header
+    #         keywords.each do |k|
+    #             stat = k.keyword_statistics.last unless k.keyword_statistics.empty?
+    #             table << [k.keyword, stat.position || '', stat.created_at.pretty ] # row
+    #         end
+
+    #         say ''
+    #         print_table table
+    #         say ''
+    #     else
+    #         account = Account.search(account)
+    #         if account.blank?
+    #             say 'no account found', :red
+    #         elsif account.keywords.empty?
+    #             say 'no keywords exist for that account yet', :red
+    #         else
+    #             table = [['# Keyword', '# Position', '']] # header
+    #             account.keywords.each do |k|
+    #                 stat = k.keyword_statistics.last unless k.keyword_statistics.empty?
+    #                 table << [k.keyword, stat.position || '', stat.created_at.pretty] # row
+    #             end
+
+    #             say ''
+    #             print_table table
+    #             say ''
+    #         end
+    #     end
+    # end
+
+    # desc "stats", "Compare keywords over time"
+    # option :search, :default => 'year', :banner => 'year,month,week,day'
+    # option :length, :type => :numeric, :default => 1
+    # option :engine, :default => :google
+    # def stats(account)
+    #     account = Account.search(account)
+
+    #     if account.blank?
+    #         say 'no account found', :red
+    #     elsif account.keywords.empty?
+    #         say 'no keywords exist for that account yet', :red
+    #     else
+
+    #         table = [['# Keyword', 'n', 'High', 'Low', 'Current', 'Delta']] # header
+    #         searched = 0;
+    #         account.keywords.each do |k|
+    #             stats = KeywordStatistic.send options[:search], k.id, options[:length], options[:engine]
+    #             stats.order(:position)
+
+    #             if !stats.empty?
+    #                 delta = stats.last.position - stats.first.position
+    #                 delta = '' if delta == 0
+    #                 table << [k.keyword, stats.size, stats.last.position, stats.first.position, stats.last.position, delta] # row
+    #                 searched = searched + stats.size
+    #             end
+    #         end
+
+    #         if searched == 0
+    #             say 'these keywords have not been indexed yet', :red
+    #         else
+    #             say ''
+    #             say account.name + ' has ' + searched.to_s + ' recorded positions for ' + account.keywords.size.to_s + ' keywords', :green
+    #             say ''
+    #             print_table table
+    #             say ''
+    #         end
+    #     end
+    # end
+
+    # #desc "import", "imports csv file"
+    # #options :file
+    # #def import(file)
+
+    # #end
+
+    # desc "index", "gets keyword position and saves it for later use"
+    # def index(account)
+    #     account = Account.search(account)
+    #     if account.blank?
+    #         say 'no account found', :red
+    #     else
+    #         table = [['# Keyword', '# Google', '# GoogleUS']] # header
+    #         account.keywords.each do |k|
+    #             # Google
+    #             google = ::Ranking.new(:keyword => k.keyword, :url => account.domain, :limit =>100).from_googleAU
+    #             if !google.blank?
+    #                 KeywordStatistic.new(:keyword_id => k.id, :engine => :google, :position => google).save
+    #                 say '.', :green, false
+    #             else
+    #                 say '.', :red, false
+    #             end
+
+    #             # GoogleUS
+    #             googleUS = ::Ranking.new(:keyword => k.keyword, :url => account.domain, :limit =>100).from_googleUS
+    #             if !googleUS.blank?
+    #                 KeywordStatistic.new(:keyword_id => k.id, :engine => :googleUS, :position => googleUS).save
+    #                 say '.', :green, false
+    #             else
+    #                 say '.', :red, false
+    #             end
+
+    #             # Bing
+    #             # bing = ::Ranking.new(:keyword => k.keyword, :url => account.domain, :limit =>100).from_bingAU
+    #             # if !bing.blank?
+    #             #    KeywordStatistic.new(:keyword_id => k.id, :engine => :bing, :position => bing).save
+    #             #    say '.', :green, false
+    #             # else
+    #             #    say '.', :red, false
+    #             # end
+
+
+    #             # Yahoo
+    #             # yahoo = ::Ranking.new(:keyword => k.keyword, :url => account.domain, :limit =>100).from_yahooAU
+    #             # if !yahoo.blank?
+    #             #    KeywordStatistic.new(:keyword_id => k.id, :engine => :yahoo, :position => yahoo).save
+    #             #    say '.', :green, false
+    #             # else
+    #             #    say '.', :red, false
+    #             # end
+
+    #             table << [k.keyword, google, googleUS]
+    #         end
+
+    #         say ''
+    #         print_table table
+    #         say ''
+    #     end
+    # end
+
+    # desc "export", "export keywords with positions"
+    # option :file
+    # def export(account)
+    #     account = Account.search(account)
+    #     if account.blank?
+    #         say 'no account found', :red
+    #     else
+    #         table = [['# Date', '# Keyword', '# Position']] # header
+
+    #         options[:file] = 'export.csv' unless options.includes? :file
+    #         CSV.open(options[:file], 'w') do |csv|
+    #             account.keywords.each do |keyword|
+    #                 keyword.keyword_statistics.each do |stat|
+    #                     row = [stat.created_at, keyword.keyword, stat.position]
+    #                     table << row
+    #                     csv << row
+    #                 end
+    #             end
+    #         end
+
+    #         say ''
+    #         print_table table
+    #         say ''
+    #     end
+    # end
+end

data/lib/subcommands/series.rb

@@ -0,0 +1,59 @@
+module SubCommands
+    class Series < Thor
+        desc "ls", "list series"
+        option :order, :type => :string, :default => "updated_at"
+        def ls
+            series = ::Series.all.order(options[:order].to_sym => :desc)
+
+            series_stats = Statistics.new
+            table = [['#', 'log', 'start', 'end', 'hours']] # header
+            series.each do |s|
+                next if s.log_id.blank?
+
+                start = s.start
+                finish = s.end
+
+                # total time
+                series_stats << timer = start.difference(finish || Time.now)
+
+                start = display_time(start) if start
+                finish = display_time(finish) if finish
+
+                table << [s.id,
+                    Log.find(s.log_id).name,
+                    start, finish || "active",
+                     (timer/3600).round(2).to_s] # row
+            end
+
+            puts ''
+            print_table table
+            puts ''
+
+            say [series.count.to_s, "series out of", ::Series.count].join(' '), :cyan
+            say [(series_stats.mean/3600).round(2), " hours avg"].join(' '), :cyan
+        end
+
+        desc "rm [ID]", "remove series"
+        option :confirm, :type => :boolean, :default => false, :alias => '-y'
+        def rm(id)
+            if ::Series.where(id: id).count == 0
+                say "Series #" + id.to_s + " not found", :red
+                exit
+            end
+
+            series = ::Series.find(id)
+
+            if !options[:confirm]
+                say "You must --confirm before removing this series", :red
+                exit
+            end
+
+            if !series.finished?
+                series.log.deactivate
+            end
+
+            destroyed = series.destroy
+            say "Series #" + id.to_s + " has been destroyed", :green
+        end
+    end
+end

data/lib/subcommands/tags.rb

@@ -0,0 +1,37 @@
+module SubCommands
+    class Tags < Thor
+        desc "add", "create new tag"
+        def add(tag)
+            tag = ::Tag.new(tag: tag.strip)
+
+            if !tag.save
+                tag.errors.full_messages.each do |error|
+                    say error, :red
+                end
+                exit 1
+            end
+
+            say tag.tag + " added!", :green
+        end
+
+        desc "rm", "remove tag"
+        # option :prune, :type => :boolean, :alias => '-p', :default => false not implemented yet
+        def rm(tag)
+            tag = ::Tag.find_by!(tag: tag)
+            tag.destroy
+            say ["Tag", tag.tag, "destroyed forever"].join(' '), :green
+        end
+
+        desc "ls", "list all tags"
+        option :order, :type => :string, :default => "created_at"
+        def ls
+            tags = ::Tag.order(options[:order].to_sym => :desc)
+
+            table = [['#', 'name', 'logs']] # header
+            tags.each do |tag|
+                table << [tag.id, tag.tag, tag.logs.count] # row
+            end
+            print_table table
+        end
+    end
+end

data/logtime.gemspec

@@ -0,0 +1,23 @@
+Gem::Specification.new do |s|
+    s.name          = 'logtime'
+    s.date          = '2015-06-03'
+    s.version       = `cat VERSION`.strip
+    s.platform      = Gem::Platform::RUBY
+    s.description   = <<-EOF
+    Tag, record and estimate your time.
+    Get better at time estimation with statistics.
+    EOF
+    s.summary       = 'Log your time'
+    s.authors       = ['Paperback']
+    s.email         = 'sam@samwhat.com'
+    s.files         = `git ls-files`.split($RS)
+    s.executables   =  s.files.grep(/^bin\//) { |f| File.basename(f) }
+    s.license       = 'MIT'
+    s.homepage      = 'https://github.com/Paperback/Logtime.git'
+    s.add_runtime_dependency "thor", ["= 0.19.1"]
+    s.add_runtime_dependency "activerecord", ["= 4.1.6"]
+    s.add_runtime_dependency "sqlite3", ["= 1.3.9"]
+    s.add_runtime_dependency "chronic_duration", ["= 0.10.6"]
+    s.cert_chain    = ['certs/paperback.pem']
+    s.signing_key   = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
+end

data.tar.gz.sig

@@ -0,0 +1,2 @@
+bڴ������ET����v�x$�B�K�L�o#�b�Z�e���Xk���U��.���m$ķ�����=�}4����
+O%V.�kPO8P�jNF�+���|����Y���hs��s&3ʗ��"��

metadata

@@ -0,0 +1,167 @@
+--- !ruby/object:Gem::Specification
+name: logtime
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+platform: ruby
+authors:
+- Paperback
+autorequire: 
+bindir: bin
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANzYW0x
+  FzAVBgoJkiaJk/IsZAEZFgdzYW13aGF0MRMwEQYKCZImiZPyLGQBGRYDY29tMB4X
+  DTE1MDYwMjA5NTQxOVoXDTE2MDYwMTA5NTQxOVowPDEMMAoGA1UEAwwDc2FtMRcw
+  FQYKCZImiZPyLGQBGRYHc2Ftd2hhdDETMBEGCgmSJomT8ixkARkWA2NvbTCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPKKZV2uNAV6W+IlPDriPQNMPp7C
+  Xw7yNlbhmrmgNxJotT4DP6Eyc1NzAJdfz5kQMqgrzxRWBbFD1wPFJB3IdgX1PGKi
+  VOV/BO6sFBFrje/2a364FtKkGjm5V+zyeNZO/DUMuFalnbs+OWvfktFrx2JdBWeU
+  Utmtx3+AcW91+OFZ8y7ZZjUd1FbNP6A+WTYh2odUDFCQXe4xk3bcSGa0Ca7uAfv8
+  VMm1cWu23n+cer1dUW0VspFprSoo/f1WGduZus8PjBFAgEQdDDmTbB49DrigilzT
+  swXvrzGfCKZ0OveVFmhJz1Zr9WUlFNs/GU5x2iQpIZjg1S1mbIfhRhw+H1MCAwEA
+  AaNxMG8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFOGu79hFpVdT
+  ALi15MDDorfHC7nPMBoGA1UdEQQTMBGBD3NhbUBzYW13aGF0LmNvbTAaBgNVHRIE
+  EzARgQ9zYW1Ac2Ftd2hhdC5jb20wDQYJKoZIhvcNAQEFBQADggEBAIQ69hz8tXeJ
+  YPTz23tOss7qcY9xo5HInXQXfQ8wZGNVaBPmtBognGO/Kqf5PxeoaZ3FfT8pE9qz
+  giuth+pA2j2EXCBwEuu6+I4J9lfIT030uVMaBIQ1JJxKZcXtRpOP2yd/gKodDVn/
+  KIGKFrb3RWI2VVKNYV7lBCtHyx4uhEBvHmOhHKm3vlkzc+IZWQtCHhJ9iSKSefZ+
+  fZbMJQmYpt4/9KimNcpD+k3mQwMEW947060mRhnpAGkwlIujltb5lQwlWQoKm/Z4
+  2/luIWFCIDih/t3xy/BezkXJLXfRZF2Xd6/Ax9+zEVss6iUJ6kcxwaZ/J5r28EDI
+  KS3vMuAGgck=
+  -----END CERTIFICATE-----
+date: 2015-06-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.6
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.9
+- !ruby/object:Gem::Dependency
+  name: chronic_duration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.6
+description: |2
+      Tag, record and estimate your time.
+      Get better at time estimation with statistics.
+email: sam@samwhat.com
+executables:
+- logtime
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
+- LICENSE.md
+- VERSION
+- bin/logtime
+- certs/paperback.pem
+- config/application.rb
+- config/database.rb
+- config/initialisation.rb
+- config/schema.rb
+- lib/app/commands/add.rb
+- lib/app/commands/list.rb
+- lib/app/commands/start.rb
+- lib/app/commands/stop.rb
+- lib/app/helpers/estimate.rb
+- lib/app/helpers/statistics.rb
+- lib/app/helpers/time_to_words.rb
+- lib/app/logtime.rb
+- lib/app/models/log.rb
+- lib/app/models/series.rb
+- lib/app/models/tag.rb
+- lib/app/subcommands/keyword.rb
+- lib/app/subcommands/series.rb
+- lib/app/subcommands/tags.rb
+- lib/commands/add.rb
+- lib/commands/list.rb
+- lib/commands/start.rb
+- lib/commands/stop.rb
+- lib/commands/version.rb
+- lib/helpers/estimate.rb
+- lib/helpers/statistics.rb
+- lib/helpers/time_difference.rb
+- lib/helpers/time_display.rb
+- lib/helpers/time_to_words.rb
+- lib/logtime.rb
+- lib/models/log.rb
+- lib/models/series.rb
+- lib/models/tag.rb
+- lib/subcommands/keyword.rb
+- lib/subcommands/series.rb
+- lib/subcommands/tags.rb
+- logtime.gemspec
+homepage: https://github.com/Paperback/Logtime.git
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
+specification_version: 4
+summary: Log your time
+test_files: []