taskwarrior-web 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e9612d9c9cee0c532430c68bf9b66a1cfbaaa6f
-  data.tar.gz: da7c54198ac489b756efcb9d71f9649a5bace0ee
+  metadata.gz: 5b2f67107f25e88bcd93e9f96058e8560d2c7aaa
+  data.tar.gz: de8be1b95c04a1cf92352d345312774b941f75ae
 SHA512:
-  metadata.gz: aa6f01caf1480aad08d527d0f62b2263a57b19713620ee100dc375ec78e6f144d5ff0016c7d1bddcd713b864812c8903a9f18714415e9e507c57948a7d930de0
-  data.tar.gz: 0e6c15697f13a35d706a3dc8e39942cc1700275a35a6bd7021fe8d687fabed31714f2fd3a31a2e22200cc7227cae247a8e9d4d182361c7776e9464665010b1f7
+  metadata.gz: 401df6b549096279f6c025b8fdf018fa34259b7d604ba4fc312daeb5c7dc170139f35b866e7f3f2f1b18e2fbbd8750c2502f6e4a1540ce64cf51805aa6413a5a
+  data.tar.gz: e8e9abfe8d9a599fcd2e548ce50f0b15cd6544f4e22e8f3b714f6b10fd7b3566f217b7af1b83e2ab2486ecb74d12c96f083f517ac52e0c24e0f0715fb468cba3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.12 (10/08/16)
+
+* Fixed JSON issue as well as issues where no tasks could be updated for
+latest Ruby version
+
 ## v1.1.11 (7/15/13)
 
 * Rethinking the tasks that are included in project lists. Now, they include

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Jake Bell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,10 +1,11 @@
 # A Web Interface for Taskwarrior
 
+**Notice** I no longer have the time to maintain this codebase. If you are
+interested in maintaining the project, please contact me. Sorry and thanks.
+
 A lightweight, Sinatra-based web interface for the
 wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
 
-![TaskwarriorWeb screenshot](https://raw.github.com/theunraveler/taskwarrior-web/gh-pages/images/screenshot.png)
-
 [![Gem Version](https://badge.fury.io/rb/taskwarrior-web.png)](http://badge.fury.io/rb/taskwarrior-web)
 [![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
 

data/lib/taskwarrior-web/app.rb

@@ -23,12 +23,13 @@ class TaskwarriorWeb::App < Sinatra::Base
   helpers Helpers
   register Sinatra::SimpleNavigation
   use Rack::Flash
-  
+
   # Before filter
   before do
     @current_page = request.path_info
     @can_edit = TaskwarriorWeb::Config.supports? :editing
     protected! if TaskwarriorWeb::Config.property('task-web.user')
+    sync if TaskwarriorWeb::Config.property('taskd.server')
   end
 
   # Task routes

data/lib/taskwarrior-web/helpers.rb

@@ -78,7 +78,7 @@ module TaskwarriorWeb::App::Helpers
 
   # Authentication
   def protected!
-    response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
+    response['WWW-Authenticate'] = %(Basic realm="Taskwarrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
   end
 
   def authorized?
@@ -86,4 +86,10 @@ module TaskwarriorWeb::App::Helpers
     values = [TaskwarriorWeb::Config.property('task-web.user'), TaskwarriorWeb::Config.property('task-web.passwd')]
     @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == values
   end
+
+  ##
+  # Syncronise the local task database with the server
+  def sync
+    TaskwarriorWeb::Command.new(:sync, nil, nil).run
+  end
 end

data/lib/taskwarrior-web/services/builder/base.rb

@@ -6,13 +6,14 @@ module TaskwarriorWeb::CommandBuilder::Base
     :add => 'add',
     :update => TaskwarriorWeb::Config.version.major >= 2 ? ':id mod' : nil,
     :delete => 'rc.confirmation=no :id delete',
-    :query => TaskwarriorWeb::Config.version > '1.9.2' ? '_query' : 'export',
+    :query => TaskwarriorWeb::Config.version == '1.9.4' ? '_query' : 'export',
     :complete => ':id done',
     :annotate => ':id annotate',
     :denotate => ':id denotate',
     :projects => '_projects',
-    :tags => '_tags'
-  }    
+    :tags => '_tags',
+    :sync => 'sync'
+  }
 
   def build
     unless @command_string
@@ -54,10 +55,12 @@ module TaskwarriorWeb::CommandBuilder::Base
     end
 
     @params.each do |attr, value|
-      if value.respond_to? :each
-        value.each { |val| string << %( #{attr.to_s}:\\"#{val.to_s.shellescape}\\") }
-      else
-        string << %( #{attr.to_s}:\\"#{value.to_s.shellescape}\\")
+      if @command != :update or attr != :uuid
+        if value.respond_to? :each
+          value.each { |val| string << %( #{attr.to_s}:\\"#{val.to_s.shellescape}\\") }
+        else
+          string << %( #{attr.to_s}:\\"#{value.to_s.shellescape}\\")
+        end
       end
     end
 

data/lib/taskwarrior-web/services/parser/json.rb

@@ -3,7 +3,6 @@ require 'json'
 module TaskwarriorWeb::Parser::Json
   def self.parse(json)
     json.strip!
-    json = '[' + json + ']'
     json == '[No matches.]' ? [] : ::JSON.parse(json)
   end
 end

data/lib/taskwarrior-web/services/runner.rb

@@ -3,6 +3,7 @@ module TaskwarriorWeb::Runner
 
   def run
     @built ||= build
+    puts "> #{TASK_BIN} #{@built}"
     `#{TASK_BIN} #{@built}`
   end
 end

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = '1.1.11'
+  VERSION = '1.1.12'
 end

data/lib/taskwarrior-web/views/projects/show.erb

@@ -17,7 +17,6 @@
           <td><%= task.description %></td>
           <td><%= format_date(task.due) unless task.due.nil? %></td>
           <td><%= format_tags(task.tags) unless task.tags.nil? %></td>
-          <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
           <td><%= task.priority unless task.priority.nil? %></td>
           <% if @can_edit %><td><%= crud_links(task) if task.active? %></td><% end %>
         </tr>

data/lib/taskwarrior-web/views/tasks/index.erb

@@ -10,13 +10,17 @@
     <table class="table table-striped table-hover table-sortable">
       <thead>
         <tr>
-          <% if params[:status] == 'pending' %>
-            <th class="no-sort"></th>
-          <% end %>
+          <% if params[:status] == 'pending' %><th class="no-sort"></th><% end %>
           <th>Description</th>
           <th>Project</th>
           <th>Due</th>
-          <% if params[:status] == 'waiting' %><th>Hidden until</th><% end %>
+          <%= 
+            case params[:status]
+            when 'waiting' then '<th>Hidden until</th>'
+            when 'completed' then '<th>Completed on</th>'
+            when 'deleted' then '<th>Deleted on</th>'
+            end
+          %>
           <th>Tags</th>
           <th data-sort-map='{"H": 0, "M": 1, "": 2, "L": 3}'>Priority</th>
           <% if can_edit %><th class="no-sort"></th><% end %>
@@ -44,7 +48,12 @@
             </td>
             <td><a href="/projects/<%= linkify(task.project) %>"><%= task.project %></a></td>
             <td><%= format_date(task.due) unless task.due.nil? %></td>
-            <% if params[:status] == 'waiting' %><td><%= format_date(task.wait) unless task.wait.nil? %></td><% end %>
+            <%= 
+              case params[:status]
+              when 'waiting' then '<td>' + (format_date(task.wait) unless task.wait.nil?) + '</td>'
+              when 'completed', 'deleted' then '<td>' + (format_date(task.end) unless task.end.nil?) + '</td>'
+              end
+            %>
             <td><%= format_tags(task.tags) unless task.tags.nil? %></td>
             <td><%= task.priority unless task.priority.nil? %></td>
             <% if can_edit %><td><%= crud_links(task) %></td><% end %>

data/taskwarrior-web.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/theunraveler/taskwarrior-web"
   s.summary     = %q{Web frontend for taskwarrior command line task manager.}
   s.description = %q{This gem provides a graphical frontend for the Taskwarrior task manager. It is based on Sinatra.}
+  s.license = 'MIT'
 
   s.rubyforge_project = "taskwarrior-web"
 
@@ -24,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport', '~> 3')
   s.add_dependency('sinatra-simple-navigation')
   s.add_dependency('rack-flash3')
-  s.add_dependency('json', '~> 1.7.7')
+  s.add_dependency('json', '~> 1.8')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rack-test')

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Jake Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: versionomy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rack-test
   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: rspec
   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: rspec-html-matchers
   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'
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
@@ -201,12 +201,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/task-web
@@ -277,7 +278,8 @@ files:
 - spec/spec_helper.rb
 - taskwarrior-web.gemspec
 homepage: http://github.com/theunraveler/taskwarrior-web
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -285,17 +287,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: taskwarrior-web
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Web frontend for taskwarrior command line task manager.