hydra-tutorial 0.0.9 → 0.1.0

data/hydra-tutorial.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "hydra-tutorial"
-  s.version = "0.0.9"
+  s.version = "0.1.0"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Chris Beer"]
   s.email = ["hydra-tech@googlegroups.com"]

data/open-repositories-tutorial.thor

@@ -581,7 +581,7 @@ class HydraOpenRepositoriesTutorialApp < Thor::Group
         gem 'hydra-head', :git => "git://github.com/projecthydra/hydra-head.git"
       else
         gem 'blacklight'
-        gem 'hydra-head'
+        gem 'hydra-head', ">= 4.1.1"
       end
       gem 'devise'
 
@@ -646,6 +646,11 @@ class HydraOpenRepositoriesTutorialApp < Thor::Group
         "
       end
 
+      insert_into_file "app/models/solr_document.rb", :after => "include Blacklight::Solr::Document\n" do
+        "
+  include Hydra::Solr::Document
+        "
+      end
       insert_into_file "app/assets/javascripts/application.js", :after => "//= require_tree .\n" do
         "Blacklight.do_search_context_behavior = function() { }\n"
       end
@@ -726,14 +731,22 @@ class HydraOpenRepositoriesTutorialApp < Thor::Group
 
     def an_integration_test
       copy_file 'integration_spec.rb', 'spec/integration/integration_spec.rb'
-
     end
 
     def run_tests_x3
+      say %Q{
+      Now that the integration spec is in place, when we try to run rspec,
+      we'll get a test failure because it can't connect to Fedora.
+      }, STATEMENT
       run 'rspec'
     end
 
     def add_jettywrapper_ci_task
+      say %Q{
+      Instead, we need to add a new Rake task that knows how to wrap the 
+      test suite --  start jetty before running the tests and stop jetty
+      at the end. We can use a feature provided by jettywrapper to do this.
+      }
       copy_file 'ci.rake', 'lib/tasks/ci.rake'
     end
 
@@ -743,6 +756,44 @@ class HydraOpenRepositoriesTutorialApp < Thor::Group
       rake 'jetty:start'
     end
 
+    def add_coverage_stats
+      say %Q{
+      Now that we have tests, we also want to have some coverage statistics.
+      }, STATEMENT
+
+      gem_group :development, :test do
+        gem 'simplecov'
+      end
+
+      run 'bundle install'
+
+      copy_file 'ci_with_coverage.rake', 'lib/tasks/ci.rake'
+      insert_into_file "spec/spec_helper.rb", :after => "ENV[\"RAILS_ENV\"] ||= 'test'\n"do
+        %Q{
+if ENV['COVERAGE'] == "true"
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "config/"
+    add_filter "spec/"
+  end
+end
+        }
+      end
+    end
+
+    def run_ci_task_again
+      rake 'jetty:stop'
+      rake 'ci'
+      rake 'jetty:start'
+    end
+
+    def coverage_prompt
+      say %Q{
+      Go take a look at the coverage report, open the file ./coverage/index.html
+      in your browser.
+      }
+      continue_prompt
+    end
   end
 
   class SprinkeSomeStyling < Thor::Group

data/or_templates/add_tests/ci_with_coverage.rake

@@ -0,0 +1,22 @@
+desc "Run Continuous Integration Suite (tests, coverage, docs)" 
+task :ci do 
+  Rake::Task["hydra:jetty:config"].invoke
+
+  require 'jettywrapper'
+  jetty_params = Jettywrapper.load_config.merge({
+    :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'),
+    :jetty_port => 8983,
+    :startup_wait => 25
+  })
+  
+  Jettywrapper.wrap(jetty_params) do
+    Rails.env = "test"
+    ENV['COVERAGE'] ||= 'true'
+    Rake::Task['rspec'].invoke
+  end
+end
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  spec.rspec_opts = ["-c", "-r ./spec/spec_helper.rb"]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-tutorial
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -76,6 +76,7 @@ files:
 - open-repositories-tutorial.thor
 - or_templates/add_file_upload/_form.html.erb
 - or_templates/add_tests/ci.rake
+- or_templates/add_tests/ci_with_coverage.rake
 - or_templates/add_tests/integration_spec.rb
 - or_templates/add_tests/records_controller_spec.rb
 - or_templates/adding_our_models/basic_af_model.rb
@@ -112,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2344410728046652505
+      hash: -1899556533464413574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2344410728046652505
+      hash: -1899556533464413574
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24