solrmarc_wrapper 0.0.1 → 0.0.2

data/Rakefile

@@ -17,5 +17,6 @@ Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
 namespace :sm_wrap do
   task :default => :ci  
-  task :rspec => :rspec_core
+  task :rspec => :rspec_plain
+  task :spec => :rspec_plain
 end

data/lib/solrmarc_wrapper/version.rb

@@ -1,3 +1,3 @@
 class SolrmarcWrapper
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tasks/jetty.rake

@@ -4,7 +4,7 @@ namespace :sm_wrap do
   namespace :jetty do
     
     desc "Modify test jetty solr to be multicore"
-    task :config_ci => ['sm_wrap:solrmarc:setup_test_jetty'] do
+    task :config => ['sm_wrap:solrmarc:setup_test_jetty'] do
 
       # copy the solr.xml file for multi-core to test jetty solr
       jetty_solr_dir = "solrmarc/test/jetty/solr" 
@@ -32,7 +32,7 @@ namespace :sm_wrap do
     end
 
     desc "Copies the SOLR config files and starts up the test-jetty instance"
-    task :load_ci => [:config_ci, 'jetty:start']
+    task :load => [:config, 'jetty:start']
 
   end
 end

data/lib/tasks/solrmarc.rake

@@ -7,7 +7,7 @@ namespace :sm_wrap do
       ant '-f solrmarc/build.xml dist_site'
     end
     
-    desc "run ant target to set up testing jetty in solrmarc"
+    desc "run ant target to set up testing jetty per straight solrmarc"
     task :setup_test_jetty do
       ant '-f solrmarc/build.xml test_clean_site'
       ant '-f solrmarc/build.xml site_setup_test_jetty'

data/lib/tasks/spec.rake

@@ -3,7 +3,7 @@ require 'rspec/core/rake_task'
 namespace :sm_wrap do
 
   desc "Run all specs, with jetty instance running"
-  task :rspec_wrapped => ['sm_wrap:solrmarc:ant_dist_site', 'sm_wrap:jetty:config_ci'] do
+  task :rspec_wrapped => ['sm_wrap:solrmarc:ant_dist_site', 'sm_wrap:jetty:config'] do
     test_jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc/test/jetty')
     require 'jettywrapper'
     jetty_params = Jettywrapper.load_config.merge({
@@ -16,12 +16,12 @@ namespace :sm_wrap do
     error = Jettywrapper.wrap(jetty_params) do 
       `sh ./spec/scripts/curl_empty_test_solr.sh`
       `sh ./spec/scripts/curl_add_bare666_to_test.sh`
-      Rake::Task['sm_wrap:rspec_core'].invoke
+      Rake::Task['sm_wrap:rspec_plain'].invoke
     end
     raise "TEST FAILURES: #{error}" if error
   end
 
-  RSpec::Core::RakeTask.new(:rspec_core) do |spec|
+  RSpec::Core::RakeTask.new(:rspec_plain) do |spec|
     spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
   end
 

metadata

@@ -2,7 +2,7 @@
 name: solrmarc_wrapper
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naomi Dushay