Skip to content

Commit 015fe29

Browse files
authored
Merge pull request #42 from tipr/lint-updates
Linter updates
2 parents 8248824 + 8d65400 commit 015fe29

File tree

4 files changed

+80
-84
lines changed

4 files changed

+80
-84
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require 'rubocop/rake_task'
1212
Bundler::GemHelper.install_tasks
1313

1414
desc 'Run rubocop'
15-
task :rubocop do
15+
task rubocop: :environment do
1616
RuboCop::RakeTask.new
1717
end
1818

bin/bagit

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,36 +85,32 @@ begin
8585

8686
# handle add/delete bag data files
8787
opts['-f']&.each do |datafile|
88-
begin
89-
if opts['add'] || opts['new']
90-
bag.add_file(File.basename(datafile), datafile)
91-
elsif opts['delete']
92-
bag.remove_file(File.basename(datafile))
93-
end
94-
rescue StandardError => e
95-
logger.error("Failed operation on bag file: #{e.message}")
88+
if opts['add'] || opts['new']
89+
bag.add_file(File.basename(datafile), datafile)
90+
elsif opts['delete']
91+
bag.remove_file(File.basename(datafile))
9692
end
93+
rescue StandardError => e
94+
logger.error("Failed operation on bag file: #{e.message}")
9795
end
9896

9997
# handle adding tag files
10098
opts['-t']&.each do |tagfile|
101-
begin
102-
if opts['add'] || opts['new']
103-
# if it does, try to manifest it
104-
if File.exist?(File.join(bag.bag_dir, File.basename(tagfile)))
105-
bag.add_tag_file(tagfile)
106-
# otherwise, add it
107-
else
108-
bag.add_tag_file(File.basename(tagfile), tagfile)
109-
end
110-
elsif opts['delete']
111-
bag.delete_tag_file(File.basename(tagfile))
112-
elsif opts['remove']
113-
bag.remove_tag_file(File.basename(tagfile))
99+
if opts['add'] || opts['new']
100+
# if it does, try to manifest it
101+
if File.exist?(File.join(bag.bag_dir, File.basename(tagfile)))
102+
bag.add_tag_file(tagfile)
103+
# otherwise, add it
104+
else
105+
bag.add_tag_file(File.basename(tagfile), tagfile)
114106
end
115-
rescue StandardError => e
116-
logger.error("Failed operation on tag file: #{e.message}".red)
107+
elsif opts['delete']
108+
bag.delete_tag_file(File.basename(tagfile))
109+
elsif opts['remove']
110+
bag.remove_tag_file(File.basename(tagfile))
117111
end
112+
rescue StandardError => e
113+
logger.error("Failed operation on tag file: #{e.message}".red)
118114
end
119115

120116
# if we haven't quit yet, we need to re-manifest

lib/bagit/info.rb

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,38 +59,38 @@ def update_bag_date
5959

6060
protected
6161

62-
def read_info_file(file)
63-
File.open(file) do |io|
64-
entries = io.read.split(/\n(?=[^\s])/)
65-
66-
entries.inject({}) do |hash, line|
67-
name, value = line.chomp.split(/\s*:\s*/, 2)
68-
hash.merge(name => value)
69-
end
62+
def read_info_file(file)
63+
File.open(file) do |io|
64+
entries = io.read.split(/\n(?=[^\s])/)
65+
66+
entries.inject({}) do |hash, line|
67+
name, value = line.chomp.split(/\s*:\s*/, 2)
68+
hash.merge(name => value)
7069
end
7170
end
71+
end
7272

73-
def write_info_file(file, hash)
74-
dups = hash.keys.inject(Set.new) do |acc, key|
75-
a = hash.keys.grep(/#{key}/i)
76-
acc + (a.size > 1 ? a : [])
77-
end
73+
def write_info_file(file, hash)
74+
dups = hash.keys.inject(Set.new) do |acc, key|
75+
a = hash.keys.grep(/#{key}/i)
76+
acc + (a.size > 1 ? a : [])
77+
end
7878

79-
raise "Multiple labels (#{dups.to_a.join ', '}) in #{file}" unless dups.empty?
79+
raise "Multiple labels (#{dups.to_a.join ', '}) in #{file}" unless dups.empty?
8080

81-
File.open(file, 'w') do |io|
82-
hash.each do |name, value|
83-
simple_entry = "#{name}: #{value.gsub(/\s+/, ' ')}"
81+
File.open(file, 'w') do |io|
82+
hash.each do |name, value|
83+
simple_entry = "#{name}: #{value.gsub(/\s+/, ' ')}"
8484

85-
entry = if simple_entry.length > 79
86-
simple_entry.wrap(77).indent(2)
87-
else
88-
simple_entry
89-
end
85+
entry = if simple_entry.length > 79
86+
simple_entry.wrap(77).indent(2)
87+
else
88+
simple_entry
89+
end
9090

91-
io.puts entry
92-
end
91+
io.puts entry
9392
end
9493
end
94+
end
9595
end
9696
end

lib/bagit/valid.rb

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -90,52 +90,52 @@ def valid_oxum?
9090

9191
protected
9292

93-
# Returns all files in the instance that are not manifested
94-
def unmanifested_files
95-
mfs = manifested_files.map { |f| File.join bag_dir, f }
96-
bag_files.reject { |f| mfs.member? f }
97-
end
93+
# Returns all files in the instance that are not manifested
94+
def unmanifested_files
95+
mfs = manifested_files.map { |f| File.join bag_dir, f }
96+
bag_files.reject { |f| mfs.member? f }
97+
end
9898

99-
# Returns a list of manifested files that are not present
100-
def empty_manifests
101-
bfs = bag_files
102-
manifested_files.reject { |f| bfs.member? File.join(bag_dir, f) }
103-
end
99+
# Returns a list of manifested files that are not present
100+
def empty_manifests
101+
bfs = bag_files
102+
manifested_files.reject { |f| bfs.member? File.join(bag_dir, f) }
103+
end
104104

105-
# Returns a list of tag manifested files that are not present
106-
def tag_empty_manifests
107-
empty = []
108-
tag_manifested_files.each do |f|
109-
empty.push f unless File.exist?(File.join(bag_dir, f))
110-
end
111-
empty
105+
# Returns a list of tag manifested files that are not present
106+
def tag_empty_manifests
107+
empty = []
108+
tag_manifested_files.each do |f|
109+
empty.push f unless File.exist?(File.join(bag_dir, f))
112110
end
111+
empty
112+
end
113113

114-
# Returns a list of all files present in the manifest files
115-
def manifested_files
116-
manifest_files.inject([]) do |acc, mf|
117-
files = File.open(mf) do |io|
118-
io.readlines.map do |line|
119-
_digest, path = line.chomp.split(/\s+/, 2)
120-
decode_filename(path)
121-
end
114+
# Returns a list of all files present in the manifest files
115+
def manifested_files
116+
manifest_files.inject([]) do |acc, mf|
117+
files = File.open(mf) do |io|
118+
io.readlines.map do |line|
119+
_digest, path = line.chomp.split(/\s+/, 2)
120+
decode_filename(path)
122121
end
123-
124-
(acc + files).uniq
125122
end
123+
124+
(acc + files).uniq
126125
end
126+
end
127127

128-
# Returns a list of all files in the tag manifest files
129-
def tag_manifested_files
130-
tagmanifest_files.inject([]) do |acc, mf|
131-
files = File.open(mf) do |io|
132-
io.readlines.map do |line|
133-
_digest, path = line.chomp.split(/\s+/, 2)
134-
path
135-
end
128+
# Returns a list of all files in the tag manifest files
129+
def tag_manifested_files
130+
tagmanifest_files.inject([]) do |acc, mf|
131+
files = File.open(mf) do |io|
132+
io.readlines.map do |line|
133+
_digest, path = line.chomp.split(/\s+/, 2)
134+
path
136135
end
137-
(acc + files).uniq
138136
end
137+
(acc + files).uniq
139138
end
139+
end
140140
end
141141
end

0 commit comments

Comments
 (0)