fcrepo_wrapper 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a774f401463d98c36bbd1bf08e7486bf45beeda4
-  data.tar.gz: 3714c2826c1ba2605baa0b5628b159014751dfa2
+  metadata.gz: f35da2e7c8fd52e646e683d3a03dfe50e0408d3e
+  data.tar.gz: 7e6fc71cb0050d0cdcd43284a48240d2cb318693
 SHA512:
-  metadata.gz: 9c2b93b72738782c84a95f1ec4f3352014c5ad24ad44ab5655ab2f38f6bb33a43d73c48b373eb23a7f080e1153d9e7b548e6b2b4ed64bd0bcb369cdb1021c123
-  data.tar.gz: a48ccbd482b42663762dc940f083f3b5ca7e25024c6eaa02a4a1d2d5980fb3a0284680579c89f552bd942b020ef7e43e1598d64af8f71de24514e83cb9c8d9da
+  metadata.gz: e4367738cd14d10256b4a6303390227092e126dae0582d8ece89af411341fcdcf9d296274967b74e6efdfd4847e7c67550ade76a115df8282f88c296f8f0d90b
+  data.tar.gz: c278c4978fd8751fa0d34556712ee9ad03c29be7b6690e0cc9e47200bb2a0ff2a880307a79609aa7af83b5008dcb501201980a85320e6cac9aeae34d72a551d3

data/.rubocop.yml

@@ -1,11 +1,9 @@
 inherit_from:
-  - .rubocop_hound.yml
   - .rubocop_todo.yml
 
 AllCops:
   Exclude:
   - "*.gemspec"
-  RunRailsCops: true
 
 Metrics/LineLength:
   Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,190 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-07-07 11:09:07 -0700 using RuboCop version 0.41.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/AmbiguousOperator:
+  Exclude:
+    - 'lib/fcrepo_wrapper.rb'
+
+# Offense count: 11
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Exclude:
+    - 'lib/fcrepo_wrapper/configuration.rb'
+    - 'lib/fcrepo_wrapper/instance.rb'
+    - 'lib/fcrepo_wrapper/md5.rb'
+    - 'spec/lib/fcrepo_wrapper/instance_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 135
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 16
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/AlignArray:
+  Exclude:
+    - 'lib/fcrepo_wrapper/configuration.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ColonMethodCall:
+  Exclude:
+    - 'spec/lib/fcrepo_wrapper_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'exe/fcrepo_wrapper'
+
+# Offense count: 6
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/fcrepo_wrapper.rb'
+    - 'lib/fcrepo_wrapper/configuration.rb'
+    - 'lib/fcrepo_wrapper/downloader.rb'
+    - 'lib/fcrepo_wrapper/instance.rb'
+    - 'lib/fcrepo_wrapper/md5.rb'
+    - 'lib/fcrepo_wrapper/rake_task.rb'
+
+# Offense count: 2
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/fcrepo_wrapper/configuration.rb'
+    - 'lib/fcrepo_wrapper/instance.rb'
+
+# Offense count: 2
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/fcrepo_wrapper/instance.rb'
+    - 'lib/fcrepo_wrapper/md5.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/fcrepo_wrapper/downloader.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Style/IndentHash:
+  Exclude:
+    - 'exe/fcrepo_wrapper'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: normal, rails
+Style/IndentationConsistency:
+  Exclude:
+    - 'lib/fcrepo_wrapper/configuration.rb'
+    - 'lib/fcrepo_wrapper/md5.rb'
+    - 'lib/fcrepo_wrapper/settings.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Style/MultilineMethodCallIndentation:
+  Exclude:
+    - 'lib/fcrepo_wrapper/instance.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NegatedWhile:
+  Exclude:
+    - 'lib/fcrepo_wrapper/instance.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantException:
+  Exclude:
+    - 'lib/fcrepo_wrapper/instance.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Exclude:
+    - 'lib/fcrepo_wrapper/rake_task.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpaceAroundKeyword:
+  Exclude:
+    - 'lib/fcrepo_wrapper/downloader.rb'
+
+# Offense count: 68
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'exe/fcrepo_wrapper'
+    - 'lib/fcrepo_wrapper/configuration.rb'
+    - 'lib/fcrepo_wrapper/downloader.rb'
+    - 'lib/fcrepo_wrapper/instance.rb'
+    - 'lib/fcrepo_wrapper/md5.rb'
+    - 'lib/fcrepo_wrapper/rake_task.rb'
+    - 'lib/fcrepo_wrapper/tasks/fcrepo_wrapper.rake'
+    - 'spec/lib/fcrepo_wrapper/configuration_spec.rb'
+    - 'spec/lib/fcrepo_wrapper/instance_spec.rb'
+    - 'spec/lib/fcrepo_wrapper/md5_spec.rb'
+    - 'spec/lib/fcrepo_wrapper_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
+Style/TrailingBlankLines:
+  Exclude:
+    - 'lib/fcrepo_wrapper/downloader.rb'
+    - 'lib/fcrepo_wrapper/md5.rb'
+    - 'lib/fcrepo_wrapper/settings.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Exclude:
+    - 'exe/fcrepo_wrapper'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/TrailingWhitespace:
+  Exclude:
+    - 'spec/lib/fcrepo_wrapper/instance_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Exclude:
+    - 'lib/fcrepo_wrapper/instance.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/WhileUntilModifier:
+  Exclude:
+    - 'exe/fcrepo_wrapper'
+    - 'lib/fcrepo_wrapper/instance.rb'

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.0
-  - jruby
-cache:
-  directories:
-  - /tmp/solr-5.1.0
+  - 2.3.1
+  - jruby-9.1.2.0
+
+jdk:
+- oraclejdk8

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 

data/exe/fcrepo_wrapper

@@ -64,7 +64,10 @@ subcommands = {
 begin
   args.order!
   command = ARGV.shift
-  subcommands[command].order! if command
+  if command
+    raise "Bad subcommand: #{command}" unless subcommands[command]
+    subcommands[command].order!
+  end
   args.parse!
 rescue => error
   $stderr.puts "ERROR: #{error}\n"
@@ -72,9 +75,6 @@ rescue => error
   exit 1
 end
 
-# default to verbose
-options[:verbose] = true if options[:verbose].nil?
-
 instance = FcrepoWrapper.default_instance(options)
 
 if command == 'clean'
@@ -91,6 +91,8 @@ instance.wrap do |conn|
       sleep 1
     end
   rescue Interrupt
+    Signal.trap("SIGTERM") { "IGNORE" }
+    Signal.trap("SIGINT") { "IGNORE" }
     $stderr.puts "Fedora is shutting down."
   end
 end

data/fcrepo_wrapper.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "simple_solr_client"
   spec.add_development_dependency "coveralls"
 end

data/lib/fcrepo_wrapper.rb

@@ -7,7 +7,7 @@ require 'fcrepo_wrapper/instance'
 
 module FcrepoWrapper
   def self.default_fcrepo_version
-    '4.5.1'
+    '4.6.0'
   end
 
   def self.default_fcrepo_port

data/lib/fcrepo_wrapper/configuration.rb

@@ -6,8 +6,9 @@ module FcrepoWrapper
   class Configuration
     attr_reader :options
     def initialize(options)
-      @options = read_config(options[:config], options[:verbose])
-                   .merge options
+      @config = options[:config]
+      @verbose = options[:verbose]
+      @options = load_configs(Array(options[:config])).merge(options)
     end
 
     def instance_dir
@@ -63,7 +64,7 @@ module FcrepoWrapper
     end
 
     def verbose?
-      !!options.fetch(:verbose, false)
+      @verbose || (options && !!options.fetch(:verbose, false))
     end
 
     def managed?
@@ -114,28 +115,34 @@ module FcrepoWrapper
 
     private
 
-      def read_config(config_file, verbose)
-        default_configuration_paths.each do |p|
+      def load_configs(config_files)
+        config = {}
+
+        (default_configuration_paths + config_files.compact).each do |p|
           path = File.expand_path(p)
-          config_file ||= path if File.exist? path
+          next unless File.exist? path
+          config.merge!(read_config(path))
         end
 
-        unless config_file
-          $stdout.puts "No config specified" if verbose
-          return {}
-        end
+        config
+      end
 
-        $stdout.puts "Loading configuration from #{config_file}" if verbose
+      def read_config(config_file)
+        $stdout.puts "Loading configuration from #{config_file}" if verbose?
         config = YAML.load(ERB.new(IO.read(config_file)).result(binding))
         unless config
-          $stderr.puts "Unable to parse config #{config_file}" if verbose
+          $stderr.puts "Unable to parse config #{config_file}" if verbose?
           return {}
         end
-        config.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+        convert_keys(config)
+      end
+
+      def convert_keys(hash)
+        hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
       end
 
       def default_configuration_paths
-        ['.fcrepo_wrapper', '~/.fcrepo_wrapper']
+        ['~/.fcrepo_wrapper.yml', '~/.fcrepo_wrapper', '.fcrepo_wrapper.yml', '.fcrepo_wrapper']
       end
 
       def default_download_dir

data/lib/fcrepo_wrapper/version.rb

@@ -1,3 +1,3 @@
 module FcrepoWrapper
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/spec/fixtures/another_sample_config.yml

@@ -0,0 +1,2 @@
+port: 9998
+verbose: true

data/spec/lib/fcrepo_wrapper/configuration_spec.rb

@@ -40,7 +40,25 @@ describe FcrepoWrapper::Configuration do
     it "doesn't cast numerics to strings" do
       expect(config.port).to eq 9999
     end
+  end
 
+  describe "#load_configs" do
+    before do
+      allow(config).to receive(:default_configuration_paths).and_return([])
+    end
+    context 'with a single config file' do
+      let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
+      it "uses values from the config file" do
+        expect(config.port).to eq 9999
+      end
+    end
+    context 'with multiple config files' do
+      let(:options) { { config: ['spec/fixtures/sample_config.yml', 'spec/fixtures/another_sample_config.yml'] } }
+      it "uses values from the config file" do
+        expect(config.port).to eq 9998
+        expect(config.verbose?).to eq true
+      end
+    end
   end
 
   describe "#validate" do

data/spec/lib/fcrepo_wrapper/instance_spec.rb

@@ -29,8 +29,8 @@ describe FcrepoWrapper::Instance do
   end
 
   describe "#instance_dir" do
-    subject { File.exists?(wrapper.instance_dir) }
-    it { is_expected.to be true }
+    subject { wrapper.instance_dir }
+    it { is_expected.to start_with Dir.tmpdir }
   end
 
   describe "#options" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_solr_client
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +118,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_hound.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
@@ -124,6 +137,7 @@ files:
 - lib/fcrepo_wrapper/settings.rb
 - lib/fcrepo_wrapper/tasks/fcrepo_wrapper.rake
 - lib/fcrepo_wrapper/version.rb
+- spec/fixtures/another_sample_config.yml
 - spec/fixtures/sample_config.yml
 - spec/lib/fcrepo_wrapper/configuration_spec.rb
 - spec/lib/fcrepo_wrapper/instance_spec.rb
@@ -150,11 +164,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper
 test_files:
+- spec/fixtures/another_sample_config.yml
 - spec/fixtures/sample_config.yml
 - spec/lib/fcrepo_wrapper/configuration_spec.rb
 - spec/lib/fcrepo_wrapper/instance_spec.rb