From 44e4c40a895173ae6af548edc1ec976ab6e3f527 Mon Sep 17 00:00:00 2001 From: jkodu Date: Thu, 16 Jul 2020 19:00:33 +0100 Subject: [PATCH 1/5] update gitignore --- .gitignore | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 15274745..6fa7d06f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,29 +3,18 @@ .bundle .config .yardoc - -Gemfile.lock -examples/**/Gemfile.lock - +*.lock InstalledFiles _yardoc coverage -doc/ lib/bundler/man pkg rdoc -spec/reports -test/tmp -test/version_tmp -tmp *.bundle *.so *.o *.a -mkmf.log - +*.log .ruby-version bin/ node_modules/ -spec/examples.txt -./results From 4cd7939f9212dedb305f7b1687ab21d688b9cb03 Mon Sep 17 00:00:00 2001 From: jkodu Date: Thu, 16 Jul 2020 19:00:42 +0100 Subject: [PATCH 2/5] remove toplevel gemspec --- axe-matchers.gemspec | 48 -------------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 axe-matchers.gemspec diff --git a/axe-matchers.gemspec b/axe-matchers.gemspec deleted file mode 100644 index cd1256c2..00000000 --- a/axe-matchers.gemspec +++ /dev/null @@ -1,48 +0,0 @@ -# coding: utf-8 - -Gem::Specification.new do |spec| - spec.name = 'axe-matchers' - spec.version = '2.6.0' - spec.license = 'MPL-2.0' - spec.authors = ['Deque Systems', 'Test Double'] - spec.email = ['helpdesk@deque.com', 'hello@testdouble.com'] - spec.homepage = 'https://www.deque.com' - spec.summary = 'Automated accessibility testing powered by aXe' - spec.description = <<-DESC - axe-matchers provides matchers that wrap the axe-core accessibility library. - The matchers can be used with RSpec, Cucumber and other test tools. - Cucumber step definitions are also provided. - DESC - - spec.metadata = { - 'bug_tracker_uri' => 'https://github.com/dequelabs/axe-matchers/issues', - 'documentation_uri' => 'https://github.com/dequelabs/axe-matchers/blob/master/README.md', - 'source_code_uri' => 'https://github.com/dequelabs/axe-matchers', - 'wiki_uri' => 'https://github.com/dequelabs/axe-matchers/wiki' - } - - spec.platform = Gem::Platform::RUBY - spec.required_ruby_version = '>= 1.9.3' - spec.required_rubygems_version = '>= 1.3.6' - spec.requirements = 'A WebDriver of some sort. e.g Capybara, Selenium or Watir' - - spec.files = Dir.glob %w[lib/**/* node_modules/axe-core/axe.min.js LICENSE README.md] - spec.require_path = 'lib' - - spec.add_dependency 'dumb_delegator', '~> 0.8' - spec.add_dependency 'virtus', '~> 1.0' - - spec.add_development_dependency 'bundler', '~> 1.16' - spec.add_development_dependency 'cucumber', '~> 2.4' - spec.add_development_dependency 'pry' - spec.add_development_dependency 'rake', '~> 12.0' - spec.add_development_dependency 'rspec', '~> 3.6' - spec.add_development_dependency 'rspec-its', '~> 1.2' - spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3' - spec.add_development_dependency 'sinatra', '~> 2.0' - # drivers - spec.add_development_dependency 'capybara', '~> 3.29' - spec.add_development_dependency 'capybara-webkit', '~> 1.14' - spec.add_development_dependency 'selenium-webdriver', '~> 3.5' - spec.add_development_dependency 'watir', '~> 6.6' -end From c0b4fc5f6abf2747d453ea9e2cb9ca9c482e9100 Mon Sep 17 00:00:00 2001 From: jkodu Date: Thu, 16 Jul 2020 19:00:59 +0100 Subject: [PATCH 3/5] add lerna esque rakefile --- Rakefile | 119 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 90 insertions(+), 29 deletions(-) diff --git a/Rakefile b/Rakefile index 52fc902d..db8e2e30 100644 --- a/Rakefile +++ b/Rakefile @@ -1,39 +1,100 @@ -require "rake/clean" -require "bundler/gem_tasks" - -CLOBBER.include "pkg", "node_modules" - -# add npm-install as pre-req for build -Rake::Task[:build].enhance [:npm] - -########### -# npm -########### -desc "alias for npm:install" -task :npm => "npm:install" -namespace :npm do - desc "Install npm dependencies" - task :install do - sh "npm install" +# bootstrap +desc "bootstrap all packages" +task :bootstrap, [:pkg] do |t, args| + if args[:pkg].nil? + sh " + baseDir=$PWD + for dir in ./packages/* + do + cd $dir + bundle install + cd $baseDir + done + " + else + pkgDir = "./packages/#{args[:pkg]}" + sh "cd #{pkgDir} && bundle install" end +end - desc "Update npm dependencies to latest version allowed by package.json" - task :update do - sh "npm update" +# test +desc "Test all packages" +task :test, [:pkg] do |t, args| + if args[:pkg].nil? + sh " + baseDir=$PWD + for dir in ./packages/* + do + cd $dir + rake test + cd $baseDir + done + " + else + pkgDir = "./packages/#{args[:pkg]}" + sh "cd #{pkgDir} && rake test" end +end - desc "Upgrade axe-core dependency to latest version available, overwriting package.json" - task :upgrade do - sh "npm install --save axe-core@latest" +# build +desc "Build all packages" +task :build, [:pkg] do |t, args| + if args[:pkg].nil? + sh " + baseDir=$PWD + for dir in ./packages/* + do + cd $dir + rake build + cd $baseDir + done + " + else + pkgDir = "./packages/#{args[:pkg]}" + sh "cd #{pkgDir} && rake build" end +end - desc "Upgrade axe-core dependency to latest prerelease version, overwriting package.json" - task :next do - sh "npm install --save axe-core@next" +# format +desc "format code in all packages" +task :format, [:pkg] do |t, args| + if args[:pkg].nil? + sh " + baseDir=$PWD + for dir in ./packages/* + do + cd $dir + rake format + cd $baseDir + done + " + else + pkgDir = "./packages/#{args[:pkg]}" + sh "cd #{pkgDir} && rake format" end +end - desc "Display currently-installed and latest-available versions of axe-core lib" - task :status do - sh "npm view axe-core version && npm list axe-core" +# clobber +desc "clobber/clean all packages" +task :clobber, [:pkg] do |t, args| + if args[:pkg].nil? + sh " + baseDir=$PWD + for dir in ./packages/* + do + cd $dir + rake clobber + cd $baseDir + done + " + else + pkgDir = "./packages/#{args[:pkg]}" + sh "cd #{pkgDir} && rake clobber" end end + +# format code +desc "Format code using rubocop" +task :format => [] do + sh "bundle exec rubocop --config rubocop.yml --auto-correct --fix-layout" +end From 529fee710f07b97bb364aea717cf6fbf48349e4d Mon Sep 17 00:00:00 2001 From: jkodu Date: Thu, 16 Jul 2020 19:03:02 +0100 Subject: [PATCH 4/5] cleanup --- Gemfile | 10 ---------- package.json | 3 +-- rubocop.yml | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 Gemfile delete mode 100644 rubocop.yml diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 3fc3263d..00000000 --- a/Gemfile +++ /dev/null @@ -1,10 +0,0 @@ -source 'https://rubygems.org' - -group :test, :development do - gem "rubocop" -end - -gemspec - -# introducing a local group to disallow unnecessary local dependencies installed in circle ci -gem 'chromedriver-helper', :group => :local diff --git a/package.json b/package.json index f333caaf..71ea86e3 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,7 @@ "url": "git+https://github.com/dequelabs/axe-core-gems.git" }, "scripts": { - "changelog": "standard-version -a --skip.tag=true --skip.commit=true --skip.bump=true", - "format": "bundle exec rubocop --config rubocop.yml --auto-correct --fix-layout" + "changelog": "standard-version -a --skip.tag=true --skip.commit=true --skip.bump=true" }, "devDependencies": { "standard-version": "^8.0.2" diff --git a/rubocop.yml b/rubocop.yml deleted file mode 100644 index 84e61082..00000000 --- a/rubocop.yml +++ /dev/null @@ -1,4 +0,0 @@ -# rubocop.yml - -Style/ClassAndModuleChildren: - EnforcedStyle: compact \ No newline at end of file From dc31d587f290c81ec7e6dc224508332f27a1bfd6 Mon Sep 17 00:00:00 2001 From: jkodu Date: Mon, 20 Jul 2020 15:37:27 +0100 Subject: [PATCH 5/5] update --- Rakefile | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Rakefile b/Rakefile index db8e2e30..1f483ae9 100644 --- a/Rakefile +++ b/Rakefile @@ -73,28 +73,3 @@ task :format, [:pkg] do |t, args| sh "cd #{pkgDir} && rake format" end end - -# clobber -desc "clobber/clean all packages" -task :clobber, [:pkg] do |t, args| - if args[:pkg].nil? - sh " - baseDir=$PWD - for dir in ./packages/* - do - cd $dir - rake clobber - cd $baseDir - done - " - else - pkgDir = "./packages/#{args[:pkg]}" - sh "cd #{pkgDir} && rake clobber" - end -end - -# format code -desc "Format code using rubocop" -task :format => [] do - sh "bundle exec rubocop --config rubocop.yml --auto-correct --fix-layout" -end