capybara-webkit 0.1.6 → 0.1.7

data/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
-gem "rake"
 gem "rspec", :require => false
 gem "capybara"
 gem "sinatra", :require => false

data/Gemfile.lock

@@ -50,6 +50,5 @@ PLATFORMS
 
 DEPENDENCIES
   capybara
-  rake
   rspec
   sinatra

data/README.md

@@ -10,11 +10,11 @@ capybara-webkit depends on a WebKit implementation from Qt, a cross-platform dev
 
 * [Download Qt](http://qt.nokia.com/downloads/downloads)
 
-If you're on OS X, the installer at the above link will set up everything you need. You can download just the framework, as the full SDK isn't required to build the gem.
+If you're on OS X, the installer at the above link will set up everything you need. You can download just the framework, as the full SDK isn't required to build the gem. We recommend downloading the non-Debug Cocoa package with just the framework. Note that installing Qt via homebrew takes more than an hour, so we recommend just downloading the precompiled framework for OS X.
 
 If you're on Ubuntu, you can install the libqt4-dev package.
 
-On Linux platforms, capybara-webkit requires an X server to run, although it doesn't create any visible windows. Xvfb works fine for this.
+On Linux platforms, capybara-webkit requires an X server to run, although it doesn't create any visible windows. Xvfb works fine for this. You can setup Xvfb yourself and set a DISPLAY variable, or try out the [headless gem](https://github.com/leonid-shevtsov/headless).
 
 Usage
 -----

data/Rakefile

@@ -1,91 +1,77 @@
-require 'fileutils'
-
-unless ENV["BUILD"]
-  require 'rubygems'
-  require 'bundler/setup'
-  require 'rspec/core/rake_task'
-  require 'rake/gempackagetask'
-end
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+require 'rake/gempackagetask'
+require 'capybara_webkit_builder'
 
 desc "Generate a Makefile using qmake"
 file 'Makefile' do
-  sh("qmake -spec macx-g++")
+  CapybaraWebkitBuilder.makefile
 end
 
 desc "Regenerate dependencies using qmake"
 task :qmake => 'Makefile' do
-  sh("make qmake")
+  CapybaraWebkitBuilder.qmake
 end
 
 desc "Build the webkit server"
 task :build => :qmake do
-  sh("make")
-
-  FileUtils.mkdir("bin") unless File.directory?("bin")
-
-  if File.exist?("src/webkit_server.app")
-    FileUtils.cp("src/webkit_server.app/Contents/MacOS/webkit_server", "bin", :preserve => true)
-  else
-    FileUtils.cp("src/webkit_server", "bin", :preserve => true)
-  end
+  CapybaraWebkitBuilder.build
 end
 
 file 'bin/webkit_server' => :build
 
-unless ENV["BUILD"]
-  RSpec::Core::RakeTask.new do |t|
-    t.pattern = "spec/**/*_spec.rb"
-    t.rspec_opts = "--format progress"
-  end
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.rspec_opts = "--format progress"
+end
 
-  desc "Default: build and run all specs"
-  task :default => [:build, :spec]
+desc "Default: build and run all specs"
+task :default => [:build, :spec]
 
-  eval("$specification = begin; #{IO.read('capybara-webkit.gemspec')}; end")
-  Rake::GemPackageTask.new($specification) do |package|
-    package.need_zip = true
-    package.need_tar = true
-  end
+eval("$specification = begin; #{IO.read('capybara-webkit.gemspec')}; end")
+Rake::GemPackageTask.new($specification) do |package|
+  package.need_zip = true
+  package.need_tar = true
+end
 
-  gem_file = "pkg/#{$specification.name}-#{$specification.version}.gem"
+gem_file = "pkg/#{$specification.name}-#{$specification.version}.gem"
 
-  desc "Build and install the latest gem"
-  task :install => :gem do
-    sh("gem install --local #{gem_file}")
-  end
+desc "Build and install the latest gem"
+task :install => :gem do
+  sh("gem install --local #{gem_file}")
+end
 
-  desc "Build and release the latest gem"
-  task :release => :gem do
-    sh("gem push #{gem_file}")
-  end
+desc "Build and release the latest gem"
+task :release => :gem do
+  sh("gem push #{gem_file}")
+end
 
-  desc "Generate a new command called NAME"
-  task :generate_command do
-    name = ENV['NAME'] or raise "Provide a name with NAME="
+desc "Generate a new command called NAME"
+task :generate_command do
+  name = ENV['NAME'] or raise "Provide a name with NAME="
 
-    header = "src/#{name}.h"
-    source = "src/#{name}.cpp"
+  header = "src/#{name}.h"
+  source = "src/#{name}.cpp"
 
-    %w(h cpp).each do |extension|
-      File.open("templates/Command.#{extension}", "r") do |source_file|
-        contents = source_file.read
-        contents.gsub!("NAME", name)
-        File.open("src/#{name}.#{extension}", "w") do |target_file|
-          target_file.write(contents)
-        end
+  %w(h cpp).each do |extension|
+    File.open("templates/Command.#{extension}", "r") do |source_file|
+      contents = source_file.read
+      contents.gsub!("NAME", name)
+      File.open("src/#{name}.#{extension}", "w") do |target_file|
+        target_file.write(contents)
       end
     end
+  end
 
-    Dir.glob("src/*.pro").each do |project_file_name|
-      project = IO.read(project_file_name)
-      project.gsub!(/^(HEADERS = .*)/, "\\1 #{name}.h")
-      project.gsub!(/^(SOURCES = .*)/, "\\1 #{name}.cpp")
-      File.open(project_file_name, "w") { |file| file.write(project) }
-    end
+  Dir.glob("src/*.pro").each do |project_file_name|
+    project = IO.read(project_file_name)
+    project.gsub!(/^(HEADERS = .*)/, "\\1 #{name}.h")
+    project.gsub!(/^(SOURCES = .*)/, "\\1 #{name}.cpp")
+    File.open(project_file_name, "w") { |file| file.write(project) }
+  end
 
-    File.open("src/find_command.h", "a") do |file|
-      file.write("CHECK_COMMAND(#{name})")
-    end
+  File.open("src/find_command.h", "a") do |file|
+    file.write("CHECK_COMMAND(#{name})")
   end
 end
-

data/capybara-webkit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capybara-webkit"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
   s.authors = ["thoughtbot", "Joe Ferris", "Jason Morrison", "Tristan Dunn"]
   s.email = "support@thoughtbot.com"
   s.files = `git ls-files`.split("\n")
@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.3.5"
   s.summary = "Headless Webkit driver for Capybara"
   s.add_runtime_dependency "capybara", "~> 0.4.1"
-  s.add_runtime_dependency "rake"
   s.extensions = "extconf.rb"
 end
 

data/extconf.rb

@@ -1,2 +1,2 @@
-system("rake build BUILD=true")
-
+require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "capybara_webkit_builder")
+CapybaraWebkitBuilder.build_all

data/lib/capybara_webkit_builder.rb

@@ -0,0 +1,31 @@
+require "fileutils"
+
+module CapybaraWebkitBuilder
+  extend self
+
+  def makefile
+    system("qmake -spec macx-g++")
+  end
+
+  def qmake
+    system("make qmake")
+  end
+
+  def build
+    system("make")
+
+    FileUtils.mkdir("bin") unless File.directory?("bin")
+
+    if File.exist?("src/webkit_server.app")
+      FileUtils.cp("src/webkit_server.app/Contents/MacOS/webkit_server", "bin", :preserve => true)
+    else
+      FileUtils.cp("src/webkit_server", "bin", :preserve => true)
+    end
+  end
+
+  def build_all
+    makefile
+    qmake
+    build
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-webkit
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - thoughtbot
@@ -18,39 +13,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: capybara
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
         version: 0.4.1
-  version_requirements: *id001
-  name: capybara
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: rake
   prerelease: false
+  version_requirements: *id001
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -73,6 +49,7 @@ files:
 - lib/capybara/driver/webkit.rb
 - lib/capybara/driver/webkit/browser.rb
 - lib/capybara/driver/webkit/node.rb
+- lib/capybara_webkit_builder.rb
 - spec/driver_spec.rb
 - spec/integration/driver_spec.rb
 - spec/integration/session_spec.rb
@@ -126,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2573501153324218535
       segments: 
       - 0
       version: "0"
@@ -135,14 +112,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Headless Webkit driver for Capybara