ammeter 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a001157dcbfae6b406995d4e01a27b89ce22ae92
-  data.tar.gz: 7f43153034ae84e0698a73c609782714224d64dc
+SHA256:
+  metadata.gz: 45a625241c915188a70b534c263a9c38bfb1c0315aedf7d7a31fd27aaec8407f
+  data.tar.gz: 80c902df52f5b7b68af80f680dbc0273c5b42b819d0a19f7de2065ddc3d556e3
 SHA512:
-  metadata.gz: 44b2ea56e21b1650b60a598d0ac45ab8e07c0e36c8500a93a067cc2ed42dacc8efc853996ceea1d4362b4f50de75454ab440833689c5ede74881a7c31aef1673
-  data.tar.gz: d54a0ab64428f7f462f5fb22c70ca2af3e0498b95e94c86b26babc6d7c5741fa8d915b820ae4dd047443432c03713c61e1e38093e0d79c044b14962c0baf24c1
+  metadata.gz: 3ce7d82c75dedff9639409713b630ce6ea8e04c11a75536bd2ef4f5200a9901cc111510d643b316b51da78b83f3cf1729ec5a85d296ff755ea9256e2caca8145
+  data.tar.gz: a99410d8eddd86ca0732099a108a9fdcad91674b72e93e7f93d67a8dc6464cde8eb93f860514edaad65c43281304b3c05d8eb9b8035b892bc42f8cb96b0cd704

data/.github/workflows/ci.yml

@@ -0,0 +1,70 @@
+name: Ammeter CI
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  test:
+    name: 'Ruby: ${{ matrix.ruby }}, Rspec: ${{matrix.env.RSPEC_VERSION}}, Rails: ${{ matrix.env.RAILS_VERSION }}'
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+       include:
+         - ruby: 3.0
+           env:
+             RSPEC_VERSION: 'master'
+             RAILS_VERSION: '~> 6.1.0'
+         - ruby: 3.0
+           env:
+             RSPEC_VERSION: '~> 4.0'
+             RAILS_VERSION: '~> 6.1.0'
+         - ruby: 3.0
+           env:
+             RSPEC_VERSION: '~> 4.0'
+             RAILS_VERSION: '~> 6.0.0'
+         - ruby: 3.0
+           env:
+             RSPEC_VERSION: '~> 3.9'
+             RAILS_VERSION: '~> 6.0.0'
+         - ruby: 2.5
+           env:
+             RSPEC_VERSION: 'master'
+             RAILS_VERSION: '~> 6.1.0'
+         - ruby: 2.5
+           env:
+             RSPEC_VERSION: '~> 4.0'
+             RAILS_VERSION: '~> 6.1.0'
+         - ruby: 2.5
+           env:
+             RSPEC_VERSION: '~> 4.0'
+             RAILS_VERSION: '~> 6.0.0'
+         - ruby: 2.5
+           env:
+             RSPEC_VERSION: '~> 4.0'
+             RAILS_VERSION: '~> 5.2.0'
+         - ruby: 2.5
+           env:
+             RSPEC_VERSION: '~> 3.9'
+             RAILS_VERSION: '~> 6.0.0'
+         - ruby: 2.5
+           env:
+             RSPEC_VERSION: '~> 3.9'
+             RAILS_VERSION: '~> 5.2.0'
+         - ruby: ruby-head
+           env:
+             RSPEC_VERSION: 'master'
+             RAILS_VERSION: '~> 6.1.0'
+    env: ${{ matrix.env }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rake ci
+        continue-on-error: ${{ matrix.allow_failure || false }}

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/Gemfile

@@ -1,7 +1,7 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-rspec_version = ENV['RSPEC_VERSION']
-rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
+rspec_version = ENV['RSPEC_VERSION'] || '~> 4.0'
+rails_version = ENV['RAILS_VERSION'] || '>= 5.1.0'
 
 if rspec_version == 'master'
   gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
@@ -13,38 +13,16 @@ if rspec_version == 'master'
   gem "rspec-support", :git => 'git://github.com/rspec/rspec-support.git'
 else
   gem 'rspec-rails', rspec_version
-  gem 'rspec',       rspec_version
 end
 
-if rspec_major_version == '2' || RUBY_VERSION.to_f < 1.9
-  # rspec 2.x does not support Rails 4.1+ nor does Ruby 1.8.7
-  gem 'rails', '~> 3.2'
-  gem 'uglifier', '~> 1.2.4'
-  gem 'rake', '~> 0.9.2.2'
-  gem 'coffee-rails', '~> 3.2'
-  gem 'sass-rails', '~> 3.2'
-  gem 'jquery-rails', '~> 2.0'
-  gem 'haml-rails', '~> 0.4'
-  gem 'execjs', '~> 2.0.0'
-elsif rspec_major_version == '3'
-  if RUBY_VERSION < '2.2.2'
-    gem 'rails', '< 5.0' # rails 5 is ruby >= 2.2.2
-  else
-    gem 'rails', '>= 4.0'
-  end
-  gem 'uglifier', '>= 1.3'
-  gem 'rake', '>= 0.10'
-  gem 'coffee-rails', '>= 4.0'
-  gem 'sass-rails', '>= 4.0'
-  gem 'jquery-rails', '>= 3.0'
-  gem 'haml-rails', '>= 0.5'
-else
-  raise "rspec version #{rspec_version} is not supported"
-end
-
-gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'
-gem "rack", '<= 1.6.4' if RUBY_VERSION < '2.2.2'
+gem 'rails', rails_version
+gem 'uglifier'
+gem 'rake'
+gem 'coffee-rails'
+gem 'sass-rails'
+gem 'jquery-rails'
+gem 'haml-rails'
 
-# Specify your gem's dependencies in rspec-rails-generator-specs.gemspec
+# Specify your gem's dependencies in ammeter.gemspec
 gemspec
 

data/History.md

@@ -1,5 +1,11 @@
 ## Ammeter release history
 
+### 1.1.6 / 2023-11-29
+
+[full changelog](https://github.com/alexrothenberg/ammeter/compare/v1.1.5...v1.1.6)
+
+* Deprecate the custom exist matcher (#68)
+
 ### 1.0.0 / 2014-04-07
 
 [full changelog](https://github.com/alexrothenberg/ammeter/compare/v0.2.9...v1.0.0)

data/README.md

@@ -1,4 +1,4 @@
-# Ammeter [![Build Status](https://secure.travis-ci.org/alexrothenberg/ammeter.png)](http://travis-ci.org/alexrothenberg/ammeter) [![Code Climate](https://codeclimate.com/github/alexrothenberg/ammeter.png)](https://codeclimate.com/github/alexrothenberg/ammeter) [![Gem Version](https://badge.fury.io/rb/ammeter.png)](http://badge.fury.io/rb/ammeter)
+# Ammeter [![Ammeter CI](https://github.com/alexrothenberg/ammeter/actions/workflows/ci.yml/badge.svg)](https://github.com/alexrothenberg/ammeter/actions/workflows/ci.yml) [![Code Climate](https://codeclimate.com/github/alexrothenberg/ammeter.png)](https://codeclimate.com/github/alexrothenberg/ammeter) [![Gem Version](https://badge.fury.io/rb/ammeter.png)](http://badge.fury.io/rb/ammeter)
 
 
 A gem that makes it easy to write specs for your Rails 3 Generators.
@@ -13,6 +13,24 @@ and we think you may find it useful too.
 An [ammeter](http://en.wikipedia.org/wiki/Ammeter) is used to measure electrical current and
 electricity can be produced by a generator.
 
+# Installation
+Add this line to your Gemfile (or gemspec):
+
+```ruby
+gem 'ammeter'
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+Add:
+```ruby
+require 'ammeter/init'
+```
+To your `spec/spec_helper.rb`.
+
 # Example
 
 ```ruby
@@ -53,8 +71,6 @@ describe Rspec::Generators::ModelGenerator, :type => :generator do
     describe 'the spec' do
       # file - gives you the absolute path where the generator will create the file
       subject { file('spec/models/posts_spec.rb') }
-      # is_expected_to exist - verifies the file exists
-      it { is_expected_to exist }
 
       # is_expected_to contain - verifies the file's contents
       it { is_expected_to contain /require 'spec_helper'/ }
@@ -64,7 +80,7 @@ describe Rspec::Generators::ModelGenerator, :type => :generator do
       subject { migration_file('db/migrate/create_posts.rb') }
 
       # is_expected_to be_a_migration - verifies the file exists with a migration timestamp as part of the filename
-      it { is_expected_to exist }
+      it { is_expected_to be_a_migration }
       it { is_expected_to contain /create_table/ }
     end
   end
@@ -73,7 +89,6 @@ end
 
 # Available matchers
 
-- `exist` - verifies the file exists
 - `contain` - verifies the file's contents
 - `be_a_migration` - verifies the file exists with a migration timestamp as part of the filename
 - `have_method` - verifies the file (or a class withing it) implements a method

data/Rakefile

@@ -35,20 +35,19 @@ def create_gem(gem_name)
   sh "mkdir -p tmp/#{gem_name}/spec"
   sh "cp '#{template_folder}/spec/spec_helper.rb' tmp/#{gem_name}/spec"
   Dir.chdir("./tmp/#{gem_name}") do
-    Bundler.clean_system 'bundle install'
+    Bundler.unbundled_system 'bundle install'
   end
 end
 
 namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app => :ensure_bundler_11 do |t|
-    sh "bundle exec rails new ./tmp/example_app -m 'features/templates/generate_example_app.rb' --skip-test-unit"
+    sh "bundle exec rails new ./tmp/example_app -m 'features/templates/generate_example_app.rb' --skip-test-unit --skip-bootsnap --skip-spring --skip-webpack-install"
     sh "cp 'features/templates/rspec.rake' ./tmp/example_app/lib/tasks"
     Dir.chdir("./tmp/example_app/") do
-      Bundler.clean_system 'bundle install'
-      Bundler.clean_system 'rake db:migrate'
-      Bundler.clean_system 'rails g rspec:install'
-      Bundler.clean_system 'spring stop'
+      Bundler.unbundled_system 'bundle install'
+      Bundler.unbundled_system 'rake db:migrate'
+      Bundler.unbundled_system 'rails g rspec:install'
     end
   end
 

data/features/support/env.rb

@@ -42,7 +42,7 @@ def copy_to_aruba_from(gem_or_app_name)
   if rspec_major_version == '2'
     # rspec 2.x does not create rails_helper.rb so we create a symlink to avoid cluttering tests
     write_symlink("tmp/#{gem_or_app_name}/spec/spec_helper.rb", gem_or_app_name, 'rails_helper.rb')
-  elsif rspec_major_version == '3'
+  elsif rspec_major_version >= '3'
     write_symlink("tmp/#{gem_or_app_name}/spec/rails_helper.rb", gem_or_app_name)
   end
 end

data/features/templates/generate_example_app.rb

@@ -11,7 +11,6 @@ if rspec_version == 'master'
   gem "rspec-support", :git => 'git://github.com/rspec/rspec-support.git'
 else
   gem 'rspec-rails', rspec_version
-  gem 'rspec',       rspec_version
 end
 
 gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'

data/features/templates/my_rails_gem/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-rspec_version = ENV['RSPEC_VERSION']
-rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
+rspec_version = ENV['RSPEC_VERSION'] || '~> 4.0'
+rails_version = ENV['RAILS_VERSION'] || '>= 5.1.0'
 
 if rspec_version == 'master'
   gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
@@ -13,19 +13,9 @@ if rspec_version == 'master'
   gem "rspec-support", :git => 'git://github.com/rspec/rspec-support.git'
 else
   gem 'rspec-rails', rspec_version
-  gem 'rspec',       rspec_version
-end
-
-if rspec_major_version == '2' || RUBY_VERSION.to_f < 1.9
-  gem 'rails', '~> 3.2.0'
-  # Execjs is causing problems on 1.8.7
-  gem 'execjs', '~> 2.0.0'
-elsif rspec_major_version == '3'
-  gem 'rails', '>= 4.1'
-else
-  raise "rspec version #{rspec_version} is not supported"
 end
 
+gem 'rails', rails_version
 
 # Specify your gem's dependencies in my_gem.gemspec
 gemspec

data/features/templates/my_rails_gem/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
 
 require 'rspec'

data/features/templates/my_railties_gem/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-rspec_version = ENV['RSPEC_VERSION']
-rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
+rspec_version = ENV['RSPEC_VERSION'] || '~> 4.0'
+rails_version = ENV['RAILS_VERSION'] || '>= 5.1.0'
 
 if rspec_version == 'master'
   gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
@@ -13,19 +13,9 @@ if rspec_version == 'master'
   gem "rspec-support", :git => 'git://github.com/rspec/rspec-support.git'
 else
   gem 'rspec-rails', rspec_version
-  gem 'rspec',       rspec_version
-end
-
-if rspec_major_version == '2' || RUBY_VERSION.to_f < 1.9
-  gem 'railties', '~> 3.2.0'
-  # Execjs is causing problems on 1.8.7
-  #gem 'execjs', '~> 2.0.0'
-elsif rspec_major_version == '3'
-  gem 'railties', '>= 4.1'
-else
-  raise "rspec version #{rspec_version} is not supported"
 end
 
+gem 'railties', rails_version
 
 # Specify your gem's dependencies in my_gem.gemspec
 gemspec

data/features/templates/my_railties_gem/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
 
 require 'rspec'

data/lib/ammeter/rspec/generator/example.rb

@@ -12,7 +12,8 @@ RSpec::configure do |c|
     c.include Ammeter::RSpec::Rails::GeneratorExampleHelpers,
       :type          => :generator
     c.include Ammeter::RSpec::Rails::GeneratorExampleGroup,
-      :type          => :generator,
+      :type          => :generator
+    c.include Ammeter::RSpec::Rails::GeneratorExampleGroup,
       :file_path     => lambda { |file_path, metadata|
         metadata[:type].nil? && generator_path_regex =~ file_path
       }

data/lib/ammeter/rspec/generator/matchers/exist.rb

@@ -1,5 +1,11 @@
-RSpec::Matchers.define :exist do
+# DEPRECATED: use `expect(Pathname.new(path)).to exist` instead
+RSpec::Matchers.define :exist do |*expected|
   match do |file_path|
-    File.exist?(file_path)
+    if !(file_path.respond_to?(:exist?) || file_path.respond_to?(:exists?))
+      ActiveSupport::Deprecation.warn "The `exist` matcher overrides one built-in by RSpec; use `expect(Pathname.new(path)).to exist` instead"
+      File.exist?(file_path)
+    else
+      RSpec::Matchers::BuiltIn::Exist.new(*expected).matches?(file_path)
+    end
   end
 end

data/lib/ammeter/rspec/generator/matchers/have_correct_syntax.rb

@@ -30,7 +30,11 @@ RSpec::Matchers.define :have_correct_syntax do
     require 'ostruct'
 
     begin
-      view = ActionView::Template::Handlers::ERB.call(OpenStruct.new(:source => code))
+      if Rails::VERSION::STRING < "6.0"
+        view = ActionView::Template::Handlers::ERB.call(OpenStruct.new(:source => code))
+      else
+        view = ActionView::Template::Handlers::ERB.call(OpenStruct.new, code)
+      end
       eval('__crash_me__; ' + view)
     rescue SyntaxError
       false

data/lib/ammeter/version.rb

@@ -1,3 +1,3 @@
 module Ammeter
-  VERSION = "1.1.4"
+  VERSION = "1.1.6"
 end

data/spec/ammeter/rspec/generator/matchers/exist_spec.rb

@@ -5,9 +5,17 @@ describe "exist" do
     allow(File).to receive(:exist?).with('/some/file/path').and_return(true)
     expect('/some/file/path').to exist
   end
+
   it 'fails when the file does not exist' do
     allow(File).to receive(:exist?).with('/some/file/path').and_return(false)
     expect('/some/file/path').to_not exist
   end
 
+  it 'maintains default RSpec behavior', :aggregate_failures do
+    path = Pathname.new('/some/file/path')
+    allow(path).to receive(:exist?).and_return(true)
+    expect(path).to exist
+    allow(path).to receive(:exist?).and_return(false)
+    expect(path).not_to exist
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ammeter
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Alex Rothenberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -213,8 +213,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".ruby-version"
 - Gemfile
 - History.md
 - LICENSE.txt
@@ -267,7 +268,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -282,9 +283,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Write specs for your Rails 3+ generators
 test_files:

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-sudo: false
-
-rvm:
-  - 2.3.0
-  - 2.2
-  - 2.1.2
-  - 2.0.0
-  - ruby-head
-  - jruby-9.1.2.0
-
-env:
-  - RSPEC_VERSION=master
-  - RSPEC_VERSION='~> 3.0'
-
-bundler_args: "--retry=3 --jobs=3"
-
-script: "bundle exec rake ci --trace"
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.1.2.0