hydra 6.0.0.rc6 → 6.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2bd3d45c25e1a7ae8062eb4c65aabf06843ce0
-  data.tar.gz: 1c29152eb56afd78c6f76823765ef5d04d44af56
+  metadata.gz: b9d0ffffd2a52b4fdba6fdac897f5abb93708676
+  data.tar.gz: 6283a727bf4e90b97061dde3c3f8986c88e3076d
 SHA512:
-  metadata.gz: fc0ede761e347948119ee1b806c3242920d2e1bf9fb29ee3c3d1cb922c74a3a79dc644492f23ee450cb6779bfa8d53f6b34d759c588f9657f0b98377cb55f2b7
-  data.tar.gz: 99d132e6c399b01438d06d2ba63217691133267956839a1016df8becc23b774148ab2a4109e059bd5448882068dc7052a457c844772802c70fdddf3566d0f106
+  metadata.gz: dea90b7c0ce0651a6c9571b2a15475c0adc9c2fc7a7f16add906f630ead87d086f3785517edd6bb2c59fb9470abb24c987255034f3b0ec438525dbe5aea25775
+  data.tar.gz: 6f02813b28d4618f021a37c8574db772df228987a0cfcee543700887eb2586365b2956422157c8bfbc2d85e3b63b7074e5550f87db979c0b82efa657c462c9c2

data/.mailmap

@@ -0,0 +1,2 @@
+Mark Bussey <mark@curationexperts.com> mark-dce <mark@curationexperts.com>
+Andrew Myers <andrew_myers@wgbh.org> afred <afredmyers@gmail.com>

data/CONTRIBUTING.md

@@ -3,19 +3,35 @@
 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.
 
-## Getting Started
+## 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](https://github.com/projecthydra/hydra/issues) by:
+* 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
-* Fork the repository on GitHub
 
-## Making Changes
+### 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`
@@ -23,9 +39,10 @@ There are a few guidelines that we need contributors to follow so that we can ha
   * 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 in the
-  [proper format](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* 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)
@@ -36,6 +53,8 @@ There are a few guidelines that we need contributors to follow so that we can ha
     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:
 
@@ -55,21 +74,38 @@ There are a few guidelines that we need contributors to follow so that we can ha
 
 * 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
+
+* 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.
 
-## 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
-
-## Submitting Changes
+### Merging Changes
 
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the project https://github.com/projecthydra/hydra
-* Update your Github issue – if you use the hub command, this can be automated – by associating the issue with the pull request.
+* 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/)
+* [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/CONTRIBUTORS.md

@@ -0,0 +1,8 @@
+Contributors to this project:
+
+*  Andrew Myers
+*  Jeremy Friesen
+*  Jessie Keck
+*  Justin Coyne
+*  Mark Bussey
+

data/LICENSE.txt

@@ -1,5 +1,6 @@
 ##########################################################################
-# Copyright 2013 Project Hydra
+# Copyright 2013 Notre Dame, Data Curation Experts, WGBH
+# Additional copyright may be held by others, as reflected in the commit log
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,4 +12,4 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.

data/README.md

@@ -1,24 +1,14 @@
-# Hydra
-
-Project Hydra Stack Dependencies
-
-## ngauthier-hydra
-
-If you are looking for the previous hydra gem, a distributed testing framework,
-please visit [https://github.com/ngauthier/hydra](https://github.com/ngauthier/hydra).
-If you need to previous hydra gem, you can use `gem ngauthier-hydra`.
-
-## Code Status
+# Hydra  
+This gem provides a distibution-like snapshot of all dependencies within the core hydra technology stack.  
 
+## Code Status  
 [![Build Status](https://travis-ci.org/projecthydra/hydra-head.png?branch=master)](https://travis-ci.org/projecthydrahydra/hydra-head)
 [![Dependencies Status](https://gemnasium.com/projecthydra/hydra.png)](https://gemnasium.com/projecthydra/hydra)
 
-## Contributing
-
+## Contributing  
 [Contributing to Project Hydra](CONTRIBUTING.md)
 
-## Developer Wiki
-
+## Developer Wiki  
 https://github.com/projecthydra/hydra/wiki
 
 ## Installation
@@ -38,3 +28,23 @@ Or install it yourself as:
 Then run:
 
     $ rails g hydra:install
+    
+## Acknowledgements  
+The initial insights and ideas behind producting a "distro-like" gem to reflect a particular known-good, 
+point-in-time state of the Hydra technology stack resulted from a series of community discussions online, 
+in e-mail, and in person during the period from December 2012 through June 2013.  Huge thanks are owed to
+Jeremy Friesen (Notre Dame), Drew Myers (WGBH), Justin Coyne (Data Curation Experts),
+and Mark Bussey (Data Curation Experts) for activating on these ideas and implementing this gem.  
+
+A giant thank you is also owed to [Nick Gauthier](https://github.com/ngauthier) for offering up the Hydra gem name:
+
+### ngauthier-hydra  
+If you are looking for the previous hydra gem, a distributed testing framework,
+please visit [https://github.com/ngauthier/hydra](https://github.com/ngauthier/hydra).
+If you need to previous hydra gem, you can use `gem ngauthier-hydra`.
+
+# Project Hydra  
+This software has been developed by and is brought to you by the Hydra community.  Learn more at the
+[Project Hydra website](http://projecthydra.org)
+
+![Project Hydra Logo](https://github.com/uvalib/libra-oa/blob/a6564a9e5c13b7873dc883367f5e307bf715d6cf/public/images/powered_by_hydra.png?raw=true)

data/hydra.gemspec

@@ -7,10 +7,11 @@ Gem::Specification.new do |gem|
   gem.name          = "hydra"
   gem.version       = Hydra::VERSION
   gem.authors       = [
-    "Jeremy Friesen",
+    "Jeremy Friesen", "Justin Coyne"
   ]
   gem.email         = [
     "jeremy.n.friesen@gmail.com",
+    "jcoyne@justincoyne.com",
   ]
   gem.description   = %q{Project Hydra Stack Dependencies}
   gem.summary       = %q{Project Hydra Stack Dependencies}
@@ -21,11 +22,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'hydra-head', '~> 6.2.0'
+  gem.add_dependency 'hydra-head', '~> 6.3.0'
   gem.add_dependency 'jettywrapper', '~> 1.4.1'
-  gem.add_dependency 'active-fedora', '~> 6.2.0'
-  gem.add_dependency 'rails', '~> 3.2.13'
-  gem.add_dependency 'om', '~> 2.1.2'
+  gem.add_dependency 'active-fedora', '~> 6.4.0'
+  gem.add_dependency 'rails', '>= 3.2.13', '< 5.0'
+  gem.add_dependency 'om', '~> 3.0.1'
   gem.add_dependency 'solrizer', '~> 3.1.0'
   gem.add_dependency 'rsolr', '~> 1.0.9'
   gem.add_dependency 'blacklight', '~> 4.2.1'

data/lib/hydra/version.rb

@@ -1,3 +1,3 @@
 module Hydra
-  VERSION = "6.0.0.rc6"
+  VERSION = "6.0.0.rc7"
 end

data/lib/hydra6.rb

@@ -1,2 +1,10 @@
 require "hydra/version"
 require 'hydra/head'
+require 'active-fedora'
+require 'rails'
+require 'om'
+require 'solrizer'
+require 'rsolr'
+require 'blacklight'
+require 'nokogiri'
+require 'rubydora'

data/script/changelog.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+function show_help() {
+  echo "Usage: changelog.sh [options]"
+  echo "Generates a changelog from git history, ommitting commit messages that"
+  echo "  are merges or contain the following: \"$skip_tag\""
+  echo
+  echo "Format:"
+  echo "commit subject [committer name]"
+  echo
+  echo "Options:"
+  echo "-v                   Verbose output (i.e. include full commit messages)"
+  echo "-r <since>..<until>  Range of commits to query, see \`git log\` for more"
+  echo "                       defaults to most recent version tag (i.e. \"`default_range`\")"
+}
+
+verbose=0
+range_parameter=0
+skip_tag="\[log skip\]"
+
+function default_range() {
+  local latest_version_tag=`git tag | grep ^v | sort | tail -1`
+  # a ".." range tag causes the `git log` command to fail
+  if [ -z "$latest_version_tag" ]; then
+    echo ''
+  else
+    echo "$latest_version_tag.."
+  fi
+}
+
+while getopts "h?vr:" opt; do
+  case $opt in
+    h|\?)
+      show_help
+      exit 0
+    ;;
+    v )
+      verbose=1
+    ;;
+    r )
+      range_parameter=$OPTARG
+    ;;
+  esac
+done;
+
+
+function get_range() {
+  if [ $range_parameter = 0 ]; then
+    default_range
+  else
+    echo $range_parameter
+  fi
+}
+
+range=`get_range`
+
+function get_format() {
+  # Subject/author line wraps at 80 characters, no padding
+  local format_subject_author="%w(80,0,0)%s [%cN]%n"
+  if [ $verbose = 0 ]; then
+    echo "tformat:$format_subject_author"
+  else
+    echo "tformat:$format_subject_author%n%w(72,4,4)%b"
+  fi
+}
+pretty_format=`get_format`
+
+function main() {
+  # Get a list of all SHA1 commits
+  #   Filter the list to exclude all SHA1 commits with $skip_tag
+  #   Then requery the log and output format
+  git log $range --no-merges --format=%H $@ |
+    grep -v -f <(git log $range --no-merges --format=%H "--grep=$skip_tag" $@) |
+    git log $range --no-merges --pretty="$pretty_format" --stdin --no-walk
+}
+
+main

data/script/contributors.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+#
+# Auto-generate a list of contributors for a given Git repository.
+#
+# At the root of a project:
+#
+#   ./script/contributors.sh
+#
+
+echo "Contributors to this project:" > CONTRIBUTORS.md
+echo >> CONTRIBUTORS.md
+git shortlog -s | cut -c '8-200' | awk '{print "* ", $0}' >> CONTRIBUTORS.md
+echo >> CONTRIBUTORS.md

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hydra
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc6
+  version: 6.0.0.rc7
 platform: ruby
 authors:
 - Jeremy Friesen
+- Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +45,48 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -167,12 +174,15 @@ dependencies:
 description: Project Hydra Stack Dependencies
 email:
 - jeremy.n.friesen@gmail.com
+- jcoyne@justincoyne.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .mailmap
 - CONTRIBUTING.md
+- CONTRIBUTORS.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -182,6 +192,8 @@ files:
 - lib/generators/hydra/install_generator.rb
 - lib/hydra/version.rb
 - lib/hydra6.rb
+- script/changelog.sh
+- script/contributors.sh
 homepage: http://projecthydra.org/
 licenses: []
 metadata: {}