infrataster 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b02e1a94765dc0d775d830797454180472654009
-  data.tar.gz: 29d0856e7cdce1920a7df6690b5f57f145cb2fc1
+  metadata.gz: edd8224440be0202f0981f08c84d41d96452ced1
+  data.tar.gz: 22738c41f609c5a5975251c41aaf4405fb2a451b
 SHA512:
-  metadata.gz: 37fd588b2774e7219915bddd22016bfe7158ffd09bad938259f526e4ace64fc21abfda87884bd0dbb925aef07002f36dcec005cb7fde760dc23b8182e0b2ab20
-  data.tar.gz: 7b10de04e16a5a507f9119aacd8c35f72948a595907c25f96ab7c61a004a69b812f67c3fa2d724c3405f2a91715a9eb2b1b6410e46b1936eafcedd0e09e5503a
+  metadata.gz: 0afc168b4efdf3c99d69f8780061c0d4276873c03801ef49394d56922a73e23a15da02a1376c6ff136c90cb5eca7b71e029d9351200b20713b3c4f4b08ebb11e
+  data.tar.gz: f737fd8a7ea09bdda40fffb1fc0e9165a3fe8369d7779a055b6c4b3b56be6ffd1568214e7996784cdbfd89db110138458bdb9e4e7e367492488bc0232eef52c5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.1.8
+
+* Use Poltergeist's header manipulation instead of BrowserMob Proxy. Remove BrowserMob Proxy dependency.
+
 ## v0.1.7
 
 * Fix a key name in a config passed to Net::SSH.start. (by @rrreeeyyy)

data/README.md

@@ -219,15 +219,6 @@ describe server(:app) do
 end
 ```
 
-If you use `capybara`, you should download and extract [BrowserMob Proxy](http://bmp.lightbody.net/) and set `Infrataster::BrowsermobProxy.bin_path` to binary path in `spec/spec_helper.rb`:
-
-```ruby
-# spec/spec_helper.rb
-Infrataster::BrowsermobProxy.bin_path = '/path/to/browsermob/bin/browsermob'
-```
-
-(BrowserMob Proxy is needed to manipulate Host HTTP header.)
-
 ### `mysql_query` resource
 
 `mysql_query` resource is now in [infrataster-plugin-mysql](https://github.com/ryotarai/infrataster-plugin-mysql).

data/Rakefile

@@ -29,25 +29,7 @@ namespace :spec do
     end
 
     desc 'Prepare'
-    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 yellow("Downloading browsermob...")
-        Dir.mktmpdir do |tmp|
-          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
+    task :prepare => ['start_vm'] do
     end
 
     task :berks_vendor do

data/infrataster.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh-gateway"
   spec.add_runtime_dependency "capybara"
   spec.add_runtime_dependency "poltergeist"
-  spec.add_runtime_dependency "browsermob-proxy"
   spec.add_runtime_dependency "faraday"
 
   spec.add_development_dependency "bundler", "~> 1.5"

data/lib/infrataster/contexts/capybara_context.rb

@@ -12,11 +12,9 @@ module Infrataster
       end
 
       def self.prepare_session
-        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)
@@ -37,18 +35,12 @@ module Infrataster
       def before_each(example)
         example.example_group_instance.extend(Capybara::RSpecMatchers)
 
-        proxy = BrowsermobProxy.proxy
-        proxy.header({"Host" => resource.uri.host})
+        session.driver.headers = {"Host" => resource.uri.host}
 
-        address, port, @gateway_finalize_proc =
-          server.open_gateway_on_from_server(resource.uri.port)
+        address, port = server.forward_port(resource.uri.port)
         Capybara.app_host = "http://#{address}:#{port}"
       end
 
-      def after_each(example)
-        @gateway_finalize_proc.call if @gateway_finalize_proc
-      end
-
       Capybara::Session::DSL_METHODS.each do |method|
         define_method method do |*args, &block|
           page.send method, *args, &block

data/lib/infrataster/contexts/http_context.rb

@@ -4,7 +4,7 @@ module Infrataster
   module Contexts
     class HttpContext < BaseContext
       def response
-        server.open_gateway_on_from_server(resource.uri.port) do |address, port|
+        server.forward_port(resource.uri.port) do |address, port|
           url = "#{resource.uri.scheme}://#{address}:#{port}"
 
           conn = Faraday.new(:url => url) do |faraday|

data/lib/infrataster/rspec.rb

@@ -13,5 +13,11 @@ RSpec.configure do |config|
   config.after(:each) do
     @infrataster_context.after_each(example) if @infrataster_context.respond_to?(:after_each)
   end
+
+  config.after(:all) do
+    Infrataster::Server.defined_servers.each do |server|
+      server.shutdown_gateway
+    end
+  end
 end
 

data/lib/infrataster/server.rb

@@ -45,63 +45,34 @@ module Infrataster
       end
     end
 
-    def ssh_gateway
-      gateway = Net::SSH::Gateway.new(*ssh_start_args)
-      finalize_proc = Proc.new do
-        gateway.shutdown!
-      end
+    def find_available_port
+      # find available local port
+      server = TCPServer.new('127.0.0.1', 0)
+      available_port = server.addr[1]
+      server.close
 
-      [gateway, finalize_proc]
+      available_port
     end
 
-    def with_ssh_gateway
-      gateway, finalize_proc = ssh_gateway
-      yield gateway
-    ensure
-      finalize_proc.call
+    def gateway
+      @gateway ||= Net::SSH::Gateway.new(*ssh_start_args)
     end
 
-    def gateway_open(host, port)
-      # find available local port
-      server = TCPServer.new('127.0.0.1', 0)
-      local_port = server.addr[1]
-      server.close
-
-      if block_given?
-        with_ssh_gateway do |gateway|
-          gateway.open(host, port, local_port) do |port|
-            yield port
-          end
-        end
-      else
-        gateway, gateway_finalize_proc = ssh_gateway
-        port = gateway.open(host, port, local_port)
-        finalize_proc = Proc.new do
-          gateway.close(port)
-          gateway_finalize_proc.call
-        end
-        [port, finalize_proc]
+    def shutdown_gateway
+      if @gateway
+        @gateway.shutdown!
+        @gateway = nil
       end
     end
 
-    def open_gateway_on_from_server(port)
+    def forward_port(port, &block)
+      host, forwarded_port = _forward_port(port)
       if block_given?
-        if from
-          from.gateway_open(@address, port) do |new_port|
-            Logger.debug("tunnel: localhost:#{new_port} -> #{from.address} -> #{@address}:#{port}")
-            yield '127.0.0.1', new_port
-          end
-        else
-          yield @address, port
-        end
+        return_value = block.call(host, forwarded_port)
+        from.gateway.close(forwarded_port) if from
+        return_value
       else
-        if from
-          new_port, finalize_proc = from.gateway_open(@address, port)
-          Logger.debug("tunnel: localhost:#{new_port} -> #{from.address} -> #{@address}:#{port}")
-          ['127.0.0.1', new_port, finalize_proc]
-        else
-          [@address, port, nil]
-        end
+        [host, forwarded_port]
       end
     end
 
@@ -119,6 +90,16 @@ module Infrataster
 
     private
 
+    def _forward_port(port)
+      if from
+        local_port = from.gateway.open(@address, port, find_available_port)
+        ['127.0.0.1', local_port]
+      else
+        # no need to forward port
+        [@address, port]
+      end
+    end
+
     def _ssh_start_args
       config = {}
 

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/infrataster.rb

@@ -2,7 +2,6 @@ require "infrataster/version"
 require "infrataster/resources"
 require "infrataster/server"
 require "infrataster/helpers"
-require "infrataster/browsermob_proxy"
 require "infrataster/contexts"
 require 'logger'
 

data/spec/integration/spec_helper.rb

@@ -12,8 +12,6 @@ Infrataster::Server.define(
   from: :proxy,
 )
 
-Infrataster::BrowsermobProxy.bin_path = File.expand_path('../vm/vendor/browsermob/bin/browsermob-proxy', __FILE__)
-
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/unit/lib/infrataster/server_spec.rb

@@ -32,26 +32,13 @@ module Infrataster
       end
     end
 
-    describe "#ssh_gateway" do
-      it "returns gateway instance and proc for finalizing" do
-        server = Server.new('name', 'address', ssh: {host: 'host', user: 'user'})
-
-        gateway_mock = double
-        expect(gateway_mock).to receive(:shutdown!)
-        expect(Net::SSH::Gateway).to receive(:new).and_return(gateway_mock)
-        gateway, finalize_proc = server.ssh_gateway
-        finalize_proc.call
-        expect(gateway).to eq(gateway_mock)
-      end
-    end
-
     describe "#_ssh_start_args" do
       context "with ssh option" do
         context "when options[:ssh][:host] is set" do
           it 'returns args for SSH.start' do
-            server = Server.new('name', 'address', ssh: {host: 'host', user: 'user'})
+            server = Server.new('name', 'address', ssh: {host_name: 'host', user: 'user'})
             expect(server.send(:_ssh_start_args)).
-              to eq(['host', 'user', {host: 'host', user: 'user'}])
+              to eq(['host', 'user', {host_name: 'host', user: 'user'}])
           end
         end
 
@@ -59,7 +46,7 @@ module Infrataster
           it 'returns args for SSH.start' do
             server = Server.new('name', 'address', ssh: {user: 'user'})
             expect(server.send(:_ssh_start_args)).
-              to eq(['address', 'user', {host: 'address', user: 'user'}])
+              to eq(['address', 'user', {host_name: 'address', user: 'user'}])
           end
         end
       end
@@ -69,9 +56,9 @@ module Infrataster
           it 'returns args for SSH.start' do
             server = Server.new('name', 'address', vagrant: true)
             expect(server).to receive(:ssh_config_for_vagrant).with('name').
-              and_return({host: 'host', user: 'user'})
+              and_return({host_name: 'host', user: 'user'})
             expect(server.send(:_ssh_start_args)).
-              to eq(['host', 'user', {host: 'host', user: 'user'}])
+              to eq(['host', 'user', {host_name: 'host', user: 'user'}])
           end
         end
 
@@ -79,9 +66,9 @@ module Infrataster
           it 'returns args for SSH.start' do
             server = Server.new('name', 'address', vagrant: 'vagrant_vm_name')
             expect(server).to receive(:ssh_config_for_vagrant).with('vagrant_vm_name').
-              and_return({host: 'host', user: 'user'})
+              and_return({host_name: 'host', user: 'user'})
             expect(server.send(:_ssh_start_args)).
-              to eq(['host', 'user', {host: 'host', user: 'user'}])
+              to eq(['host', 'user', {host_name: 'host', user: 'user'}])
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: browsermob-proxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +153,6 @@ files:
 - ci/jenkins_build
 - infrataster.gemspec
 - lib/infrataster.rb
-- lib/infrataster/browsermob_proxy.rb
 - lib/infrataster/contexts.rb
 - lib/infrataster/contexts/base_context.rb
 - lib/infrataster/contexts/capybara_context.rb

data/lib/infrataster/browsermob_proxy.rb

@@ -1,36 +0,0 @@
-require 'browsermob/proxy'
-
-module Infrataster
-  module BrowsermobProxy
-    class << self
-      def server
-        @server ||= start_server
-      end
-
-      def proxy
-        @proxy ||= server.create_proxy
-      end
-
-      def bin_path
-        @bin_path
-      end
-
-      def bin_path=(path)
-        @bin_path = path
-      end
-
-      private
-      def start_server
-        BrowserMob::Proxy::Server.new(find_bin, timeout: 60).tap do |server|
-          server.start
-        end
-      end
-
-      def find_bin
-        return @bin_path if @bin_path
-        `which browsermob-proxy`
-      end
-    end
-  end
-end
-