hydra 6.0.0 → 6.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f1e7d6a4d66a02b94e2577628ecfa01068b9bfe
-  data.tar.gz: 87e14e52b73e41dc746d4412085e3d540cc84517
+  metadata.gz: 927eb8b7fa0597bb763acb9ded156d34fd027ac9
+  data.tar.gz: d92d8544fba8e69dd0ffd6fe040295cac3f5d13f
 SHA512:
-  metadata.gz: cd5b10252b0f4a65be6b9d6efb896497ef0e68947041a13fb15c34bc98bfe3f7b157b7c9dbfaa6e3b559c97acd6e41493149df46e347b6b278abd8bb6c978b8c
-  data.tar.gz: 8131f787bb558c7a8417bc7d84f10f296d8d1b0894a3474d7a584b94946ab80197c8be3349b225a89095b2c0643d16ca551c3e9e52d83bb94b1beae787356368
+  metadata.gz: 0272fdda5893ebec1d8edf707c610cf6069a1620d52f42a7f126d572fd51167ee5b102f257f41208a8d0bba3ead015f67bce9636d5ecf4159447c8157c934f03
+  data.tar.gz: ea7a2c202ab0ae712d03ca7de253fc1a50fbf1054240577096256bedb0bcc6f651eae8b8fd05c035ed7c94d755f7bdbb399c92ac950f25224acf65c89dc08e44

data/CONTRIBUTING.md

@@ -78,6 +78,8 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 ### 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`

data/README.md

@@ -1,18 +1,25 @@
-# Hydra  
-This gem provides a distibution-like snapshot of all dependencies within the core hydra technology stack.  
+# Hydra
+This gem provides a distibution-like snapshot of all dependencies within the core hydra technology stack.
 
-## Code Status  
+## Code Status
+[![Gem Version](https://badge.fury.io/rb/hydra.png)](http://badge.fury.io/rb/hydra)
 [![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 to Project Hydra](CONTRIBUTING.md)
+## For Developers
 
-## Developer Wiki  
-https://github.com/projecthydra/hydra/wiki
+* [Dive Into Hydra Tutorial](https://github.com/projecthydra/hydra/wiki/Dive-into-Hydra)
+* [Developer Wiki](https://github.com/projecthydra/hydra/wiki)
+
+## Contributing
+* [Contributing to Project Hydra](CONTRIBUTING.md)
 
 ## Installation
 
+You may want to consider the [Dive Into Hydra Tutorial](https://github.com/projecthydra/hydra/wiki/Dive-into-Hydra).
+Or perhaps you want a little more self-directed.
+If so:
+
 Add this line to your application's Gemfile:
 
     gem 'hydra', :require => 'hydra6'
@@ -24,22 +31,22 @@ And then execute:
 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, 
+
+## 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.  
+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:
+A giant thank you is also owed to [Nick Gauthier](https://github.com/ngauthier) for offering up the Hydra gem name.
 
-### ngauthier-hydra  
+### 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  
+# 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)
 

data/hydra.gemspec

@@ -22,15 +22,17 @@ 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.3.1'
+  gem.add_dependency 'hydra-head', '6.4.0.pre1'
   gem.add_dependency 'jettywrapper', '~> 1.4.1'
-  gem.add_dependency 'active-fedora', '~> 6.4.0'
+  gem.add_dependency 'active-fedora', '6.6.0.pre1'
   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'
+  # TODO Bl 4.5.0
+  gem.add_dependency 'blacklight', '~> 4.3.0'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'rubydora', '~> 1.6.5'
   gem.add_dependency 'nom-xml', '~> 0.5.1'
+  gem.add_development_dependency 'github_api', '~> 0.10.1'
 end

data/lib/hydra.rb

@@ -0,0 +1,11 @@
+puts "REQUIRING HYDRA"
+require "hydra/version"
+require 'hydra-head'
+require 'active-fedora'
+require 'rails'
+require 'om'
+require 'solrizer'
+require 'rsolr'
+require 'blacklight'
+require 'nokogiri'
+require 'rubydora'

data/lib/hydra/version.rb

@@ -1,3 +1,3 @@
 module Hydra
-  VERSION = "6.0.0"
+  VERSION = "6.1.0.pre1"
 end

data/script/changelog.sh

@@ -6,20 +6,24 @@ function show_help() {
   echo "  are merges or contain the following: \"$skip_tag\""
   echo
   echo "Format:"
-  echo "commit subject [committer name]"
+  echo "YYYY-MM-DD: 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`\")"
+  echo "-b                   Add a banner to the output"
+  echo "-p                   Specify the working directory of the repository (default: \"$repository_path\")"
 }
 
 verbose=0
 range_parameter=0
+banner=0
 skip_tag="\[log skip\]"
+repository_path="./"
 
 function default_range() {
-  local latest_version_tag=`git tag | grep ^v | sort | tail -1`
+  local latest_version_tag=`cd $repository_path && git tag | grep ^v | sort | tail -1`
   # a ".." range tag causes the `git log` command to fail
   if [ -z "$latest_version_tag" ]; then
     echo ''
@@ -28,22 +32,27 @@ function default_range() {
   fi
 }
 
-while getopts "h?vr:" opt; do
+while getopts "h?bvp:r:" opt; do
   case $opt in
     h|\?)
       show_help
       exit 0
     ;;
+    b )
+      banner=1
+    ;;
     v )
       verbose=1
     ;;
     r )
       range_parameter=$OPTARG
     ;;
+    p )
+      repository_path=$OPTARG
+    ;;
   esac
 done;
 
-
 function get_range() {
   if [ $range_parameter = 0 ]; then
     default_range
@@ -56,7 +65,7 @@ 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"
+  local format_subject_author="%w(80,0,0)%ad: %s [%cN]%n"
   if [ $verbose = 0 ]; then
     echo "tformat:$format_subject_author"
   else
@@ -65,13 +74,22 @@ function get_format() {
 }
 pretty_format=`get_format`
 
-function main() {
+function changelog() {
   # 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
+  cd $repository_path && git log $range --no-merges --format=%H $@ |
+    grep -v -f <(cd $repository_path && git log $range --no-merges --format=%H --grep="$skip_tag" $@) |
+    git log $range --no-merges --pretty="$pretty_format" --date=short --stdin --no-walk
+}
+
+function main() {
+  if [ $banner = 1 ]; then
+    echo $range
+    echo $range | sed -e 's/./-/g'
+    echo ''
+  fi
+  changelog
 }
 
 main

data/script/grant_revoke_gem_authority.rb

@@ -0,0 +1,75 @@
+# To run:
+# $ ruby ./script/grant_revoke_gem_authority.rb
+RUBYGEM_NAMES = [
+  'active-fedora',
+  'active_fedora-registered_attributes',
+  'active_fedora_relsint',
+  'fcrepo_admin',
+  'hydra',
+  'hydra-access-controls',
+  'hydra-batch-edit',
+  'hydra-core',
+  'hydra-derivatives',
+  'hydra-editor',
+  'hydra-head',
+  'hydra-ldap',
+  'hydra-migrate',
+  'hydra-mods',
+  'hydra-role-management',
+  'jettywrapper',
+  'om',
+  'rubydora',
+  'solrizer',
+  'solrizer-fedora',
+  'sufia',
+  'sufia-models',
+]
+
+HYDRA_COMMITTER_EMAILS = [
+  "amsterdamos@gmail.com",
+  "armintor@gmail.com",
+  "bess@stanford.edu",
+  "cam156@psu.edu",
+  "chris@cbeer.info",
+  "cjcolvar@indiana.edu",
+  "dan.coughlin@gmail.com",
+  "dchandekstark@gmail.com",
+  "edwin.shin@yourmediashelf.com",
+  "jeremy.n.friesen@gmail.com",
+  "jessie.keck@gmail.com",
+  "john.scofield@yourmediashelf.com",
+  "justin@curationexperts.com",
+  "leftwing@alumni.rutgers.edu",
+  "matt@curationexperts.com",
+  "mbklein@gmail.com",
+  "montyhindman@gmail.com",
+  "mstrom81@gmail.com",
+  "ndushay@stanford.edu",
+]
+
+@errors = []
+
+def system_command_with_error_check(command)
+  if !system(command)
+    @errors << "ERROR FOR: #{command}"
+  end
+end
+RUBYGEM_NAMES.each do |gemname|
+  current_committers = `gem owner #{gemname} | grep -e ^-`.split("\n")
+  current_committers.collect! { |cc| cc.sub(/^.\s+/,'')}
+  committers_to_remove = current_committers - HYDRA_COMMITTER_EMAILS
+  committers_to_add = HYDRA_COMMITTER_EMAILS - current_committers
+
+  committers_to_remove.each do |email_to_remove|
+    system_command_with_error_check("gem owner #{gemname} -r #{email_to_remove}")
+  end
+
+  committers_to_add.each do |email_to_add|
+    system_command_with_error_check("gem owner #{gemname} -a #{email_to_add}")
+  end
+end
+
+if ! @errors.empty?
+  $stderr.puts("The following errors were encountered:")
+  $stderr.puts(%(#{@errors.join("\n")}))
+end

data/script/push_contributing_document.rb

@@ -0,0 +1,46 @@
+require 'github_api'
+require File.expand_path('../../lib/hydra/version', __FILE__)
+
+ORGANIZATION_NAME = 'projecthydra'
+
+#
+# You will need to use one of your properly scoped Github authentication keys:
+# $ curl -u 'YOUR GITHUB USERNAME' -d '{"scopes":["repo"],"note":"Read/Write for your Repos"}' https://api.github.com/authorizations
+#
+# Then run this script:
+# `ruby script/push_contributing_docuemnt.rb SUPER-SECRET-TOKEN`
+#
+AUTHORIZATION_TOKEN = ARGV.fetch(0)
+
+github = Github.new oauth_token: AUTHORIZATION_TOKEN
+
+repos = github.repos.list(org: ORGANIZATION_NAME)
+contributing_content = File.read(File.expand_path('../../CONTRIBUTING.md', __FILE__))
+
+repos.each do |repo|
+  puts "Processing #{repo.full_name}"
+  begin
+    output = github.repos.contents.get(
+      ORGANIZATION_NAME, repo.name, 'CONTRIBUTING.md',
+      path:'CONTRIBUTING.md'
+    )
+    github.repos.contents.update(
+      ORGANIZATION_NAME, repo.name, 'CONTRIBUTING.md',
+      path:'CONTRIBUTING.md',
+      content: contributing_content,
+      sha: output.sha,
+      message: "Updating CONTRIBUTING.md as per Hydra v#{Hydra::VERSION}\n\n[ci skip]"
+    )
+    puts "Updated #{repo.full_name} CONTRIBUTING.md"
+  rescue Github::Error::NotFound
+    github.repos.contents.create(
+      ORGANIZATION_NAME, repo.name, 'CONTRIBUTING.md',
+      path:'CONTRIBUTING.md',
+      content: contributing_content,
+      message: "Updating CONTRIBUTING.md as per Hydra v#{Hydra::VERSION}\n\n[ci skip]"
+
+    )
+    puts "Created #{repo.full_name} CONTRIBUTING.md"
+  end
+  puts "Processed #{repo.full_name}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0.pre1
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: 6.4.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: 6.4.0.pre1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +43,16 @@ dependencies:
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.6.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.6.0.pre1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: github_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: Project Hydra Stack Dependencies
 email:
 - jeremy.n.friesen@gmail.com
@@ -190,10 +204,13 @@ files:
 - Rakefile
 - hydra.gemspec
 - lib/generators/hydra/install_generator.rb
+- lib/hydra.rb
 - lib/hydra/version.rb
 - lib/hydra6.rb
 - script/changelog.sh
 - script/contributors.sh
+- script/grant_revoke_gem_authority.rb
+- script/push_contributing_document.rb
 homepage: http://projecthydra.org/
 licenses: []
 metadata: {}
@@ -208,12 +225,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Project Hydra Stack Dependencies