hydra 6.1.0 → 6.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b9440b727600f3edd9e6162ff9c62d9773056b
-  data.tar.gz: 9261759236bfc695d8c1fa5a6bef7daabddd8368
+  metadata.gz: 1030231cd3874aa23071819673548bddc86bc379
+  data.tar.gz: 289c9773051f3c26e6b810bff6129b3c36140608
 SHA512:
-  metadata.gz: 1b83785df9366c34644dbb6891c9c14c1e7ba73e72f8b58ae8f74679340f1583da8633f92a485a2d1f010708e7b505a9c05c22a1118372468e6aea20af4501ad
-  data.tar.gz: 8df2a5490d78e64f9386fe5cb772ddc9c4679b0c9272446981c7ce20ebea9c1b787551c3c11da4b79e35c476c8f23b9350b5beea85af5dbe8e79630b9e05f3a0
+  metadata.gz: 6853f31463667240e7bae67a59e04f29e79caf7f6a516def921d0e0555a4d71d3b9ddcff8521b66279f4af56a9f777d90308b96af28dce6c257bee3d5fc398a0
+  data.tar.gz: d347414c2f1b6694e3b60a9d4ee962af3d98b5516ed8ba120394d6fdd81b0350e809c2cbc7f2ab90e8638c1e3e65e58b2c60a3d20940aea435254303e64ca2c2

data/README.md

@@ -22,7 +22,7 @@ If so:
 
 Add this line to your application's Gemfile:
 
-    gem 'hydra', :require => 'hydra6'
+    gem 'hydra'
 
 And then execute:
 

data/hydra.gemspec

@@ -23,16 +23,16 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license = 'APACHE2'
 
-  gem.add_dependency 'hydra-head', '~> 6.4.0'
+  gem.add_dependency 'hydra-head', '6.5.0.rc2'
   gem.add_dependency 'jettywrapper', '~> 1.5.0'
-  gem.add_dependency 'active-fedora', '~> 6.7.0'
+  gem.add_dependency 'active-fedora', '~> 6.7.6'
   gem.add_dependency 'rails', '>= 3.2.15', '< 5.0'
   gem.add_dependency 'om', '~> 3.0.3'
   gem.add_dependency 'solrizer', '~> 3.1.0'
   gem.add_dependency 'rsolr', '~> 1.0.9'
-  gem.add_dependency 'blacklight', '~> 4.5.0'
+  gem.add_dependency 'blacklight', '~> 4.7.0'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
-  gem.add_dependency 'rubydora', '~> 1.6.5'
+  gem.add_dependency 'rubydora', '~> 1.7.1'
   gem.add_dependency 'nom-xml', '~> 0.5.1'
   gem.add_development_dependency 'github_api', '~> 0.10.1'
 end

data/lib/hydra/version.rb

@@ -1,3 +1,3 @@
 module Hydra
-  VERSION = "6.1.0"
+  VERSION = "6.2.0.pre.1"
 end

data/script/changelog.sh

@@ -23,7 +23,7 @@ skip_tag="\[log skip\]"
 repository_path="./"
 
 function default_range() {
-  local latest_version_tag=`cd $repository_path && git tag | grep ^v | sort | tail -1`
+  local latest_version_tag=`cd $repository_path && git describe --abbrev=0 --tags | tail -1`
   # a ".." range tag causes the `git log` command to fail
   if [ -z "$latest_version_tag" ]; then
     echo ''

data/script/grant_revoke_gem_authority.rb

@@ -18,7 +18,9 @@ RUBYGEM_NAMES = [
   'hydra-role-management',
   'hydra-file_characterization',
   'jettywrapper',
+  'curate',
   'om',
+  'qa',
   'rubydora',
   'solrizer',
   'solrizer-fedora',
@@ -39,7 +41,6 @@ HYDRA_COMMITTER_EMAILS = [
   "jeremy.n.friesen@gmail.com",
   "jessie.keck@gmail.com",
   "jim.coble@duke.edu",
-  "john.scofield@yourmediashelf.com",
   "justin@curationexperts.com",
   "leftwing@alumni.rutgers.edu",
   "matt@curationexperts.com",

data/script/query-for-deprecation.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wKU
+#!/usr/bin/env ruby -KU
 
 # Given that the Hydra gem is pegged against specific versions other gems
 # When we update the Hydra gem and its underlying dependent gems
@@ -10,7 +10,7 @@ require 'fileutils'
 include Open3
 
 PREVIOUS_HYDRA_VERSION = 'v6.0.0'
-NEXT_HYDRA_VERSION = 'v6.1.0.rc1'
+NEXT_HYDRA_VERSION = 'v6.1.0'
 DIFF_SUFFIX = 'diff'
 TEMP_DIRECTORY = File.expand_path("../../tmp/", __FILE__)
 
@@ -21,34 +21,58 @@ class GemChange
     @name, @previous_version, @next_version = name, previous_version, next_version
   end
 
-  def filenames
-    @filenames ||= begin
+  def with_projecthydra_changes
+    url = github_project_url
+    if url && commit_ids.any?
+      yield(url, commit_ids)
+    end
+  end
+
+  def commit_ids
+    @commit_ids ||= begin
       # Assuming that you have all of your git project hydra repos in the same parent directory
-      repository_directory = File.expand_path("../../../#{name}", __FILE__)
-      command = "cd #{repository_directory} && git log -G'Deprecation.warn' v#{previous_version}..v#{next_version} --stat | grep -e '| [0-9]' | cut -f 1,2 -d ' '"
-      stdin, stdout, stderr, wait_thr = popen3(command)
-      begin
-        out = stdout.read
-        err = stderr.read
-        exit_status = wait_thr.value
-        raise "Unable to execute command \"#{command}\"\n#{err}" unless exit_status.success?
-      ensure
-        stdin.close
-        stdout.close
-        stderr.close
-      end
-      if out.strip != ""
-        filenames = out.split("\n").collect(&:strip).uniq
-        filenames.each do |filename|
-          flat_filename = name + '-' + filename.gsub("/", '-')
-          `cd #{repository_directory} && git diff v#{previous_version}..v#{next_version} #{filename} > #{File.join(TEMP_DIRECTORY, flat_filename)}.#{DIFF_SUFFIX}`
-        end
-        filenames
+      command = "cd #{repository_directory} && git log -G'deprecat' -i v#{previous_version}..v#{next_version} --pretty=format:%H"
+      output = execute_command(command)
+      if output.strip != ""
+        output.split("\n").collect(&:strip).uniq
       else
         []
       end
     end
   end
+
+  protected
+
+  def github_project_url
+    command = "cd #{repository_directory} && git config --get remote.origin.url"
+    remote_url = execute_command(command).strip
+    if remote_url =~ /projecthydra/
+      remote_url.sub(/\A.*projecthydra\/([\w-]*).*\Z/, 'https://github.com/projecthydra/\1')
+    elsif remote_url =~ /projectblacklight/
+      remote_url.sub(/\A.*projectblacklight\/([\w-]*).*\Z/, 'https://github.com/projectblacklight/\1')
+    else
+      nil
+    end
+  end
+
+  def repository_directory
+    File.expand_path("../../../#{name}", __FILE__)
+  end
+
+  def execute_command(command)
+    stdin, stdout, stderr, wait_thr = popen3(command)
+    begin
+      out = stdout.read
+      err = stderr.read
+      exit_status = wait_thr.value
+      raise "Unable to execute command \"#{command}\"\n#{err}" unless exit_status.success?
+      out
+    ensure
+      stdin.close
+      stdout.close
+      stderr.close
+    end
+  end
 end
 
 class Changes < Array
@@ -57,12 +81,17 @@ class Changes < Array
     @previous_version, @next_version = previous_version, next_version
   end
   def print
-    $stdout.puts "Deprecation changes for Hydra #{previous_version}..#{next_version}"
+    $stdout.puts "Deprecation changes for Hydra #{previous_version}..#{next_version}\n\n"
     each do |change|
-      $stdout.puts "\tFiles for #{change.name} v#{change.previous_version}..v#{change.next_version}"
-      $stdout.puts "\t\t" << change.filenames.join("\n\t\t")
-      $stdout.puts "\n"
+      change.with_projecthydra_changes do |github_project_url, commit_ids|
+        $stdout.puts "\tCommits for #{change.name} v#{change.previous_version}..v#{change.next_version}"
+        change.commit_ids.each do |commit_id|
+          $stdout.puts "\t\t" << commit_id << "\t" << File.join(github_project_url, 'commit', commit_id)
+        end
+        $stdout.puts "\n"
+      end
     end
+
     if any?
       $stdout.puts "See tmp/ dir for diff output and review"
     end
@@ -76,8 +105,6 @@ next_gemspec = File.new(File.expand_path("../../hydra-#{changes.next_version}.ge
 
 begin
 
-  system("rm #{File.join(TEMP_DIRECTORY, "*.#{DIFF_SUFFIX}")}")
-
   File.open(previous_gemspec.path, 'w+') do |f|
     f.write `git show #{changes.previous_version}:hydra.gemspec`
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0.pre.1
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-02-11 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.4.0
+        version: 6.5.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0.rc2
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: 6.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: 6.7.6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -149,14 +149,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: nom-xml
   requirement: !ruby/object:Gem::Requirement
@@ -228,14 +228,13 @@ 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.2.2
 signing_key: 
 specification_version: 4
 summary: Project Hydra Stack Dependencies
 test_files: []
-has_rdoc: