infrataster 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c688ef83410f30dc9e25254d43f69a64ac91800
-  data.tar.gz: edf44d55e56d2d2b146e42a4a1e971bd94e34f92
+  metadata.gz: 8ce1087098d32e5590380749af3c3d864cb877ff
+  data.tar.gz: 3db9a8a5b018a199ce49a90853b0906c820d22fb
 SHA512:
-  metadata.gz: 59d06ca182ed05759cac708bf4c320b5df020cb10018b56f68751e0a719b0490b8c0219eb6f069dfd3db3a6faaa50b8aa54edbb73f279815ddd82fd9d03efa32
-  data.tar.gz: 0dfd6f925864f1add5905ee34ff1fa6ff9fe4012e6a1d13e80814e87b9c840f161ce6224ab96d03ea52dc3d5ef0c641fe4871d16f7d9138ffdc723807677ef1f
+  metadata.gz: 6d03e0bee9d2b39ffaaf1f628c541532702aafe38771f4dc870125cc1e647d20cb1650fbbe9598fb31c5473b6208e26f5e97bf2d180424dc42a070be6f4480d5
+  data.tar.gz: 50e50689ea235aafbf3aa1729716e7996021310e532bf539be391bdc9a8958cfb73bc813e5e0e5a9994172d3d3ec4c648402d4f6a1a6320d720a2907627612f8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.1.3
+
+* Don't create multiple phantomjs and browsermob proxy. `capybara` resources become faster.
+
 ## v0.1.2
 
 * Use poltergeist (PhantomJS) as capybara driver instead of selenium-webdriver.

data/README.md

@@ -1,5 +1,7 @@
 # Infrataster
 
+[![Gem Version](https://badge.fury.io/rb/infrataster.png)](http://badge.fury.io/rb/infrataster)
+
 Infrastructure Behavior Testing Framework.
 
 ## Usage

data/Rakefile

@@ -1,8 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "open-uri"
 
-def red(str)
-  "\e[31m#{str}\e[m"
+def yellow(str)
+  "\e[33m#{str}\e[m"
 end
 
 ENV['VAGRANT_CWD'] = File.expand_path('spec/integration/vm')
@@ -18,16 +19,23 @@ namespace :spec do
 
   namespace :integration do
     integration_dir = 'spec/integration'
+
     task :prepare => ['download_browsermob', 'start_vm'] do
     end
 
     task :download_browsermob do
       dir = File.join(integration_dir, 'vm/vendor/browsermob')
       unless Dir.exist?(dir)
-        puts red("Downloading browsermob...")
+        puts yellow("Downloading browsermob...")
         Dir.mktmpdir do |tmp|
-          cmd = "cd #{tmp} && wget -O browsermob-proxy.zip https://s3-us-west-1.amazonaws.com/lightbody-bmp/browsermob-proxy-2.0-beta-9-bin.zip && unzip browsermob-proxy.zip"
-          system cmd
+          open('https://s3-us-west-1.amazonaws.com/lightbody-bmp/browsermob-proxy-2.0-beta-9-bin.zip') do |remote|
+            open(File.join(tmp, 'browsermob-proxy.zip'), 'wb') do |f|
+              f.write(remote.read)
+            end
+          end
+          Dir.chdir(tmp) do
+            system "unzip browsermob-proxy.zip"
+          end
           FileUtils.mv(File.join(tmp, 'browsermob-proxy-2.0-beta-9'), dir)
         end
       end
@@ -37,15 +45,15 @@ namespace :spec do
       dir = File.join(integration_dir, 'vm/vendor/cookbooks')
       # Berkshelf
       if Dir.exist?(dir)
-        puts red("'#{dir}' already exists. If you want update cookbooks, delete the directory and re-run rake command")
+        puts yellow("'#{dir}' already exists. If you want update cookbooks, delete the directory and re-run rake command")
       else
-        puts red('Installing cookbooks by berkshelf...')
-        system "cd #{integartion_dir} && berks vendor vendor/cookbooks"
+        puts yellow('Installing cookbooks by berkshelf...')
+        system "cd #{integration_dir}/vm && berks vendor vendor/cookbooks"
       end
     end
 
     task :start_vm => ['berks_vendor'] do
-      puts red('Starting VM...')
+      puts yellow('Starting VM...')
       system '/usr/bin/vagrant up'
     end
   end

data/lib/infrataster/browsermob_proxy.rb

@@ -7,6 +7,10 @@ module Infrataster
         @server ||= start_server
       end
 
+      def proxy
+        @proxy ||= server.create_proxy
+      end
+
       def bin_path
         @bin_path
       end
@@ -29,3 +33,4 @@ module Infrataster
     end
   end
 end
+

data/lib/infrataster/contexts/capybara_context.rb

@@ -5,18 +5,29 @@ require 'capybara/poltergeist'
 module Infrataster
   module Contexts
     class CapybaraContext < BaseContext
+      def self.session
+        @session ||= prepare_session
+      end
+
+      def self.prepare_session
+        capybara_driver_name = :infrataster_driver
+
+        proxy = BrowsermobProxy.proxy
+        Capybara.register_driver capybara_driver_name do |app|
+          Capybara::Poltergeist::Driver.new(
+            app,
+            phantomjs_options: ["--proxy=http://#{proxy.host}:#{proxy.port}"],
+          )
+        end
+        Capybara::Session.new(capybara_driver_name)
+      end
+
       def initialize(*args)
         super(*args)
-
-        register_capybara_driver
       end
 
       def session
-        return @session if @session
-
-        address, port, @gateway_finalize_proc = server.from_gateway_open(resource.uri.port)
-        Capybara.app_host = "http://#{address}:#{port}"
-        @session = Capybara::Session.new(capybara_driver_name)
+        self.class.session
       end
 
       def page
@@ -25,6 +36,12 @@ module Infrataster
 
       def before_each(example)
         example.example_group_instance.extend(Capybara::RSpecMatchers)
+
+        proxy = BrowsermobProxy.proxy
+        proxy.header({"Host" => resource.uri.host})
+
+        address, port, @gateway_finalize_proc = server.from_gateway_open(resource.uri.port)
+        Capybara.app_host = "http://#{address}:#{port}"
       end
 
       def after_each(example)
@@ -34,23 +51,6 @@ module Infrataster
       def method_missing(method, *args)
         session.public_send(method, *args)
       end
-
-      private
-      def register_capybara_driver
-        proxy = BrowsermobProxy.server.create_proxy
-        proxy.header({"Host" => resource.uri.host})
-
-        Capybara.register_driver capybara_driver_name do |app|
-          Capybara::Poltergeist::Driver.new(
-            app,
-            phantomjs_options: ["--proxy=http://#{proxy.host}:#{proxy.port}"],
-          )
-        end
-      end
-
-      def capybara_driver_name
-        :"selenium_via_proxy_#{hash}"
-      end
     end
   end
 end

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec