ammeter 0.2.3 → 0.2.4

data/History.md

@@ -1,5 +1,11 @@
 ## Ammeter release history
 
+### 0.2.4 / 2012-04-06
+
+[full changelog](https://github.com/alexrothenberg/ammeter/compare/v0.2.3...v0.2.4)
+
+* Fixed issue #8 with migration_file and be_a_migration [@EppO]
+
 ### 0.2.3 / 2012-03-05
 
 [full changelog](https://github.com/alexrothenberg/ammeter/compare/v0.2.2...v0.2.3)

data/Rakefile

@@ -21,21 +21,19 @@ Cucumber::Rake::Task.new(:cucumber)
 # for cucumber features that create a sample project
 def in_example_app(command)
   Dir.chdir("./tmp/example_app/") do
-    Bundler.with_clean_env do
-      sh command
-    end
+    Bundler.clean_system command
   end
 end
 namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app do |t|
-    # unless File.directory?('./tmp/example_app')
-      sh "bundle exec rails new ./tmp/example_app -m 'features/templates/generate_example_app.rb' --skip-test-unit"
-      sh "cp 'features/templates/rspec.rake' ./tmp/example_app/lib/tasks"
-      in_example_app 'rake db:migrate'
-      in_example_app 'rails g rspec:install'
-      in_example_app 'bundle install'
-    # end
+    raise 'Bundler 1.1 is a development dependency to build ammeter. Please upgrade bundler.' unless Bundler::VERSION >= '1.1'
+
+    sh "bundle exec rails new ./tmp/example_app -m 'features/templates/generate_example_app.rb' --skip-test-unit"
+    sh "cp 'features/templates/rspec.rake' ./tmp/example_app/lib/tasks"
+    in_example_app 'rake db:migrate'
+    in_example_app 'rails g rspec:install'
+    in_example_app 'bundle install'
   end
 end
 

data/ammeter.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rspec',         '>= 2.2'
   s.add_runtime_dependency 'rspec-rails',   '>= 2.2'
 
-  s.add_development_dependency 'rails',    '>= 3.1'
-  s.add_development_dependency 'uglifier'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'sass-rails'
-  s.add_development_dependency 'jquery-rails'
-  s.add_development_dependency 'cucumber', '~> 0.10'
-  s.add_development_dependency 'aruba',    '~> 0.3'
-  s.add_development_dependency 'sqlite3',  '~> 1'
+  s.add_development_dependency 'rails',        '>= 3.1'
+  s.add_development_dependency 'uglifier',     '>= 1.2.4'
+  s.add_development_dependency 'rake',         '>= 0.9.2.2'
+  s.add_development_dependency 'coffee-rails', '>= 3.2.2'
+  s.add_development_dependency 'sass-rails',   '>= 3.2.5'
+  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'
 end

data/features/generator_spec.feature

@@ -158,11 +158,12 @@ Feature: generator spec
         before { run_generator %w(create_posts) }
         subject { migration_file('db/migrate/create_posts.rb') }
         it { should exist }
+        it { should be_a_migration }
         it { should contain 'class CreatePosts < ActiveRecord::Migration' }
       end
       """
     When I run `rake spec`
-    Then the output should contain "2 examples, 0 failures"
+    Then the output should contain "3 examples, 0 failures"
 
   Scenario: Can tell the generator where to put its files
     Given a file named "spec/generators/awesome_generator_spec.rb" with:

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

@@ -1,7 +1,11 @@
 RSpec::Matchers.define :be_a_migration do
   match do |file_path|
-    dirname, file_name = File.dirname(file_path), File.basename(file_path).sub(/\.rb$/, '')
-    migration_file_path = Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
+    dirname, file_name = File.dirname(file_path), File.basename(file_path)
+    if file_name.match(/\d+_.*\.rb/)
+      migration_file_path = file_path
+    else
+      migration_file_path = Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}$/).first
+    end
     File.exist?(migration_file_path)
   end
 end

data/lib/ammeter/version.rb

@@ -1,3 +1,3 @@
 module Ammeter
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

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

@@ -11,9 +11,12 @@ describe "be_a_migration" do
     end
     Dir.stub!(:glob).with('db/migrate/[0-9]*_*.rb').and_return(migration_files)
   end
-  it 'should find for the migration file with timestamp in filename' do
+  it 'should find for the migration file adding the filename timestamp for us' do
     'db/migrate/create_users.rb'.should be_a_migration
   end
+  it 'should find for the migration file when we know the filename timestamp' do
+    'db/migrate/20110504132601_create_posts.rb'.should be_a_migration
+  end
   it 'should know when a migration does not exist' do
     'db/migrate/create_comments.rb'.should_not be_a_migration
   end

metadata

@@ -1,221 +1,231 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ammeter
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.2.4
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Alex Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id001
+date: 2012-04-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
   name: rails
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
   name: uglifier
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
   name: coffee-rails
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.2
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+- !ruby/object:Gem::Dependency
   name: sass-rails
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.5
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+- !ruby/object:Gem::Dependency
   name: jquery-rails
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  version_requirements: *id011
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
   name: cucumber
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
-  version_requirements: *id012
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
   name: aruba
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        version: "1"
-  version_requirements: *id013
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Write specs for your Rails 3+ generators
-email: 
+email:
 - alex@alexrothenberg.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -245,40 +255,37 @@ files:
 - spec/ammeter/rspec/generator/matchers/exist_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1621738140737887747
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1621738140737887747
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Write specs for your Rails 3+ generators
-test_files: 
+test_files:
 - features/generator_spec.feature
 - features/support/env.rb
 - features/templates/generate_example_app.rb