Replace jetty generator with jettywrapper

blacklight.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "bootstrap-sass", "~> 3.0"
   s.add_dependency "deprecation"
 
-  s.add_development_dependency "jettywrapper", ">= 1.5.2"
+  s.add_development_dependency "jettywrapper", ">= 1.7.0"
   s.add_development_dependency "blacklight-marc", "~> 5.0"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"

lib/generators/blacklight/install_generator.rb

@@ -3,9 +3,10 @@ class Install < Rails::Generators::Base
 
     source_root File.expand_path('../templates', __FILE__)
 
-    argument     :model_name, :type => :string , :default => "user"
-    class_option :devise    , :type => :boolean, :default => false, :aliases => "-d", :desc => "Use Devise as authentication logic."
-    class_option :marc      , :type => :boolean, :default => false, :aliases => "-m", :desc => "Generate MARC-based demo ."
+    argument     :model_name  , type: :string , default: "user"
+    class_option :devise      , type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
+    class_option :jettywrapper, type: :boolean, default: false, aliases: "-d", desc: "Use jettywrapper to download and control Jetty"
+    class_option :marc        , type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo ."
 
     desc """
   This generator makes the following changes to your application:
@@ -19,6 +20,14 @@ class Install < Rails::Generators::Base
   Thank you for Installing Blacklight.
          """ 
 
+    def install_jettywrapper
+      return unless options[:jettywrapper]
+      gem "jettywrapper", "~> 1.7"
+      append_to_file "Rakefile", 
+        "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.6.0.zip\"\n" +
+        "require 'jettywrapper'\n"
+    end
+
     def bundle_install
       Bundler.with_clean_env do
         run "bundle install"
@@ -93,4 +102,4 @@ def inject_blacklight_i18n_strings
       copy_file "blacklight.en.yml", "config/locales/blacklight.en.yml"
     end
   end
-end
+end

spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -23,7 +23,7 @@ def run_blacklight_generator
       run "bundle install"
     end
 
-    generate 'blacklight:install', '--devise --marc'
+    generate 'blacklight:install', '--devise --marc --jettywrapper'
   end
 
   def run_test_support_generator

template.demo.rb

@@ -1,20 +1,12 @@
 gem "blacklight"
 
-# add jettywrapper
-gem 'jettywrapper', ">= 1.5.2"
-prepend_to_file "Rakefile", <<-EOF
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.6.0.zip"
-
-require 'jettywrapper'
-EOF
-
 # copy the blacklight jetty.yml into their app
 create_file "config/jetty.yml", File.read(File.expand_path('../config/jetty.yml', __FILE__))
 
 run "bundle install"
 
 # run the blacklight install generator
-generate 'blacklight:install', '--devise --marc'
+generate 'blacklight:install', '--devise --marc --jettywrapper'
 
 # run the database migrations
 rake "db:migrate"
@@ -28,4 +20,4 @@
 jetty_params = Jettywrapper.load_config('development')
 Jettywrapper.wrap(jetty_params) do
   rake "blacklight:solr:seed"
-end
+end