hydra-head 3.1.0.pre4 → 3.1.0.pre5

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.0.pre4"
+  VERSION = "3.1.0.pre5"
 end
 

data/lib/hydra.rb

@@ -10,7 +10,6 @@ require 'mediashelf/active_fedora_helper'
 
 require 'hydra/repository_controller'
 require 'hydra/access_controls_enforcement'
-require 'hydra/testing_server'
 require 'hydra/assets_controller_helper'
 require 'hydra/file_assets_helper'
 

data/lib/railties/hydra_jetty.rake

@@ -18,8 +18,8 @@ namespace :hydra do
     desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
     task :config_solr do
       FileList['solr_conf/conf/*'].each do |f|  
-        cp("#{f}", 'jetty/solr/development-core/config/', :verbose => true)
-        cp("#{f}", 'jetty/solr/test-core/config/', :verbose => true)
+        cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
+        cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
       end
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1923832017
+  hash: 1923832019
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 4
-  version: 3.1.0.pre4
+  - 5
+  version: 3.1.0.pre5
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -984,7 +984,6 @@ files:
 - lib/hydra/rights_metadata.rb
 - lib/hydra/submission_workflow.rb
 - lib/hydra/superuser_attributes.rb
-- lib/hydra/testing_server.rb
 - lib/hydra/user.rb
 - lib/jetty_cleaner.rb
 - lib/marc_mapper.rb
@@ -1127,7 +1126,6 @@ files:
 - test_support/spec/support/matchers/solr_matchers.rb
 - test_support/spec/unit/hydra-head-engine_spec.rb
 - test_support/spec/unit/hydra-head_spec.rb
-- test_support/spec/utilities/hydra_testing_server_spec.rb
 - test_support/spec/views/uploader.html.erb_spec.rb
 - tmp/.placeholder
 - uninstall.rb

data/lib/hydra/testing_server.rb

@@ -1,183 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-module Hydra 
-# A singleton class for starting/stopping a Jetty server for testing purposes
-# The behavior of TestSolrServer can be modified prior to start() by changing 
-# port, solr_home, and quiet properties.
-#
-# This class is based on Blacklight's TestSolrServer
-class TestingServer
-  require 'singleton'
-  include Singleton
-  require 'win32/process' if RUBY_PLATFORM =~ /mswin32/
-  attr_accessor :port, :jetty_home, :solr_home, :quiet, :fedora_home, :base_path
-
-  # configure the singleton with some defaults
-  def initialize(params = {})
-    @pid = nil
-    if defined?(Rails.root)
-      @base_path = Rails.root
-    else
-      @base_path = "."
-    end
-  end
-
-  class << self
-    def configure(params = {})
-      hydra_server = self.instance
-      hydra_server.quiet = params[:quiet].nil? ? true : params[:quiet]
-      if defined?(Rails.root)
-        base_path = Rails.root
-      else
-        base_path = "."
-      end
-      hydra_server.jetty_home = params[:jetty_home] || File.expand_path(File.join(base_path, 'jetty'))
-      hydra_server.solr_home = params[:solr_home]  || File.join( hydra_server.jetty_home, "solr")
-      hydra_server.fedora_home = params[:fedora_home] || File.join( hydra_server.jetty_home, "fedora","default")
-      hydra_server.port = params[:jetty_port] || 8888
-      return hydra_server
-    end
-    
-    def wrap(params = {})
-      error = false
-      hydra_server = self.configure(params)
-      begin
-        puts "starting Hydra jetty server on #{RUBY_PLATFORM}"
-        hydra_server.start
-        sleep params[:startup_wait] || 5
-        yield
-      rescue
-        error = true
-      ensure
-        puts "stopping Hydra jetty server"
-        hydra_server.stop
-      end
-
-      return error
-    end
-  end
-
-  def jetty_command
-    "java -Djetty.port=#{@port} -Dsolr.solr.home=#{@solr_home} -Dfedora.home=#{@fedora_home} -jar start.jar"
-  end
- 
-  def start
-    puts "jetty_home: #{@jetty_home}"
-    puts "solr_home: #{@solr_home}"
-    puts "fedora_home: #{@fedora_home}"
-    puts "jetty_command: #{jetty_command}"
-    if pid
-      begin
-        Process.kill(0,pid)
-        raise("Server is already running with PID #{pid}")
-      rescue Errno::ESRCH
-        STDERR.puts("Removing stale PID file at #{pid_path}")
-        File.delete(pid_path)
-      end
-    end
-    Dir.chdir(@jetty_home) do
-      self.send "#{platform}_process".to_sym
-    end
-    mkpath(pid_dir) unless File.directory?(pid_dir)
-    begin
-      f = File.new(pid_path,  "w")
-    rescue Errno::ENOENT, Errno::EACCES
-      f = File.new(File.join(@base_path,'tmp',pid_file),"w")
-    end
-    f.puts "#{@pid}"
-    f.close
-  end
-  
-  def stop
-    puts "stopping"
-    if pid
-      begin
-        self.send "#{platform}_stop".to_sym
-      rescue Errno::ESRCH
-        STDERR.puts("Removing stale PID file at #{pid_path}")
-      end
-      FileUtils.rm(pid_path)
-    end
-  end
-  
-  def win_process
-    @pid = Process.create(
-          :app_name         => jetty_command,
-          :creation_flags   => Process::DETACHED_PROCESS,
-          :process_inherit  => false,
-          :thread_inherit   => true,
-          :cwd              => "#{@jetty_home}"
-       ).process_id
-  end
-
-  def platform
-    case RUBY_PLATFORM
-    when /mswin32/
-      return 'win'
-    else
-      return 'nix'
-    end
-  end
-
-  def nix_process
-    @pid = fork do
-      STDERR.close if @quiet
-      exec jetty_command
-    end
-  end
-
-  # stop a running solr server
-  def win_stop
-    Process.kill(1, @pid)
-  end
-
-  def nix_stop
-    Process.kill('TERM',pid)
-  end
-
-  def pid_path
-    File.join(pid_dir, pid_file)
-  end
-
-  def pid_file
-    @pid_file || 'hydra-jetty.pid'
-  end
-
-  def pid_dir
-    File.expand_path(@pid_dir || File.join(@base_path,'tmp','pids'))
-  end
-
-  def pid
-    @pid || File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
-  end
-
-end # class TestingServer
-end # module Hydra
-
-# 
-# puts "hello"
-# SOLR_PARAMS = {
-#   :quiet => ENV['SOLR_CONSOLE'] ? false : true,
-#   :jetty_home => ENV['SOLR_JETTY_HOME'] || File.expand_path('../../jetty'),
-#   :jetty_port => ENV['SOLR_JETTY_PORT'] || 8888,
-#   :solr_home => ENV['SOLR_HOME'] || File.expand_path('test')
-# }
-# 
-# # wrap functional tests with a test-specific Solr server
-# got_error = TestSolrServer.wrap(SOLR_PARAMS) do
-#   puts `ps aux | grep start.jar` 
-# end
-# 
-# raise "test failures" if got_error
-# 

data/test_support/spec/utilities/hydra_testing_server_spec.rb

@@ -1,49 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-# require File.expand_path(File.dirname(__FILE__) + '/../../lib/hydra/hydra_testing_server.rb')
-
-describe Hydra::TestingServer do
-  
-  it "should be configurable with params hash" do
-    jetty_params = {
-      :quiet => false,
-      :jetty_home => "/path/to/jetty",
-      :jetty_port => 8888,
-      :solr_home => '/path/to/solr',
-      :fedora_home => '/path/to/fedora'
-    }
-    
-    ts = Hydra::TestingServer.configure(jetty_params) 
-    ts.quiet.should == false
-    ts.jetty_home.should == "/path/to/jetty"
-    ts.port.should == 8888
-    ts.solr_home.should == '/path/to/solr'
-    ts.fedora_home.should == '/path/to/fedora'
-  end
-  
-  it "should be configurable with default values" do
-    ts = Hydra::TestingServer.configure 
-    ts.quiet.should == true
-    ts.jetty_home.should == File.join(::Rails.root.to_s, "jetty")
-    ts.port.should == 8888
-    ts.solr_home.should == File.join(ts.jetty_home, "solr" )
-    ts.fedora_home.should == File.join(ts.jetty_home, "fedora","default")
-  end
-  
-  it "should override nil params with defaults" do
-    jetty_params = {
-      :quiet => false,
-      :jetty_home => nil,
-      :jetty_port => 8888,
-      :solr_home => '/path/to/solr',
-      :fedora_home => nil
-    }
-    
-    ts = Hydra::TestingServer.configure(jetty_params) 
-    ts.quiet.should == false
-    ts.jetty_home.should == File.join(::Rails.root.to_s, "jetty")
-    ts.port.should == 8888
-    ts.solr_home.should == "/path/to/solr"
-    ts.fedora_home.should == File.join(ts.jetty_home, "fedora","default")
-  end
-  
-end