ammeter 0.2.8 → 0.2.9

data/.gitignore

@@ -9,4 +9,5 @@ gemfiles/*.lock
 .rvmrc
 **/.DS_Store
 *~
-*.swp
+*.swp
+.rbx

data/.travis.yml

@@ -1,4 +1,18 @@
 script: "bundle exec rake ci"
 rvm:
+  - ruby-head
+  - 2.0.0
+  - 1.9.3
   - 1.8.7
-  - 1.9.3
+  - jruby-head
+  - jruby-19mode
+  - jruby-18mode
+  - rbx-19mode
+  - rbx-18mode
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: jruby-19mode
+    - rvm: jruby-18mode
+    - rvm: rbx-19mode
+    - rvm: rbx-18mode

data/History.md

@@ -1,5 +1,12 @@
 ## Ammeter release history
 
+### 0.2.9 / 2013-06-06
+
+[full changelog](https://github.com/alexrothenberg/ammeter/compare/v0.2.8...v0.2.9)
+
+* Improves `contain` matcher for generated file contents
+* Adds `ensure_current_path` method to GeneratorExampleGroup
+
 ### 0.2.8 / 2012-07-06
 
 [full changelog](https://github.com/alexrothenberg/ammeter/compare/v0.2.7...v0.2.8)

data/README.md

@@ -1,73 +1,74 @@
-# Ammeter [![Build Status](https://secure.travis-ci.org/alexrothenberg/ammeter.png)](http://travis-ci.org/alexrothenberg/ammeter) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/alexrothenberg/ammeter)
+# 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)
+
 
 A gem that makes it easy to write specs for your Rails 3 Generators.
 
-RSpec is using ammeter to 
-[spec](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/model/model_generator_spec.rb) 
-[its](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/controller/controller_generator_spec.rb) 
-[own](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/helper/helper_generator_spec.rb) 
+RSpec is using ammeter to
+[spec](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/model/model_generator_spec.rb)
+[its](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/controller/controller_generator_spec.rb)
+[own](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/helper/helper_generator_spec.rb)
 [generators](https://github.com/rspec/rspec-rails/blob/master/spec/generators/rspec/scaffold/scaffold_generator_spec.rb)
 and we think you may find it useful too.
 
-An [ammeter](http://en.wikipedia.org/wiki/Ammeter) is used to measure electrical current and 
+An [ammeter](http://en.wikipedia.org/wiki/Ammeter) is used to measure electrical current and
 electricity can be produced by a generator.
 
 # Example
 
-    require 'spec_helper'
-
-    # Generators are not automatically loaded by Rails
-    require 'generators/rspec/model/model_generator'
-
-    describe Rspec::Generators::ModelGenerator do
-      # Tell the generator where to put its output (what it thinks of as Rails.root)
-      destination File.expand_path("../../../../../tmp", __FILE__)
-      before do
-        prepare_destination
-      end
-
-      # using mocks to ensure proper methods are called
-      # invoke_all - will call all the tasks in the generator
-      it 'should run all tasks in the generator' do
-        gen = generator %w(posts)
-        gen.should_receive :create_model_spec
-        gen.should_receive :create_fixture_file
-        capture(:stdout) { gen.invoke_all }
-      end
-
-      # invoke_task - will call just the named task in the generator
-      it 'should run a specific tasks in the generator' do
-        gen = generator %w(posts)
-        gen.should_receive     :create_model_spec
-        gen.should_not_receive :create_fixture_file
-        capture(:stdout) { gen.invoke_task :create_model_spec }
-      end
-
-      # custom matchers make it easy to verify what the generator creates
-      describe 'the generated files' do
-        before do
-          run_generator %w(posts)
-        end
-        describe 'the spec' do
-          # file - gives you the absolute path where the generator will create the file
-          subject { file('spec/models/posts_spec.rb') }
-
-          # should exist - verifies the file exists
-          it { should exist }
-
-          # should contain - verifies the file's contents
-          it { should contain /require 'spec_helper'/ }
-          it { should contain /describe Posts/ }
-        end
-        describe 'the migration' do
-          subject { file('db/migrate/create_posts.rb') }
-
-          # should be_a_migration - verifies the file exists with a migration timestamp as part of the filename 
-          it { should be_a_migration }
-        end
-      end
+```ruby
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/model/model_generator'
+
+describe Rspec::Generators::ModelGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+  before do
+    prepare_destination
+  end
+
+  # using mocks to ensure proper methods are called
+  # invoke_all - will call all the tasks in the generator
+  it 'should run all tasks in the generator' do
+    gen = generator %w(posts)
+    gen.should_receive :create_model_spec
+    gen.should_receive :create_fixture_file
+    capture(:stdout) { gen.invoke_all }
+  end
+
+  # invoke_task - will call just the named task in the generator
+  it 'should run a specific tasks in the generator' do
+    gen = generator %w(posts)
+    gen.should_receive     :create_model_spec
+    gen.should_not_receive :create_fixture_file
+    capture(:stdout) { gen.invoke_task :create_model_spec }
+  end
+
+  # custom matchers make it easy to verify what the generator creates
+  describe 'the generated files' do
+    before do
+      run_generator %w(posts)
+    end
+    describe 'the spec' do
+      # file - gives you the absolute path where the generator will create the file
+      subject { file('spec/models/posts_spec.rb') }
+       # should exist - verifies the file exists
+      it { should exist }
+
+      # should contain - verifies the file's contents
+      it { should contain /require 'spec_helper'/ }
+      it { should contain /describe Posts/ }
     end
+    describe 'the migration' do
+      subject { file('db/migrate/create_posts.rb') }
 
+      # should be_a_migration - verifies the file exists with a migration timestamp as part of the filename
+      it { should be_a_migration }
+    end
+  end
+end
+```
 
 # Contributing
 

data/Rakefile

@@ -32,7 +32,7 @@ def create_gem(gem_name)
   sh "cp '#{template_folder}/Gemfile' tmp/#{gem_name}"
   sh "cp '#{template_folder}/#{gem_name}.gemspec' tmp/#{gem_name}"
   sh "cp '#{template_folder}/Rakefile' tmp/#{gem_name}"
-  sh "mkdir tmp/#{gem_name}/spec"
+  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'

data/ammeter.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_runtime_dependency 'railties',      '>= 3.0'
   s.add_runtime_dependency 'activesupport', '>= 3.0'
   s.add_runtime_dependency 'rspec',         '>= 2.2'
@@ -30,5 +30,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'jquery-rails', '>= 2.0.2'
   s.add_development_dependency 'cucumber',     '>= 0.10'
   s.add_development_dependency 'aruba',        '>= 0.3'
-  s.add_development_dependency 'sqlite3',      '>= 1'
+  case RUBY_PLATFORM
+  when 'java'
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    s.add_development_dependency 'therubyrhino'
+  else
+    s.add_development_dependency 'sqlite3',      '>= 1'
+  end
 end

data/features/support/aruba_timeout.rb

@@ -0,0 +1,14 @@
+# see https://github.com/cucumber/aruba#jruby-tips
+Aruba.configure do |config|
+  config.before_cmd do |cmd|
+    set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+    set_env('JAVA_OPTS', "-d32 #{ENV['JAVA_OPTS']}") # force jRuby to use client JVM for faster startup times
+  end
+end if RUBY_PLATFORM == 'java'
+
+# MRI 1.8.7 does not define RUBY_ENGINE
+if defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE)
+  Before do
+    @aruba_timeout_seconds = 30
+  end
+end

data/features/templates/my_railties_gem/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'bundler/setup'
-require 'ammeter/init'
 require 'rails'
+require 'ammeter/init'
 
 Bundler.require

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

@@ -25,6 +25,10 @@ module Ammeter
           def prepare_destination
             self.test_unit_test_case_delegate.send :prepare_destination
           end
+
+          def ensure_current_path
+            self.test_unit_test_case_delegate.send :ensure_current_path
+          end
           
           def initialize_delegate
             self.test_unit_test_case_delegate = ::Rails::Generators::TestCase.new 'pending'
@@ -49,7 +53,7 @@ module Ammeter
         end
       
         included do
-          delegate :generator, :run_generator, :destination, :arguments, :to => :'self.class'
+          delegate :generator, :run_generator, :destination, :arguments, :ensure_current_path, :to => :'self.class'
           DELEGATED_METHODS.each do |method|
             delegate method,  :to => :'self.class'
           end

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

@@ -1,19 +1,46 @@
-RSpec::Matchers.define :contain do |expected_content|
-  match do |file_path|
-    @actual_contents = File.new(file_path).read
-    case expected_content
-      when String
-        @actual_contents.include? expected_content
-      when Regexp
-        @actual_contents =~ expected_content
-    end
+RSpec::Matchers.define :contain do |*expected_contents|
+  match_for_should do |file_path|
+    @actual_contents = File.read(file_path)
+    not_found_expectations.empty?
+  end
+
+  match_for_should_not do |file_path|
+    @actual_contents = File.read(file_path)
+    found_expectations.empty?
   end
-  
+
   failure_message_for_should do |file_path|
-    "expected the file #{file_path} to contain #{expected_content.inspect} but it contained #{@actual_contents.inspect}"
+    "expected the file #{file_path} to contain " +
+      if expected_contents.many?
+        "#{expected_contents.map(&:inspect).to_sentence} but " +
+          "#{not_found_expectations.map(&:inspect).to_sentence} #{not_found_expectations.many? ? 'were' : 'was'} not found"
+      else
+        "#{expected_contents.first.inspect} but it contained #{@actual_contents.inspect}"
+      end
   end
-  
+
   failure_message_for_should_not do |file_path|
-    "expected the file #{file_path} to not contain #{expected_content.inspect} but it did"
+    "expected the file #{file_path} to not contain " +
+      if expected_contents.many?
+        "#{expected_contents.map(&:inspect).to_sentence} but " +
+          "#{found_expectations.map(&:inspect).to_sentence} #{found_expectations.many? ? 'were' : 'was'} found"
+      else
+        "#{expected_contents.first.inspect} but it did"
+      end
+  end
+
+  define_method :found_expectations do
+    @found_expectations ||= expected_contents.select do |expected_content|
+      case expected_content
+        when String
+          @actual_contents.include? expected_content
+        when Regexp
+          @actual_contents =~ expected_content
+      end
+    end
+  end
+
+  define_method :not_found_expectations do
+    @not_found_expectations ||= expected_contents - found_expectations
   end
 end

data/lib/ammeter/version.rb

@@ -1,3 +1,3 @@
 module Ammeter
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

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

@@ -4,18 +4,19 @@ describe "contain" do
 
   context "when the file exists" do
     let(:contents) { "This file\ncontains\nthis text" }
-    let(:mock_file) { mock(:read=>contents) }
 
     subject { '/some/file/path' }
     before do
-      File.stub(:new).with('/some/file/path').and_return(mock_file)
+      File.stub(:read).with('/some/file/path').and_return(contents)
     end
     it { should contain "This file\ncontains\nthis text" }
     it { should contain "This file" }
     it { should contain "this text" }
     it { should contain /This file/ }
     it { should contain /this text/ }
+    it { should contain "contains", /this text/ }
     it { should_not contain /something not there/ }
+    it { should_not contain /this isn't at the contents/, /neither is this/ }
   end
 
   context "when the file is not there" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ammeter
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -237,6 +237,7 @@ files:
 - features/generator_in_a_gem.feature
 - features/generator_spec.feature
 - features/hooking_into_other_generators.feature
+- features/support/aruba_timeout.rb
 - features/support/env.rb
 - features/templates/generate_example_app.rb
 - features/templates/my_rails_gem/Gemfile
@@ -278,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2565557972017694478
+      hash: 1076241884620753575
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -287,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2565557972017694478
+      hash: 1076241884620753575
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -298,6 +299,7 @@ test_files:
 - features/generator_in_a_gem.feature
 - features/generator_spec.feature
 - features/hooking_into_other_generators.feature
+- features/support/aruba_timeout.rb
 - features/support/env.rb
 - features/templates/generate_example_app.rb
 - features/templates/my_rails_gem/Gemfile