rtasklib 0.1.2.pre.alpha → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddff6869a1475069decc94f5998be42aa6729b5
-  data.tar.gz: 80905fa55abea1eb3d07fdb0177f8e462804a39a
+  metadata.gz: 6594a20f1c965ccf953918bf9fb7eba89832dc70
+  data.tar.gz: 6c889440f54c76d7eac9f46e62ad1d7300e44399
 SHA512:
-  metadata.gz: fad524b012a515c047e810c2bf86de2d1a2dcc98d1d4adf8778af4419175a6bf72e20da630f61c9fd4f5280c5dfa67e6bde8c0fbdb85ba7e295d2281fe88381d
-  data.tar.gz: 8a477502dc39c6b0cb214b894b1663fefbc58a30131a14d0d9d27eef4cbeb761d8202615de5fe960f64fd35ee2536908fdfc756c4b49e195a31af327cb31012c
+  metadata.gz: 23c9ecccf416dcf6e94835258096ec96dc5257d9ee1109a31014c11100bfd329b11b02ca42a59d2c72c095b6f360b21ddbdc5db1726cdf0c21dc61a6fb127b5b
+  data.tar.gz: b9962b934cca761f7a8e3c7ad623d76238a1b10722e0e1eb876c75d06640cf5b326e9339f31da34cfe73c12669f7b322d7e1f2652eef35afaf0c1782380aa670

data/Rakefile

@@ -7,3 +7,12 @@ RSpec::Core::RakeTask.new :spec do |task|
 end
 
 task default: :spec
+
+desc "Update and publish docs to gh-pages"
+task :docs do |task|
+  `yard docs`
+  `ghp-import -p doc`
+end
+
+task :build_rpm do
+end

data/lib/rtasklib/controller.rb

@@ -6,6 +6,10 @@ module Rtasklib
   module Controller
     extend self
 
+    # Retrieves the current task list from the TW database
+    #
+    # @return [Array<Models::TaskModel>]
+    # @api public
     def all
       all = []
       Execute.task_popen3(*@override_a, "export") do |i, o, e, t|
@@ -16,19 +20,73 @@ module Rtasklib
       all
     end
 
-    def update_config attr, val
+    def filter ids: nil, tags: nil, query: nil
+    end
+
+    def add!
+    end
+
+    # def modify! attr:, val:, ids: nil, tags: nil, query: nil
+    # end
+
+    def undo!
+    end
+
+    def update_config! attr, val
       Execute.task_popen3(*override_a, "config #{attr} #{val}") do |i, o, e, t|
         return t.value
       end
     end
 
+    # Retrieves an array of hashes with info about the udas currently available
     def get_udas
+      taskrc.config.attributes
+        .select { |attr, val| uda_attr? attr }
+        .sort
+        .chunk  { |attr, val| arbitrary_attr attr }
+        .map do |attr, arr|
+          uda = arr.map do |pair|
+            key = deep_attr(pair[0])
+            val = pair[1]
+            [key, val]
+          end
+          {attr.to_sym => Hash[uda]}
+        end
+    end
+
+    # Is a given attribute dealing with udas?
+    def uda_attr? attr
+      attr.to_s.start_with? "uda"
+    end
+    private :uda_attr?
+
+    # Returns part of attribute at a given depth
+    def arbitrary_attr attr, depth: 1
+      attr.to_s.split("_")[depth]
+    end
+
+    # Returns all attribute string after given depth
+    def deep_attr attr, depth: 2
+      attr.to_s.split("_")[depth..-1].join("_")
+    end
+    private :deep_attr
+    
+
+    # Retrieve an array of the uda names
+    #
+    # @return [Array<String>]
+    # @api public
+    def get_uda_names
       Execute.task_popen3(*@override_a, "_udas") do |i, o, e, t|
         return o.read.each_line.map { |l| l.chomp }
       end
     end
 
     # Checks if a given uda exists in the current task database
+    #
+    # @param uda_name [String] the uda name to check for
+    # @return [Boolean] whether it matches or not
+    # @api public
     def check_uda uda_name
       if get_udas.any? { |uda| uda == uda_name }
         true
@@ -37,9 +95,16 @@ module Rtasklib
       end
     end
 
-    def create_uda name, label: nil, values: nil, default: nil, urgency: nil
+    def create_uda name, type: "string", label: nil, values: nil,
+                   default: nil, urgency: nil
       label = name if label.nil?
       p name, label, values, default, urgency
+
+      update_config "uda.#{name}.type",  type
+      update_config "uda.#{name}.label", label
+      update_config "uda.#{name}.values",  values unless values.nil?
+      update_config "uda.#{name}.default", default unless default.nil?
+      update_config "uda.#{name}.urgency", urgency unless urgency.nil?
     end
 
     def get_rc
@@ -58,10 +123,14 @@ module Rtasklib
       version
     end
 
-    # Convert "1.6.2 (adf342jsd)" to Gem::Version object
+    # Converts a string of format "1.6.2 (adf342jsd)" to Gem::Version object
+    #
+    #
     def to_gem_version raw
       std_ver = raw.chomp.gsub(' ','.').delete('(').delete(')')
       Gem::Version.new std_ver
     end
+    private :to_gem_version
+
   end
 end

data/lib/rtasklib/models.rb

@@ -30,7 +30,7 @@ module Rtasklib::Models
   class TaskModel
     include Virtus.model
     # perhaps use Veto
-    include ActiveModel::Validations
+    # include ActiveModel::Validations
 
     # Default attributes from TW
     # Should match: http://taskwarrior.org/docs/design/task.html
@@ -40,12 +40,12 @@ module Rtasklib::Models
     # But on creation these should be set by `task`
     attribute :status,        String
     attribute :uuid,          String
-    attribute :entry,         Date
+    attribute :entry,         DateTime
 
     # Optional for every task
-    attribute :start,         Date
-    attribute :until,         Date
-    attribute :scheduled,     Date
+    attribute :start,         DateTime
+    attribute :until,         DateTime
+    attribute :scheduled,     DateTime
     attribute :annotation,    Array[String]
     attribute :tags,          Array[String]
     attribute :project,       String
@@ -55,24 +55,24 @@ module Rtasklib::Models
     attribute :priority,      String
 
     # Required only for tasks that are Deleted or Completed
-    attribute :end,           Date
+    attribute :end,           DateTime
 
     # Required only for tasks that are Waiting
-    attribute :wait,          Date
+    attribute :wait,          DateTime
 
     # Required only for tasks that are Recurring or have Recurring Parent
-    attribute :recur,         Date
+    attribute :recur,         DateTime
 
     # Optional except for tasks with Recurring Parents
-    attribute :due,           Date
+    attribute :due,           DateTime
 
     # Required only for tasks that have Recurring Child
-    attribute :parent,        UUID
+    attribute :parent,        String
 
     # Internal attributes should be read-only
     attribute :mask,          String
     attribute :imask,         String
-    attribute :modified,      Date
+    attribute :modified,      DateTime
 
     # TODO: handle arbitrary UDA's
 

data/lib/rtasklib/version.rb

@@ -1,3 +1,3 @@
 module Rtasklib
-  VERSION = "0.1.2-alpha"
+  VERSION = "0.1.4"
 end

data/lib/rtasklib.rb

@@ -2,7 +2,6 @@ require_relative "rtasklib/version"
 require_relative "rtasklib/models"
 require_relative "rtasklib/execute"
 require_relative "rtasklib/controller"
-require_relative "rtasklib/serializer"
 require_relative "rtasklib/taskrc"
 
 require "open3"
@@ -11,7 +10,7 @@ require "pathname"
 module Rtasklib
 
   class TaskWarrior
-    attr_reader :version, :data_location, :taskrc, :create_new,
+    attr_reader :version, :data_location, :taskrc,
                 :override, :override_a, :override_str
 
     include Controller
@@ -31,7 +30,7 @@ module Rtasklib
       override_h     = DEFAULTS.merge({data_location: data}).merge(opts)
       @override      = Taskrc.new(override_h, :hash)
       @override_a    = override.model_to_rc
-      @config        = get_rc
+      @taskrc        = get_rc
 
       # Check TaskWarrior version, and throw warning if unavailable
       begin
@@ -48,4 +47,7 @@ module Rtasklib
       version
     end
   end
+  
+  # Add a convenience alias
+  TW = TaskWarrior
 end

data/rtasklib.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.1'
+  spec.requirements << 'taskwarrior, >=2.4.0'
 
   spec.add_dependency "virtus"
   spec.add_dependency "activesupport"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtasklib
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre.alpha
+  version: 0.1.4
 platform: ruby
 authors:
 - Will Paul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -249,9 +249,7 @@ files:
 - lib/rtasklib/serializer.rb
 - lib/rtasklib/taskrc.rb
 - lib/rtasklib/version.rb
-- rtasklib-0.1.0.gem
 - rtasklib.gemspec
-- rubygem-rtasklib_0.1.0_all.deb
 - spec/controller_spec.rb
 - spec/data/.task/backlog.data
 - spec/data/.task/completed.data
@@ -276,15 +274,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
-requirements: []
+      version: '0'
+requirements:
+- taskwarrior, >=2.4.0
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper around the TaskWarrior CLI