mkuklis-webrat 0.5.1 → 0.6.rc1

data/spec/integration/merb/spec/webrat_spec.rb

@@ -1,39 +1,39 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-
-describe "Webrat" do
-  it "should visit pages" do
-    response = visit "/"
-    response.should contain("Webrat Form")
-  end
-
-  it "should submit forms" do
-    visit "/"
-    fill_in "Text field", :with => "Hello"
-    check "TOS"
-    select "January"
-    click_button "Test"
-  end
-
-  it "should follow internal redirects" do
-    response = visit "/internal_redirect"
-    response.status.should == 200
-    response.should contain("Webrat Form")
-  end
-
-  it "should check the value of a field" do
-    visit "/"
-    field_labeled("Prefilled").value.should == "text"
-  end
-
-  it "should not follow external redirects" do
-    response = visit "/external_redirect"
-    response.status.should == 302
-  end
-
-  it "should upload files" do
-    visit "/upload"
-    attach_file "File", __FILE__
-    response = click_button "Upload"
-    response.should contain(%(["webrat_spec.rb", "Tempfile"]))
-  end
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "Webrat" do
+  it "should visit pages" do
+    response = visit "/"
+    response.should contain("Webrat Form")
+  end
+
+  it "should submit forms" do
+    visit "/"
+    fill_in "Text field", :with => "Hello"
+    check "TOS"
+    select "January"
+    click_button "Test"
+  end
+
+  it "should follow internal redirects" do
+    response = visit "/internal_redirect"
+    response.status.should == 200
+    response.should contain("Webrat Form")
+  end
+
+  it "should check the value of a field" do
+    visit "/"
+    field_labeled("Prefilled").value.should == "text"
+  end
+
+  it "should not follow external redirects" do
+    response = visit "/external_redirect"
+    response.status.should == 302
+  end
+
+  it "should upload files" do
+    visit "/upload"
+    attach_file "File", __FILE__
+    response = click_button "Upload"
+    response.should contain(%(["webrat_spec.rb", "Tempfile"]))
+  end
+end

data/spec/integration/merb/tasks/merb.thor/app_script.rb

@@ -1,31 +1,31 @@
-#!/usr/bin/env ruby
-
-# This was added by Merb's bundler
-
-require "rubygems"
-require File.join(File.dirname(__FILE__), "common")
-
-gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')
-
-if File.directory?(gems_dir)
-  $BUNDLE = true
-  Gem.clear_paths
-  Gem.path.replace([File.expand_path(gems_dir)])
-  ENV["PATH"] = "#{File.dirname(__FILE__)}:#{ENV["PATH"]}"
-
-  gem_file = File.join(gems_dir, "specifications", "<%= spec.name %>-*.gemspec")
-
-  if local_gem = Dir[gem_file].last
-    version = File.basename(local_gem)[/-([\.\d]+)\.gemspec$/, 1]
-  end
-end
-
-version ||= "<%= Gem::Requirement.default %>"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem '<%= @spec.name %>', version
-load '<%= bin_file_name %>'
+#!/usr/bin/env ruby
+
+# This was added by Merb's bundler
+
+require "rubygems"
+require File.join(File.dirname(__FILE__), "common")
+
+gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')
+
+if File.directory?(gems_dir)
+  $BUNDLE = true
+  Gem.clear_paths
+  Gem.path.replace([File.expand_path(gems_dir)])
+  ENV["PATH"] = "#{File.dirname(__FILE__)}:#{ENV["PATH"]}"
+
+  gem_file = File.join(gems_dir, "specifications", "<%= spec.name %>-*.gemspec")
+
+  if local_gem = Dir[gem_file].last
+    version = File.basename(local_gem)[/-([\.\d]+)\.gemspec$/, 1]
+  end
+end
+
+version ||= "<%= Gem::Requirement.default %>"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+gem '<%= @spec.name %>', version
+load '<%= bin_file_name %>'

data/spec/integration/merb/tasks/merb.thor/common.rb

@@ -1,64 +1,64 @@
-# This was added via Merb's bundler
-
-require "rubygems"
-require "rubygems/source_index"
-
-module Gem
-  BUNDLED_SPECS = File.join(Dir.pwd, "gems", "specifications")
-  MAIN_INDEX = Gem::SourceIndex.from_gems_in(BUNDLED_SPECS)
-  FALLBACK_INDEX = Gem::SourceIndex.from_installed_gems
-
-  def self.source_index
-    MultiSourceIndex.new
-  end
-
-  def self.searcher
-    MultiPathSearcher.new
-  end
-
-  class ArbitrarySearcher < GemPathSearcher
-    def initialize(source_index)
-      @source_index = source_index
-      super()
-    end
-
-    def init_gemspecs
-      @source_index.map { |_, spec| spec }.sort { |a,b|
-        (a.name <=> b.name).nonzero? || (b.version <=> a.version)
-      }
-    end
-  end
-
-  class MultiPathSearcher
-    def initialize
-      @main_searcher = ArbitrarySearcher.new(MAIN_INDEX)
-      @fallback_searcher = ArbitrarySearcher.new(FALLBACK_INDEX)
-    end
-
-    def find(path)
-      try = @main_searcher.find(path)
-      return try if try
-      @fallback_searcher.find(path)
-    end
-
-    def find_all(path)
-      try = @main_searcher.find_all(path)
-      return try unless try.empty?
-      @fallback_searcher.find_all(path)
-    end
-  end
-
-  class MultiSourceIndex
-    def search(*args)
-      try = MAIN_INDEX.search(*args)
-      return try unless try.empty?
-      FALLBACK_INDEX.search(*args)
-    end
-
-    def find_name(*args)
-      try = MAIN_INDEX.find_name(*args)
-      return try unless try.empty?
-      FALLBACK_INDEX.find_name(*args)
-    end
-  end
-end
+# This was added via Merb's bundler
+
+require "rubygems"
+require "rubygems/source_index"
+
+module Gem
+  BUNDLED_SPECS = File.join(Dir.pwd, "gems", "specifications")
+  MAIN_INDEX = Gem::SourceIndex.from_gems_in(BUNDLED_SPECS)
+  FALLBACK_INDEX = Gem::SourceIndex.from_installed_gems
+
+  def self.source_index
+    MultiSourceIndex.new
+  end
+
+  def self.searcher
+    MultiPathSearcher.new
+  end
+
+  class ArbitrarySearcher < GemPathSearcher
+    def initialize(source_index)
+      @source_index = source_index
+      super()
+    end
+
+    def init_gemspecs
+      @source_index.map { |_, spec| spec }.sort { |a,b|
+        (a.name <=> b.name).nonzero? || (b.version <=> a.version)
+      }
+    end
+  end
+
+  class MultiPathSearcher
+    def initialize
+      @main_searcher = ArbitrarySearcher.new(MAIN_INDEX)
+      @fallback_searcher = ArbitrarySearcher.new(FALLBACK_INDEX)
+    end
+
+    def find(path)
+      try = @main_searcher.find(path)
+      return try if try
+      @fallback_searcher.find(path)
+    end
+
+    def find_all(path)
+      try = @main_searcher.find_all(path)
+      return try unless try.empty?
+      @fallback_searcher.find_all(path)
+    end
+  end
+
+  class MultiSourceIndex
+    def search(*args)
+      try = MAIN_INDEX.search(*args)
+      return try unless try.empty?
+      FALLBACK_INDEX.search(*args)
+    end
+
+    def find_name(*args)
+      try = MAIN_INDEX.find_name(*args)
+      return try unless try.empty?
+      FALLBACK_INDEX.find_name(*args)
+    end
+  end
+end

data/spec/integration/merb/tasks/merb.thor/gem_ext.rb

@@ -1,124 +1,124 @@
-require "erb"
-
-Gem.pre_install_hooks.push(proc do |installer|
-  $INSTALLING << installer.spec
-
-  unless File.file?(installer.bin_dir / "common.rb")
-    FileUtils.mkdir_p(installer.bin_dir)
-    FileUtils.cp(File.dirname(__FILE__) / "common.rb", installer.bin_dir / "common.rb")
-  end
-
-  include ColorfulMessages
-  name = installer.spec.name
-  if $GEMS && versions = ($GEMS.assoc(name) || [])[1]
-    dep = Gem::Dependency.new(name, versions)
-    unless dep.version_requirements.satisfied_by?(installer.spec.version)
-      error "Cannot install #{installer.spec.full_name} " \
-            "for #{$INSTALLING.map {|x| x.full_name}.join(", ")}; " \
-            "you required #{dep}"
-      ::Thor::Tasks::Merb::Gem.rollback_trans
-      exit!
-    end
-  end
-  success "Installing #{installer.spec.full_name}"
-end)
-
-class ::Gem::Uninstaller
-  def self._with_silent_ui
-
-    ui = Gem::DefaultUserInteraction.ui
-    def ui.say(str)
-      puts "- #{str}"
-    end
-
-    yield
-
-    class << Gem::DefaultUserInteraction.ui
-      remove_method :say
-    end
-  end
-
-  def self._uninstall(source_index, name, op, version)
-    unless source_index.find_name(name, "#{op} #{version}").empty?
-      uninstaller = Gem::Uninstaller.new(
-        name,
-        :version => "#{op} #{version}",
-        :install_dir => Dir.pwd / "gems",
-        :all => true,
-        :ignore => true
-      )
-      _with_silent_ui { uninstaller.uninstall }
-    end
-  end
-
-  def self._uninstall_others(source_index, name, version)
-    _uninstall(source_index, name, "<", version)
-    _uninstall(source_index, name, ">", version)
-  end
-end
-
-Gem.post_install_hooks.push(proc do |installer|
-  $INSTALLING.pop
-  source_index = installer.instance_variable_get("@source_index")
-  ::Gem::Uninstaller._uninstall_others(
-    source_index, installer.spec.name, installer.spec.version
-  )
-end)
-
-class ::Gem::DependencyInstaller
-  alias old_fg find_gems_with_sources
-
-  def find_gems_with_sources(dep)
-    if @source_index.any? { |_, installed_spec|
-      installed_spec.satisfies_requirement?(dep)
-    }
-      return []
-    end
-
-    old_fg(dep)
-  end
-end
-
-class ::Gem::SpecFetcher
-  alias old_fetch fetch
-  def fetch(dependency, all = false, matching_platform = true)
-    idx = Gem::SourceIndex.from_installed_gems
-
-    dep = idx.search(dependency).sort.last
-
-    if dep
-      file = dep.loaded_from.dup
-      file.gsub!(/specifications/, "cache")
-      file.gsub!(/gemspec$/, "gem")
-      spec = ::Gem::Format.from_file_by_path(file).spec
-      [[spec, file]]
-    else
-      old_fetch(dependency, all, matching_platform)
-    end
-  end
-end
-
-class ::Gem::Installer
-  def app_script_text(bin_file_name)
-    template = File.read(File.dirname(__FILE__) / "app_script.rb")
-    erb = ERB.new(template)
-    erb.result(binding)
-  end
-end
-
-class ::Gem::Specification
-  def recursive_dependencies(from, index = Gem.source_index)
-    specs = self.runtime_dependencies.map do |dep|
-      spec = index.search(dep).last
-      unless spec
-        from_name = from.is_a?(::Gem::Specification) ? from.full_name : from.to_s
-        wider_net = index.find_name(dep.name).last
-        ThorUI.error "Needed #{dep} for #{from_name}, but could not find it"
-        ThorUI.error "Found #{wider_net.full_name}" if wider_net
-        ::Thor::Tasks::Merb::Gem.rollback_trans
-      end
-      spec
-    end
-    specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq
-  end
-end
+require "erb"
+
+Gem.pre_install_hooks.push(proc do |installer|
+  $INSTALLING << installer.spec
+
+  unless File.file?(installer.bin_dir / "common.rb")
+    FileUtils.mkdir_p(installer.bin_dir)
+    FileUtils.cp(File.dirname(__FILE__) / "common.rb", installer.bin_dir / "common.rb")
+  end
+
+  include ColorfulMessages
+  name = installer.spec.name
+  if $GEMS && versions = ($GEMS.assoc(name) || [])[1]
+    dep = Gem::Dependency.new(name, versions)
+    unless dep.version_requirements.satisfied_by?(installer.spec.version)
+      error "Cannot install #{installer.spec.full_name} " \
+            "for #{$INSTALLING.map {|x| x.full_name}.join(", ")}; " \
+            "you required #{dep}"
+      ::Thor::Tasks::Merb::Gem.rollback_trans
+      exit!
+    end
+  end
+  success "Installing #{installer.spec.full_name}"
+end)
+
+class ::Gem::Uninstaller
+  def self._with_silent_ui
+
+    ui = Gem::DefaultUserInteraction.ui
+    def ui.say(str)
+      puts "- #{str}"
+    end
+
+    yield
+
+    class << Gem::DefaultUserInteraction.ui
+      remove_method :say
+    end
+  end
+
+  def self._uninstall(source_index, name, op, version)
+    unless source_index.find_name(name, "#{op} #{version}").empty?
+      uninstaller = Gem::Uninstaller.new(
+        name,
+        :version => "#{op} #{version}",
+        :install_dir => Dir.pwd / "gems",
+        :all => true,
+        :ignore => true
+      )
+      _with_silent_ui { uninstaller.uninstall }
+    end
+  end
+
+  def self._uninstall_others(source_index, name, version)
+    _uninstall(source_index, name, "<", version)
+    _uninstall(source_index, name, ">", version)
+  end
+end
+
+Gem.post_install_hooks.push(proc do |installer|
+  $INSTALLING.pop
+  source_index = installer.instance_variable_get("@source_index")
+  ::Gem::Uninstaller._uninstall_others(
+    source_index, installer.spec.name, installer.spec.version
+  )
+end)
+
+class ::Gem::DependencyInstaller
+  alias old_fg find_gems_with_sources
+
+  def find_gems_with_sources(dep)
+    if @source_index.any? { |_, installed_spec|
+      installed_spec.satisfies_requirement?(dep)
+    }
+      return []
+    end
+
+    old_fg(dep)
+  end
+end
+
+class ::Gem::SpecFetcher
+  alias old_fetch fetch
+  def fetch(dependency, all = false, matching_platform = true)
+    idx = Gem::SourceIndex.from_installed_gems
+
+    dep = idx.search(dependency).sort.last
+
+    if dep
+      file = dep.loaded_from.dup
+      file.gsub!(/specifications/, "cache")
+      file.gsub!(/gemspec$/, "gem")
+      spec = ::Gem::Format.from_file_by_path(file).spec
+      [[spec, file]]
+    else
+      old_fetch(dependency, all, matching_platform)
+    end
+  end
+end
+
+class ::Gem::Installer
+  def app_script_text(bin_file_name)
+    template = File.read(File.dirname(__FILE__) / "app_script.rb")
+    erb = ERB.new(template)
+    erb.result(binding)
+  end
+end
+
+class ::Gem::Specification
+  def recursive_dependencies(from, index = Gem.source_index)
+    specs = self.runtime_dependencies.map do |dep|
+      spec = index.search(dep).last
+      unless spec
+        from_name = from.is_a?(::Gem::Specification) ? from.full_name : from.to_s
+        wider_net = index.find_name(dep.name).last
+        ThorUI.error "Needed #{dep} for #{from_name}, but could not find it"
+        ThorUI.error "Found #{wider_net.full_name}" if wider_net
+        ::Thor::Tasks::Merb::Gem.rollback_trans
+      end
+      spec
+    end
+    specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq
+  end
+end