sicily 0.1.4 → 0.1.5
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 +4 -4
- data/.rubocop.yml +17 -0
- data/.ruby-version +1 -1
- data/Gemfile +4 -2
- data/Gemfile.lock +1 -1
- data/README.md +11 -6
- data/Rakefile +5 -3
- data/bin/console +6 -4
- data/exe/sicily +69 -69
- data/generator/god.rb +12 -10
- data/generator/google_photo.rb +18 -14
- data/generator/rules.rb +22 -13
- data/generator/schedule.rb +10 -8
- data/lib/sicily.rb +48 -22
- data/lib/sicily/batch_processor.rb +47 -26
- data/lib/sicily/config.rb +6 -4
- data/lib/sicily/error/monitor_error.rb +6 -0
- data/lib/sicily/file_processor.rb +9 -1
- data/lib/sicily/generator.rb +3 -1
- data/lib/sicily/logger.rb +51 -0
- data/lib/sicily/monitor.rb +26 -8
- data/lib/sicily/task/dummy_task.rb +4 -2
- data/lib/sicily/task/file_task.rb +24 -13
- data/lib/sicily/task/google_photo_task.rb +33 -10
- data/lib/sicily/task/resize_task.rb +11 -11
- data/lib/sicily/task_loader.rb +30 -10
- data/lib/sicily/util/exif_util.rb +4 -2
- data/lib/sicily/util/file_util.rb +10 -7
- data/lib/sicily/util/image_util.rb +3 -1
- data/lib/sicily/util/notification_util.rb +19 -6
- data/lib/sicily/version.rb +3 -1
- data/sicily.gemspec +34 -35
- metadata +37 -37
@@ -1,22 +1,25 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'sicily/util/exif_util'
|
4
|
+
require 'pathname'
|
3
5
|
|
4
6
|
module Sicily
|
5
7
|
module Util
|
6
8
|
class FileUtil
|
7
|
-
def self.
|
9
|
+
def self.related?(maybe_parent_path, maybe_child_path)
|
8
10
|
expanded_parent_path = File.expand_path(maybe_parent_path)
|
9
11
|
expanded_child_path = File.expand_path(maybe_child_path)
|
10
|
-
|
12
|
+
parent_path_expr = File.join(expanded_parent_path, '**')
|
13
|
+
Pathname.new(expanded_child_path).fnmatch? parent_path_expr
|
11
14
|
end
|
12
15
|
|
13
16
|
def self.eval_dest_path(src_path, dest_path)
|
14
|
-
time =
|
17
|
+
time = extract_time(src_path)
|
15
18
|
time.strftime(dest_path)
|
16
19
|
end
|
17
20
|
|
18
21
|
def self.extract_time(path)
|
19
|
-
if [
|
22
|
+
if %w[.jpg .jpeg].include? File.extname(path).downcase
|
20
23
|
time_from_exif = ExifUtil.extract_time_from_jpeg(path)
|
21
24
|
return time_from_exif unless time_from_exif.nil?
|
22
25
|
end
|
@@ -25,4 +28,4 @@ module Sicily
|
|
25
28
|
end
|
26
29
|
end
|
27
30
|
end
|
28
|
-
end
|
31
|
+
end
|
@@ -1,14 +1,27 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'terminal-notifier'
|
2
4
|
|
3
5
|
module Sicily
|
4
6
|
module Util
|
5
7
|
class NotificationUtil
|
6
|
-
def self.
|
7
|
-
msg = files
|
8
|
+
def self.notify_beginning(files)
|
9
|
+
msg = file_names(files)
|
10
|
+
title = "Beginning processing #{files.size} file(s)"
|
11
|
+
TerminalNotifier.notify(msg, title: title)
|
12
|
+
end
|
13
|
+
|
14
|
+
def self.notify_done(files)
|
15
|
+
msg = file_names(files)
|
16
|
+
title = "Finished processing #{files.size} file(s)"
|
17
|
+
TerminalNotifier.notify(msg, title: title)
|
18
|
+
end
|
19
|
+
|
20
|
+
def self.file_names(files)
|
21
|
+
files.map do |file|
|
8
22
|
File.basename(file)
|
9
|
-
|
10
|
-
TerminalNotifier.notify(msg, :title => "Finished processing #{files.size} file(s)")
|
23
|
+
end.join(', ')
|
11
24
|
end
|
12
25
|
end
|
13
26
|
end
|
14
|
-
end
|
27
|
+
end
|
data/lib/sicily/version.rb
CHANGED
data/sicily.gemspec
CHANGED
@@ -1,51 +1,50 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
|
2
|
-
lib = File.expand_path(
|
3
|
+
lib = File.expand_path('../lib', __FILE__)
|
3
4
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
|
-
require
|
5
|
+
require 'sicily/version'
|
5
6
|
|
6
7
|
Gem::Specification.new do |spec|
|
7
|
-
spec.name =
|
8
|
+
spec.name = 'sicily'
|
8
9
|
spec.version = Sicily::VERSION
|
9
|
-
spec.authors = [
|
10
|
-
spec.email = [
|
10
|
+
spec.authors = ['Paul Eunjae Lee']
|
11
|
+
spec.email = ['paul@valuepotion.com']
|
11
12
|
|
12
|
-
spec.summary =
|
13
|
+
spec.summary = 'A rule-based photo organizer written in Ruby'
|
13
14
|
spec.description = spec.summary
|
14
|
-
spec.homepage =
|
15
|
-
spec.license =
|
15
|
+
spec.homepage = 'https://github.com/eunjae-lee/sicily'
|
16
|
+
spec.license = 'MIT'
|
16
17
|
|
17
18
|
spec.metadata = {
|
18
|
-
|
19
|
+
'changelog_uri' => 'https://github.com/eunjae-lee/sicily/blob/master/CHANGELOG.md'
|
19
20
|
}
|
20
21
|
|
21
|
-
spec.post_install_message =
|
22
|
+
spec.post_install_message = <<~MESSAGE
|
23
|
+
To finish installation, please execute the following:
|
24
|
+
$ npm install -g upload-gphotos
|
22
25
|
|
23
|
-
|
24
|
-
|
26
|
+
And Libgd is required for this gem. Please install it like the following:
|
27
|
+
$ brew install gd
|
28
|
+
MESSAGE
|
25
29
|
|
26
|
-
|
27
|
-
$ brew install gd
|
28
|
-
|
29
|
-
}
|
30
|
-
|
31
|
-
spec.files = `git ls-files -z`.split("\x0").reject do |f|
|
30
|
+
spec.files = `git ls-files -z`.split("\x0").reject do |f|
|
32
31
|
f.match(%r{^(test|spec|features)/})
|
33
32
|
end
|
34
|
-
spec.bindir
|
35
|
-
spec.executables
|
36
|
-
spec.require_paths = [
|
37
|
-
spec.required_ruby_version = '>= 2.
|
38
|
-
|
39
|
-
spec.add_dependency
|
40
|
-
spec.add_dependency
|
41
|
-
spec.add_dependency
|
42
|
-
spec.add_dependency
|
43
|
-
spec.add_dependency
|
44
|
-
spec.add_dependency
|
45
|
-
spec.add_dependency
|
46
|
-
spec.add_dependency
|
47
|
-
|
48
|
-
spec.add_development_dependency
|
49
|
-
spec.add_development_dependency
|
50
|
-
spec.add_development_dependency
|
33
|
+
spec.bindir = 'exe'
|
34
|
+
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
35
|
+
spec.require_paths = ['lib']
|
36
|
+
spec.required_ruby_version = '>= 2.3.1'
|
37
|
+
|
38
|
+
spec.add_dependency 'concurrent-ruby', '~> 1.0.5'
|
39
|
+
spec.add_dependency 'exifr', '~> 1.3.3'
|
40
|
+
spec.add_dependency 'fastimage', '~> 2.1.1'
|
41
|
+
spec.add_dependency 'fastimage_resize', '~> 2.0.3'
|
42
|
+
spec.add_dependency 'god', '~> 0.13.7'
|
43
|
+
spec.add_dependency 'listen', '~> 3.1.5'
|
44
|
+
spec.add_dependency 'terminal-notifier', '~> 2.0.0'
|
45
|
+
spec.add_dependency 'whenever', '~> 0.10.0'
|
46
|
+
|
47
|
+
spec.add_development_dependency 'bundler', '~> 1.16'
|
48
|
+
spec.add_development_dependency 'rake', '~> 10.0'
|
49
|
+
spec.add_development_dependency 'rspec', '~> 3.0'
|
51
50
|
end
|
metadata
CHANGED
@@ -1,127 +1,127 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sicily
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
|
-
- Paul Lee
|
7
|
+
- Paul Eunjae Lee
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-02-
|
11
|
+
date: 2018-02-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name:
|
14
|
+
name: concurrent-ruby
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
19
|
+
version: 1.0.5
|
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
|
-
version:
|
26
|
+
version: 1.0.5
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: exifr
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version:
|
33
|
+
version: 1.3.3
|
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
|
-
version:
|
40
|
+
version: 1.3.3
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: fastimage
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 2.1.1
|
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
|
-
version:
|
54
|
+
version: 2.1.1
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
56
|
+
name: fastimage_resize
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 2.0.
|
61
|
+
version: 2.0.3
|
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
|
-
version: 2.0.
|
68
|
+
version: 2.0.3
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
70
|
+
name: god
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
75
|
+
version: 0.13.7
|
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
|
-
version:
|
82
|
+
version: 0.13.7
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
84
|
+
name: listen
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: 1.
|
89
|
+
version: 3.1.5
|
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
|
-
version: 1.
|
96
|
+
version: 3.1.5
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
name:
|
98
|
+
name: terminal-notifier
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 2.
|
103
|
+
version: 2.0.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
|
-
version: 2.
|
110
|
+
version: 2.0.0
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
|
-
name:
|
112
|
+
name: whenever
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
115
|
- - "~>"
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version:
|
117
|
+
version: 0.10.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
|
-
version:
|
124
|
+
version: 0.10.0
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: bundler
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -174,6 +174,7 @@ extra_rdoc_files: []
|
|
174
174
|
files:
|
175
175
|
- ".gitignore"
|
176
176
|
- ".rspec"
|
177
|
+
- ".rubocop.yml"
|
177
178
|
- ".ruby-version"
|
178
179
|
- ".travis.yml"
|
179
180
|
- CHANGELOG.md
|
@@ -193,8 +194,10 @@ files:
|
|
193
194
|
- lib/sicily.rb
|
194
195
|
- lib/sicily/batch_processor.rb
|
195
196
|
- lib/sicily/config.rb
|
197
|
+
- lib/sicily/error/monitor_error.rb
|
196
198
|
- lib/sicily/file_processor.rb
|
197
199
|
- lib/sicily/generator.rb
|
200
|
+
- lib/sicily/logger.rb
|
198
201
|
- lib/sicily/monitor.rb
|
199
202
|
- lib/sicily/task/dummy_task.rb
|
200
203
|
- lib/sicily/task/file_task.rb
|
@@ -212,15 +215,12 @@ licenses:
|
|
212
215
|
- MIT
|
213
216
|
metadata:
|
214
217
|
changelog_uri: https://github.com/eunjae-lee/sicily/blob/master/CHANGELOG.md
|
215
|
-
post_install_message: |
|
216
|
-
|
217
|
-
|
218
|
-
To finish installation, please execute the following:
|
219
|
-
$ npm install -g upload-gphotos
|
220
|
-
|
221
|
-
And Libgd is required for this gem. Please install it like the following:
|
222
|
-
$ brew install gd
|
218
|
+
post_install_message: |
|
219
|
+
To finish installation, please execute the following:
|
220
|
+
$ npm install -g upload-gphotos
|
223
221
|
|
222
|
+
And Libgd is required for this gem. Please install it like the following:
|
223
|
+
$ brew install gd
|
224
224
|
rdoc_options: []
|
225
225
|
require_paths:
|
226
226
|
- lib
|
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
228
228
|
requirements:
|
229
229
|
- - ">="
|
230
230
|
- !ruby/object:Gem::Version
|
231
|
-
version: 2.
|
231
|
+
version: 2.3.1
|
232
232
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
234
|
- - ">="
|
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
236
236
|
version: '0'
|
237
237
|
requirements: []
|
238
238
|
rubyforge_project:
|
239
|
-
rubygems_version: 2.
|
239
|
+
rubygems_version: 2.5.1
|
240
240
|
signing_key:
|
241
241
|
specification_version: 4
|
242
242
|
summary: A rule-based photo organizer written in Ruby
|