mvr 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/bin/mvr +15 -32
  3. data/lib/mvr/version.rb +1 -1
  4. data/mvr.gemspec +2 -2
  5. metadata +12 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fcc6ffdeb25144e2b3d0b62f9a7103ddf3ed3846
4
- data.tar.gz: 67ece6ccbf268839eb7dfa290a7b84dfa63260a4
3
+ metadata.gz: b31dfca1e865c5252be881be8b37c8b6ae8d0aac
4
+ data.tar.gz: e5de4f45dc22c27e5505d727934f6a5d276196ad
5
5
  SHA512:
6
- metadata.gz: d14026c601fb4cf587e6e7e632014fc9af15a93491df9aa7cb3bb436421fa661d800010d192cfaa17ecfdb0b24f09dfb3c372ad308be47e1d07b127c40da28e7
7
- data.tar.gz: 8b3c05fea9933bc6f8b4e3c7f5e5e7c3dbf60d1d33b316d7a5eac1e6d5a145482c5c7108cf4d193f694a08ac3c97201c34c892aff48ace0cd7252c907d377784
6
+ metadata.gz: 112ae3336c17dd3c2cd00ed463d35a0fa9a4f44b230ed6dc42ca8d88c76dee36c7b1f9a1cdb7409cc77553638c704940dfff24a6f0ec6993bc957630372b15bc
7
+ data.tar.gz: 57079bc4fc7781ff6f1997d94bbfb85edc0cc60441f910479a6a97a944aaf58044f08747a664731578651a0428ba66d5d3fc466293258744e876fe0c78c8407a
data/bin/mvr CHANGED
@@ -5,7 +5,7 @@ require 'yaml'
5
5
  require 'rubygems'
6
6
  require 'everyday-cli-utils'
7
7
  include EverydayCliUtils
8
- import :format, :option
8
+ import :format, :option, :ask
9
9
 
10
10
  #noinspection RubyResolve
11
11
  require 'mvr/plugin'
@@ -99,9 +99,9 @@ if ARGV.length < 2
99
99
  end
100
100
  replacement = ARGV.shift
101
101
  regex = /#{pattern}/o
102
- mappings = Hash.new
103
- encountered = Array.new
104
- duplicated = Array.new
102
+ mappings = {}
103
+ encountered = []
104
+ duplicated = []
105
105
  ARGV.each do |filename|
106
106
  file_basename = File.basename(filename)
107
107
  directory = filename[0, (filename.length - file_basename.length)]
@@ -129,24 +129,11 @@ end
129
129
 
130
130
  ARGV.clear
131
131
 
132
- len1 = mappings.keys.max do |a, b|
133
- a.length <=> b.length
134
- end
135
-
136
- len2 = mappings.values.max do |a, b|
137
- a.length <=> b.length
138
- end
132
+ len1 = mappings.keys.map { |k| k.to_s.length }.max
133
+ len2 = mappings.values.map { |v| v.to_s.length }.max
139
134
 
140
- len1 = len1.length
141
- len2 = len2.length
142
-
143
- if len1 < 3
144
- len1 = 3
145
- end
146
-
147
- if len2 < 3
148
- len2 = 3
149
- end
135
+ len1 = 3 if len1 < 3
136
+ len2 = 3 if len2 < 3
150
137
 
151
138
  border = "+#{'-' * (len1+2)}+#{'-' * (len2+2)}+"
152
139
 
@@ -154,7 +141,7 @@ puts border
154
141
  puts "| #{'Old'.mycenter(len1)} | #{'New'.mycenter(len2)} |"
155
142
  puts border
156
143
 
157
- mappings.each do |from, to|
144
+ mappings.each { |from, to|
158
145
  from2 = from.mycenter(len1)
159
146
  to2 = to.mycenter(len2)
160
147
  if from == to
@@ -168,16 +155,12 @@ mappings.each do |from, to|
168
155
  to2 = "{#{to2}}(:normal)"
169
156
  end
170
157
  puts "| #{from2} | #{to2} |".format_all
171
- end
158
+ }
172
159
 
173
160
  puts border
174
161
 
175
- print "\nAre you sure you want to rename these files (yes/no or y/n)? "
176
- response = gets.chomp
177
- if response.downcase == 'yes' || response.downcase == 'y'
178
- mappings.each do |from, to|
179
- if from != to
180
- File.rename(from, to)
181
- end
182
- end
183
- end
162
+ Ask.ask_yn("\nAre you sure you want to rename these files?", only: :yes) { |resp|
163
+ mappings.each { |from, to|
164
+ File.rename(from, to) if from != to
165
+ }
166
+ }
@@ -1,3 +1,3 @@
1
1
  module Mvr
2
- VERSION = '2.0.1'
2
+ VERSION = '2.0.2'
3
3
  end
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
23
23
  spec.add_development_dependency 'rake', '~> 10.0'
24
24
  spec.add_development_dependency 'rspec'
25
25
 
26
- spec.add_dependency 'everyday-cli-utils', '~> 1.8', '>= 1.8.1'
27
- spec.add_dependency 'everyday-plugins', '~> 1.2'
26
+ spec.add_dependency 'everyday-cli-utils', '~> 1.8', '>= 1.8.7.1'
27
+ spec.add_dependency 'everyday-plugins', '~> 1.2', '>= 1.2.1'
28
28
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mvr
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Henderson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-03 00:00:00.000000000 Z
11
+ date: 2016-03-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -61,7 +61,7 @@ dependencies:
61
61
  version: '1.8'
62
62
  - - ">="
63
63
  - !ruby/object:Gem::Version
64
- version: 1.8.1
64
+ version: 1.8.7.1
65
65
  type: :runtime
66
66
  prerelease: false
67
67
  version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
71
71
  version: '1.8'
72
72
  - - ">="
73
73
  - !ruby/object:Gem::Version
74
- version: 1.8.1
74
+ version: 1.8.7.1
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: everyday-plugins
77
77
  requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,9 @@ dependencies:
79
79
  - - "~>"
80
80
  - !ruby/object:Gem::Version
81
81
  version: '1.2'
82
+ - - ">="
83
+ - !ruby/object:Gem::Version
84
+ version: 1.2.1
82
85
  type: :runtime
83
86
  prerelease: false
84
87
  version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +89,9 @@ dependencies:
86
89
  - - "~>"
87
90
  - !ruby/object:Gem::Version
88
91
  version: '1.2'
92
+ - - ">="
93
+ - !ruby/object:Gem::Version
94
+ version: 1.2.1
89
95
  description: a Ruby script that allows you to rename a group of files via regular
90
96
  expression
91
97
  email:
@@ -127,9 +133,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
127
133
  version: '0'
128
134
  requirements: []
129
135
  rubyforge_project:
130
- rubygems_version: 2.4.2
136
+ rubygems_version: 2.5.1
131
137
  signing_key:
132
138
  specification_version: 4
133
139
  summary: regex rename
134
140
  test_files:
135
141
  - spec/extension_spec.rb
142
+ has_rdoc: