ammeter 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a15e1595dc23477cee95c4f7e815238c59be77b
-  data.tar.gz: bd903e9447a95611b53a7d15f29b58c810309ec8
+  metadata.gz: 8b09616152a6a841841c86b88596daa437725df9
+  data.tar.gz: 7aee1b867d17fa150330198d7f5c8c73c9812237
 SHA512:
-  metadata.gz: 8bfb2ce3d1e364af1be88d2d8d63656fac3222ccc81cbb5ec1da0e9485b4da31ccad75b8047f3a439839b9f18285f897365c188ebd5fb4854d8b695b319318c0
-  data.tar.gz: 69d2fbe00c5ab63057c64a6020108d67d70f2215e61e7b361fc653d0198aeeee900ed81f8f4404faac4599fbbf11af5127ec243d5ef536d7ed9e6b385c1732e1
+  metadata.gz: 4f7affdbcb8d11a54dbb7eefd2d8694b4f6a519bc1f42a22bb49d2ea13381360c519dbc576eace67f6a9ec6bafd2704697a146660961199d19a65049b7da610f
+  data.tar.gz: 76fbf530694d7c1727f6ea40080799bfd50f8363cd4ddc86d1d1ba8e13490ef3ff93b8672efaeda239005260a5481d0961e7d84b64eb006c4a2234d27a4a3c0e

data/.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
+sudo: false
 
 rvm:
-  - 1.8.7
+  - 2.2
   - 2.1.2
   - 2.0.0
   - 1.9.3
+  - 1.8.7
   - ruby-head
-  - jruby-head
-  - jruby-19mode
-  - rbx-19mode
+  - jruby-9.0.0.0.pre1
+  - jruby-1.7.9-d19
 
 env:
   - RSPEC_VERSION=master
@@ -22,7 +23,8 @@ script: "bundle exec rake ci --trace"
 
 matrix:
   allow_failures:
+    - rvm: 2.2
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode
+    - rvm: jruby-9.0.0.0.pre1
+    - rvm: jruby-1.7.9-d19
+

data/Gemfile

@@ -38,6 +38,8 @@ else
   raise "rspec version #{rspec_version} is not supported"
 end
 
+gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'
+
 # Specify your gem's dependencies in rspec-rails-generator-specs.gemspec
 gemspec
 

data/README.md

@@ -21,7 +21,7 @@ require 'spec_helper'
 # Generators are not automatically loaded by Rails
 require 'generators/rspec/model/model_generator'
 
-describe Rspec::Generators::ModelGenerator do
+describe Rspec::Generators::ModelGenerator, :type => :generator do
   # Tell the generator where to put its output (what it thinks of as Rails.root)
   destination File.expand_path("../../../../../tmp", __FILE__)
   before do
@@ -61,10 +61,11 @@ describe Rspec::Generators::ModelGenerator do
       it { is_expected_to contain /describe Posts/ }
     end
     describe 'the migration' do
-      subject { file('db/migrate/create_posts.rb') }
+      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 be_a_migration }
+      it { is_expected_to exist }
+      it { is_expected_to contain /create_table/ }
     end
   end
 end

data/Rakefile

@@ -48,6 +48,7 @@ namespace :generate do
       Bundler.clean_system 'bundle install'
       Bundler.clean_system 'rake db:migrate'
       Bundler.clean_system 'rails g rspec:install'
+      Bundler.clean_system 'spring stop'
     end
   end
 

data/features/support/env.rb

@@ -1,7 +1,11 @@
 require 'aruba/cucumber'
 
 Before do
-  @aruba_timeout_seconds = 30
+  if RUBY_VERSION == "1.9.3"
+    @aruba_timeout_seconds = 60
+  else
+    @aruba_timeout_seconds = 30
+  end
 end
 
 def aruba_path(file_or_dir, source_foldername)

data/features/templates/generate_example_app.rb

@@ -14,6 +14,7 @@ else
   gem 'rspec',       rspec_version
 end
 
+gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'
 gem 'ammeter', :path=>'../..'
 if defined?(Rails) && Rails::VERSION::STRING.to_f < 4
   # Execjs is causing problems on 1.8.7

data/lib/ammeter/init.rb

@@ -1,4 +1,5 @@
 require 'rspec/core'
+require 'rspec/rails'
 if RSpec::Core::Version::STRING < '3'
   require 'ammeter/rspec/rspec_2_compatibility'  # if rspec2
 end

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

@@ -1,7 +1,5 @@
 require 'rails/generators'
 require 'active_support/core_ext'
-require 'rspec/rails/adapters'
-require 'rspec/rails/example/rails_example_group'
 require 'tmpdir'
 require 'fileutils'
 
@@ -65,8 +63,6 @@ module Ammeter
           ::Rails::Generators::TestCase.destination File.expand_path('ammeter', Dir.tmpdir)
           initialize_delegate
 
-          subject { generator }
-
           before do
             self.class.initialize_delegate
             prepare_destination
@@ -86,7 +82,10 @@ module Ammeter
           migration_file = "#{File.dirname(file_path)}/TIMESTAMP_#{File.basename(file_path)}" if migration_file.nil?
           migration_file
         end
+        def subject
+          generator
+        end
       end
     end
   end
-end
+end

data/lib/ammeter/version.rb

@@ -1,3 +1,3 @@
 module Ammeter
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ammeter
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Alex Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties