task_time 0.0.1.pre.alpha → 0.0.1.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e89e25415e709fec44863b46bef7a5ea2c9bc6
-  data.tar.gz: 86e69e256f96121dfe6dc0014e1a6735cf568303
+  metadata.gz: 187bec98557e2c146473a696f19fee26e577ebd3
+  data.tar.gz: 901e0236d23a991d492c4830dbe687ddc50331b4
 SHA512:
-  metadata.gz: e1b52a0f46c698a9b4328f391bc0ea3ba653555da8491871be8c4483803862679c0109515785d261e787d479f28d723bdbeaef6a037c132ce51f1a6f486c16f4
-  data.tar.gz: b52d4f2069c6bd74c6ccb3b9b4d9fba4d9b72e561eec50987164474c39e1a85780fc5563746ae51f10d348daf169d9bfcd16edc67bae8ed36708090dbd7026eb
+  metadata.gz: d14cffd0267efa4b972edee01507f3a96d0b1dd3122175985ecaabdeda074ed235e2f96cf6d5096c9c5610e71e3cd7419fecdf4397fc0902699d2a71eeb3bdd0
+  data.tar.gz: ff273d2cdc61dfd91533787d897e06f186de9981df3311a6ca51de5d65efff5f75b4a9f6f631e6201fc4caf914d09b7474a26ceeb9b6faeb152349ad741fdd37

data/.gitignore

@@ -26,9 +26,9 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.3
+ruby-2.2.2

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
+group :development do
+  gem 'rtasklib', path: "#{Dir.home}/Code/rtasklib/"
+end
+
 # Specify your gem's dependencies in task_time.gemspec
 gemspec

data/bin/task_time

@@ -1,5 +1,89 @@
 #!/usr/bin/env ruby
 
+require 'gli'
 require_relative "../lib/task_time"
 
-TaskTime::CLI.start
+include GLI::App
+
+program_desc "An addon to TaskWarrior that allows time tracking and reporting"
+
+version TaskTime::VERSION
+
+subcommand_option_handling :normal
+arguments :strict
+
+# desc 'Describe some switch here'
+# switch [:s,:switch]
+
+desc 'Specify where the task_time config file is located'
+arg 'config', :optional
+default_value File.join(ENV['HOME'], '.task_time_rc.yaml')
+flag [:c, :config]
+
+desc "Start a timer on the specified task"
+arg_name 'Describe arguments to start here'
+command :start do |c|
+  c.desc 'Describe a switch to start'
+  c.switch :s
+
+  c.desc 'Describe a flag to start'
+  c.default_value 'default'
+  c.flag :f
+  c.action do |global_options,options,args|
+
+    # Your command logic here
+     
+    # If you have any errors, just raise them
+    # raise "that command made no sense"
+
+    puts "start command ran"
+  end
+end
+
+desc "Stop the timer on the specified task"
+arg_name 'Describe arguments to stop here'
+command :stop do |c|
+  c.action do |global_options,options,args|
+    puts "stop command ran"
+  end
+end
+
+desc 'Describe toggle here'
+arg_name 'Describe arguments to toggle here'
+command :toggle do |c|
+  c.action do |global_options,options,args|
+    puts "toggle command ran"
+  end
+end
+
+desc 'Describe report here'
+arg_name 'Describe arguments to report here'
+command :report do |c|
+  c.action do |global_options,options,args|
+    puts "report command ran"
+  end
+end
+
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abort and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  $tt = TaskTime::TT.new(global[:config])
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)

data/lib/task_time/helpers.rb

@@ -0,0 +1,18 @@
+require 'yaml'
+
+module TaskTime
+  
+  module Helpers
+    # make this module a stateless, singleton
+    extend self
+
+    # Read a configuration file into a hash and merge it with a default hash
+    def read_config file_path, defaults=TaskTime::DEFAULTS
+      if File.exists? file_path
+        config = YAML.load_file(file_path)
+        defaults = defaults.merge(config)
+      end
+      defaults
+    end
+  end
+end

data/lib/task_time/version.rb

@@ -1,3 +1,3 @@
 module TaskTime
-  VERSION = "0.0.1-alpha"
+  VERSION = "0.0.1-beta"
 end

data/lib/task_time.rb

@@ -1,37 +1,23 @@
 require_relative "task_time/version"
-require "thor"
+require_relative "task_time/helpers"
+require "gli"
+require "rtasklib"
 
 module TaskTime
+  DEFAULTS = {
+    task_data: "#{Dir.home}/.task"
+  }
 
-  class CLI < Thor
+  UDAS = [ "timestamps", "time-spent", "time-est",
+           "time-prog", "progress", "client" ]
 
-    desc "start", "Start a timer on the specified task"
-    def start(filter)
-    end
-
-    desc "stop", "Stop the timer on the specified task"
-    def stop(filter)
-    end
-
-    desc "toggle", ""
-    def toggle(filter)
-    end
-
-    desc "edit", ""
-    def edit(filter)
-    end
-
-    desc "modify", ""
-    def modify(filter)
-    end
+  class TT
+    attr_accessor :config, :tw
 
-    desc "report", ""
-    def report(filter)
+    def initialize config
+      @config = Helpers.read_config(config)
+      @tw = Rtasklib::TW.new(config["data_location"])
+      puts tw.all
     end
-
-    desc "export", ""
-    def export(filter, format)
-    end
-
   end
 end

data/sample.task_time_rc.yaml

@@ -0,0 +1,41 @@
+# This example shows all default options that mean something to task_time
+# Arbitrary configs set here will be available in the custom reports
+#
+# Configure TaskWarrior so rtasklib knows where to look for your data
+task_data: "~/.task"
+
+# Set global defaults for generating billing reports
+currency_marker: "$"
+hourly_rate: "50"
+rounding?: true
+rounding_minutes: 15
+
+# describe yourself
+you:
+  first_name:  "Will"
+  middle_name: "Henry"
+  last_name:   "Paul"
+
+  address: "847 Coopers Dr"
+  city:  "Rochester"
+  state: "Minnesota"
+  zip: "14892"
+
+# describe your clients, note that you can override global defaults on a
+# per client basis
+clients:
+  - sample_client:
+      client_name: "Company, inc."
+      contact_first_name: "John"
+      contact_last_name: "Smith"
+
+      address: "847 Coopers Dr"
+      city:  "Rochester"
+      state: "Minnesota"
+      zip: "14892"
+
+      hourly_rate: "25"
+
+      projects: 
+        - "RMA"
+        - "SYN"

data/task_time.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
+  # spec.add_dependency "thor"
   spec.add_dependency "rtasklib"
+  spec.add_dependency "gli"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: task_time
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.alpha
+  version: 0.0.1.pre.beta
 platform: ruby
 authors:
 - Will
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rtasklib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rtasklib
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -153,7 +153,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -162,7 +161,9 @@ files:
 - bin/setup
 - bin/task_time
 - lib/task_time.rb
+- lib/task_time/helpers.rb
 - lib/task_time/version.rb
+- sample.task_time_rc.yaml
 - spec/spec_helper.rb
 - spec/task_time_spec.rb
 - task_time.gemspec
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A taskwarrior plugin that adds time tracking and reporting features.

data/Gemfile.lock

@@ -1,106 +0,0 @@
-PATH
-  remote: .
-  specs:
-    task_time (0.0.1)
-      rtasklib
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    coderay (1.1.0)
-    coveralls (0.7.11)
-      multi_json (~> 1.10)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.9.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    ffi (1.9.6)
-    formatador (0.2.5)
-    guard (2.12.4)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.5.0)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hitimes (1.2.2)
-    listen (2.8.5)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    multi_json (1.10.1)
-    nenv (0.2.0)
-    netrc (0.10.3)
-    notiffany (0.0.6)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rest-client (1.7.3)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.1)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-nc (0.2.0)
-      rspec (>= 2.9)
-      terminal-notifier (>= 1.4)
-    rspec-support (3.2.2)
-    rtasklib (0.1.0)
-    shellany (0.0.1)
-    simplecov (0.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    slop (3.6.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    terminal-notifier (1.6.2)
-    thor (0.19.1)
-    timers (4.0.1)
-      hitimes
-    tins (1.3.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  coveralls
-  guard
-  guard-rspec
-  rake (~> 10.0)
-  rspec
-  rspec-nc
-  task_time!