From bfbaf63de6cb88117a63ac1a70afdeb837099bba Mon Sep 17 00:00:00 2001 From: Joseph Rodriguez Date: Fri, 28 Mar 2014 10:46:04 -0600 Subject: [PATCH] move acts_as_list to gems (empty vendor/plugins) fixes CNVS-12056 test plan: * ordering/reordering of modules/module items should still work * ordering/reordering of discussion topics should still work Change-Id: I599b559933a4a89c9329d631d71f83343c6f24da Reviewed-on: https://gerrit.instructure.com/32516 Tested-by: Jenkins Product-Review: Simon Williams Reviewed-by: Cameron Sutter QA-Review: Matt Fairbourn --- Gemfile.d/other_stuff.rb | 1 + gems/acts_as_list/Gemfile | 8 ++++++ {vendor/plugins => gems}/acts_as_list/README | 0 gems/acts_as_list/acts_as_list.gemspec | 27 +++++++++++++++++++ .../lib/active_record/acts/list.rb | 0 .../acts_as_list/lib/acts_as_list.rb | 3 +-- .../acts_as_list/test/list_test.rb | 0 7 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gems/acts_as_list/Gemfile rename {vendor/plugins => gems}/acts_as_list/README (100%) create mode 100644 gems/acts_as_list/acts_as_list.gemspec rename {vendor/plugins => gems}/acts_as_list/lib/active_record/acts/list.rb (100%) rename vendor/plugins/acts_as_list/init.rb => gems/acts_as_list/lib/acts_as_list.rb (68%) rename {vendor/plugins => gems}/acts_as_list/test/list_test.rb (100%) diff --git a/Gemfile.d/other_stuff.rb b/Gemfile.d/other_stuff.rb index 0dc83aa7c52..0e68adcaced 100644 --- a/Gemfile.d/other_stuff.rb +++ b/Gemfile.d/other_stuff.rb @@ -114,6 +114,7 @@ gem 'foreigner', '0.9.2' gem 'crocodoc-ruby', '0.0.1', :require => 'crocodoc' gem 'activesupport-suspend_callbacks', :path => 'gems/activesupport-suspend_callbacks' +gem 'acts_as_list', :path => 'gems/acts_as_list' gem 'adheres_to_policy', :path => 'gems/adheres_to_policy' gem 'canvas_breach_mitigation', :path => 'gems/canvas_breach_mitigation' gem 'canvas_color', :path => 'gems/canvas_color' diff --git a/gems/acts_as_list/Gemfile b/gems/acts_as_list/Gemfile new file mode 100644 index 00000000000..71d8209b537 --- /dev/null +++ b/gems/acts_as_list/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' +gemspec + +if CANVAS_RAILS3 + gem 'rails', '3.2.15' +else + gem 'rails', :github => 'makandra/rails', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915' +end \ No newline at end of file diff --git a/vendor/plugins/acts_as_list/README b/gems/acts_as_list/README similarity index 100% rename from vendor/plugins/acts_as_list/README rename to gems/acts_as_list/README diff --git a/gems/acts_as_list/acts_as_list.gemspec b/gems/acts_as_list/acts_as_list.gemspec new file mode 100644 index 00000000000..d47b7c462e7 --- /dev/null +++ b/gems/acts_as_list/acts_as_list.gemspec @@ -0,0 +1,27 @@ +# coding: utf-8 +lib = File.expand_path('../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) + +unless defined?(CANVAS_RAILS3) + CANVAS_RAILS3 = !!ENV["CANVAS_RAILS3"] || File.exist?(File.expand_path("../../../config/RAILS3", __FILE__)) +end + +Gem::Specification.new do |spec| + spec.name = "acts_as_list" + spec.version = "0.0.1" + spec.authors = ["Brian Palmer"] + spec.email = ["brianp@instructure.com"] + spec.summary = %q{This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list.} + spec.homepage = "https://github.com/instructure/canvas-lms" + spec.license = "AGPL" + + spec.files = Dir.glob("{lib,spec}/**/*") + spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } + spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) + spec.require_paths = ["lib"] + + spec.add_dependency "rails" + + spec.add_development_dependency "bundler", "~> 1.5" + spec.add_development_dependency "sqlite3" +end diff --git a/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb b/gems/acts_as_list/lib/active_record/acts/list.rb similarity index 100% rename from vendor/plugins/acts_as_list/lib/active_record/acts/list.rb rename to gems/acts_as_list/lib/active_record/acts/list.rb diff --git a/vendor/plugins/acts_as_list/init.rb b/gems/acts_as_list/lib/acts_as_list.rb similarity index 68% rename from vendor/plugins/acts_as_list/init.rb rename to gems/acts_as_list/lib/acts_as_list.rb index eb87e879014..5d5e2c88d43 100644 --- a/vendor/plugins/acts_as_list/init.rb +++ b/gems/acts_as_list/lib/acts_as_list.rb @@ -1,3 +1,2 @@ -$:.unshift "#{File.dirname(__FILE__)}/lib" require 'active_record/acts/list' -ActiveRecord::Base.class_eval { include ActiveRecord::Acts::List } +ActiveRecord::Base.class_eval { include ActiveRecord::Acts::List } \ No newline at end of file diff --git a/vendor/plugins/acts_as_list/test/list_test.rb b/gems/acts_as_list/test/list_test.rb similarity index 100% rename from vendor/plugins/acts_as_list/test/list_test.rb rename to gems/acts_as_list/test/list_test.rb