Merge pull request #42 from tipr/lint-updates

Linter updates

Author: little9

Rakefile

@@ -12,7 +12,7 @@ require 'rubocop/rake_task'
 Bundler::GemHelper.install_tasks
 
 desc 'Run rubocop'
-task :rubocop do
+task rubocop: :environment do
   RuboCop::RakeTask.new
 end
 

bin/bagit

@@ -85,36 +85,32 @@ begin
 
   # handle add/delete bag data files
   opts['-f']&.each do |datafile|
-    begin
-      if opts['add'] || opts['new']
-        bag.add_file(File.basename(datafile), datafile)
-      elsif opts['delete']
-        bag.remove_file(File.basename(datafile))
-      end
-    rescue StandardError => e
-      logger.error("Failed operation on bag file: #{e.message}")
+    if opts['add'] || opts['new']
+      bag.add_file(File.basename(datafile), datafile)
+    elsif opts['delete']
+      bag.remove_file(File.basename(datafile))
     end
+  rescue StandardError => e
+    logger.error("Failed operation on bag file: #{e.message}")
   end
 
   # handle adding tag files
   opts['-t']&.each do |tagfile|
-    begin
-      if opts['add'] || opts['new']
-        # if it does, try to manifest it
-        if File.exist?(File.join(bag.bag_dir, File.basename(tagfile)))
-          bag.add_tag_file(tagfile)
-          # otherwise, add it
-        else
-          bag.add_tag_file(File.basename(tagfile), tagfile)
-        end
-      elsif opts['delete']
-        bag.delete_tag_file(File.basename(tagfile))
-      elsif opts['remove']
-        bag.remove_tag_file(File.basename(tagfile))
+    if opts['add'] || opts['new']
+      # if it does, try to manifest it
+      if File.exist?(File.join(bag.bag_dir, File.basename(tagfile)))
+        bag.add_tag_file(tagfile)
+        # otherwise, add it
+      else
+        bag.add_tag_file(File.basename(tagfile), tagfile)
       end
-    rescue StandardError => e
-      logger.error("Failed operation on tag file: #{e.message}".red)
+    elsif opts['delete']
+      bag.delete_tag_file(File.basename(tagfile))
+    elsif opts['remove']
+      bag.remove_tag_file(File.basename(tagfile))
     end
+  rescue StandardError => e
+    logger.error("Failed operation on tag file: #{e.message}".red)
   end
 
   # if we haven't quit yet, we need to re-manifest

lib/bagit/info.rb

@@ -59,38 +59,38 @@ def update_bag_date
 
     protected
 
-      def read_info_file(file)
-        File.open(file) do |io|
-          entries = io.read.split(/\n(?=[^\s])/)
-
-          entries.inject({}) do |hash, line|
-            name, value = line.chomp.split(/\s*:\s*/, 2)
-            hash.merge(name => value)
-          end
+    def read_info_file(file)
+      File.open(file) do |io|
+        entries = io.read.split(/\n(?=[^\s])/)
+
+        entries.inject({}) do |hash, line|
+          name, value = line.chomp.split(/\s*:\s*/, 2)
+          hash.merge(name => value)
         end
       end
+    end
 
-      def write_info_file(file, hash)
-        dups = hash.keys.inject(Set.new) do |acc, key|
-          a = hash.keys.grep(/#{key}/i)
-          acc + (a.size > 1 ? a : [])
-        end
+    def write_info_file(file, hash)
+      dups = hash.keys.inject(Set.new) do |acc, key|
+        a = hash.keys.grep(/#{key}/i)
+        acc + (a.size > 1 ? a : [])
+      end
 
-        raise "Multiple labels (#{dups.to_a.join ', '}) in #{file}" unless dups.empty?
+      raise "Multiple labels (#{dups.to_a.join ', '}) in #{file}" unless dups.empty?
 
-        File.open(file, 'w') do |io|
-          hash.each do |name, value|
-            simple_entry = "#{name}: #{value.gsub(/\s+/, ' ')}"
+      File.open(file, 'w') do |io|
+        hash.each do |name, value|
+          simple_entry = "#{name}: #{value.gsub(/\s+/, ' ')}"
 
-            entry = if simple_entry.length > 79
-                      simple_entry.wrap(77).indent(2)
-                    else
-                      simple_entry
-                    end
+          entry = if simple_entry.length > 79
+                    simple_entry.wrap(77).indent(2)
+                  else
+                    simple_entry
+                  end
 
-            io.puts entry
-          end
+          io.puts entry
         end
       end
+    end
   end
 end

lib/bagit/valid.rb

@@ -90,52 +90,52 @@ def valid_oxum?
 
     protected
 
-      # Returns all files in the instance that are not manifested
-      def unmanifested_files
-        mfs = manifested_files.map { |f| File.join bag_dir, f }
-        bag_files.reject { |f| mfs.member? f }
-      end
+    # Returns all files in the instance that are not manifested
+    def unmanifested_files
+      mfs = manifested_files.map { |f| File.join bag_dir, f }
+      bag_files.reject { |f| mfs.member? f }
+    end
 
-      # Returns a list of manifested files that are not present
-      def empty_manifests
-        bfs = bag_files
-        manifested_files.reject { |f| bfs.member? File.join(bag_dir, f) }
-      end
+    # Returns a list of manifested files that are not present
+    def empty_manifests
+      bfs = bag_files
+      manifested_files.reject { |f| bfs.member? File.join(bag_dir, f) }
+    end
 
-      # Returns a list of tag manifested files that are not present
-      def tag_empty_manifests
-        empty = []
-        tag_manifested_files.each do |f|
-          empty.push f unless File.exist?(File.join(bag_dir, f))
-        end
-        empty
+    # Returns a list of tag manifested files that are not present
+    def tag_empty_manifests
+      empty = []
+      tag_manifested_files.each do |f|
+        empty.push f unless File.exist?(File.join(bag_dir, f))
       end
+      empty
+    end
 
-      # Returns a list of all files present in the manifest files
-      def manifested_files
-        manifest_files.inject([]) do |acc, mf|
-          files = File.open(mf) do |io|
-            io.readlines.map do |line|
-              _digest, path = line.chomp.split(/\s+/, 2)
-              decode_filename(path)
-            end
+    # Returns a list of all files present in the manifest files
+    def manifested_files
+      manifest_files.inject([]) do |acc, mf|
+        files = File.open(mf) do |io|
+          io.readlines.map do |line|
+            _digest, path = line.chomp.split(/\s+/, 2)
+            decode_filename(path)
           end
-
-          (acc + files).uniq
         end
+
+        (acc + files).uniq
       end
+    end
 
-      # Returns a list of all files in the tag manifest files
-      def tag_manifested_files
-        tagmanifest_files.inject([]) do |acc, mf|
-          files = File.open(mf) do |io|
-            io.readlines.map do |line|
-              _digest, path = line.chomp.split(/\s+/, 2)
-              path
-            end
+    # Returns a list of all files in the tag manifest files
+    def tag_manifested_files
+      tagmanifest_files.inject([]) do |acc, mf|
+        files = File.open(mf) do |io|
+          io.readlines.map do |line|
+            _digest, path = line.chomp.split(/\s+/, 2)
+            path
           end
-          (acc + files).uniq
         end
+        (acc + files).uniq
       end
+    end
   end
 end