solrizer-fedora 2.0.0.rc1 → 2.0.0.rc2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    solrizer-fedora (2.0.0.rc1)
-      active-fedora (= 4.0.0.rc15)
+    solrizer-fedora (2.0.0.rc2)
+      active-fedora (~> 4.0.0.rc15)
       fastercsv
 
 GEM

data/History.textile

@@ -1,5 +1,5 @@
 h2. 2.0.0
-Requiring active-fedora >= 3.3.3
+Requiring active-fedora >= 4.0.0 
 Supports sharding.
 Removed dependency on ruby-solr
 

data/Rakefile

@@ -1,49 +1,7 @@
-# require 'rubygems'
-# require 'rake'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-
 # load rake tasks in lib/tasks
 Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  # spec.libs << 'lib' << 'spec'
-  # spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.pattern = 'spec/**/*_spec.rb'
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-#  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-# task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "solrizer #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end

data/lib/solrizer/fedora.rb

@@ -12,3 +12,6 @@ end
 Dir[File.join(File.dirname(__FILE__),"fedora","*.rb")].each {|file| require file }
 
 Solrizer::Extractor.send(:include, Solrizer::Fedora::Extractor)
+
+load File.join(File.dirname(__FILE__),"../tasks/solrizer-fedora.rake") if defined?(Rake)
+

data/lib/solrizer/fedora/version.rb

@@ -1,5 +1,5 @@
 module Solrizer
   module Fedora
-    VERSION = "2.0.0.rc1"
+    VERSION = "2.0.0.rc2"
   end
 end

data/lib/tasks/solrizer-fedora-dev.rake

@@ -0,0 +1,84 @@
+require 'jettywrapper'
+require 'rspec/core/rake_task'
+
+APP_ROOT = File.expand_path("../..",File.dirname(__FILE__))
+desc "Task to execute builds on a Hudson Continuous Integration Server."
+task :hudson do
+  if (ENV['RAILS_ENV'] == "test")  
+    require "jettywrapper"
+    jetty_params = { 
+      :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'), 
+      :quiet => false, 
+      :jetty_port => 8983, 
+      :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr/test-core'),
+      :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/fedora/default'),
+      :startup_wait => 25
+    }
+    error = Jettywrapper.wrap(jetty_params) do
+      Rake::Task["doc"].invoke
+      Rake::Task["solrizer:fedora:rspec"].invoke
+    end
+    raise "test failures: #{error}" if error
+  else
+    system("rake hudson RAILS_ENV=test")
+  end
+end
+
+# Use yard to build docs
+begin
+  require 'yard'
+  require 'yard/rake/yardoc_task'
+  project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
+  doc_destination = File.join(project_root, 'doc')
+
+  YARD::Rake::YardocTask.new(:doc) do |yt|
+    yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
+                 [ File.join(project_root, 'README.textile') ]
+    yt.options = ['--output-dir', doc_destination, '--readme', 'README.textile']
+  end
+rescue LoadError
+  desc "Generate YARD Documentation"
+  task :doc do
+    abort "Please install the YARD gem to generate rdoc."
+  end
+end
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  # spec.libs << 'lib' << 'spec'
+  # spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+#  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+# task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "solrizer #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+

data/lib/tasks/solrizer-fedora.rake

@@ -1,46 +1,3 @@
-require 'jettywrapper'
-APP_ROOT = File.expand_path("../..",File.dirname(__FILE__))
-desc "Task to execute builds on a Hudson Continuous Integration Server."
-task :hudson do
-  if (ENV['RAILS_ENV'] == "test")  
-    require "jettywrapper"
-    jetty_params = { 
-      :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'), 
-      :quiet => false, 
-      :jetty_port => 8983, 
-      :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr/test-core'),
-      :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/fedora/default'),
-      :startup_wait => 25
-    }
-    error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task["doc"].invoke
-      Rake::Task["solrizer:fedora:rspec"].invoke
-    end
-    raise "test failures: #{error}" if error
-  else
-    system("rake hudson RAILS_ENV=test")
-  end
-end
-
-# Use yard to build docs
-begin
-  require 'yard'
-  require 'yard/rake/yardoc_task'
-  project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
-  doc_destination = File.join(project_root, 'doc')
-
-  YARD::Rake::YardocTask.new(:doc) do |yt|
-    yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
-                 [ File.join(project_root, 'README.textile') ]
-    yt.options = ['--output-dir', doc_destination, '--readme', 'README.textile']
-  end
-rescue LoadError
-  desc "Generate YARD Documentation"
-  task :doc do
-    abort "Please install the YARD gem to generate rdoc."
-  end
-end
-
 namespace :solrizer do
   
   namespace :fedora  do
@@ -65,24 +22,12 @@ namespace :solrizer do
       end
     
       puts "Re-indexing Fedora Repository."
-      puts "Fedora URL: #{ActiveFedora.fedora_config[:url]}"
+      puts "Fedora URL: #{ActiveFedora.config.credentials[:url]}"
       puts "Fedora Solr URL: #{ActiveFedora.solr_config[:url]}"
-      puts "Blacklight Solr Config: #{Blacklight.solr_config.inspect}"
       puts "Doing full text index." if index_full_text
       solrizer = Solrizer::Fedora::Solrizer.new :index_full_text=> index_full_text
       solrizer.solrize_objects
       puts "Solrizer task complete."
     end  
-    
-    RSpec::Core::RakeTask.new(:rspec) do |t|
-      t.pattern = 'spec/**/*_spec.rb'
-      #t.spec_files = FileList['spec/**/*_spec.rb']
-      t.rcov = true
-      t.rcov_opts = lambda do
-        IO.readlines("spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-      end
-    end
-    
   end
-  
 end

data/solrizer-fedora.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "solrizer-fedora"
 
-  s.add_dependency('active-fedora', '4.0.0.rc15')#,'>=3.4.0') 
+  s.add_dependency('active-fedora', '~> 4.0.0.rc15') 
   # s.add_dependency('rsolr', '>=1.0.6') 
   # s.add_dependency('solrizer', '>=1.0.0')
   s.add_dependency('fastercsv') # this is used by solrize_objects when you pass it a csv file of pids

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424087
+  hash: 15424081
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 1
-  version: 2.0.0.rc1
+  - 2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-19 00:00:00 Z
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: active-fedora
@@ -25,7 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15424139
         segments: 
@@ -111,6 +111,7 @@ files:
 - lib/solrizer/fedora/repository.rb
 - lib/solrizer/fedora/solrizer.rb
 - lib/solrizer/fedora/version.rb
+- lib/tasks/solrizer-fedora-dev.rake
 - lib/tasks/solrizer-fedora.rake
 - solrizer-fedora.gemspec
 - spec/fixtures/rels_ext_cmodel.xml