ammeter 0.1.3 → 0.2.0

data/features/generator_spec.feature

@@ -8,13 +8,14 @@ Feature: generator spec
       """
       class AwesomeGenerator < Rails::Generators::NamedBase
         source_root File.expand_path('../templates', __FILE__)
+        class_option :super, :type => :boolean, :default => false
 
         def create_awesomeness
-          template 'awesome.html', File.join('public', name, 'awesome.html')
+          template 'awesome.html', File.join('public', name, "#{"super_" if options[:super]}awesome.html")
         end
 
         def create_lameness
-          template 'lame.html', File.join('public', name, 'lame.html')
+          template 'lame.html', File.join('public', name, "#{"super_" if options[:super]}lame.html")
         end
       end
       """
@@ -36,41 +37,142 @@ Feature: generator spec
       describe AwesomeGenerator do
         destination File.expand_path("../../tmp", __FILE__)
 
-        before do
-          run_generator %w(my_dir)
+        before { run_generator %w(my_dir) }
+        describe 'public/my_dir/awesome.html' do
+          subject { file('public/my_dir/awesome.html') }
+          it { should exist }
+          it { should contain 'This is an awesome file' }
+          it { should_not contain 'This text is not in the file' }
+        end
+        describe 'public/my_dir/lame.html' do
+          subject { file('public/my_dir/lame.html') }
+          it { should exist }
+          it { should contain 'This is a lame file' }
+          it { should_not contain 'This text is not in the file' }
         end
-        it 'should copy the awesome file into public' do
-          file('public/my_dir/awesome.html').should exist
+      end
+      """
+    When I run `rake spec`
+    Then the output should contain "6 examples, 0 failures"
+
+  Scenario: A spec that runs one task in the generator
+    Given a file named "spec/generators/another_awesome_generator_spec.rb" with:
+      """
+      require "spec_helper"
+      require 'generators/awesome/awesome_generator'
+
+      describe AwesomeGenerator do
+        destination File.expand_path("../../tmp", __FILE__)
+        arguments %w(another_dir)
+
+        before { invoke_task :create_awesomeness }
+        describe 'public/another_dir/awesome.html' do
+          subject { file('public/another_dir/awesome.html') }
+          it { should exist }
+          it { should contain 'This is an awesome file' }
+          it { should_not contain 'This text is not in the file' }
         end
-        it 'should copy the lame file into public' do
-          file('public/my_dir/lame.html').should exist
+        describe 'public/another_dir/lame.html' do
+          subject { file('public/another_dir/lame.html') }
+          it { should_not exist }
         end
       end
       """
     When I run `rake spec`
-    Then the output should contain "2 examples, 0 failures"
+    Then the output should contain "4 examples, 0 failures"
+
+  Scenario: A spec with some failures shows good error messages
+    Given a file named "spec/generators/awesome_generator_spec.rb" with:
+      """
+      require "spec_helper"
+      require 'generators/awesome/awesome_generator'
+
+      describe AwesomeGenerator do
+        destination File.expand_path("../../tmp", __FILE__)
 
-    Scenario: A spec that runs one task in the generator
-      Given a file named "spec/generators/another_awesome_generator_spec.rb" with:
-        """
-        require "spec_helper"
-        require 'generators/awesome/awesome_generator'
-
-        describe AwesomeGenerator do
-          destination File.expand_path("../../tmp", __FILE__)
-          arguments %w(another_dir)
-
-          before do
-            invoke_task :create_awesomeness
-          end
-          it 'should copy the awesome file into public' do
-            file('public/another_dir/awesome.html').should exist
-            file('public/another_dir/awesome.html').should contain 'This is an awesome file'
-          end
-          it 'should not have copied the lame file into public' do
-            file('public/another_dir/lame.html').should_not exist
-          end
+        before { run_generator %w(my_dir) }
+        describe 'public/my_dir/awesome.html' do
+          subject { file('public/my_dir/awesome.html') }
+          it { should_not contain 'This is an awesome file' }
+          it { should     contain 'This text is not in the file' }
+          it { should_not exist }
         end
-        """
-      When I run `rake spec`
-      Then the output should contain "2 examples, 0 failures"
+        describe 'public/my_dir/non_existent.html' do
+          subject { file('public/my_dir/non_existent.html') }
+          it { should exist }
+        end
+        describe 'db/migrate/non_existent_migration.rb' do
+          subject { migration_file('db/migrate/non_existent_migration.rb') }
+          it { should exist }
+        end
+      end
+      """
+    When I run `rake spec`
+    Then the output should contain "5 examples, 5 failures"
+     And the output should contain:
+       """
+       /tmp/public/my_dir/awesome.html to not contain "This is an awesome file" but it did
+       """
+     And the output should contain:
+       """
+       /tmp/public/my_dir/awesome.html to contain "This text is not in the file" but it contained "This is an awesome file"
+       """
+     And the output should contain:
+       """
+       /tmp/public/my_dir/awesome.html" not to exist
+       """
+     And the output should contain:
+       """
+       /tmp/public/my_dir/non_existent.html" to exist
+       """
+     And the output should contain:
+       """
+       db/migrate/TIMESTAMP_non_existent_migration.rb" to exist
+       """
+
+   Scenario: Can specify arguments separately from running the generator
+     Given a file named "spec/generators/awesome_generator_spec.rb" with:
+       """
+       require "spec_helper"
+       require 'generators/awesome/awesome_generator'
+
+       describe AwesomeGenerator do
+         destination File.expand_path("../../tmp", __FILE__)
+         arguments %w(my_dir --super)
+
+         before { generator.invoke_all }
+         describe 'public/my_dir/super_awesome.html' do
+           subject { file('public/my_dir/super_awesome.html') }
+           it { should exist }
+         end
+         describe 'public/my_dir/super_lame.html' do
+           subject { file('public/my_dir/super_lame.html') }
+           it { should exist }
+         end
+       end
+       """
+     When I run `rake spec`
+     Then the output should contain "2 examples, 0 failures"
+
+  Scenario: A generator that creates a migration
+    Given a file named "spec/generators/a_migration_spec.rb" with:
+      """
+      require "spec_helper"
+      require 'rails/generators/active_record/migration/migration_generator'
+
+      describe ActiveRecord::Generators::MigrationGenerator do
+        destination File.expand_path("../../tmp", __FILE__)
+
+        before do
+          prepare_destination
+          run_generator %w(create_posts)
+        end
+        subject { migration_file('db/migrate/create_posts.rb') }
+        it { should exist }
+        it { should contain 'class CreatePosts < ActiveRecord::Migration' }
+      end
+      """
+    When I run `rake spec`
+    Then the output should contain "2 examples, 0 failures"
+
+

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

@@ -11,7 +11,7 @@ module Ammeter
         extend ActiveSupport::Concern
         include ::RSpec::Rails::RailsExampleGroup
 
-        DELEGATED_METHODS = [:generator, :capture, :prepare_destination,
+        DELEGATED_METHODS = [:capture, :prepare_destination,
                              :destination_root, :current_path, :generator_class]
         module ClassMethods
           mattr_accessor :test_unit_test_case_delegate
@@ -24,11 +24,18 @@ module Ammeter
           def initialize_delegate
             self.test_unit_test_case_delegate = ::Rails::Generators::TestCase.new 'pending'
             self.test_unit_test_case_delegate.class.tests(describes)
+            @generator = nil
+          end
+
+          def generator(given_args=self.default_arguments, config={})
+            @generator ||= begin
+              args, opts = Thor::Options.split(given_args)
+              self.test_unit_test_case_delegate.generator(args, opts, config)
+            end
           end
 
           def run_generator(given_args=self.default_arguments, config={})
-            args, opts = Thor::Options.split(given_args)
-            capture(:stdout) { generator(args, opts, config).invoke_all }
+            capture(:stdout) { generator(given_args, config).invoke_all }
           end
         end
 
@@ -39,7 +46,7 @@ module Ammeter
         end
 
         included do
-          delegate :run_generator, :destination, :arguments, :to => :'self.class'
+          delegate :generator, :run_generator, :destination, :arguments, :to => :'self.class'
           DELEGATED_METHODS.each do |method|
             delegate method,  :to => :'self.class'
           end
@@ -67,6 +74,12 @@ module Ammeter
         def file relative
           File.expand_path(relative, destination_root)
         end
+        def migration_file relative
+          file_path = file(relative)
+          migration_file = Dir.glob("#{File.dirname(file_path)}/[0-9]*_#{File.basename(file_path)}").first
+          migration_file = "#{File.dirname(file_path)}/TIMESTAMP_#{File.basename(file_path)}" if migration_file.nil?
+          migration_file
+        end
       end
     end
   end

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

@@ -13,7 +13,7 @@ RSpec::Matchers.define :contain do |expected_content|
     "expected the file #{file_path} to contain #{expected_content.inspect} but it contained #{@actual_contents.inspect}"
   end
   
-  failure_message_for_should_not do |relative|
-    "expected the file #{file_path} to not contain #{expected_content} but it did"
+  failure_message_for_should_not do |file_path|
+    "expected the file #{file_path} to not contain #{expected_content.inspect} but it did"
   end
 end

data/lib/ammeter/version.rb

@@ -1,3 +1,3 @@
 module Ammeter
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/ammeter/rspec/rails/generator/example/generator_example_group_spec.rb

@@ -41,6 +41,33 @@ module Ammeter::RSpec::Rails
           end
         end
       end
+
+      describe 'working with files' do
+        let(:path_to_gem_root_tmp) { File.expand_path(__FILE__ + '../../../../../../../../tmp') }
+        before do
+          group.destination path_to_gem_root_tmp
+          FileUtils.rm_rf path_to_gem_root_tmp
+          FileUtils.mkdir path_to_gem_root_tmp
+        end
+        it 'should use destination to find relative root file' do
+          group.file('app/model/post.rb').should == "#{path_to_gem_root_tmp}/app/model/post.rb"
+        end
+
+        describe 'migrations' do
+          before do
+            tmp_db_migrate = path_to_gem_root_tmp + '/db/migrate'
+            FileUtils.mkdir_p tmp_db_migrate
+            FileUtils.touch(tmp_db_migrate + '/20111010200000_create_comments.rb')
+            FileUtils.touch(tmp_db_migrate + '/20111010203337_create_posts.rb')
+          end
+          it 'should use destination to find relative root file' do
+            group.migration_file('db/migrate/create_posts.rb').should == "#{path_to_gem_root_tmp}/db/migrate/20111010203337_create_posts.rb"
+          end
+          it 'should stick "TIMESTAMP" in when migration does not exist' do
+            group.migration_file('db/migrate/migration_that_is_not_there.rb').should == "#{path_to_gem_root_tmp}/db/migrate/TIMESTAMP_migration_that_is_not_there.rb"
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ammeter
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Rothenberg
@@ -15,211 +10,162 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 -04:00
+date: 2011-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: railties
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
-  name: railties
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: activesupport
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
-  name: activesupport
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rspec
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
         version: "2.2"
   type: :runtime
-  name: rspec
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rspec-rails
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
         version: "2.2"
   type: :runtime
-  name: rspec-rails
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rails
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
         version: "3.1"
   type: :development
-  name: rails
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: uglifier
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: uglifier
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: turn
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: turn
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rake
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: rake
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: coffee-rails
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: coffee-rails
+  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: sass-rails
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: sass-rails
+  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: jquery-rails
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  name: jquery-rails
+  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: cucumber
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
         version: "0.10"
   type: :development
-  name: cucumber
+  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: aruba
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
         version: "0.3"
   type: :development
-  name: aruba
+  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: sqlite3
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
         version: "1"
   type: :development
-  name: sqlite3
+  prerelease: false
   version_requirements: *id014
 description: Write specs for your Rails 3 generators
 email: 
@@ -273,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -856853819327253995
       segments: 
       - 0
       version: "0"
@@ -282,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -856853819327253995
       segments: 
       - 0
       version: "0"