conventional_models 0.2.2 → 0.3.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+tmp
+.idea

data/.rspec

@@ -0,0 +1,2 @@
+--color
+

data/Gemfile

@@ -1,20 +1,5 @@
 source :gemcutter
 
-group :features do
-  gem "cucumber", "0.7.2"
-  gem "aruba"
-  gem "open4"
-end
+gemspec
 
-group :specs do
-  gem "rspec", "1.3.0"
-end
-
-group :development do
-  gem "jeweler"
-  gem "rake"
-  gem "ZenTest"
-end
-
-gem "activerecord", "2.3.5"
 gem "sqlite3-ruby"

data/Gemfile.lock

@@ -1,81 +1,61 @@
---- 
-dependencies: 
-  ZenTest: 
-    group: 
-    - :development
-    version: ">= 0"
-  activerecord: 
-    group: 
-    - :default
-    version: = 2.3.5
-  sqlite3-ruby: 
-    group: 
-    - :default
-    version: ">= 0"
-  rake: 
-    group: 
-    - :development
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :specs
-    version: = 1.3.0
-  aruba: 
-    group: 
-    - :features
-    version: ">= 0"
-  jeweler: 
-    group: 
-    - :development
-    version: ">= 0"
-  cucumber: 
-    group: 
-    - :features
-    version: = 0.7.2
-  open4: 
-    group: 
-    - :features
-    version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- ZenTest: 
-    version: 4.3.1
-- activesupport: 
-    version: 2.3.5
-- activerecord: 
-    version: 2.3.5
-- aruba: 
-    version: 0.1.9
-- builder: 
-    version: 2.1.2
-- bundler: 
-    version: 0.9.24
-- diff-lcs: 
-    version: 1.1.2
-- trollop: 
-    version: 1.16.2
-- gherkin: 
-    version: 1.0.25
-- json_pure: 
-    version: 1.4.3
-- term-ansicolor: 
-    version: 1.0.5
-- cucumber: 
-    version: 0.7.2
-- gemcutter: 
-    version: 0.5.0
-- git: 
-    version: 1.2.5
-- jeweler: 
-    version: 1.4.0
-- open4: 
-    version: 1.0.1
-- rspec: 
-    version: 1.3.0
-- sqlite3-ruby: 
-    version: 1.2.5
-hash: 49b2ba6893f5940e80f19c400ec7f4a2d38964a5
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
+PATH
+  remote: .
+  specs:
+    conventional_models (0.3.0)
+      activerecord (>= 2.3.5)
+      rdoc
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.5)
+    arel (2.0.9)
+    aruba (0.2.7)
+      background_process
+      cucumber (~> 0.10.0)
+    background_process (1.2)
+    builder (2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    i18n (0.5.0)
+    json (1.4.6)
+    rdoc (3.5.3)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.5)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (>= 0.1.7)
+  conventional_models!
+  cucumber (>= 0.6.4)
+  rspec (>= 2.3)
+  sqlite3-ruby

data/README.rdoc

@@ -15,7 +15,6 @@ We have a table called Page and another called ContentItems (not following Activ
   require 'active_record'
   ActiveRecord::Base.establish_connection(:database => 'db.sqlite', :adapter => 'sqlite3')
   
-  # set your conventions
   require 'conventional_models'
   ConventionalModels.configure do
     primary_key_name "Id"
@@ -84,12 +83,6 @@ You can use this from rake as follows:
     IRB.start
   end
   
-
-== Why?
-
-I use this for data migrations or quick scripting tasks on databases that don't follow rails 
-conventions.
-
 == Multiple databases
 
 Given a table called pages in both development.sqlite and test.sqlite:
@@ -142,4 +135,4 @@ Given a table called pages in both development.sqlite and test.sqlite:
 
 == Copyright
 
-Copyright (c) 2010 Steve Hodgkiss. See LICENSE for details.
+Copyright (c) 2011 Steve Hodgkiss. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,10 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
+
+task :default => :spec

data/bin/cmconsole

@@ -41,5 +41,5 @@ rescue LoadError
     require File.dirname(__FILE__) + '/../lib/conventional_models'
   end
 end
-cli = ConventionalModels::CLI.new(ARGV)
-cli.run
+cli = ConventionalModels::CLI.new
+cli.run(ARGV)

data/conventional_models.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "conventional_models/version"
+
+Gem::Specification.new do |s|
+  s.name = %q{conventional_models}
+  s.version = ConventionalModels::VERSION::STRING
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Steve Hodgkiss"]
+  s.email = %q{steve@hodgkiss.me.uk}
+  s.homepage = %q{http://github.com/stevehodgkiss/conventional_models}
+  s.summary = %q{Generate ActiveRecord models. For lazy people.}
+  s.description = %q{Generate ActiveRecord models automatically with basic relationships based on conventions.}
+  s.default_executable = %q{cmconsole}
+  
+  s.rubyforge_project = "conventional_models"
+  
+  s.files         = `git ls-files`.split("\n")
+  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_development_dependency("rspec", [">= 2.3"])
+  s.add_development_dependency("cucumber", [">= 0.6.4"])
+  s.add_development_dependency("aruba", [">= 0.1.7"])
+  s.add_runtime_dependency("activerecord", [">= 2.3.5"])
+  s.add_runtime_dependency("rdoc")
+end

data/features/cmconsole.feature

@@ -1,4 +1,3 @@
-@wip
 Feature: Cmconsole
   In order to play with models generated against other projects with ease
   As a user
@@ -26,9 +25,9 @@ Feature: Cmconsole
         timeout: 5000
       """
     And a table "pages"
-    When I run "../../bin/cmconsole" as child "irb"
-    Then I should see ">> " from child "irb"
-  
-  
-
-  
+    When I run "../../bin/cmconsole" interactively
+    And I type "Page.count"
+    And I type "Page.superclass"
+    And I type "exit"
+    Then the output should contain "0"
+    And the output should contain "ActiveRecord::Base"

data/features/conventional_models.feature

@@ -16,7 +16,7 @@ Feature: ConventionalModels
       puts "Number of records: #{<model_name>.count}"
       """
     When I run "ruby my_script.rb"
-    Then I should see "Number of records: 0"
+    Then the output should contain "Number of records: 0"
     
     Examples:
       | table_name    | model_name  |
@@ -36,7 +36,7 @@ Feature: ConventionalModels
       puts "Number of records: #{<model_name>.count}"
       """
     When I run "ruby my_script.rb"
-    Then I should see "Number of records: 0"
+    Then the output should contain "Number of records: 0"
 
     Examples:
       | table_name    | model_name  |
@@ -68,6 +68,6 @@ Feature: ConventionalModels
       puts "My page's content item name: #{page.content_items.first.Name}"
       """
     When I run "ruby my_script.rb"
-    Then I should see "My page's content item name: content1"
+    Then the output should contain "My page's content item name: content1"
   
   

data/features/multiple_databases.feature

@@ -38,5 +38,5 @@ Feature: Multiple database connection
       puts "Number of production records: #{Test::Page.count}"
       """
     When I run "ruby my_script.rb"
-    Then I should see "Number of development records: 2"
-    Then I should see "Number of production records: 1"
+    Then the output should contain "Number of development records: 2"
+    Then the output should contain "Number of production records: 1"

data/features/step_definitions/output_model_code_steps.rb

@@ -1,6 +1,5 @@
 Then /^within "([^\"]*)" I should see:$/ do |within, table|
-  puts combined_output
-  output = combined_output.scan(/#{within}:\<\<(.*)\>\>/m).to_s
+  output = all_output.match(/#{within}:\<\<(.*)\>\>/m)[0]
   table.hashes.each do |row|
     output.should =~ /#{row["line"]}/
   end

data/features/support/env.rb

@@ -1,9 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'conventional_models'
 
-require 'spec/expectations'
+require 'rspec'
 
-require 'aruba'
+require 'aruba/cucumber'
+require 'aruba/api'
 require 'active_record'
 
 Before do

data/lib/conventional_models.rb

@@ -8,7 +8,6 @@ require 'conventional_models/table'
 require 'conventional_models/column'
 require 'conventional_models/active_record_base_model_for'
 require 'conventional_models/options'
-require 'conventional_models/option_parser'
 require 'conventional_models/cli'
 require 'irb'
 require 'irb/completion'

data/lib/conventional_models/cli.rb

@@ -1,5 +1,4 @@
 require 'optparse'
-require 'rdoc/usage'
 require 'ostruct'
 require 'date'
 
@@ -7,20 +6,24 @@ module ConventionalModels
   class CLI
     attr_reader :options
 
-    def initialize(arguments)
-      @arguments = arguments
-      @option_parser = OptionParser.new(arguments)
-      @options = @option_parser.options
-    end
-    
-    def run
-      if @option_parser.parsed_options?
-        return output_help if @options.output_help
+    def run(args)
+      opts = OptionParser.new
+      @options = Options.new
+      opts.on('-v', '--version')    { @options.output_version = true }
+      opts.on('-h', '--help')       { @options.output_help = opts }
+      opts.on('-s', '--skip-configure')    { @options.skip_configure = true }  
+      opts.on('-c', '--config FILE')      { |file| @options.config = file }
+      opts.on('-e', '--environment ENV')      { |env| @options.environment = env }
+      opts.on('-V', '--verbose')      { |env| @options.verbose = true }
+      
+      begin
+        opts.parse!(args)
         return output_version if @options.output_version
+        return output_help(@options.output_help) if @options.output_help
         output_options if @options.verbose
         run_console
-      else
-        output_usage
+      rescue
+        puts opts
       end
     end
     
@@ -44,18 +47,13 @@ module ConventionalModels
           puts "  #{name} = #{val}"
         end
       end
-    
-      def output_help
-        output_version
-        RDoc::usage()
-      end
-    
-      def output_usage
-        RDoc::usage('usage')
-      end
-    
+
       def output_version
         puts "ConventionalModels version #{ConventionalModels::VERSION::STRING}"
       end
+      
+      def output_help(options)
+        puts options
+      end
   end
 end

data/lib/conventional_models/database.rb

@@ -7,7 +7,8 @@ module ConventionalModels
     def initialize(config)
       if config.connection.nil?
         @connection = ::ActiveRecord::Base.connection
-      else
+      end
+      if config.module_name
         base_class_code = []
         base_class_code << "module ::#{config.module_name}"
         base_class_code << "  class Base < ActiveRecord::Base;"
@@ -15,6 +16,7 @@ module ConventionalModels
         base_class_code << "  end;"
         base_class_code << "end"
         eval base_class_code.join
+        
         @base_class = "::#{config.module_name}::Base".constantize
         @base_class.class_eval do
           establish_connection config.connection

data/lib/conventional_models/version.rb

@@ -1,8 +1,8 @@
 module ConventionalModels #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
-    BUILD = 2
+    MINOR = 3
+    BUILD = 0
  
     STRING = [MAJOR, MINOR, BUILD].join('.')
   end

data/spec/conventional_models/cli_spec.rb

@@ -2,18 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module ConventionalModels
   describe CLI do
-    let(:option_parser) { mock(OptionParser, :options => @options) }
     before(:each) do
       @args = []
       @options = Options.new
-      OptionParser.stub(:new).and_return(option_parser)
       File.stub(:exists?).with(@options.config).and_return(true)
     end
     
-    it "should create a new option parser with args" do
-      OptionParser.should_receive(:new).with(@args)
-      CLI.new(@args)
-    end
     
     describe "run" do
       before(:each) do
@@ -24,14 +18,13 @@ module ConventionalModels
         $stdout = @stdout_orig
       end
       
-      def run
+      def run(args = [])
         @cli = CLI.new(@args)
-        @cli.run
+        @cli.run(Array.wrap(args))
       end
       
       context "with parsed options" do
         before(:each) do
-          option_parser.stub(:parsed_options?).and_return(true)
           ConventionalModels.stub(:configure)
           ConventionalModels.stub(:model_code)
           ConventionalModels.stub(:configure_active_record)
@@ -77,26 +70,22 @@ module ConventionalModels
         
         context "with skip-configure option" do
           it "does not call configure" do
-            @options.skip_configure = true
             ConventionalModels.should_not_receive(:configure)
-            run
+            run("-s")
           end
         end
         
         context "with help option" do
           it "outputs help" do
-            RDoc.should_receive(:usage)
-            @options.output_help = true
             ConventionalModels.should_not_receive(:configure_active_record)
-            run
+            run("-h")
           end
         end
         
         context "with output version option" do
           it "outputs the version" do
-            @options.output_version = true
             ConventionalModels.should_not_receive(:configure_active_record)
-            run
+            run("-v")
             $stdout.string.should =~ /#{VERSION::STRING}/
           end
         end
@@ -104,9 +93,8 @@ module ConventionalModels
       
       context "with invalid options" do
         it "prints usage" do
-          RDoc.should_receive(:usage).with('usage')
-          option_parser.stub(:parsed_options?).and_return(false)
-          run
+          run("-d invalid")
+          $stdout.string.should =~ /Usage:/
         end
       end
     end

data/spec/conventional_models/database_spec.rb

@@ -3,14 +3,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 module ConventionalModels
   describe Database do
     let(:table) { mock(Table, :apply_conventions => nil, :belongs_to_names => [], :name => "Test") }
-    let(:config) { mock(Config, :ignored_tables => [], :connection => nil) }
+    let(:config) { mock(Config, :ignored_tables => [], :connection => nil, :module_name => nil) }
     let(:connection) do
       mock(::ActiveRecord::ConnectionAdapters::AbstractAdapter, :tables => ["Test"], :columns => columns)
     end
     let(:columns) { [mock(Column)] }
     
     before do
-      ::ActiveRecord::Base.stub(:connection).and_return(connection)
+      ::ActiveRecord::Base.stub(:connection => connection)
       Table.stub(:new => table)
     end
     

data/spec/conventional_models_spec.rb

@@ -3,13 +3,14 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 module ConventionalModels
   describe ConventionalModels do
     let(:config) { mock(Config) }
-    let(:generated_code) { mock(String) }
+    let(:generated_code) { "class TestCode; end" }
     let(:database) { mock(Database, :code => generated_code, :apply_conventions => nil) }
     
     before do
       Config.stub(:new => config)
       Database.stub(:new => database)
       ConventionalModels.stub(:run_code)
+      ConventionalModels.class_eval { @@model_code = [] }
     end
     
     describe ".configure" do

data/spec/spec_helper.rb

@@ -1,12 +1,10 @@
 require 'rubygems'
-require 'bundler'
-Bundler.setup(:specs)
+require 'bundler/setup'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'conventional_models'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: conventional_models
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steve Hodgkiss
@@ -14,34 +10,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 +01:00
+date: 2011-03-02 00:00:00 +00:00
 default_executable: cmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: "2.3"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
   type: :development
   version_requirements: *id002
@@ -49,13 +39,10 @@ dependencies:
   name: aruba
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 7
         version: 0.1.7
   type: :development
   version_requirements: *id003
@@ -63,39 +50,68 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
         version: 2.3.5
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: Generate ActiveRecord models automatically with basic relationships based on conventions.
 email: steve@hodgkiss.me.uk
 executables: 
 - cmconsole
 extensions: []
 
-extra_rdoc_files: 
+extra_rdoc_files: []
+
+files: 
+- .document
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
-files: 
+- Rakefile
+- bin/cmconsole
+- conventional_models.gemspec
+- features/cmconsole.feature
+- features/conventional_models.feature
+- features/multiple_databases.feature
+- features/output_model_code.feature
+- features/step_definitions/cmconsole_steps.rb
+- features/step_definitions/conventional_models_steps.rb
+- features/step_definitions/multiple_databases.rb
+- features/step_definitions/output_model_code_steps.rb
+- features/support/env.rb
+- lib/conventional_models.rb
 - lib/conventional_models/active_record_base_model_for.rb
 - lib/conventional_models/cli.rb
 - lib/conventional_models/column.rb
 - lib/conventional_models/config.rb
 - lib/conventional_models/database.rb
-- lib/conventional_models/option_parser.rb
 - lib/conventional_models/options.rb
 - lib/conventional_models/table.rb
 - lib/conventional_models/version.rb
-- lib/conventional_models.rb
-- bin/cmconsole
-- LICENSE
-- README.rdoc
+- spec/conventional_models/cli_spec.rb
+- spec/conventional_models/config_spec.rb
+- spec/conventional_models/database_spec.rb
+- spec/conventional_models/options_spec.rb
+- spec/conventional_models/table_spec.rb
+- spec/conventional_models_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/stevehodgkiss/conventional_models
 licenses: []
@@ -106,37 +122,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      version: "0"
 requirements: []
 
 rubyforge_project: conventional_models
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Generate ActiveRecord models. For lazy people.
 test_files: 
-- spec/conventional_models/cli_spec.rb
-- spec/conventional_models/config_spec.rb
-- spec/conventional_models/database_spec.rb
-- spec/conventional_models/option_parser_spec.rb
-- spec/conventional_models/options_spec.rb
-- spec/conventional_models/table_spec.rb
-- spec/conventional_models_spec.rb
-- spec/spec_helper.rb
 - features/cmconsole.feature
 - features/conventional_models.feature
 - features/multiple_databases.feature
@@ -146,5 +150,10 @@ test_files:
 - features/step_definitions/multiple_databases.rb
 - features/step_definitions/output_model_code_steps.rb
 - features/support/env.rb
-- Gemfile
-- Gemfile.lock
+- spec/conventional_models/cli_spec.rb
+- spec/conventional_models/config_spec.rb
+- spec/conventional_models/database_spec.rb
+- spec/conventional_models/options_spec.rb
+- spec/conventional_models/table_spec.rb
+- spec/conventional_models_spec.rb
+- spec/spec_helper.rb

data/lib/conventional_models/option_parser.rb

@@ -1,50 +0,0 @@
-require 'optparse'
-require 'rdoc/usage'
-require 'ostruct'
-require 'date'
-
-module ConventionalModels
-  class OptionParser
-  
-    attr_reader :options
-
-    def initialize(arguments)
-      @arguments = arguments
-      
-      @options = Options.new
-
-      @parsed_options = true
-      parse
-    end
-  
-    def parsed_options?
-      @parsed_options
-    end
-    
-    def parse
-      opts = ::OptionParser.new
-      opts.on('-v', '--version')    { @options.output_version = true }
-      opts.on('-h', '--help')       { @options.output_help = true }
-      opts.on('-s', '--skip-configure')    { @options.skip_configure = true }  
-      opts.on('-c', '--config FILE')      { |file| @options.config = file }
-      opts.on('-e', '--environment ENV')      { |env| @options.environment = env }
-      opts.on('-V', '--verbose')      { |env| @options.verbose = true }
-      
-      opts.parse!(@arguments) rescue @parsed_options = false
-    end
-      
-    protected
-      def output_help
-        output_version
-        RDoc::usage()
-      end
-    
-      def output_usage
-        RDoc::usage('usage')
-      end
-    
-      def output_version
-        puts "ConventionalModels version #{ConventionalModels::VERSION}"
-      end
-  end
-end

data/spec/conventional_models/option_parser_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-module ConventionalModels
-  describe OptionParser do
-    def options_for(args)
-      @option_parser = OptionParser.new(args)
-      @option_parser.options
-    end
-    
-    context "parsing" do
-      it "accepts a database config file" do
-        options_for(["-c", "config/db.yml"]).config.should == "config/db.yml"
-        options_for(["--config", "config/db.yml"]).config.should == "config/db.yml"
-      end
-      
-      it "accepts an environment flag" do
-        options_for(["-e", "production"]).environment.should == "production"
-        options_for(["--environment", "production"]).environment.should == "production"
-      end
-      
-      it "accepts a skip configure flag" do
-        options_for(["-s"]).skip_configure.should == true
-        options_for(["--skip-configure"]).skip_configure.should == true
-      end
-      
-      it "accepts an output version flag" do
-        options_for(["-v"]).output_version.should == true
-        options_for(["--version"]).output_version.should == true
-      end
-      
-      it "accepts an output help flag" do
-        options_for(["-h"]).output_help.should == true
-        options_for(["--help"]).output_help.should == true
-      end
-    end
-    
-    context "invalid arguments" do
-      it "should set parsed_options? to false" do
-        options_for(["--boobs"])
-        @option_parser.parsed_options?.should == false
-      end
-    end
-  end
-end