jettywrapper 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd615b5894ae53105f6abfebb4631fb96d99530e
-  data.tar.gz: 67aa692a2180259b925218c854701a6077200e92
+  metadata.gz: 41090c9b128c286ef7693a2cea00c70de5896f1d
+  data.tar.gz: 869ac3689c8c830a01a3f3a6582f75010c3a3848
 SHA512:
-  metadata.gz: c1689a3e0d63505018f1824196872b179a83110adf2bb328e5e439d48f3eb60d3b9d7103fe876acd1e7ea53e3fb128160695111a7dae46a2ef641a42f59d4566
-  data.tar.gz: 65aa972099f95f6afb84101f425b7b1d0c1554f0b94687623e5616f1668f887b551f9f6cf41a4b22c77ee4af1693d8197a26cac6a75569e174510d5313715c06
+  metadata.gz: 88128ee21fe30aadce3a2b8ec72bda31879c98aca9e298a9ae520e42edfd8daf9256f4faf52e5bb3e771c8f214592acfb5410c1ce79b0dc5cc4b7a5fb0d2273c
+  data.tar.gz: 3123a2564cbd8e24f2650b74bf47517b048fe2a259159732c1fc210482ac52fdd1151975d10e52d9a65ec5ecb93752f18787ffd1f8686b7266789aacb2b34dce

data/README.md

@@ -0,0 +1,70 @@
+# Jettywrapper [![Version](https://badge.fury.io/gh/projecthydra%2Fjettywrapper.png)](http://badge.fury.io/gh/projecthydra%2Fjettywrapper) [![Build Status](https://travis-ci.org/projecthydra/jettywrapper.png?branch=master)](https://travis-ci.org/projecthydra/jettywrapper)
+
+This gem is designed to make it easier to integrate a jetty servlet container into a rails project.  
+Jettywrapper provides rake tasks for starting and stopping jetty, as well as the method `Jettywrapper.wrap` that will start
+the server before the block and stop the server after the block, which is useful for automated testing.
+
+By default, Jettywrapper is designed to work with Rails projects that use the Hydra gem, and downloads an instance of a 
+[hydra-jetty](https://github.com/projecthydra/hydra-jetty) project zipfile. However, it can be configured to 
+download any Jetty-based project on Github.
+
+Jettywrapper supports
+
+* ruby 2.0.0
+* ruby 1.9.3 
+* ruby 1.8.7 
+* ree  1.8.7
+* jruby 1.6.6+
+
+## Configuring Jettywrapper
+
+Jettywrapper starts the process with a list of options that you can specify in `config/jetty.yml`, otherwise a default is used.
+You can provide a per-environment configuration, or you can have a default configuration which will be used when a per-environment
+configuration is not specified. Such a configuration might look like:
+
+    default:
+      jetty_port: 8983
+      java_opts:
+        - "-XX:MaxPermSize=128m"
+        - "-Xmx256m"
+
+You can also configure a specific version of hydra-jetty. This is placed in your codebase, usually in a rake task 
+
+    Jettywrapper.hydra_jetty_version = "v1.2.3"
+
+Alternatively, you can use a completely different Jetty-based repository, Hydra-related or not
+
+    Jettywrapper.url = "https://github.com/myorg/my-jetty/archive/master.zip"
+
+The name of the zip file can either be a branch name, such as master or develop, or the tag name of a released version.
+Basically, any url that Github provides as a *.zip file will work.
+
+## Example rake task
+
+```ruby
+require 'jettywrapper'
+Jettywrapper.url = "https://github.com/myorg/my-jetty/archive/testing-feature-branch.zip"
+desc "Hudson build"
+task :hudson do
+  jetty_params = Jettywrapper.load_config.merge({:jetty_home => File.expand_path(File.dirname(__FILE__) + '/../jetty')})
+  error = Jettywrapper.wrap(jetty_params) do  
+    Rake::Task["spec"].invoke
+  end
+  raise "test failures: #{error}" if error
+end
+```
+
+## Testing the gem 
+
+If you haven't already, clone the git repository
+
+    git clone git@github.com:projecthydra/jettywrapper.git
+    cd jettywrapper
+
+Install the gems
+
+    bundle install
+
+Run the tests
+
+    rake 

data/lib/jettywrapper.rb

@@ -42,7 +42,7 @@ class Jettywrapper
     attr_writer :hydra_jetty_version, :url, :tmp_dir, :jetty_dir, :env
 
     def hydra_jetty_version
-      @hydra_jetty_version ||= 'v8.1.1'
+      @hydra_jetty_version ||= 'master'
     end
 
     def url

data/lib/jettywrapper/version.rb

@@ -1,3 +1,3 @@
 class Jettywrapper
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/lib/jettywrapper_spec.rb

@@ -21,13 +21,13 @@ require 'fileutils'
 
     before do
       Jettywrapper.reset_config
-      FileUtils.rm "tmp/v8.1.1.zip", force: true
+      FileUtils.rm "tmp/master.zip", force: true
     end
 
     context "downloading" do
       context "with default file" do
         it "should download the zip file" do
-          expect(Jettywrapper).to receive(:open).with('https://github.com/projecthydra/hydra-jetty/archive/v8.1.1.zip').and_return(system ('true'))
+          expect(Jettywrapper).to receive(:open).with('https://github.com/projecthydra/hydra-jetty/archive/master.zip').and_return(system ('true'))
           Jettywrapper.download
         end
       end
@@ -56,7 +56,7 @@ require 'fileutils'
         it "should download the zip file" do
           expect(File).to receive(:exists?).and_return(true)
           expect(Jettywrapper).to receive(:expanded_zip_dir).and_return('tmp/jetty_generator/interal_dir')
-          expect(Zip::File).to receive(:open).with('tmp/v8.1.1.zip').and_return(true)
+          expect(Zip::File).to receive(:open).with('tmp/master.zip').and_return(true)
           expect(FileUtils).to receive(:remove_dir).with('jetty',true).and_return(true)
           expect(FileUtils).to receive(:mv).with('tmp/jetty_generator/interal_dir','jetty').and_return(true)
           Jettywrapper.unzip
@@ -99,7 +99,7 @@ require 'fileutils'
         its(:url) {should == 'http://example.com/bar.zip'}
       end
       context "when url is not set" do
-        its(:url) {should == 'https://github.com/projecthydra/hydra-jetty/archive/v8.1.1.zip'}
+        its(:url) {should == 'https://github.com/projecthydra/hydra-jetty/archive/master.zip'}
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -154,7 +154,7 @@ files:
 - Gemfile
 - History.txt
 - LICENSE
-- README.textile
+- README.md
 - Rakefile
 - TODO.txt
 - config/jetty.yml
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Convenience tasks for working with jetty from within a ruby project.

data/README.textile

@@ -1,64 +0,0 @@
-h1. jettywrapper
-
-!https://travis-ci.org/projecthydra/jettywrapper.png?branch=master!:https://travis-ci.org/projecthydra/jettywrapper
-
-This gem is designed to make it easier to integrate a jetty servlet container into a rails project.  
-Jettywrapper provides rake tasks for starting and stopping jetty, as well as a method (Jettywrapper.wrap) that will start the server before the block and stop the server after the block, which is useful for automated testing.
-
-jettywrapper supports 
-  ruby 2.0.0
-  ruby 1.9.3 
-  ruby 1.8.7 
-  ree  1.8.7
-  jruby 1.6.6+
-
-h2. Configuring Jettywrapper
-
-Jettywrapper starts the process with a list of options that you can specify in config/jetty.yml (otherwise a default is used).  You can provide a per environment configuration, or you can have a default configuration which will be used when a per-environment configuration is not specified.
-
-<pre>default:
-  jetty_port: 8983
-  java_opts:
-    - "-XX:MaxPermSize=128m"
-    - "-Xmx256m"
-</pre>
-
-
-
-h2. Example rake task:
-
-bc.. require 'jettywrapper'
-desc "Hudson build"
-task :hudson do
-  jetty_params = Jettywrapper.load_config.merge({:jetty_home => File.expand_path(File.dirname(__FILE__) + '/../jetty')})
-  error = Jettywrapper.wrap(jetty_params) do  
-    Rake::Task["spec"].invoke
-  end
-  raise "test failures: #{error}" if error
-end
-
-h2. Testing the gem 
-
-If you haven't already, clone the git repository
-
-<pre>
-  git clone git@github.com:projecthydra/jettywrapper.git
-  cd jettywrapper
-</pre>
-
-
-Install the gems
-
-<pre>
-  bundle install
-</pre>
-
-Run the tests
-
-<pre>
-  rake 
-</pre>
-
-
-
-