imagetools 1.0.0 → 1.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5abc00d417b2d224af26de6cbb9c99da4490161371850b1d6319c13c72a3600b
4
- data.tar.gz: 409367ec029ca9278ef5201bbfa723077dbe913e695a02aff8d12f299e56fcc7
3
+ metadata.gz: 0f730c14a7478df14386f50aeb978a3cb58f9e2c800c0f483c043b8edc80d0bc
4
+ data.tar.gz: 73664d7af84776da892acaea41d3c4c983971a4948828ae02e52a7406bdead98
5
5
  SHA512:
6
- metadata.gz: d27538f7941479ab48b900defe281d80f015e3efc67aebf288297e70124eb2da3c89ca335da7d41b6113ff4768898f6296911a3526cf2a9c7a3ac1b72e903df4
7
- data.tar.gz: 3fcae0439cc3136f6844b3e034032e49cc2796ea8d55bb01531589f0f0955a278a5be68708f8058ad8aeca416982f8994c7b13477d6040284b5d44d3abdbb0a5
6
+ metadata.gz: de65041bf1503e972d7f4606c5257dc60ced6fd597416f513be651cff307ea45d888bed257d5b74506da391a6bbd88be08ab6560beb76746eb3f4dcf2a72c17c
7
+ data.tar.gz: 2e9911cdd9f4e0e33c6939a6358c2262a0fb7c626ebc68ee4d4f2811f8fa621c6bb6ad291651171564259d5308d8712a75f863b3d4a0e712ad0bb639fddb673c
data/.idea/workspace.xml CHANGED
@@ -3,10 +3,10 @@
3
3
  <component name="ChangeListManager">
4
4
  <list default="true" id="b197c64f-57f8-4389-ab8d-dc9fe3cb05ba" name="Default" comment="">
5
5
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+ <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
7
+ <change beforePath="$PROJECT_DIR$/imagetools.gemspec" beforeDir="false" afterPath="$PROJECT_DIR$/imagetools.gemspec" afterDir="false" />
6
8
  <change beforePath="$PROJECT_DIR$/imagetools.iml" beforeDir="false" afterPath="$PROJECT_DIR$/imagetools.iml" afterDir="false" />
7
9
  </list>
8
- <ignored path="$PROJECT_DIR$/out/" />
9
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10
10
  <option name="SHOW_DIALOG" value="false" />
11
11
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
12
12
  <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -15,61 +15,6 @@
15
15
  <component name="CoverageDataManager">
16
16
  <SUITE FILE_PATH="coverage/imagetools@iconcreator.rcov" NAME="iconcreator Coverage Results" MODIFIED="1534313786832" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/exe" MODULE_NAME="imagetools" />
17
17
  </component>
18
- <component name="FileEditorManager">
19
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20
- <file pinned="false" current-in-tab="false">
21
- <entry file="file://$PROJECT_DIR$/exe/iconcreator">
22
- <provider selected="true" editor-type-id="text-editor">
23
- <state relative-caret-position="75">
24
- <caret line="5" selection-start-line="5" selection-end-line="5" />
25
- </state>
26
- </provider>
27
- </entry>
28
- </file>
29
- <file pinned="false" current-in-tab="false">
30
- <entry file="file://$PROJECT_DIR$/lib/imagetools/imagefilter.rb">
31
- <provider selected="true" editor-type-id="text-editor">
32
- <state relative-caret-position="315">
33
- <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
34
- </state>
35
- </provider>
36
- </entry>
37
- </file>
38
- <file pinned="false" current-in-tab="false">
39
- <entry file="file://$PROJECT_DIR$/lib/imagetools/imageconcat.rb">
40
- <provider selected="true" editor-type-id="text-editor">
41
- <state relative-caret-position="315">
42
- <caret line="21" column="33" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
43
- </state>
44
- </provider>
45
- </entry>
46
- </file>
47
- <file pinned="false" current-in-tab="false">
48
- <entry file="file://$PROJECT_DIR$/lib/imagetools/iconextractor.rb">
49
- <provider selected="true" editor-type-id="text-editor" />
50
- </entry>
51
- </file>
52
- <file pinned="false" current-in-tab="true">
53
- <entry file="file://$PROJECT_DIR$/lib/imagetools/iconcreator.rb">
54
- <provider selected="true" editor-type-id="text-editor" />
55
- </entry>
56
- </file>
57
- <file pinned="false" current-in-tab="false">
58
- <entry file="file://$PROJECT_DIR$/lib/imagetools/imageresizer.rb">
59
- <provider selected="true" editor-type-id="text-editor">
60
- <state relative-caret-position="300">
61
- <caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
62
- </state>
63
- </provider>
64
- </entry>
65
- </file>
66
- <file pinned="false" current-in-tab="false">
67
- <entry file="file://$PROJECT_DIR$/lib/imagetools/version.rb">
68
- <provider selected="true" editor-type-id="text-editor" />
69
- </entry>
70
- </file>
71
- </leaf>
72
- </component>
73
18
  <component name="FindInProjectRecents">
74
19
  <findStrings>
75
20
  <find>&quot;-c</find>
@@ -84,41 +29,11 @@
84
29
  <option name="width" value="1920" />
85
30
  <option name="height" value="1177" />
86
31
  </component>
87
- <component name="ProjectView">
88
- <navigator proportions="" version="1">
89
- <foldersAlwaysOnTop value="true" />
90
- </navigator>
91
- <panes>
92
- <pane id="ProjectPane">
93
- <subPane>
94
- <expand>
95
- <path>
96
- <item name="imagetools" type="b2602c69:ProjectViewProjectNode" />
97
- <item name="imagetools" type="462c0819:PsiDirectoryNode" />
98
- </path>
99
- <path>
100
- <item name="imagetools" type="b2602c69:ProjectViewProjectNode" />
101
- <item name="imagetools" type="462c0819:PsiDirectoryNode" />
102
- <item name="exe" type="462c0819:PsiDirectoryNode" />
103
- </path>
104
- <path>
105
- <item name="imagetools" type="b2602c69:ProjectViewProjectNode" />
106
- <item name="imagetools" type="462c0819:PsiDirectoryNode" />
107
- <item name="lib" type="462c0819:PsiDirectoryNode" />
108
- </path>
109
- <path>
110
- <item name="imagetools" type="b2602c69:ProjectViewProjectNode" />
111
- <item name="imagetools" type="462c0819:PsiDirectoryNode" />
112
- <item name="lib" type="462c0819:PsiDirectoryNode" />
113
- <item name="imagetools" type="462c0819:PsiDirectoryNode" />
114
- </path>
115
- </expand>
116
- <select />
117
- </subPane>
118
- </pane>
119
- <pane id="PackagesPane" />
120
- <pane id="Scope" />
121
- </panes>
32
+ <component name="ProjectId" id="1YvZY4FKb8fv8Y6MWahnStNLEFS" />
33
+ <component name="ProjectViewState">
34
+ <option name="hideEmptyMiddlePackages" value="true" />
35
+ <option name="showExcludedFiles" value="true" />
36
+ <option name="showLibraryContents" value="true" />
122
37
  </component>
123
38
  <component name="PropertiesComponent">
124
39
  <property name="GoToClass.includeLibraries" value="false" />
@@ -135,18 +50,6 @@
135
50
  <property name="nodejs_npm_path_reset_for_default_project" value="true" />
136
51
  <property name="settings.editor.selected.configurable" value="preferences.keymap" />
137
52
  </component>
138
- <component name="RunDashboard">
139
- <option name="ruleStates">
140
- <list>
141
- <RuleState>
142
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
143
- </RuleState>
144
- <RuleState>
145
- <option name="name" value="StatusDashboardGroupingRule" />
146
- </RuleState>
147
- </list>
148
- </option>
149
- </component>
150
53
  <component name="RunManager">
151
54
  <configuration default="true" type="Application" factoryName="Application">
152
55
  <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -200,7 +103,7 @@
200
103
  </method>
201
104
  </configuration>
202
105
  </component>
203
- <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
106
+ <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="false" RAILS_SPRING_PRE_LOADER_OPTION="false" />
204
107
  <component name="SvnConfiguration">
205
108
  <configuration />
206
109
  </component>
@@ -211,86 +114,28 @@
211
114
  <option name="presentableId" value="Default" />
212
115
  <updated>1570340432394</updated>
213
116
  <workItem from="1570340436196" duration="217000" />
117
+ <workItem from="1583825074054" duration="96000" />
214
118
  </task>
215
119
  <servers />
216
120
  </component>
217
- <component name="TimeTrackingManager">
218
- <option name="totallyTimeSpent" value="217000" />
219
- </component>
220
- <component name="ToolWindowManager">
221
- <frame x="254" y="418" width="1920" height="1177" extended-state="0" />
222
- <layout>
223
- <window_info id="Image Layers" />
224
- <window_info id="UI Designer" />
225
- <window_info id="Capture Tool" />
226
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19329074" />
227
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
228
- <window_info id="Designer" order="2" />
229
- <window_info id="Favorites" order="3" side_tool="true" />
230
- <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
231
- <window_info anchor="bottom" id="Terminal" />
232
- <window_info anchor="bottom" id="Message" order="0" />
233
- <window_info anchor="bottom" id="Find" order="1" />
234
- <window_info anchor="bottom" id="Run" order="2" />
235
- <window_info anchor="bottom" id="Debug" order="3" weight="0.39924315" />
236
- <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
237
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
238
- <window_info anchor="bottom" id="TODO" order="6" />
239
- <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
240
- <window_info anchor="bottom" id="Version Control" order="8" />
241
- <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
242
- <window_info anchor="right" id="Palette" />
243
- <window_info anchor="right" id="Capture Analysis" />
244
- <window_info anchor="right" id="Maven" />
245
- <window_info anchor="right" id="Theme Preview" />
246
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
247
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
248
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
249
- <window_info anchor="right" id="Database" order="3" />
250
- <window_info anchor="right" id="Palette&#9;" order="4" />
251
- </layout>
252
- </component>
253
121
  <component name="TypeScriptGeneratedFilesManager">
254
122
  <option name="version" value="1" />
255
123
  </component>
256
- <component name="editorHistoryManager">
257
- <entry file="file://$PROJECT_DIR$/exe/iconcreator">
258
- <provider selected="true" editor-type-id="text-editor">
259
- <state relative-caret-position="75">
260
- <caret line="5" selection-start-line="5" selection-end-line="5" />
261
- </state>
262
- </provider>
263
- </entry>
264
- <entry file="file://$PROJECT_DIR$/lib/imagetools/imagefilter.rb">
265
- <provider selected="true" editor-type-id="text-editor">
266
- <state relative-caret-position="315">
267
- <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
268
- </state>
269
- </provider>
270
- </entry>
271
- <entry file="file://$PROJECT_DIR$/lib/imagetools/imageconcat.rb">
272
- <provider selected="true" editor-type-id="text-editor">
273
- <state relative-caret-position="315">
274
- <caret line="21" column="33" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
275
- </state>
276
- </provider>
277
- </entry>
278
- <entry file="file://$PROJECT_DIR$/lib/imagetools/iconextractor.rb">
279
- <provider selected="true" editor-type-id="text-editor" />
280
- </entry>
281
- <entry file="file://$PROJECT_DIR$/lib/imagetools/imageresizer.rb">
282
- <provider selected="true" editor-type-id="text-editor">
283
- <state relative-caret-position="300">
284
- <caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
285
- </state>
286
- </provider>
287
- </entry>
288
- <entry file="file://$PROJECT_DIR$/lib/imagetools/version.rb">
289
- <provider selected="true" editor-type-id="text-editor" />
290
- </entry>
291
- <entry file="file://$PROJECT_DIR$/lib/imagetools/iconcreator.rb">
292
- <provider selected="true" editor-type-id="text-editor" />
293
- </entry>
124
+ <component name="Vcs.Log.History.Properties">
125
+ <option name="COLUMN_ORDER">
126
+ <list>
127
+ <option value="0" />
128
+ <option value="2" />
129
+ <option value="3" />
130
+ <option value="1" />
131
+ </list>
132
+ </option>
133
+ </component>
134
+ <component name="WindowStateProjectService">
135
+ <state x="100" y="123" width="1720" height="977" key="DiffContextDialog" timestamp="1583825160786">
136
+ <screen x="0" y="23" width="1920" height="1177" />
137
+ </state>
138
+ <state x="100" y="123" width="1720" height="977" key="DiffContextDialog/-1920.23.1920.1177/0.23.1920.1177@0.23.1920.1177" timestamp="1583825160786" />
294
139
  </component>
295
140
  <component name="masterDetails">
296
141
  <states>
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.5.5
1
+ 2.6.5
data/Gemfile.lock CHANGED
@@ -1,15 +1,15 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- imagetools (1.0.0)
5
- rmagick
4
+ imagetools (1.3.0)
5
+ rmagick (= 3.2.0)
6
6
 
7
7
  GEM
8
8
  remote: https://rubygems.org/
9
9
  specs:
10
- minitest (5.11.3)
11
- rake (10.5.0)
12
- rmagick (3.1.0)
10
+ minitest (5.14.4)
11
+ rake (13.0.6)
12
+ rmagick (3.2.0)
13
13
 
14
14
  PLATFORMS
15
15
  ruby
@@ -18,7 +18,7 @@ DEPENDENCIES
18
18
  bundler (~> 2.0)
19
19
  imagetools!
20
20
  minitest (~> 5.0)
21
- rake (~> 10.0)
21
+ rake (~> 13.0)
22
22
 
23
23
  BUNDLED WITH
24
- 2.0.1
24
+ 2.1.4
data/imagetools.gemspec CHANGED
@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
29
29
  spec.bindir = "exe"
30
30
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
31
31
  spec.require_paths = ["lib"]
32
- spec.add_dependency "rmagick"
32
+ spec.add_dependency "rmagick", "3.2.0"
33
33
  spec.add_development_dependency "bundler", "~> 2.0"
34
- spec.add_development_dependency "rake", "~> 10.0"
34
+ spec.add_development_dependency "rake", "~> 13.0"
35
35
  spec.add_development_dependency "minitest", "~> 5.0"
36
36
  end
data/imagetools.iml CHANGED
@@ -3,93 +3,96 @@
3
3
  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
4
  <exclude-output />
5
5
  <content url="file://$MODULE_DIR$" />
6
- <orderEntry type="jdk" jdkName="rbenv: 2.5.5" jdkType="RUBY_SDK" />
6
+ <orderEntry type="jdk" jdkName="rbenv: 2.6.5" jdkType="RUBY_SDK" />
7
7
  <orderEntry type="sourceFolder" forTests="false" />
8
8
  <orderEntry type="module-library">
9
- <library name="minitest (vbundled(5.11.3)) [path][gem]" type="rubylib">
9
+ <library name="minitest (vbundled(5.14.0)) [path][gem]" type="rubylib">
10
10
  <properties>
11
11
  <option name="version" value="4" />
12
12
  </properties>
13
13
  <CLASSES>
14
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/minitest-5.11.3/lib" />
15
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/minitest-5.11.3/test" />
14
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/minitest-5.14.0/lib" />
15
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/minitest-5.14.0/test" />
16
16
  </CLASSES>
17
17
  <JAVADOC />
18
18
  <SOURCES>
19
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/minitest-5.11.3/lib" />
20
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/minitest-5.11.3/test" />
19
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/minitest-5.14.0/lib" />
20
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/minitest-5.14.0/test" />
21
21
  </SOURCES>
22
22
  <excluded>
23
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/minitest-5.11.3/test" />
23
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/minitest-5.14.0/test" />
24
24
  </excluded>
25
25
  </library>
26
26
  </orderEntry>
27
27
  <orderEntry type="module-library">
28
- <library name="rake (vbundled(10.5.0)) [path][gem]" type="rubylib">
28
+ <library name="rake (vbundled(13.0.1)) [path][gem]" type="rubylib">
29
29
  <properties>
30
30
  <option name="version" value="4" />
31
31
  </properties>
32
32
  <CLASSES>
33
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/bin" />
34
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/doc" />
35
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/lib" />
36
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/test" />
37
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/rakelib" />
33
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/bin" />
34
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/doc" />
35
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/exe" />
36
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/lib" />
37
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/.github" />
38
38
  </CLASSES>
39
39
  <JAVADOC />
40
40
  <SOURCES>
41
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/bin" />
42
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/doc" />
43
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/lib" />
44
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/test" />
45
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/rakelib" />
41
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/bin" />
42
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/doc" />
43
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/exe" />
44
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/lib" />
45
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/.github" />
46
46
  </SOURCES>
47
47
  <excluded>
48
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/bin" />
49
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/doc" />
50
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/test" />
51
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rake-10.5.0/rakelib" />
48
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/bin" />
49
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/doc" />
50
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/exe" />
51
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rake-13.0.1/.github" />
52
52
  </excluded>
53
53
  </library>
54
54
  </orderEntry>
55
55
  <orderEntry type="module-library">
56
- <library name="rmagick (vbundled(3.1.0)) [path][gem]" type="rubylib">
56
+ <library name="rmagick (vbundled(3.2.0)) [path][gem]" type="rubylib">
57
57
  <properties>
58
58
  <option name="version" value="4" />
59
59
  </properties>
60
60
  <CLASSES>
61
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/doc" />
62
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/ext" />
63
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/lib" />
64
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/spec" />
65
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/test" />
66
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/examples" />
67
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/.circleci" />
68
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/deprecated" />
61
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/doc" />
62
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/ext" />
63
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/lib" />
64
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/spec" />
65
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/test" />
66
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/examples" />
67
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/.circleci" />
68
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/benchmarks" />
69
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/deprecated" />
69
70
  </CLASSES>
70
71
  <JAVADOC />
71
72
  <SOURCES>
72
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/doc" />
73
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/ext" />
74
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/lib" />
75
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/spec" />
76
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/test" />
77
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/examples" />
78
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/.circleci" />
79
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/deprecated" />
73
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/doc" />
74
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/ext" />
75
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/lib" />
76
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/spec" />
77
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/test" />
78
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/examples" />
79
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/.circleci" />
80
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/benchmarks" />
81
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/deprecated" />
80
82
  </SOURCES>
81
83
  <excluded>
82
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/doc" />
83
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/ext" />
84
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/spec" />
85
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/test" />
86
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/examples" />
87
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/.circleci" />
88
- <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/rmagick-3.1.0/deprecated" />
84
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/doc" />
85
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/ext" />
86
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/spec" />
87
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/test" />
88
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/examples" />
89
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/.circleci" />
90
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/benchmarks" />
91
+ <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rmagick-3.2.0/deprecated" />
89
92
  </excluded>
90
93
  </library>
91
94
  </orderEntry>
92
- <orderEntry type="library" scope="PROVIDED" name="bundler (v2.0.1, rbenv: 2.5.5) [gem]" level="application" />
93
- <orderEntry type="library" scope="PROVIDED" name="minitest (v5.10.3, rbenv: 2.5.5) [gem]" level="application" />
95
+ <orderEntry type="library" scope="PROVIDED" name="bundler (v2.0.2, rbenv: 2.6.5) [gem]" level="application" />
96
+ <orderEntry type="library" scope="PROVIDED" name="minitest (v5.11.3, rbenv: 2.6.5) [gem]" level="application" />
94
97
  </component>
95
98
  </module>
@@ -44,17 +44,19 @@ module Imagetools
44
44
  end
45
45
 
46
46
  class Imagefilter
47
- OTHER_JPG_SEARCH = /\.(large|huge|jpg_large)$/i
47
+ OTHER_JPG_SEARCH = /\.(large|huge|jpg_large|JPG)$/i
48
48
  OTHER_JPG_REPLACE = '.jpg'
49
49
 
50
50
  CONVERT_CMD = "convert"
51
51
  DWEBP_CMD = "dwebp"
52
- RESIZE_CMD = "mogrify -resize 1280x\\> "
52
+ # RESIZE_CMD = "mogrify -resize 1280x\\> "
53
+ RESIZE_CMD = "mogrify -background white -resize 1280x\\> "
54
+ ROTATE_CMD = "exiftran -ai "
53
55
  COMPRESS_CMD = "jpegoptim --strip-all --max=90 "
54
- EXTERNAL_CMDS = [RESIZE_CMD, COMPRESS_CMD]
56
+ EXTERNAL_CMDS = [RESIZE_CMD, ROTATE_CMD, COMPRESS_CMD]
55
57
 
56
58
  WEBP_SEARCH = /(.+)\.webp/i
57
- WEBP_REPLACE = '\1.jpg'
59
+ WEBP_REPLACE = '\1.png'
58
60
 
59
61
  PNG_SEARCH = /(.+)\.png/i
60
62
  PNG_REPLACE = '\1.jpg'
@@ -71,6 +73,7 @@ module Imagetools
71
73
  opt.separator('Parameters:')
72
74
  param =<<EOM
73
75
  RESIZE_CMD: #{RESIZE_CMD}
76
+ ROTATE_CMD: #{ROTATE_CMD}
74
77
  COMPRESS_CMD: #{COMPRESS_CMD}
75
78
  EOM
76
79
  opt.separator(param)
@@ -89,14 +92,11 @@ EOM
89
92
 
90
93
  config_file = opts[:c] || "~/.imagefilterrc"
91
94
  config_file = File.expand_path(config_file)
92
- p config_file
93
95
  yaml = nil
94
96
  if FileTest.file?(config_file)
95
97
  yaml = YAML.load_file(config_file)
96
- p "aaaaaaaaa"
97
98
  end
98
99
  config = Config.new(yaml)
99
- p config.filename_patterns
100
100
  if opts[:t]
101
101
  ret = selftest
102
102
  exit(ret)
@@ -127,8 +127,6 @@ EOM
127
127
  filename = filename.dup
128
128
  patterns.each do |search, replace|
129
129
  if search && replace
130
- p search
131
- p replace
132
130
  reg = Regexp.new(search, Regexp::IGNORECASE)
133
131
  filename = filename.sub(reg, replace)
134
132
  end
@@ -136,7 +134,7 @@ EOM
136
134
  filename.sub(OTHER_JPG_SEARCH, OTHER_JPG_REPLACE)
137
135
  end
138
136
 
139
- def self.replace_webp2jpg(filename)
137
+ def self.replace_webp2png(filename)
140
138
  filename.sub(WEBP_SEARCH, WEBP_REPLACE)
141
139
  end
142
140
 
@@ -176,9 +174,10 @@ EOM
176
174
  end
177
175
 
178
176
  filepath = rename_image(filepath)
179
- filepath = webp2jpg(filepath)
177
+ filepath = webp2png(filepath)
180
178
  filepath = png2jpg(filepath)
181
179
  filepath = resize_jpg(filepath)
180
+ filepath = rotate_jpg(filepath)
182
181
  filepath = compress_jpg(filepath)
183
182
  filepath
184
183
  end
@@ -201,13 +200,16 @@ EOM
201
200
  dir = File.dirname(filepath)
202
201
  topath = File.join(dir, toname)
203
202
  puts "rename: #{filepath} => #{topath}"
204
- FileUtils.mv(filepath, topath) unless @opts[:n]
203
+ # FileUtils.mv(filepath, topath, :force => true) unless @opts[:n]
204
+ # aaa.JPG => aaa.jpgを成功させるためにFIleUtils.mv(same fileエラーがでる)ではなくmvを使う
205
+ cmd = "mv #{filepath} #{topath}"
206
+ system(cmd)
205
207
  return topath
206
208
  end
207
209
 
208
- def webp2jpg(filepath)
210
+ def webp2png(filepath)
209
211
  fromname = File.basename(filepath)
210
- toname = self.class.replace_webp2jpg(fromname)
212
+ toname = self.class.replace_webp2png(fromname)
211
213
  return filepath if fromname == toname
212
214
 
213
215
  dir = File.dirname(filepath)
@@ -247,6 +249,17 @@ EOM
247
249
  system(cmd)
248
250
  return filepath
249
251
  end
252
+
253
+ def rotate_jpg(filepath)
254
+ fromname = File.basename(filepath)
255
+ unless fromname =~ JPG_SEARCH
256
+ return filepath
257
+ end
258
+ puts "rotate: #{filepath}"
259
+ cmd = "#{ROTATE_CMD} \"#{filepath}\""
260
+ system(cmd)
261
+ return filepath
262
+ end
250
263
 
251
264
  def compress_jpg(filepath)
252
265
  fromname = File.basename(filepath)
@@ -1,3 +1,3 @@
1
1
  module Imagetools
2
- VERSION = "1.0.0"
2
+ VERSION = "1.3.0"
3
3
  end
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: imagetools
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - src
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-11-20 00:00:00.000000000 Z
11
+ date: 2021-12-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rmagick
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: 3.2.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
- version: '0'
26
+ version: 3.2.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '10.0'
47
+ version: '13.0'
48
48
  type: :development
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: '10.0'
54
+ version: '13.0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: minitest
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -171,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
171
171
  - !ruby/object:Gem::Version
172
172
  version: '0'
173
173
  requirements: []
174
- rubyforge_project:
175
- rubygems_version: 2.7.6.2
174
+ rubygems_version: 3.0.3
176
175
  signing_key:
177
176
  specification_version: 4
178
177
  summary: Image Tools.