jettywrapper 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5d0b9a04e3888b74d2ff224194e07561b8b585
-  data.tar.gz: 4ac859cff668c516cf5e09cb28901cecd8878c19
+  metadata.gz: 6643f2b0f438bad3aa59c4eb32e4e499dc0287cf
+  data.tar.gz: 1edd1684c627c4631646c21709bcd2ab231fdf16
 SHA512:
-  metadata.gz: 1b3e543901d470e3d5b101e468d23c86ca71eee5476d4bae0095673364fb7eeef886b77fe2ce8ec9ee1da1a1663008c24c0e13175309f15e5f9011699f18684d
-  data.tar.gz: bb2ebeac2b6ee3bbe48d31cc03f12742a0db629d7f0381c4db981266267efbe4dcab1daa6c9551849bbd1a65a2ea40b0a8c14a042b7c5b92b99b9713604b2860
+  metadata.gz: 2e23ce23bdd43c788090de4771a2db874233885835a6656900ebdd18e5abe9578102b39ab0519754fa1c110333cf77ef68e47987e6bb1f2ae577c6b9e3dc295b
+  data.tar.gz: 5a91eeabf34b9fb225c4618a68717ce0534c4363b226eaa59b5a3316c97c4c6c2708dc25a7b1316da0a8dd0c98acac47f7a2566b37e0a481015abd1c8fcde16f

data/CONTRIBUTING.md

@@ -0,0 +1,113 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/jettywrapper.gemspec

@@ -5,7 +5,7 @@ require 'bundler'
 
 Gem::Specification.new do |s|
   s.name        = "jettywrapper"
-  s.version     = GEMVERSION
+  s.version     = Jettywrapper::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chris Beer", "Justin Coyne", "Bess Sadler"]
   s.email       = ["hydra-tech@googlegroups.com"]

data/lib/jettywrapper.rb

@@ -44,7 +44,7 @@ class Jettywrapper
     end
 
     def url
-      @url ||= defined?(ZIP_URL) ? ZIP_URL : 'https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip'
+      @url ||= defined?(ZIP_URL) ? ZIP_URL : 'https://github.com/projecthydra/hydra-jetty/archive/v5.2.0.zip'
       @url
     end
 
@@ -69,7 +69,7 @@ class Jettywrapper
       logger.info "Downloading jetty at #{self.url} ..."
       FileUtils.mkdir tmp_dir unless File.exists? tmp_dir
       system "curl -L #{self.url} -o #{zip_file}"
-      abort "Unable to download jetty from #{url}" unless $?.success?
+      abort "Unable to download jetty from #{self.url}" unless $?.success?
     end
     
     def unzip
@@ -79,6 +79,10 @@ class Jettywrapper
       system "unzip -d #{tmp_save_dir} -qo #{zip_file}"
       abort "Unable to unzip #{zip_file} into tmp_save_dir/" unless $?.success?
 
+      # Remove the old jetty directory if it exists
+      system "rm -r #{jetty_dir}" if File.directory?(jetty_dir)
+
+      # Move the expanded zip file into the final destination.
       expanded_dir = expanded_zip_dir(tmp_save_dir)
       system "mv #{expanded_dir} #{jetty_dir}"
       abort "Unable to move #{expanded_dir} into #{jetty_dir}/" unless $?.success?
@@ -101,14 +105,9 @@ class Jettywrapper
 
     def app_root
       return @app_root if @app_root
-      if defined?(Rails.root)
-        @app_root = Rails.root
-      elsif defined?(APP_ROOT)
-        @app_root = APP_ROOT
-      else
-        @app_root = '.'
-      end
-      @app_root
+      @app_root = Rails.root if defined?(Rails.root)
+      @app_root ||= APP_ROOT if defined?(APP_ROOT)
+      @app_root ||= '.'
     end
     
     def load_config
@@ -159,14 +158,8 @@ class Jettywrapper
       jetty_server = self.instance
       jetty_server.reset_process!
       jetty_server.quiet = params[:quiet].nil? ? true : params[:quiet]
-      if defined?(Rails.root)
-       base_path = Rails.root
-      elsif defined?(APP_ROOT)
-       base_path = APP_ROOT
-      else
-       raise "You must set either Rails.root, APP_ROOT or pass :jetty_home as a parameter so I know where jetty is" unless params[:jetty_home]
-      end
-      jetty_server.jetty_home = params[:jetty_home] || File.expand_path(File.join(base_path, 'jetty'))
+
+      jetty_server.jetty_home = params[:jetty_home] || File.expand_path(File.join(app_root, 'jetty'))
       jetty_server.solr_home = params[:solr_home]  || File.join( jetty_server.jetty_home, "solr")
       jetty_server.port = params[:jetty_port] || 8888
       jetty_server.startup_wait = params[:startup_wait] || 5

data/lib/jettywrapper/version.rb

@@ -1 +1,3 @@
-GEMVERSION = "1.4.1"
+class Jettywrapper
+  VERSION = "1.4.2"
+end

data/spec/lib/jettywrapper_spec.rb

@@ -21,7 +21,7 @@ require 'rubygems'
     context "downloading" do
       context "with default file" do
         it "should download the zip file" do
-          Jettywrapper.should_receive(:system).with('curl -L https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip -o tmp/new-solr-schema.zip').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('curl -L https://github.com/projecthydra/hydra-jetty/archive/v5.2.0.zip -o tmp/v5.2.0.zip').and_return(system ('true'))
           Jettywrapper.download
         end
       end
@@ -42,9 +42,10 @@ require 'rubygems'
       context "with default file" do
         it "should download the zip file" do
           File.should_receive(:exists?).and_return(true)
-          Jettywrapper.should_receive(:expanded_zip_dir).and_return('tmp/jetty_generator/hydra-jetty-new-solr-schema')
-          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/new-solr-schema.zip').and_return(system ('true'))
-          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/hydra-jetty-new-solr-schema jetty').and_return(system ('true'))
+          Jettywrapper.should_receive(:expanded_zip_dir).and_return('tmp/jetty_generator/hydra-jetty-v5.2.0')
+          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/v5.2.0.zip').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('rm -r jetty').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/hydra-jetty-v5.2.0 jetty').and_return(system ('true'))
           Jettywrapper.unzip
         end
       end
@@ -57,6 +58,7 @@ require 'rubygems'
           File.should_receive(:exists?).and_return(true)
           Jettywrapper.should_receive(:expanded_zip_dir).and_return('tmp/jetty_generator/interal_dir')
           Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/file.zip').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('rm -r jetty').and_return(system ('true'))
           Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/interal_dir jetty').and_return(system ('true'))
           Jettywrapper.unzip
         end
@@ -84,7 +86,7 @@ require 'rubygems'
         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/new-solr-schema.zip'}
+        its(:url) {should == 'https://github.com/projecthydra/hydra-jetty/archive/v5.2.0.zip'}
       end
     end
 
@@ -186,11 +188,6 @@ require 'rubygems'
         ts.jetty_opts.should == @jetty_params[:jetty_opts]
       end
 
-      # passing in a hash is no longer optional
-      it "raises an error when called without a :jetty_home value" do
-          lambda { ts = Jettywrapper.configure }.should raise_exception
-      end
-
       it "should override nil params with defaults" do
         jetty_params = {
           :quiet => nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -150,6 +150,7 @@ files:
 - .gitmodules
 - .rspec
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - History.txt
 - README.textile
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Convenience tasks for working with jetty from within a ruby project.