gyunyu 0.2.1 → 0.3.0
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.
- data/VERSION +1 -1
- data/gyunyu.gemspec +2 -1
- data/lib/gyunyu/command/export/app.rb +2 -2
- data/lib/gyunyu/command/export/format/csv.rb +83 -6
- data/spec/app/command/export/format/csv_spec.rb +105 -0
- metadata +21 -20
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.3.0
|
data/gyunyu.gemspec
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{gyunyu}
|
|
8
|
-
s.version = "0.
|
|
8
|
+
s.version = "0.3.0"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = [%q{wtnabe}]
|
|
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
|
|
|
41
41
|
"spec/app/.gitkeep",
|
|
42
42
|
"spec/app/command/export/app_spec.rb",
|
|
43
43
|
"spec/app/command/export/custom_filter_spec.rb",
|
|
44
|
+
"spec/app/command/export/format/csv_spec.rb",
|
|
44
45
|
"spec/app/command/export/option_spec.rb",
|
|
45
46
|
"spec/app/command_spec.rb",
|
|
46
47
|
"spec/app/expander_spec.rb",
|
|
@@ -49,7 +49,7 @@ module Gyunyu
|
|
|
49
49
|
if option.show_filter_list
|
|
50
50
|
puts CustomFilter.filter.keys.sort
|
|
51
51
|
else
|
|
52
|
-
export( build_filter )
|
|
52
|
+
puts export( build_filter )
|
|
53
53
|
end
|
|
54
54
|
else
|
|
55
55
|
puts option.parser
|
|
@@ -134,7 +134,7 @@ module Gyunyu
|
|
|
134
134
|
# [return] Object
|
|
135
135
|
#
|
|
136
136
|
def export( filter = nil )
|
|
137
|
-
|
|
137
|
+
format_module.export( pickup_fields( filter ), fields )
|
|
138
138
|
end
|
|
139
139
|
|
|
140
140
|
#
|
|
@@ -11,13 +11,90 @@ module Gyunyu
|
|
|
11
11
|
module Export
|
|
12
12
|
module Format
|
|
13
13
|
module Csv
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
@num_tags = nil
|
|
15
|
+
@num_notes = nil
|
|
16
|
+
|
|
17
|
+
class << self
|
|
18
|
+
def export( tasks, fields )
|
|
19
|
+
FasterCSV.generate { |csv|
|
|
20
|
+
tasks, fields = parse( tasks, fields )
|
|
21
|
+
csv << fields
|
|
22
|
+
fields.delete('')
|
|
23
|
+
tasks.each { |t|
|
|
24
|
+
csv << fields.map { |f|
|
|
25
|
+
case f
|
|
26
|
+
when 'tags', 'notes'
|
|
27
|
+
num = instance_variable_get( "@num_#{f}" )
|
|
28
|
+
while t[f].size < num
|
|
29
|
+
t[f] += ['']
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
t[f]
|
|
33
|
+
}.flatten
|
|
34
|
+
}
|
|
19
35
|
}
|
|
20
|
-
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
def parse( tasks, fields )
|
|
39
|
+
if !fields.include?( 'tags' ) and !fields.include?( 'notes' )
|
|
40
|
+
[tasks, fields]
|
|
41
|
+
else
|
|
42
|
+
if fields.include?( 'tags' )
|
|
43
|
+
tasks = tasks.map { |t| parse_tags( t ) }
|
|
44
|
+
end
|
|
45
|
+
if fields.include?( 'notes' )
|
|
46
|
+
tasks = tasks.map { |t| parse_notes( t ) }
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
[tasks, expand_fields( fields )]
|
|
50
|
+
end
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
def parse_tags( t )
|
|
54
|
+
tags = if t['tags'].first.has_key? 'tag'
|
|
55
|
+
t['tags'].first['tag']
|
|
56
|
+
else
|
|
57
|
+
[]
|
|
58
|
+
end
|
|
59
|
+
if !@num_tags or tags.size > @num_tags
|
|
60
|
+
@num_tags = tags.size
|
|
61
|
+
end
|
|
62
|
+
t['tags'] = tags.sort
|
|
63
|
+
|
|
64
|
+
t
|
|
65
|
+
end
|
|
66
|
+
|
|
67
|
+
def parse_notes( t )
|
|
68
|
+
notes = if t['notes'].first.has_key? 'note'
|
|
69
|
+
t['notes'].first['note'].map { |n|
|
|
70
|
+
n['content']
|
|
71
|
+
}
|
|
72
|
+
else
|
|
73
|
+
[]
|
|
74
|
+
end
|
|
75
|
+
if !@num_notes or notes.size > @num_notes
|
|
76
|
+
@num_notes = notes.size
|
|
77
|
+
end
|
|
78
|
+
t['notes'] = notes
|
|
79
|
+
|
|
80
|
+
t
|
|
81
|
+
end
|
|
82
|
+
|
|
83
|
+
def expand_fields( fields )
|
|
84
|
+
fields.map { |e|
|
|
85
|
+
case e
|
|
86
|
+
when 'tags', 'notes'
|
|
87
|
+
num = instance_variable_get("@num_#{e}")
|
|
88
|
+
if num and num > 1
|
|
89
|
+
[e] + Array.new(num - 1, '')
|
|
90
|
+
else
|
|
91
|
+
e
|
|
92
|
+
end
|
|
93
|
+
else
|
|
94
|
+
e
|
|
95
|
+
end
|
|
96
|
+
}.flatten
|
|
97
|
+
end
|
|
21
98
|
end
|
|
22
99
|
end
|
|
23
100
|
end
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
require File.dirname(__FILE__) + '/../../../../spec_helper'
|
|
3
|
+
|
|
4
|
+
describe Gyunyu::Command::Export::Format::Csv do
|
|
5
|
+
csv_formatter = Gyunyu::Command::Export::Format::Csv
|
|
6
|
+
|
|
7
|
+
let(:app) { Gyunyu::Command::Export::App.new }
|
|
8
|
+
|
|
9
|
+
before {
|
|
10
|
+
stub(app).task_list { task_raw_data }
|
|
11
|
+
stub(app).find_list {
|
|
12
|
+
list = Struct.new( :name ).new
|
|
13
|
+
list.name ='仕事'
|
|
14
|
+
list
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
describe 'export' do
|
|
19
|
+
subject {
|
|
20
|
+
app.export
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
context 'tags' do
|
|
24
|
+
before {
|
|
25
|
+
app._init_option( %w( -d name,tags ) )
|
|
26
|
+
}
|
|
27
|
+
it {
|
|
28
|
+
should == <<EOD
|
|
29
|
+
list,name,tags,""
|
|
30
|
+
仕事,jsのlintについて,research,writing
|
|
31
|
+
仕事,あの本読む,reading,""
|
|
32
|
+
仕事,この本読む,reading,""
|
|
33
|
+
EOD
|
|
34
|
+
}
|
|
35
|
+
end
|
|
36
|
+
context 'notes' do
|
|
37
|
+
before {
|
|
38
|
+
app._init_option( %w( -d name,notes ) )
|
|
39
|
+
}
|
|
40
|
+
it {
|
|
41
|
+
should == <<EOD
|
|
42
|
+
list,name,notes
|
|
43
|
+
仕事,jsのlintについて,意図が分かんないな、このメモ。結局何をしたかった？
|
|
44
|
+
仕事,あの本読む,""
|
|
45
|
+
仕事,この本読む,""
|
|
46
|
+
EOD
|
|
47
|
+
}
|
|
48
|
+
end
|
|
49
|
+
end
|
|
50
|
+
|
|
51
|
+
describe 'expand_fields' do
|
|
52
|
+
context 'empty' do
|
|
53
|
+
subject {
|
|
54
|
+
csv_formatter.expand_fields( [] )
|
|
55
|
+
}
|
|
56
|
+
it {
|
|
57
|
+
should == []
|
|
58
|
+
}
|
|
59
|
+
end
|
|
60
|
+
context 'missing number of tags' do
|
|
61
|
+
before {
|
|
62
|
+
csv_formatter.instance_variable_set( '@num_tags', nil )
|
|
63
|
+
}
|
|
64
|
+
subject {
|
|
65
|
+
csv_formatter.expand_fields( %w( name tags ) )
|
|
66
|
+
}
|
|
67
|
+
it {
|
|
68
|
+
should == %w( name tags )
|
|
69
|
+
}
|
|
70
|
+
end
|
|
71
|
+
context 'have max 1 tags' do
|
|
72
|
+
before {
|
|
73
|
+
csv_formatter.instance_variable_set( '@num_tags', 1 )
|
|
74
|
+
}
|
|
75
|
+
subject {
|
|
76
|
+
csv_formatter.expand_fields( %w( name tags ) )
|
|
77
|
+
}
|
|
78
|
+
it {
|
|
79
|
+
should == %w( name tags )
|
|
80
|
+
}
|
|
81
|
+
end
|
|
82
|
+
context 'have max 2 tags' do
|
|
83
|
+
before {
|
|
84
|
+
csv_formatter.instance_variable_set( '@num_tags', 2 )
|
|
85
|
+
}
|
|
86
|
+
subject {
|
|
87
|
+
csv_formatter.expand_fields( %w( name tags ) )
|
|
88
|
+
}
|
|
89
|
+
it {
|
|
90
|
+
should == ['name', 'tags', '']
|
|
91
|
+
}
|
|
92
|
+
end
|
|
93
|
+
context 'have max 3 notes' do
|
|
94
|
+
before {
|
|
95
|
+
csv_formatter.instance_variable_set( '@num_notes', 3 )
|
|
96
|
+
}
|
|
97
|
+
subject {
|
|
98
|
+
csv_formatter.expand_fields( %w( name notes due ) )
|
|
99
|
+
}
|
|
100
|
+
it {
|
|
101
|
+
should == ['name', 'notes', '', '', 'due']
|
|
102
|
+
}
|
|
103
|
+
end
|
|
104
|
+
end
|
|
105
|
+
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: gyunyu
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.3.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -13,7 +13,7 @@ date: 2012-01-08 00:00:00.000000000Z
|
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rtmilk
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &3040340 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ! '>='
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: '0'
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *3040340
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: xml-simple
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &3040040 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ! '>='
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: '0'
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *3040040
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: rtm-time
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &3039770 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ! '>='
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: 0.2.0
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *3039770
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rspec
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &3039510 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ~>
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: 2.3.0
|
|
55
55
|
type: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *3039510
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: bundler
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &3039210 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ~>
|
|
@@ -65,10 +65,10 @@ dependencies:
|
|
|
65
65
|
version: 1.0.0
|
|
66
66
|
type: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *3039210
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: jeweler
|
|
71
|
-
requirement: &
|
|
71
|
+
requirement: &3038910 !ruby/object:Gem::Requirement
|
|
72
72
|
none: false
|
|
73
73
|
requirements:
|
|
74
74
|
- - ~>
|
|
@@ -76,10 +76,10 @@ dependencies:
|
|
|
76
76
|
version: 1.6.4
|
|
77
77
|
type: :development
|
|
78
78
|
prerelease: false
|
|
79
|
-
version_requirements: *
|
|
79
|
+
version_requirements: *3038910
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
81
|
name: yard
|
|
82
|
-
requirement: &
|
|
82
|
+
requirement: &3038620 !ruby/object:Gem::Requirement
|
|
83
83
|
none: false
|
|
84
84
|
requirements:
|
|
85
85
|
- - ! '>='
|
|
@@ -87,10 +87,10 @@ dependencies:
|
|
|
87
87
|
version: '0'
|
|
88
88
|
type: :development
|
|
89
89
|
prerelease: false
|
|
90
|
-
version_requirements: *
|
|
90
|
+
version_requirements: *3038620
|
|
91
91
|
- !ruby/object:Gem::Dependency
|
|
92
92
|
name: rcov
|
|
93
|
-
requirement: &
|
|
93
|
+
requirement: &3038350 !ruby/object:Gem::Requirement
|
|
94
94
|
none: false
|
|
95
95
|
requirements:
|
|
96
96
|
- - ! '>='
|
|
@@ -98,10 +98,10 @@ dependencies:
|
|
|
98
98
|
version: '0'
|
|
99
99
|
type: :development
|
|
100
100
|
prerelease: false
|
|
101
|
-
version_requirements: *
|
|
101
|
+
version_requirements: *3038350
|
|
102
102
|
- !ruby/object:Gem::Dependency
|
|
103
103
|
name: rr
|
|
104
|
-
requirement: &
|
|
104
|
+
requirement: &3038090 !ruby/object:Gem::Requirement
|
|
105
105
|
none: false
|
|
106
106
|
requirements:
|
|
107
107
|
- - ! '>='
|
|
@@ -109,7 +109,7 @@ dependencies:
|
|
|
109
109
|
version: '0'
|
|
110
110
|
type: :development
|
|
111
111
|
prerelease: false
|
|
112
|
-
version_requirements: *
|
|
112
|
+
version_requirements: *3038090
|
|
113
113
|
description: now available export command
|
|
114
114
|
email: wtnabe@gmail.com
|
|
115
115
|
executables:
|
|
@@ -142,6 +142,7 @@ files:
|
|
|
142
142
|
- spec/app/.gitkeep
|
|
143
143
|
- spec/app/command/export/app_spec.rb
|
|
144
144
|
- spec/app/command/export/custom_filter_spec.rb
|
|
145
|
+
- spec/app/command/export/format/csv_spec.rb
|
|
145
146
|
- spec/app/command/export/option_spec.rb
|
|
146
147
|
- spec/app/command_spec.rb
|
|
147
148
|
- spec/app/expander_spec.rb
|
|
@@ -166,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
166
167
|
version: '0'
|
|
167
168
|
segments:
|
|
168
169
|
- 0
|
|
169
|
-
hash:
|
|
170
|
+
hash: -22170513
|
|
170
171
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
171
172
|
none: false
|
|
172
173
|
requirements:
|