taskwarrior-web 1.1.11 → 1.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2e9612d9c9cee0c532430c68bf9b66a1cfbaaa6f
4
- data.tar.gz: da7c54198ac489b756efcb9d71f9649a5bace0ee
3
+ metadata.gz: 5b2f67107f25e88bcd93e9f96058e8560d2c7aaa
4
+ data.tar.gz: de8be1b95c04a1cf92352d345312774b941f75ae
5
5
  SHA512:
6
- metadata.gz: aa6f01caf1480aad08d527d0f62b2263a57b19713620ee100dc375ec78e6f144d5ff0016c7d1bddcd713b864812c8903a9f18714415e9e507c57948a7d930de0
7
- data.tar.gz: 0e6c15697f13a35d706a3dc8e39942cc1700275a35a6bd7021fe8d687fabed31714f2fd3a31a2e22200cc7227cae247a8e9d4d182361c7776e9464665010b1f7
6
+ metadata.gz: 401df6b549096279f6c025b8fdf018fa34259b7d604ba4fc312daeb5c7dc170139f35b866e7f3f2f1b18e2fbbd8750c2502f6e4a1540ce64cf51805aa6413a5a
7
+ data.tar.gz: e8e9abfe8d9a599fcd2e548ce50f0b15cd6544f4e22e8f3b714f6b10fd7b3566f217b7af1b83e2ab2486ecb74d12c96f083f517ac52e0c24e0f0715fb468cba3
@@ -1,3 +1,8 @@
1
+ ## v1.1.12 (10/08/16)
2
+
3
+ * Fixed JSON issue as well as issues where no tasks could be updated for
4
+ latest Ruby version
5
+
1
6
  ## v1.1.11 (7/15/13)
2
7
 
3
8
  * Rethinking the tasks that are included in project lists. Now, they include
data/LICENSE ADDED
@@ -0,0 +1,21 @@
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2013 Jake Bell
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in
13
+ all copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
+ THE SOFTWARE.
data/README.md CHANGED
@@ -1,10 +1,11 @@
1
1
  # A Web Interface for Taskwarrior
2
2
 
3
+ **Notice** I no longer have the time to maintain this codebase. If you are
4
+ interested in maintaining the project, please contact me. Sorry and thanks.
5
+
3
6
  A lightweight, Sinatra-based web interface for the
4
7
  wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
5
8
 
6
- ![TaskwarriorWeb screenshot](https://raw.github.com/theunraveler/taskwarrior-web/gh-pages/images/screenshot.png)
7
-
8
9
  [![Gem Version](https://badge.fury.io/rb/taskwarrior-web.png)](http://badge.fury.io/rb/taskwarrior-web)
9
10
  [![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
10
11
 
@@ -23,12 +23,13 @@ class TaskwarriorWeb::App < Sinatra::Base
23
23
  helpers Helpers
24
24
  register Sinatra::SimpleNavigation
25
25
  use Rack::Flash
26
-
26
+
27
27
  # Before filter
28
28
  before do
29
29
  @current_page = request.path_info
30
30
  @can_edit = TaskwarriorWeb::Config.supports? :editing
31
31
  protected! if TaskwarriorWeb::Config.property('task-web.user')
32
+ sync if TaskwarriorWeb::Config.property('taskd.server')
32
33
  end
33
34
 
34
35
  # Task routes
@@ -78,7 +78,7 @@ module TaskwarriorWeb::App::Helpers
78
78
 
79
79
  # Authentication
80
80
  def protected!
81
- response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
81
+ response['WWW-Authenticate'] = %(Basic realm="Taskwarrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
82
82
  end
83
83
 
84
84
  def authorized?
@@ -86,4 +86,10 @@ module TaskwarriorWeb::App::Helpers
86
86
  values = [TaskwarriorWeb::Config.property('task-web.user'), TaskwarriorWeb::Config.property('task-web.passwd')]
87
87
  @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == values
88
88
  end
89
+
90
+ ##
91
+ # Syncronise the local task database with the server
92
+ def sync
93
+ TaskwarriorWeb::Command.new(:sync, nil, nil).run
94
+ end
89
95
  end
@@ -6,13 +6,14 @@ module TaskwarriorWeb::CommandBuilder::Base
6
6
  :add => 'add',
7
7
  :update => TaskwarriorWeb::Config.version.major >= 2 ? ':id mod' : nil,
8
8
  :delete => 'rc.confirmation=no :id delete',
9
- :query => TaskwarriorWeb::Config.version > '1.9.2' ? '_query' : 'export',
9
+ :query => TaskwarriorWeb::Config.version == '1.9.4' ? '_query' : 'export',
10
10
  :complete => ':id done',
11
11
  :annotate => ':id annotate',
12
12
  :denotate => ':id denotate',
13
13
  :projects => '_projects',
14
- :tags => '_tags'
15
- }
14
+ :tags => '_tags',
15
+ :sync => 'sync'
16
+ }
16
17
 
17
18
  def build
18
19
  unless @command_string
@@ -54,10 +55,12 @@ module TaskwarriorWeb::CommandBuilder::Base
54
55
  end
55
56
 
56
57
  @params.each do |attr, value|
57
- if value.respond_to? :each
58
- value.each { |val| string << %( #{attr.to_s}:\\"#{val.to_s.shellescape}\\") }
59
- else
60
- string << %( #{attr.to_s}:\\"#{value.to_s.shellescape}\\")
58
+ if @command != :update or attr != :uuid
59
+ if value.respond_to? :each
60
+ value.each { |val| string << %( #{attr.to_s}:\\"#{val.to_s.shellescape}\\") }
61
+ else
62
+ string << %( #{attr.to_s}:\\"#{value.to_s.shellescape}\\")
63
+ end
61
64
  end
62
65
  end
63
66
 
@@ -3,7 +3,6 @@ require 'json'
3
3
  module TaskwarriorWeb::Parser::Json
4
4
  def self.parse(json)
5
5
  json.strip!
6
- json = '[' + json + ']'
7
6
  json == '[No matches.]' ? [] : ::JSON.parse(json)
8
7
  end
9
8
  end
@@ -3,6 +3,7 @@ module TaskwarriorWeb::Runner
3
3
 
4
4
  def run
5
5
  @built ||= build
6
+ puts "> #{TASK_BIN} #{@built}"
6
7
  `#{TASK_BIN} #{@built}`
7
8
  end
8
9
  end
@@ -1,3 +1,3 @@
1
1
  module TaskwarriorWeb
2
- VERSION = '1.1.11'
2
+ VERSION = '1.1.12'
3
3
  end
@@ -17,7 +17,6 @@
17
17
  <td><%= task.description %></td>
18
18
  <td><%= format_date(task.due) unless task.due.nil? %></td>
19
19
  <td><%= format_tags(task.tags) unless task.tags.nil? %></td>
20
- <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
21
20
  <td><%= task.priority unless task.priority.nil? %></td>
22
21
  <% if @can_edit %><td><%= crud_links(task) if task.active? %></td><% end %>
23
22
  </tr>
@@ -10,13 +10,17 @@
10
10
  <table class="table table-striped table-hover table-sortable">
11
11
  <thead>
12
12
  <tr>
13
- <% if params[:status] == 'pending' %>
14
- <th class="no-sort"></th>
15
- <% end %>
13
+ <% if params[:status] == 'pending' %><th class="no-sort"></th><% end %>
16
14
  <th>Description</th>
17
15
  <th>Project</th>
18
16
  <th>Due</th>
19
- <% if params[:status] == 'waiting' %><th>Hidden until</th><% end %>
17
+ <%=
18
+ case params[:status]
19
+ when 'waiting' then '<th>Hidden until</th>'
20
+ when 'completed' then '<th>Completed on</th>'
21
+ when 'deleted' then '<th>Deleted on</th>'
22
+ end
23
+ %>
20
24
  <th>Tags</th>
21
25
  <th data-sort-map='{"H": 0, "M": 1, "": 2, "L": 3}'>Priority</th>
22
26
  <% if can_edit %><th class="no-sort"></th><% end %>
@@ -44,7 +48,12 @@
44
48
  </td>
45
49
  <td><a href="/projects/<%= linkify(task.project) %>"><%= task.project %></a></td>
46
50
  <td><%= format_date(task.due) unless task.due.nil? %></td>
47
- <% if params[:status] == 'waiting' %><td><%= format_date(task.wait) unless task.wait.nil? %></td><% end %>
51
+ <%=
52
+ case params[:status]
53
+ when 'waiting' then '<td>' + (format_date(task.wait) unless task.wait.nil?) + '</td>'
54
+ when 'completed', 'deleted' then '<td>' + (format_date(task.end) unless task.end.nil?) + '</td>'
55
+ end
56
+ %>
48
57
  <td><%= format_tags(task.tags) unless task.tags.nil? %></td>
49
58
  <td><%= task.priority unless task.priority.nil? %></td>
50
59
  <% if can_edit %><td><%= crud_links(task) %></td><% end %>
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
11
11
  s.homepage = "http://github.com/theunraveler/taskwarrior-web"
12
12
  s.summary = %q{Web frontend for taskwarrior command line task manager.}
13
13
  s.description = %q{This gem provides a graphical frontend for the Taskwarrior task manager. It is based on Sinatra.}
14
+ s.license = 'MIT'
14
15
 
15
16
  s.rubyforge_project = "taskwarrior-web"
16
17
 
@@ -24,7 +25,7 @@ Gem::Specification.new do |s|
24
25
  s.add_dependency('activesupport', '~> 3')
25
26
  s.add_dependency('sinatra-simple-navigation')
26
27
  s.add_dependency('rack-flash3')
27
- s.add_dependency('json', '~> 1.7.7')
28
+ s.add_dependency('json', '~> 1.8')
28
29
 
29
30
  s.add_development_dependency('rake')
30
31
  s.add_development_dependency('rack-test')
metadata CHANGED
@@ -1,195 +1,195 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: taskwarrior-web
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.11
4
+ version: 1.1.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jake Bell
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-16 00:00:00.000000000 Z
11
+ date: 2016-12-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sinatra
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: parseconfig
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: vegas
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rinku
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: versionomy
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: activesupport
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '3'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '3'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: sinatra-simple-navigation
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rack-flash3
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: json
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.7.7
131
+ version: '1.8'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.7.7
138
+ version: '1.8'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rake
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: rack-test
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - '>='
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - '>='
164
+ - - ">="
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: rspec
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rspec-html-matchers
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - '>='
185
+ - - ">="
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - '>='
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  description: This gem provides a graphical frontend for the Taskwarrior task manager.
@@ -201,12 +201,13 @@ executables:
201
201
  extensions: []
202
202
  extra_rdoc_files: []
203
203
  files:
204
- - .gitignore
205
- - .rspec
206
- - .travis.yml
204
+ - ".gitignore"
205
+ - ".rspec"
206
+ - ".travis.yml"
207
207
  - CHANGELOG.md
208
208
  - Gemfile
209
209
  - Guardfile
210
+ - LICENSE
210
211
  - README.md
211
212
  - Rakefile
212
213
  - bin/task-web
@@ -277,7 +278,8 @@ files:
277
278
  - spec/spec_helper.rb
278
279
  - taskwarrior-web.gemspec
279
280
  homepage: http://github.com/theunraveler/taskwarrior-web
280
- licenses: []
281
+ licenses:
282
+ - MIT
281
283
  metadata: {}
282
284
  post_install_message:
283
285
  rdoc_options: []
@@ -285,17 +287,17 @@ require_paths:
285
287
  - lib
286
288
  required_ruby_version: !ruby/object:Gem::Requirement
287
289
  requirements:
288
- - - '>='
290
+ - - ">="
289
291
  - !ruby/object:Gem::Version
290
292
  version: 1.9.0
291
293
  required_rubygems_version: !ruby/object:Gem::Requirement
292
294
  requirements:
293
- - - '>='
295
+ - - ">="
294
296
  - !ruby/object:Gem::Version
295
297
  version: '0'
296
298
  requirements: []
297
299
  rubyforge_project: taskwarrior-web
298
- rubygems_version: 2.0.3
300
+ rubygems_version: 2.5.1
299
301
  signing_key:
300
302
  specification_version: 4
301
303
  summary: Web frontend for taskwarrior command line task manager.