bret-watircraft 0.4.1 → 0.4.2

data/BUGS.txt

@@ -1,11 +1,9 @@
 Known Bugs
 
-* Support for FireWatir is incomplete (specifically: Page fields)
-* Page fields do not support Radio lists.
+* Can't install on mac. (This used to work.)
+* The name of the element underlying each field is not consistent. In pages,
+  it is called foo_field; in tables, foo_element. (Should probably be
+  foo_element in both places.)
+* Page fields do not support Radio lists. Workaround: use elements.
 * Need to provide homepage for project.
-
-Reported Bugs which we can't reproduce
-
-* "Couldn't find 'site' generator" when running watircraft command.
-  (using 0.3.1, neither taza nor watircraft-beta is also installed)
   

data/History.txt

@@ -1,6 +1,11 @@
+=== 0.4.2 / 2009-03-24
+
+* Fixed "can't find site generator" bug that occured when creating a new project.
+* Page field and table fields now support Firefox.
+
 === 0.4.1 / 2009-02-24
 
-* Fix bug with script\console:  no such file to load -- site_start
+* Fixed bug with script\console:  no such file to load -- site_start
 
 === 0.4.0 / 2009-02-23
 
@@ -60,7 +65,6 @@ Other Changes
 * Explicitly declare dependency on Watir 1.6.2 (or newer). Previously this
   was assumed.
 
-
 === 0.3.2 / 2009-02-04
 
 Another patch release. Like 0.3.1, no need to update if your project is 

data/Manifest.txt

@@ -56,7 +56,6 @@ 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_generator_spec.rb
 spec/site_spec.rb
 spec/spec_generator_helper.rb
 spec/spec_generator_spec.rb
@@ -66,15 +65,18 @@ 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/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
@@ -86,11 +88,6 @@ watircraft_generators/page/page_generator.rb
 watircraft_generators/page/templates
 watircraft_generators/page/templates/page.rb.erb
 watircraft_generators/page/USAGE
-watircraft_generators/site
-watircraft_generators/site/site_generator.rb
-watircraft_generators/site/templates
-watircraft_generators/site/templates/environments.yml.erb
-watircraft_generators/site/templates/site.rb.erb
 watircraft_generators/spec
 watircraft_generators/spec/spec_generator.rb
 watircraft_generators/spec/templates

data/README.rdoc

@@ -7,11 +7,11 @@ It allows tests to be expressed as Rspec or Cucumber tests and provides
 a library structure to support maintainable testing. It gives you
 a place to put things.
 
-* http://testobsessed.com/2008/05/31/a-place-to-put-things/
+* http://testobsessed.com/2008/05/31/a-place-to-put-things
 
 == FEATURES
 
-* Generate a directory structure for your test suite with one command.
+* Generates a directory structure for your test suite with one command.
 * Provides page adapters you can customize for your application.
 * Configure application URL and browser type (IE, Firefox) in one location.
 * Framework automatically initializes browser for testing.
@@ -30,8 +30,8 @@ get the benefit.
 
 == INSTALL
 
-* gem update --system
-* gem install watircraft
+  gem update --system
+  gem install watircraft
 
 == EXAMPLE
 

data/VERSION.yml

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

data/{watircraft_generators/site → app_generators/watircraft}/templates/site.rb.erb

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'taza'
 
-module <%= name.camelize %>
+module <%= site.camelize %>
   include ForwardInitialization
 
-  class <%= name.camelize %> < ::Taza::Site
+  class <%= site.camelize %> < ::Taza::Site
 
   end
 end

data/app_generators/watircraft/watircraft_generator.rb

@@ -44,7 +44,7 @@ class WatircraftGenerator < RubiGen::Base
       m.file "spec_helper.rb", "test/specs/spec_helper.rb", :collision => :force
       m.file "feature_helper.rb", "test/features/feature_helper.rb", :collision => :force
 
-      m.template "initialize.rb.erb", "lib/initialize.rb", :collision => :ask
+      m.template "initialize.rb.erb", "lib/initialize.rb", :collision => :skip # not sure what's right
       m.file "spec_initialize.rb", "lib/init/spec_initialize.rb", :collision => :force
       m.file "world.rb", "lib/steps/world.rb", :collision => :force
       m.template "site_start.rb.erb", "lib/init/site_start.rb", :collision => :force
@@ -53,7 +53,9 @@ class WatircraftGenerator < RubiGen::Base
 
       m.dependency "install_rubigen_scripts", [destination_root, 'watircraft'],
         :shebang => options[:shebang], :collision => :ask
-      m.dependency "site", [@site], :destination => destination_root
+
+      m.template "site.rb.erb", "lib/#{@site}.rb", :collision => :skip
+      m.template "environments.yml.erb", "config/environments.yml", :collision => :skip
     end
   end
 

data/lib/extensions/watir.rb

@@ -1,7 +1,9 @@
 # TODO: support radiogroup
 # TODO: migrate this code into Watir
-# TODO: also handle FireWatir classes
-module Watir
+  
+def Watir.add_display_value_methods_to mod
+    mod.module_eval <<-CLASS_END
+
   class TextField # includes Hidden
     def display_value
       value
@@ -34,8 +36,15 @@ module Watir
       text
     end
   end
+  class NonControlElement
+    def display_value
+      text
+    end
+  end
 
   class B < NonControlElement
     TAG = 'B'
   end
+
+    CLASS_END
 end

data/lib/taza/browser.rb

@@ -1,45 +1,50 @@
-module Taza
-  class Browser
-    
-    # Create a browser instance depending on configuration.  Configuration should be read in via Taza::Settings.config.
-    # 
-    # Example:
-    #     browser = Taza::Browser.create(Taza::Settings.config)
-    #
-    def self.create(params={})
-      self.send("create_#{params[:driver]}".to_sym,params)
-    end
-
-    private    
-
-    def self.create_watir(params)
-      require 'watir'
-      if params[:browser] == :ie
-        require 'watir/ie'
-        require 'extensions/watir'
-      end
-      Watir::Browser.default = params[:browser].to_s
-      Watir::Browser.new
-    end
-
-    def self.create_selenium(params)
-      require 'selenium'
-      Selenium::SeleniumDriver.new(params[:server_ip],params[:server_port],'*' + params[:browser].to_s,params[:timeout])
-    end
-    
-    def self.create_fake(params)
-      FakeBrowser.new
-    end
-
-  end
-
-  class FakeBrowser
-    def goto(*args)
-    end
-    def close
-    end
-    
-  end
-  
-end
-
+module Taza
+  class Browser
+    
+    # Create a browser instance depending on configuration.  Configuration should be read in via Taza::Settings.config.
+    # 
+    # Example:
+    #     browser = Taza::Browser.create(Taza::Settings.config)
+    #
+    def self.create(params={})
+      self.send("create_#{params[:driver]}".to_sym,params)
+    end
+
+    private    
+
+    def self.create_watir(params)
+      require 'watir'
+      require 'extensions/watir'
+      if params[:browser] == :ie
+        require 'watir/ie'
+        Watir.add_display_value_methods_to Watir
+      end
+      if params[:browser] == :firefox
+        require 'firewatir'
+        Watir.add_display_value_methods_to FireWatir
+      end
+      Watir::Browser.default = params[:browser].to_s
+      Watir::Browser.new
+    end
+
+    def self.create_selenium(params)
+      require 'selenium'
+      Selenium::SeleniumDriver.new(params[:server_ip],params[:server_port],'*' + params[:browser].to_s,params[:timeout])
+    end
+    
+    def self.create_fake(params)
+      FakeBrowser.new
+    end
+
+  end
+
+  class FakeBrowser
+    def goto(*args)
+    end
+    def close
+    end
+    
+  end
+  
+end
+

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.1'; end
+module WatirCraft; VERSION = '0.4.2'; end

data/spec/page_generator_spec.rb

@@ -10,8 +10,13 @@ describe "Page Generation" do
   include Helpers::Taza
 
   before :each do
-    generate_project
-    @site_class = generate_site('Gap')
+    site_name = "Gap#{Time.now.to_i}"
+    generate_project ["--site=#{site_name}"]
+    site_file_path = File.join(PROJECT_FOLDER,'lib',"#{site_name.underscore}.rb")
+    require site_file_path
+    "::#{site_name.camelize}::#{site_name.camelize}".constantize.any_instance.stubs(:base_path).returns(PROJECT_FOLDER)
+    @site_class = site_name.camelize.constantize
+    
     @site_name = @site_class.to_s.underscore
   end
 

data/spec/project_generator_spec.rb

@@ -7,97 +7,151 @@ require 'taza'
 
 describe "Project Generator" do
   include RubiGen::GeneratorTestHelper
+  include Helpers::Generator
   
   def project_file relative_path
     File.join(TMP_ROOT, PROJECT_NAME, relative_path)
   end
-
+  def project_folder project_name=PROJECT_NAME
+    File.join(TMP_ROOT, project_name)
+  end
+  
   before :each do
-    @spec_helper = project_file 'test/specs/spec_helper.rb'
-    @initializer = project_file 'lib/initialize.rb'
     ENV['ENVIRONMENT'] = nil
     bare_setup
+    
+    @site_folder = project_file 'lib'
+    @page_folder = project_file 'lib/pages'
+    @initializer = project_file 'lib/initialize.rb'
   end
 
   after :each do
     bare_teardown
   end
 
-  def should_be_loadable file, options=[]
-    options = [options] unless options.is_a? Array
-    generator_args = [APP_ROOT] + options
-    run_generator('watircraft', generator_args, generator_sources)
+  def should_be_loadable file
     load_path = File.dirname(__FILE__) + '/../lib'
     system("ruby -I#{load_path} #{file} > #{null_device}").should be_true
   end
 
   it "should generate a spec helper that can be required even when site name is different" do
-    should_be_loadable @spec_helper, ['--site=another_name', '--driver=fake']
-  end
+    generate_project ['--site=another_name', '--driver=fake']
+    spec_helper = project_file 'test/specs/spec_helper.rb'
+    should_be_loadable spec_helper
+  end 
 
   it "should generate a feature helper that can be required" do
+    generate_project ['--driver=fake']
     feature_helper = project_file 'test/features/feature_helper.rb'
-    should_be_loadable feature_helper, '--driver=fake'
+    should_be_loadable feature_helper
   end
 
   it "should generate a world file that can be required" do
+    generate_project ['--driver=fake']
     world = project_file 'lib/steps/world.rb'
-    should_be_loadable world, '--driver=fake'
+    should_be_loadable world
   end
 
   it "should generate a rakefile that can be required" do
+    generate_project
     rakefile = project_file 'rakefile'
     should_be_loadable rakefile
   end
   
   it "should generate an initializer that can be required" do
+    generate_project
     should_be_loadable @initializer
   end
   
   it "should be able to update an existing project and figure out the site name" do
-    run_generator('watircraft', [APP_ROOT, '--site=crazy'], generator_sources)
-    run_generator('watircraft', [APP_ROOT], generator_sources)
+    generate_project ['--site=crazy']
+    generate_project
     Taza::Settings.config[:site].should == 'crazy'
   end
 
   it "initializer should set the ENVIRONMENT variable if it is not provided" do
-    run_generator('watircraft', [APP_ROOT], generator_sources)
+    generate_project
     load @initializer
     ENV['ENVIRONMENT'].should eql("test")
   end
   
   it "initializer should not override the ENVIRONMENT variable if was provided" do
     ENV['ENVIRONMENT'] = 'orange pie? is there such a thing?'
-    run_generator('watircraft', [APP_ROOT], generator_sources)
+    generate_project
     load @initializer
     ENV['ENVIRONMENT'].should eql('orange pie? is there such a thing?')
   end
   
   it "should configure a project for watir, implicitly" do
-    run_generator('watircraft', [APP_ROOT], generator_sources)
+    generate_project
     Taza::Settings.stubs(:path).returns(APP_ROOT)
     ENV['ENVIRONMENT'] = 'test'
     Taza::Settings.config[:driver].should == :watir
   end
 
   it "should allow a site name to be specified" do
-    run_generator('watircraft', [APP_ROOT, '--site=site_name'], generator_sources)
+    generate_project ['--site=site_name']
     Taza::Settings.stubs(:path).returns(APP_ROOT)
     ENV['ENVIRONMENT'] = 'test'
     Taza::Settings.config[:site].should == 'site_name'
   end
   
   it "should allow a browser driver to be specified" do
-    run_generator('watircraft', [APP_ROOT, '--driver=nine_iron'], generator_sources)
+    generate_project ['--driver=nine_iron']
     Taza::Settings.stubs(:path).returns(APP_ROOT)
     ENV['ENVIRONMENT'] = 'test'
     Taza::Settings.config[:driver].should == :nine_iron
   end
   
   it "should generate a script/console" do
-    run_generator('watircraft', [APP_ROOT], generator_sources)
+    generate_project
     File.exist?(project_file('script/console')).should be_true
     File.exist?(project_file('script/console.cmd')).should be_true
   end
 
+  it "should generate configuration file for a site" do
+    generate_project
+    File.exists?(File.join(PROJECT_FOLDER,'config','environments.yml')).should be_true
+  end
+
+  it "should generate site files and folders" do
+    generate_project
+    File.directory?(@site_folder).should be_true
+    File.directory?(@page_folder).should be_true
+    File.exists?("#{@site_folder}/example.rb").should be_true
+  end
+
+  it "should generate a site path even if the site name is given with spaces" do
+    generate_project ["--site=example foo"]
+    File.directory?(@site_folder).should be_true
+    File.directory?(@page_folder).should be_true
+    File.exists?("#{@site_folder}/example_foo.rb").should be_true
+  end
+
+  it "should generate a site path even if the site name is given with underscores" do
+    generate_project ["--site=example_foo"]
+    File.directory?(@site_folder).should be_true
+    File.directory?(@page_folder).should be_true
+    File.exists?("#{@site_folder}/example_foo.rb").should be_true
+  end
+  
+  include Helpers::Taza
+  it "generated site that uses the block given in new" do
+    site_name = "example#{Time.now.to_i}"
+    generate_project ["--site=#{site_name}"]
+
+    site_file_path = project_file "lib/#{site_name.underscore}.rb"
+    require site_file_path
+    "::#{site_name.camelize}::#{site_name.camelize}".constantize.any_instance.stubs(:base_path).returns(PROJECT_FOLDER)
+    site_class = site_name.camelize.constantize
+    
+    stub_settings
+    stub_browser
+    foo = nil
+    site_class.new {|site| foo = site}
+    foo.should_not be_nil
+    foo.should be_a_kind_of(Taza::Site)
+  end
+  
+
 end

data/spec/spec_generator_helper.rb

@@ -10,16 +10,9 @@ end
 
 module Helpers
   module Generator
-    def generate_site(site_name)
-      site_name = "#{site_name}#{Time.now.to_i}"
-      run_generator('site', [site_name], generator_sources)
-      site_file_path = File.join(PROJECT_FOLDER,'lib',"#{site_name.underscore}.rb")
-      require site_file_path
-      "::#{site_name.camelize}::#{site_name.camelize}".constantize.any_instance.stubs(:base_path).returns(PROJECT_FOLDER)
-      site_name.camelize.constantize
-    end
-    def generate_project
-      run_generator('watircraft', [APP_ROOT], generator_sources)
+    def generate_project options=[]
+      generator_args = [APP_ROOT] + options
+      run_generator('watircraft', generator_args, generator_sources)
       ::Taza::Settings.stubs(:path).returns(APP_ROOT)       
     end
   end

data/spec/watir_spec.rb

@@ -0,0 +1,36 @@
+require 'spec/spec_helper'
+require 'watir'
+require 'watir/ie'
+require 'firewatir'
+require 'extensions/watir'
+
+describe 'Watir Extensions' do
+  share_examples_for 'extended watir' do
+    def should_provide_display_value_method_for_class klass
+      container = stub()
+      container.stubs(:page_container)
+      element = klass.new container, :index, 1
+      element.method(:display_value) # should be defined
+    end
+    
+    specify { should_provide_display_value_method_for_class @module::TextField }
+    specify { should_provide_display_value_method_for_class @module::NonControlElement}
+    specify { should_provide_display_value_method_for_class @module::H3 }
+  end
+
+  describe "IE Watir" do
+    it_should_behave_like 'extended watir'
+    Watir.add_display_value_methods_to Watir
+    before do
+      @module = Watir
+    end
+  end
+  
+  describe "Fire Watir" do
+    it_should_behave_like 'extended watir'
+    Watir.add_display_value_methods_to FireWatir
+    before do
+      @module = FireWatir
+    end
+  end
+end

data/watircraft.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watircraft}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   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-02-25}
+  s.date = %q{2009-03-24}
   s.default_executable = %q{watircraft}
   s.description = %q{WatirCraft is a framework for web testing.}
   s.email = %q{bret@pettichord.com}
   s.executables = ["watircraft"]
   s.extra_rdoc_files = ["History.txt", "README.rdoc"]
-  s.files = ["BUGS.txt", "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_generator_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", "app_generators/watircraft", "app_generators/watircraft/templates", "app_generators/watircraft/templates/config.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/script", "app_generators/watircraft/templates/script/console", "app_generators/watircraft/templates/script/console.cmd", "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/site", "watircraft_generators/site/site_generator.rb", "watircraft_generators/site/templates", "watircraft_generators/site/templates/environments.yml.erb", "watircraft_generators/site/templates/site.rb.erb", "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 = ["BUGS.txt", "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/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.has_rdoc = true
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bret-watircraft
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: watircraft
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,7 +153,6 @@ files:
 - spec/sandbox/pages/foo/partials
 - spec/sandbox/pages/foo/partials/partial_the_reckoning.rb
 - spec/settings_spec.rb
-- spec/site_generator_spec.rb
 - spec/site_spec.rb
 - spec/spec_generator_helper.rb
 - spec/spec_generator_spec.rb
@@ -163,15 +162,18 @@ files:
 - 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/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
@@ -183,11 +185,6 @@ files:
 - watircraft_generators/page/templates
 - watircraft_generators/page/templates/page.rb.erb
 - watircraft_generators/page/USAGE
-- watircraft_generators/site
-- watircraft_generators/site/site_generator.rb
-- watircraft_generators/site/templates
-- watircraft_generators/site/templates/environments.yml.erb
-- watircraft_generators/site/templates/site.rb.erb
 - watircraft_generators/spec
 - watircraft_generators/spec/spec_generator.rb
 - watircraft_generators/spec/templates

data/spec/site_generator_spec.rb

@@ -1,62 +0,0 @@
-require 'spec/spec_helper'
-require 'spec/spec_generator_helper'
-require 'rubygems'
-require 'fileutils'
-require 'taza'
-
-describe "Site Generation" do
-  include RubiGen::GeneratorTestHelper
-  include Helpers::Generator
-  include Helpers::Taza
-  
-  before :all do
-    @spec_helper = File.join(TMP_ROOT,PROJECT_NAME,'spec','spec_helper.rb')
-    @site_name = "WikipediaFoo"
-    @site_file = File.join(PROJECT_FOLDER,'lib', "wikipedia_foo.rb")
-    @site_folder = File.join(PROJECT_FOLDER,'lib')
-    @page_folder = File.join(@site_folder, 'pages')
-  end
-
-  before :each do
-    bare_setup
-    run_generator('watircraft', [APP_ROOT], generator_sources)
-  end
-
-  after :each do
-    bare_teardown
-  end
-
-  it "should generate configuration file for a site" do
-    run_generator('site', [@site_name], generator_sources)
-    File.exists?(File.join(PROJECT_FOLDER,'config','environments.yml')).should be_true
-  end
-
-  it "should generate a site path for pages" do
-    run_generator('site', [@site_name], generator_sources)
-    File.directory?(@site_folder).should be_true
-    File.directory?(@page_folder).should be_true
-  end
-  
-  it "should generate a site path even if the site name is given with spaces" do
-    run_generator('site', ["Wikipedia Foo"], generator_sources)
-    File.directory?(@site_folder).should be_true
-    File.directory?(@page_folder).should be_true
-  end
-  
-  it "should generate a site path even if the site name is given with underscores" do
-    run_generator('site', ["wikipedia_foo"], generator_sources)
-    File.directory?(@site_folder).should be_true
-    File.directory?(@page_folder).should be_true
-  end
-
-  it "generated site that uses the block given in new" do
-    @site_class = generate_site(@site_name)
-    stub_settings
-    stub_browser
-    foo = nil
-    @site_class.new {|site| foo = site}
-    foo.should_not be_nil
-    foo.should be_a_kind_of(Taza::Site)
-  end
-
-end

data/watircraft_generators/site/site_generator.rb

@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'rubigen'
-require 'extensions/string'
-
-class SiteGenerator < RubiGen::Base
-  default_options :author => nil
-  attr_reader :name
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @name = args.shift.computerize
-    extract_options
-  end
-
-  def manifest
-    record do |m|
-      m.template "site.rb.erb", "lib/#{name}.rb", :collision => :skip
-      m.template "environments.yml.erb", "config/environments.yml", :collision => :skip
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS
-    Creates the site for a watircraft project.
-
-    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