bret-watircraft 0.4.5 → 0.5.0

data/History.txt

@@ -1,3 +1,27 @@
+=== 0.5.0 / 2009-04-10
+
+This release adds a new artifact to your project: methods libraries. It also
+adds commands for use in script\console.
+
+You will need to update your project using "watircraft ." to use this
+release.
+
+New Features
+
+* New generator: "methods". This creates templates for methods that can be
+  be used with both rspec (specs) and cucumber (steps). Use
+  "script\generate methods" for details. 
+* Added commands to navigate tables in script\console. The page.tables method
+  will return a list of the tables defined on the page. The table.fields and
+  table.elements methods return lists of fields and elements defined for the
+  table. 
+
+But Fixes
+
+* When using Rspec 1.2.x, you should be able to execute specs simply by 
+  "running" the file with Ruby. This worked pre 1.2 and now works with 1.2.
+  (Fixed both project specs and WatirCraft's own unit tests.)
+
 === 0.4.5 / 2009-04-07
 
 New Features

data/Manifest.txt

@@ -32,6 +32,7 @@ spec/fake_table.rb
 spec/fixtures_spec.rb
 spec/fixture_spec.rb
 spec/hash_spec.rb
+spec/method_generator_spec.rb
 spec/object_spec.rb
 spec/page_generator_spec.rb
 spec/page_spec.rb
@@ -49,6 +50,8 @@ spec/sandbox/fixtures/users.yml
 spec/sandbox/flows
 spec/sandbox/flows/batman.rb
 spec/sandbox/flows/robin.rb
+spec/sandbox/methods
+spec/sandbox/methods/spiderman.rb
 spec/sandbox/pages
 spec/sandbox/pages/foo
 spec/sandbox/pages/foo/bar_page.rb
@@ -83,6 +86,11 @@ app_generators/watircraft/templates/spec_initialize.rb
 app_generators/watircraft/templates/world.rb
 app_generators/watircraft/USAGE
 app_generators/watircraft/watircraft_generator.rb
+watircraft_generators/method
+watircraft_generators/method/method_generator.rb
+watircraft_generators/method/templates
+watircraft_generators/method/templates/method.rb.erb
+watircraft_generators/method/USAGE
 watircraft_generators/page
 watircraft_generators/page/page_generator.rb
 watircraft_generators/page/templates

data/README.rdoc

@@ -9,22 +9,6 @@ An example test suite for this framework can be found in the framework
 examples project on github. Look in the +watircraft+ directory.
 * http://github.com/bret/framework-examples
 
-== QUESTIONS AND FEEDBACK
-
-Known bugs and road map. You can report bugs and request features here.
-* http://watircraft.lighthouseapp.com/projects/28400-watircraft/overview
-
-Join our mailing list for WatirCraft users.
-* http://tech.groups.yahoo.com/group/watir-framework
-
-The WatirCraft framework is developed by WatirCraft LLC, based on Taza[http://github.com/scudco/taza/wikis]. 
-Please send your comments to us at feedback@watircraft.com[mailto:feedback@watircraft.com] 
-We love getting your emails.
-
-WatirCraft LLC provides training and consulting for Watir, Ruby and the 
-WatirCraft framework. 
-* http://www.watircraft.com
-
 == LICENSE
 
 (The MIT License)

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 4
-:patch: 5
+:minor: 5
+:patch: 0
 :major: 0

data/app_generators/watircraft/templates/readme.txt

@@ -11,7 +11,7 @@ WatirCraft allows you to create Rspec tests, Cucumber tests or both.
 
 Rspec Tests
  
- 4. Create Test: script\generate spec testname
+ 4. Create a test: script\generate spec testname
  5. Edit the file, adding Watir commands where specified.
  6. Run one test: ruby test\specs\testname_spec.rb
     Or you can just use F5 if using the Scite editor.
@@ -19,7 +19,7 @@ Rspec Tests
 
 Cucumber Tests
 
- 8. Create Feature. Place your feature-tests in the test\features directory.
+ 8. Create a feature. Place your feature-tests in the test\features directory.
     They should follow the standard cucumber format.
  9. Create Steps File: script\generate steps filename
 10. Dry Run: cucumber test\features\featurename
@@ -34,5 +34,11 @@ Pages are optional and can be used with either Rspec or Cucumber tests.
 15. Create a page: script\generate page pagename
 16. Pages can be referenced from rspec tests or cucumber steps.
 
+Methods are optional cna be used with either Rspec or Cucumber tests.
+
+17. Create a method: script\generate method methodname
+18. Methods can be referenced from rspec tests, cucumber steps or from
+    other methods.
+
 Enter "script\generate" to see a complete list of WatirCraft files that
 you can create.

data/app_generators/watircraft/templates/spec_initialize.rb

@@ -4,6 +4,13 @@
 require 'init/site_start'
 require 'spec'
 require 'mocha'
+begin
+  # Needed for rspec 1.2.x. (Allows "ruby" to run specs.) 
+  # But not available before that.
+  require 'spec/autorun'
+rescue LoadError
+  nil
+end
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha

data/app_generators/watircraft/watircraft_generator.rb

@@ -69,6 +69,7 @@ class WatircraftGenerator < RubiGen::Base
       lib/init
       lib/pages
       lib/steps
+      lib/methods
       test
       test/specs
       test/features

data/lib/taza/page.rb

@@ -29,10 +29,14 @@ module Taza
       def filters # :nodoc:
         @filters ||= Hash.new { [] }
       end
-
+      
       def fields # :nodoc:
         @fields ||= []
       end
+      
+      def tables # :nodoc:
+        @tables ||= []
+      end
 
       def url string=nil
         if string.nil?
@@ -141,6 +145,7 @@ module Taza
       # subclass and then allows its class methods to define fields and 
       # elements on the table.
       def table(name, &block)
+        tables << name
         # create subclass for the table
         sub_class = Class.new(WatirCraft::Table)
         sub_class.class_eval &block
@@ -221,6 +226,11 @@ module Taza
       self.class.fields.map &:to_s
     end
     
+    # Return the names of the tables defined for the page.
+    def tables
+      self.class.tables.map &:to_s
+    end
+    
     # Returns a hash with the names and values of the specified fields.
     # If no fields are specifieds, all fields on the page are used.
     def values field_names=fields

data/lib/taza/settings.rb

@@ -27,8 +27,8 @@ module Taza
               
         # Because of the way #merge works, the settings at the bottom of the list
         # trump those at the top.
-        settings = environment_settings.merge(
-                     default_settings.merge(
+        settings = default_settings.merge(
+                     environment_settings.merge(
                        config_file.merge(
                          env_settings)))
   

data/lib/taza/site.rb

@@ -44,8 +44,6 @@ module Taza
       end
 
     end
-    include Spec::Matchers
-
     
     @@before_browser_closes = Proc.new() {}
     # Use this to do something with the browser before it closes, but note that it is a class method which
@@ -79,15 +77,19 @@ module Taza
     # (not sure if this is a useful feature or not)
     def initialize(params={}, &block)
       @site = self
-      @module_name = self.class.parent.to_s
+      @parent_module = self.class.parent
+      @module_name = @parent_module.to_s
       @class_name  = self.class.to_s.split("::").last
 
       define_flows
-
+      load_methods_files
+      
       page_loader = PageLoader.new(@module_name, pages_path)
       @pages = page_loader.page_names
       @methods_module = page_loader.page_methods
       @methods_module.send(:include, Methods)
+      @methods_module.send(:include, Spec::Matchers)
+      @methods_module.send(:include, @parent_module::Methods) if defined?(@parent_module::Methods)
       self.extend(@methods_module)
 
       @browser = params[:browser]
@@ -160,7 +162,6 @@ module Taza
     
     def initialize_context!(context)
       context.extend @methods_module
-      context.extend Spec::Matchers
       context.site = @site
       context.browser = @site.browser
       context
@@ -176,32 +177,20 @@ module Taza
         require file
       end
     end
+    
+    def load_methods_files # :nodoc:
+      Dir.glob(methods_path) do |file|
+        require file
+      end      
+    end
 
-    # This is used to call a flow belonging to the site
-    #
-    # Example:
-    #  Google.new do |google|
-    #    google.flow(:perform_search, :query => "taza")
-    #  end
-    #
-    # Where the flow would be defined under lib/sites/google/flows/perform_search.rb and look like:
-    #  class PerformSearch < Taza::Flow
-    #    alias :google :site
-    #
-    #    def run(params={})
-    #      google.search.set params[:query]
-    #      google.submit.click
-    #    end
-    #  end
-
-    #
-    # methods that neither depend on or modify state
-    #
-
-    private
     def flows_path # :nodoc:
       File.join(path,'flows','*.rb')
     end
+    
+    def methods_path # :nodoc:
+      File.join(path,'methods','*.rb')
+    end
 
     def path # :nodoc:
       File.join(base_path,'lib')

data/lib/watircraft/generator_helper.rb

@@ -1,27 +1,30 @@
-require 'taza/settings'
-
-module WatirCraft
-  # Assumes #site_name and #destination_root and #usage methods are defined.
-  module GeneratorHelper
-    protected
-    def configured_validated_site
-      site = configured_site
-      check_if_site_exists site
-      site
-    end
-    def configured_site
-      site_name = Taza::Settings.config_file[:site]
-    end
-    def check_if_site_exists site_name=@site_name
-      if site_name.nil?
-        raise RubiGen::UsageError, 
-          "Error. A site must first be specified in config.yml"
-      end
-      site_file = File.join(destination_root,'lib',"#{site_name.underscore}.rb")
-      unless File.exists?(site_file)
-        raise RubiGen::UsageError, 
-          "Error. Site file #{site_file} not found. (Check config.yml)"
-      end
-    end    
-  end
+require 'taza/settings'
+
+module WatirCraft
+  # Assumes #site_name and #destination_root and #usage methods are defined.
+  module GeneratorHelper
+    def site_module
+      @site_name.camelize
+    end
+    protected
+    def configured_validated_site
+      site = configured_site
+      check_if_site_exists site
+      site
+    end
+    def configured_site
+      site_name = Taza::Settings.config_file[:site]
+    end
+    def check_if_site_exists site_name=@site_name
+      if site_name.nil?
+        raise RubiGen::UsageError, 
+          "Error. A site must first be specified in config.yml"
+      end
+      site_file = File.join(destination_root,'lib',"#{site_name.underscore}.rb")
+      unless File.exists?(site_file)
+        raise RubiGen::UsageError, 
+          "Error. Site file #{site_file} not found. (Check config.yml)"
+      end
+    end    
+  end
 end

data/lib/watircraft/table.rb

@@ -25,16 +25,27 @@ module WatirCraft
       end
       nil
     end
+    def fields
+      self.class.row_class.fields.map &:to_s
+    end
+    def elements
+      self.class.row_class.elements.map &:to_s
+    end
   end
   
   class Row
     class << self
       def element name, &block
+        elements << name
         define_method(name) do
           instance_eval &block
         end
       end
+      def elements # :nodoc:
+        @elements ||= []
+      end
       def field name, &block
+        fields << name
         element_name = "#{name}_field"
         element element_name, &block
         define_method(name) do
@@ -44,6 +55,9 @@ module WatirCraft
           send(element_name).set value
         end
       end
+      def fields # :nodoc:
+        @fields ||= []
+      end
     end
     attr_reader :row
     def initialize watir_row

data/lib/watircraft/version.rb

@@ -1,3 +1,3 @@
 # This file is autogenerated. Do not edit.
 # Use 'rake version.rb' to update.
-module WatirCraft; VERSION = '0.4.5'; end
+module WatirCraft; VERSION = '0.5.0'; end

data/spec/method_generator_spec.rb

@@ -0,0 +1,40 @@
+require 'spec/spec_helper'
+require 'spec/spec_generator_helper'
+
+describe "Spec Generation" do
+  include RubiGen::GeneratorTestHelper
+  include Helpers::Generator
+  include Helpers::Taza
+  
+  before :each do
+    generate_project ["--site=frito"]
+  end  
+
+  after :each do
+    bare_teardown   
+  end
+
+  it "should be able to generate a method" do
+    run_generator('method', ['empty_shopping_cart'], generator_sources)
+  end
+  
+  it "should work when when the provided name includes a space" do
+    MethodGenerator.any_instance.stubs(:configured_site).returns('frito')
+    generator = MethodGenerator.new(['check out'])
+    generator.name.should == 'check_out'
+  end
+  
+  it "should add a method to the site" do
+    MethodGenerator.any_instance.stubs(:configured_site).returns('frito')
+    run_generator('method', ['extra'], generator_sources)
+
+    require File.join(PROJECT_FOLDER, 'lib/frito')
+    Frito::Frito.any_instance.stubs(:base_path).returns(PROJECT_FOLDER)
+    
+    stub_settings
+    stub_browser
+
+    Frito::Frito.new.extra
+  end
+  
+end

data/spec/page_spec.rb

@@ -341,6 +341,29 @@ describe Taza::Page do
       uses_table_page
       @table_page.results.row(:missing => 'nada').should be_nil
     end
+    
+    it "should be able to be listed from the page" do
+      uses_table_page
+      @table_page.tables.should == ['results']
+    end
+    
+    it "should list its fields" do
+      uses_table_page
+      @table_page.results.fields.should == %w(name phone missing)
+    end
+    
+    it "should list its elements" do
+      @page_class.class_eval do
+        element(:results_table) do FakeTable.new []
+        end
+        table(:results) do
+          field(:name){row.element(:letter)}
+          element(:phone){row.element(:number)}
+        end
+      end
+      @table_page = @page_class.new
+      @table_page.results.elements.should == %w(name_field phone)
+    end
   
   end
   

data/spec/sandbox/methods/spiderman.rb

@@ -0,0 +1,7 @@
+module Foo
+  module Methods
+    def spiderman
+      'i am spiderman'
+    end
+  end
+end

data/spec/sandbox/pages/foo/bar_page.rb

@@ -1,4 +1,4 @@
-class BarPage < Taza::Page
+class Foo::BarPage < Taza::Page
   element :foo do
     browser
   end

data/spec/site_spec.rb

@@ -4,21 +4,31 @@ require 'taza'
 
 describe do
   
+  module ::Foo
+    class Foo < ::Taza::Site
+      
+    end
+  end
+  
   before :all do
     @pages_path = File.join("spec","sandbox","pages","foo","**","*.rb")
     @flows_path = File.join("spec","sandbox","flows","*.rb")
-    @foo_class = Class.new(Taza::Site)
+    @methods_path = File.join("spec","sandbox","methods","*.rb")
+    @foo_class = ::Foo::Foo
   end
 
   before :each do
     ENV['BROWSER'] = nil
     ENV['DRIVER'] = nil
+
     @foo_class.any_instance.stubs(:pages_path).returns(@pages_path)
+    @foo_class.any_instance.stubs(:methods_path).returns(@methods_path)
     Taza::Settings.stubs(:config_file).returns({})
     Taza::Settings.stubs(:environment_settings).returns({})
     Taza::Site.before_browser_closes {}
     @browser = stub_browser
     Taza::Browser.stubs(:create).returns(@browser)
+
     @site = @foo_class.new
   end
         
@@ -35,23 +45,23 @@ describe do
       @context.bar_page do |bar|
         barzor = bar
       end
-      barzor.should be_an_instance_of(BarPage)
+      barzor.should be_an_instance_of(Foo::BarPage)
     end
     
     it "should return a page by name" do
       # Bar is a page on the site
-      @context.bar_page.should be_an_instance_of(BarPage)
+      @context.bar_page.should be_an_instance_of(Foo::BarPage)
     end
     
     it "should return a page by method" do
-      @context.page('bar').should be_an_instance_of(BarPage)
-      @context.page('Bar').should be_an_instance_of(BarPage)
+      @context.page('bar').should be_an_instance_of(Foo::BarPage)
+      @context.page('Bar').should be_an_instance_of(Foo::BarPage)
     end
     
     it "should yield to a page" do
       the_page = nil
       @context.page('Bar') {|page| the_page = page }
-      the_page.should be_an_instance_of(BarPage)
+      the_page.should be_an_instance_of(Foo::BarPage)
     end
   
     it "should pass the site browser instance to its pages " do
@@ -66,8 +76,7 @@ describe do
       Taza::Settings.expects(:environment_settings).returns({:url => 'http://www.zoro.com'}).at_least_once
       @context.site.origin.should == 'http://www.zoro.com'
     end
-    
-    
+        
     it "should go to a relative url" do
       @browser.expects(:goto).with('http://www.foo.com/page.html')
       Taza::Settings.stubs(:config).returns(:url => 'http://www.foo.com')
@@ -91,6 +100,15 @@ describe do
     it "should provide Spec::Matchers" do
       @context.instance_eval { [1,2,3].should include(2) }
     end
+    
+    it "should load the methods files" do
+      defined?(Foo::Methods).should be_true
+      Foo::Methods.instance_methods.should include("spiderman")
+    end
+    
+    it "should have user-site-methods defined as instance methods" do
+      @context.spiderman.should == 'i am spiderman'
+    end
   end
     
   describe Taza::Site do

data/spec/spec_generator_helper.rb

@@ -1,6 +1,7 @@
 #### Rubigen helpers
 require 'rubigen'
 require 'rubigen/helpers/generator_test_helper'
+require 'taza'
 
 
 def generator_sources

data/spec/spec_generator_spec.rb

@@ -1,8 +1,5 @@
 require 'spec/spec_helper'
 require 'spec/spec_generator_helper'
-require 'rubygems'
-require 'fileutils'
-require 'taza'
 
 describe "Spec Generation" do
   include RubiGen::GeneratorTestHelper

data/spec/spec_helper.rb

@@ -1,6 +1,14 @@
 require 'rubygems'
 require 'spec'
 require 'mocha'
+begin
+  # Needed for rspec 1.2.x. (Allows "ruby" to run specs.) 
+  # But not available before that.
+  require 'spec/autorun'
+rescue LoadError
+  nil
+end
+
 require 'config/vendorized_gems'
 lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)

data/watircraft.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watircraft}
-  s.version = "0.4.5"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bret Pettichord", "Jim Matthews", "Charley Baker", "Adam Anderson"]
-  s.date = %q{2009-04-07}
+  s.date = %q{2009-04-10}
   s.default_executable = %q{watircraft}
   s.description = %q{WatirCraft is a framework for testing web apps.}
   s.email = %q{bret@pettichord.com}
   s.executables = ["watircraft"]
   s.extra_rdoc_files = ["History.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "VERSION.yml", "watircraft.gemspec", "bin/watircraft", "lib/extensions", "lib/extensions/array.rb", "lib/extensions/hash.rb", "lib/extensions/object.rb", "lib/extensions/string.rb", "lib/extensions/watir.rb", "lib/taza", "lib/taza/browser.rb", "lib/taza/entity.rb", "lib/taza/fixture.rb", "lib/taza/flow.rb", "lib/taza/page.rb", "lib/taza/settings.rb", "lib/taza/site.rb", "lib/taza/tasks.rb", "lib/taza.rb", "lib/watircraft", "lib/watircraft/generator_helper.rb", "lib/watircraft/table.rb", "lib/watircraft/version.rb", "lib/watircraft.rb", "spec/array_spec.rb", "spec/browser_spec.rb", "spec/entity_spec.rb", "spec/fake_table.rb", "spec/fixtures_spec.rb", "spec/fixture_spec.rb", "spec/hash_spec.rb", "spec/object_spec.rb", "spec/page_generator_spec.rb", "spec/page_spec.rb", "spec/project_generator_spec.rb", "spec/sandbox", "spec/sandbox/config", "spec/sandbox/config/config.yml", "spec/sandbox/config/environments.yml", "spec/sandbox/config/simpler.yml", "spec/sandbox/config/simpler_site.yml", "spec/sandbox/config.yml", "spec/sandbox/fixtures", "spec/sandbox/fixtures/examples.yml", "spec/sandbox/fixtures/users.yml", "spec/sandbox/flows", "spec/sandbox/flows/batman.rb", "spec/sandbox/flows/robin.rb", "spec/sandbox/pages", "spec/sandbox/pages/foo", "spec/sandbox/pages/foo/bar_page.rb", "spec/sandbox/pages/foo/partials", "spec/sandbox/pages/foo/partials/partial_the_reckoning.rb", "spec/settings_spec.rb", "spec/site_spec.rb", "spec/spec_generator_helper.rb", "spec/spec_generator_spec.rb", "spec/spec_helper.rb", "spec/steps_generator_spec.rb", "spec/string_spec.rb", "spec/table_spec.rb", "spec/taza_spec.rb", "spec/watircraft_bin_spec.rb", "spec/watir_spec.rb", "app_generators/watircraft", "app_generators/watircraft/templates", "app_generators/watircraft/templates/config.yml.erb", "app_generators/watircraft/templates/environments.yml.erb", "app_generators/watircraft/templates/feature_helper.rb", "app_generators/watircraft/templates/initialize.rb.erb", "app_generators/watircraft/templates/rakefile.rb", "app_generators/watircraft/templates/readme.txt", "app_generators/watircraft/templates/script", "app_generators/watircraft/templates/script/console", "app_generators/watircraft/templates/script/console.cmd", "app_generators/watircraft/templates/site.rb.erb", "app_generators/watircraft/templates/site_start.rb.erb", "app_generators/watircraft/templates/spec_helper.rb", "app_generators/watircraft/templates/spec_initialize.rb", "app_generators/watircraft/templates/world.rb", "app_generators/watircraft/USAGE", "app_generators/watircraft/watircraft_generator.rb", "watircraft_generators/page", "watircraft_generators/page/page_generator.rb", "watircraft_generators/page/templates", "watircraft_generators/page/templates/page.rb.erb", "watircraft_generators/page/USAGE", "watircraft_generators/spec", "watircraft_generators/spec/spec_generator.rb", "watircraft_generators/spec/templates", "watircraft_generators/spec/templates/spec.rb.erb", "watircraft_generators/spec/USAGE", "watircraft_generators/steps", "watircraft_generators/steps/steps_generator.rb", "watircraft_generators/steps/templates", "watircraft_generators/steps/templates/steps.rb.erb", "watircraft_generators/steps/USAGE"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "VERSION.yml", "watircraft.gemspec", "bin/watircraft", "lib/extensions", "lib/extensions/array.rb", "lib/extensions/hash.rb", "lib/extensions/object.rb", "lib/extensions/string.rb", "lib/extensions/watir.rb", "lib/taza", "lib/taza/browser.rb", "lib/taza/entity.rb", "lib/taza/fixture.rb", "lib/taza/flow.rb", "lib/taza/page.rb", "lib/taza/settings.rb", "lib/taza/site.rb", "lib/taza/tasks.rb", "lib/taza.rb", "lib/watircraft", "lib/watircraft/generator_helper.rb", "lib/watircraft/table.rb", "lib/watircraft/version.rb", "lib/watircraft.rb", "spec/array_spec.rb", "spec/browser_spec.rb", "spec/entity_spec.rb", "spec/fake_table.rb", "spec/fixtures_spec.rb", "spec/fixture_spec.rb", "spec/hash_spec.rb", "spec/method_generator_spec.rb", "spec/object_spec.rb", "spec/page_generator_spec.rb", "spec/page_spec.rb", "spec/project_generator_spec.rb", "spec/sandbox", "spec/sandbox/config", "spec/sandbox/config/config.yml", "spec/sandbox/config/environments.yml", "spec/sandbox/config/simpler.yml", "spec/sandbox/config/simpler_site.yml", "spec/sandbox/config.yml", "spec/sandbox/fixtures", "spec/sandbox/fixtures/examples.yml", "spec/sandbox/fixtures/users.yml", "spec/sandbox/flows", "spec/sandbox/flows/batman.rb", "spec/sandbox/flows/robin.rb", "spec/sandbox/methods", "spec/sandbox/methods/spiderman.rb", "spec/sandbox/pages", "spec/sandbox/pages/foo", "spec/sandbox/pages/foo/bar_page.rb", "spec/sandbox/pages/foo/partials", "spec/sandbox/pages/foo/partials/partial_the_reckoning.rb", "spec/settings_spec.rb", "spec/site_spec.rb", "spec/spec_generator_helper.rb", "spec/spec_generator_spec.rb", "spec/spec_helper.rb", "spec/steps_generator_spec.rb", "spec/string_spec.rb", "spec/table_spec.rb", "spec/taza_spec.rb", "spec/watircraft_bin_spec.rb", "spec/watir_spec.rb", "app_generators/watircraft", "app_generators/watircraft/templates", "app_generators/watircraft/templates/config.yml.erb", "app_generators/watircraft/templates/environments.yml.erb", "app_generators/watircraft/templates/feature_helper.rb", "app_generators/watircraft/templates/initialize.rb.erb", "app_generators/watircraft/templates/rakefile.rb", "app_generators/watircraft/templates/readme.txt", "app_generators/watircraft/templates/script", "app_generators/watircraft/templates/script/console", "app_generators/watircraft/templates/script/console.cmd", "app_generators/watircraft/templates/site.rb.erb", "app_generators/watircraft/templates/site_start.rb.erb", "app_generators/watircraft/templates/spec_helper.rb", "app_generators/watircraft/templates/spec_initialize.rb", "app_generators/watircraft/templates/world.rb", "app_generators/watircraft/USAGE", "app_generators/watircraft/watircraft_generator.rb", "watircraft_generators/method", "watircraft_generators/method/method_generator.rb", "watircraft_generators/method/templates", "watircraft_generators/method/templates/method.rb.erb", "watircraft_generators/method/USAGE", "watircraft_generators/page", "watircraft_generators/page/page_generator.rb", "watircraft_generators/page/templates", "watircraft_generators/page/templates/page.rb.erb", "watircraft_generators/page/USAGE", "watircraft_generators/spec", "watircraft_generators/spec/spec_generator.rb", "watircraft_generators/spec/templates", "watircraft_generators/spec/templates/spec.rb.erb", "watircraft_generators/spec/USAGE", "watircraft_generators/steps", "watircraft_generators/steps/steps_generator.rb", "watircraft_generators/steps/templates", "watircraft_generators/steps/templates/steps.rb.erb", "watircraft_generators/steps/USAGE"]
   s.has_rdoc = true
   s.homepage = %q{http://wiki.github.com/bret/watircraft}
   s.rdoc_options = ["--main", "README.rdoc"]

data/watircraft_generators/method/USAGE

@@ -0,0 +1,15 @@
+Description:
+
+  Creates a template for a WatirCraft method. The method can be called 
+  from a spec (in an "it", "before" or "after" block) or from a 
+  step (a Given or When or Then block). 
+  
+  It can also be called from within script\console or as a method on the
+  site object.
+  
+  The @browser and @site instance variables are available to your method.
+  
+Examples:
+  
+  script\generate method notice
+  script\generate method empty_shopping_cart

data/watircraft_generators/method/method_generator.rb

@@ -0,0 +1,54 @@
+require 'rubygems'
+require 'rubigen'
+require 'activesupport'
+require 'watircraft/generator_helper'
+require 'extensions/string'
+
+class MethodGenerator < RubiGen::Base
+  include WatirCraft::GeneratorHelper
+  default_options :author => nil
+  attr_reader :name, :site_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift.computerize
+    @site_name = configured_validated_site
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      m.template "method.rb.erb", File.join('lib','methods',"#{name}.rb")
+    end
+  end
+
+  protected
+  def banner
+    <<-EOS
+    Creates a template for a WatirCraft method.
+
+    USAGE: #{$0} #{spec.name} name
+    
+    EOS
+  end
+
+  def add_options!(opts)
+    # opts.separator ''
+    # opts.separator 'Options:'
+    # For each option below, place the default
+    # at the top of the file next to "default_options"
+    # opts.on("-a", "--author=\"Your Name\"", String,
+    #         "Some comment about this option",
+    #         "Default: none") { |options[:author]| }
+    # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+  end
+
+  def extract_options
+    # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+    # Templates can access these value via the attr_reader-generated methods, but not the
+    # raw instance variable value.
+    # @author = options[:author]
+  end
+
+end

data/watircraft_generators/method/templates/method.rb.erb

@@ -0,0 +1,8 @@
+module <%= site_module %>
+  module Methods
+    def <%= name %>
+      # Place the code for your method here.
+
+    end
+  end
+end

data/watircraft_generators/page/USAGE

@@ -1,8 +1,8 @@
 Description:
   
-  A page class collects elements that grouped together. They might all
-  be on the same page. You can also use page classes for parts of a 
-  page, or for items which appear on many pages. 
+  A page class collects elements that grouped together. Usually they all 
+  appear on the same physical page. But you can also use page classes for 
+  parts of a page, or for items which appear on many pages. 
 
 Examples:
 

data/watircraft_generators/page/page_generator.rb

@@ -16,10 +16,6 @@ class PageGenerator < RubiGen::Base
     extract_options
   end
   
-  def site_module
-    @site_name.camelize
-  end
-  
   def page_class
     "#{name.computerize.camelize}Page"
   end

data/watircraft_generators/spec/spec_generator.rb

@@ -26,7 +26,7 @@ class SpecGenerator < RubiGen::Base
   protected
   def banner
     <<-EOS
-    Creates a spec.
+    Creates a template for an Rspec test.
 
     USAGE: #{$0} #{spec.name} name
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bret-watircraft
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-04-10 00:00:00 -07:00
 default_executable: watircraft
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - spec/fixtures_spec.rb
 - spec/fixture_spec.rb
 - spec/hash_spec.rb
+- spec/method_generator_spec.rb
 - spec/object_spec.rb
 - spec/page_generator_spec.rb
 - spec/page_spec.rb
@@ -136,6 +137,8 @@ files:
 - spec/sandbox/flows
 - spec/sandbox/flows/batman.rb
 - spec/sandbox/flows/robin.rb
+- spec/sandbox/methods
+- spec/sandbox/methods/spiderman.rb
 - spec/sandbox/pages
 - spec/sandbox/pages/foo
 - spec/sandbox/pages/foo/bar_page.rb
@@ -170,6 +173,11 @@ files:
 - app_generators/watircraft/templates/world.rb
 - app_generators/watircraft/USAGE
 - app_generators/watircraft/watircraft_generator.rb
+- watircraft_generators/method
+- watircraft_generators/method/method_generator.rb
+- watircraft_generators/method/templates
+- watircraft_generators/method/templates/method.rb.erb
+- watircraft_generators/method/USAGE
 - watircraft_generators/page
 - watircraft_generators/page/page_generator.rb
 - watircraft_generators/page/templates