hydra 6.1.0.rc3 → 6.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebe40da26618ae76336b3eee248de76a4f610cb
-  data.tar.gz: 2f64c9a93039a992381743eddfb8d9fd0ffebefc
+  metadata.gz: 5e5c903a478c63818af764e7bc07e8cf42beec10
+  data.tar.gz: d00f0bc467652e936e0c3bd7343318acc19a7fc7
 SHA512:
-  metadata.gz: 94dbe91298888aef904f4587fbe3528f0771160aa93356340efb926fbb5ea86a3b61654a34e13237236c1b04498ce54bb0ed95dc429b2cbd55f094f5833747ed
-  data.tar.gz: 0153224b2110048ec7a02b35fbfa0542465bc1c385c63b56e92571a0b167c356cd2cd9c70e7728d8779fbcd75e6c55e83e6e2991f6efe6038d5d3f9b070300c3
+  metadata.gz: 0f448be1c4c32b1a7a7f2f32897e953e666a484ee1f2556d3b47ba6c2499566f2ff6037b131ac1ee2a66e05d7d1138afdb45846154d783d2dca66daa4ad6f690
+  data.tar.gz: dda9793a37bbfec906a2492c8f4dfae8bba712ce2993529f09ee447336c11d4a618bf6d5f0d88a9e0fe47319f224f46a112c4d8469c28040c8a927bd1325cf6f

data/RELEASE-POLICY.md

@@ -1,10 +1,24 @@
-Potential Triggers for hydra Framework Major Releases
-
-* rails - Major release definite, minor release possible
-* ruby - Major release definite, minor release possible
-* hydra-core - Major release
-* blacklight - Major release
-* active-fedora - Major release, though informed by subgems (i.e Solrizer, OM, etc)
-  * Solr - Solr schema and Solr version
-  * Fedora - Fedora version
-* major new functionality
+# Updating Hydra gem procedure
+
+## Deprecations
+
+### Indicating Deprecations
+
+Each of the ProjectHydra gems in hydra.gemspec make use of the [`deprecation`
+gem](https://github.com/cbeer/deprecation). Below is our preferred method for
+indicating deprecation:
+
+    class Foo
+      def bar
+        Deprecation.warn(Foo, 'Foo#bar is deprecated. Please use Baz', caller)
+        …
+      end
+    end
+
+By adhearing to the above deprecation semantic we are able to report
+deprecations when the Hydra gem is updated.
+
+### Reporting Deprecations on Hydra upgrades
+
+The `./script/query-for-deprecation.rb` is a tool to help report what methods
+have had a change in deprecation status.

data/hydra.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'hydra-head', '6.4.0.rc2'
   gem.add_dependency 'jettywrapper', '~> 1.4.1'
-  gem.add_dependency 'active-fedora', '6.6.0.rc1'
+  gem.add_dependency 'active-fedora', '6.6.0.rc2'
   gem.add_dependency 'rails', '>= 3.2.13', '< 5.0'
   gem.add_dependency 'om', '~> 3.0.1'
   gem.add_dependency 'solrizer', '~> 3.1.0'

data/lib/hydra/version.rb

@@ -1,3 +1,3 @@
 module Hydra
-  VERSION = "6.1.0.rc3"
+  VERSION = "6.1.0.rc4"
 end

data/script/query-for-deprecation.rb

@@ -6,37 +6,103 @@
 # Then we should provide a list of files with a change in Deprecation
 # And provide some means for a huamn to review those changes
 require 'open3'
+require 'fileutils'
 include Open3
 
-spec = Gem::Specification.load(File.expand_path('../../hydra.gemspec', __FILE__))
-spec.runtime_dependencies.each do |dep|
-  name = dep.name
-  version = dep.requirement.requirements.flatten.compact.detect { |r| r.is_a?(Gem::Version) }
-  repository_directory = File.expand_path("../../../#{name}", __FILE__)
-
-  command = "cd #{repository_directory} && git log -G'extend Deprecation' v#{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
+PREVIOUS_HYDRA_VERSION = 'v6.0.0'
+NEXT_HYDRA_VERSION = 'v6.1.0.rc1'
+DIFF_SUFFIX = 'diff'
+TEMP_DIRECTORY = File.expand_path("../../tmp/", __FILE__)
+
+
+class GemChange
+  attr_reader :name, :previous_version, :next_version
+  def initialize(name, previous_version, next_version)
+    @name, @previous_version, @next_version = name, previous_version, next_version
+  end
+
+  def filenames
+    @filenames ||= 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
+      else
+        []
+      end
+    end
+  end
+end
+
+class Changes < Array
+  attr_reader :previous_version, :next_version
+  def initialize(previous_version, next_version)
+    @previous_version, @next_version = previous_version, next_version
   end
-  if out.strip != ""
-    filenames = out.split("\n").collect(&:strip).uniq
-    banner = "*" * 80 << "\n"
-    puts banner
-    puts "Files for #{name} v#{version}"
-    puts "\t" << filenames.join("\n\t")
-    puts banner
-    puts "See tmp/ dir for diff output"
-    filenames.each do |filename|
-      flat_filename = filename.gsub("/", '-')
-      `cd #{repository_directory} && git diff v#{version}.. #{filename} > #{File.expand_path("../../tmp/#{flat_filename}", __FILE__)}.patch`
+  def print
+    $stdout.puts "Deprecation changes for Hydra #{previous_version}..#{next_version}"
+    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"
+    end
+    if any?
+      $stdout.puts "See tmp/ dir for diff output and review"
     end
   end
 end
+
+changes = Changes.new(PREVIOUS_HYDRA_VERSION, NEXT_HYDRA_VERSION)
+
+previous_gemspec = File.new(File.expand_path("../../hydra-#{changes.previous_version}.gemspec", __FILE__), 'w+')
+next_gemspec = File.new(File.expand_path("../../hydra-#{changes.next_version}.gemspec", __FILE__), 'w+')
+
+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
+
+  File.open(next_gemspec.path, 'w+') do |f|
+    f.write `git show #{changes.next_version}:hydra.gemspec`
+  end
+
+  next_spec = Gem::Specification.load(next_gemspec.path)
+
+  previous_spec = Gem::Specification.load(previous_gemspec.path)
+  previous_spec.runtime_dependencies.each do |previous_dep|
+    # Skipping rails as we don't want to manage those deprecation dependencies
+    next if previous_dep.name == 'rails'
+    next_dep = next_spec.runtime_dependencies.detect { |d| d.name == previous_dep.name }
+    gem_name = previous_dep.name
+
+    previous_version = previous_dep.requirement.requirements.flatten.compact.detect { |r| r.is_a?(Gem::Version) }
+    next_version = next_dep.requirement.requirements.flatten.compact.detect { |r| r.is_a?(Gem::Version) }
+
+    changes << GemChange.new(gem_name, previous_version, next_version)
+  end
+ensure
+  File.unlink(previous_gemspec.path) if File.exist?(previous_gemspec.path)
+  File.unlink(next_gemspec.path) if File.exist?(next_gemspec.path)
+end
+
+changes.print

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra
 version: !ruby/object:Gem::Version
-  version: 6.1.0.rc3
+  version: 6.1.0.rc4
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.0.rc1
+        version: 6.6.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.0.rc1
+        version: 6.6.0.rc2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -233,8 +233,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       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
 test_files: []
+has_rdoc: