infrataster 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3856ecbc568b65e542d045e1a487276cd8af2d91
-  data.tar.gz: ec9de90a7d2f8b93b48aa81260414587f008983a
+  metadata.gz: b0f55bdccf28c4b1f8550418fec4c53e68bf4462
+  data.tar.gz: c81fd723defa93cf29bcd6160b0cde91cf0491c4
 SHA512:
-  metadata.gz: 18e6571f13959f66b4b6a98d4df2cd529bfcb4ccc545866463d3ea09320ebc12733a184de1a594aad977091985d9b65f10cad50ad2f267cd715384d596568f16
-  data.tar.gz: ab7a261a28a0de03bd81c342ae42743c92ee0c89832a13b0a94e7f7de72a4e55fa0cd65227a3cb2f2135c778f6d5695d7bee90643a625db7a6c3b262210d723d
+  metadata.gz: 9f1f9c8ae16e732ebdb6002bd0ab41afe1a5e65eea2c7b09eb05b7a0f30b6ec0d51f550bbff1996c2b04a9758fac80a2262617e42cda479296f316e2474b9ad8
+  data.tar.gz: e377410f6e398bf4098eeb25562b99c6405ceeb8c6427875fbf4919ff2e8357d72c5916fee8ced00b0b0da24e6a58d426997fa19ad4ebc7412ece03a85166283

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Infrataster Changelog
+
+## v0.1.1
+
+* Http resources accept `method`, `params` and `headers` options. (Issue #7)
+
+## v0.1.0
+
+* Initial release
+

data/README.md

@@ -37,7 +37,7 @@ require 'infrataster/rspec'
 Infrataster::Server.define(
   :proxy,          # name
   '192.168.33.10', # ip address
-  vagrant: true,   # for vagrant VM
+  vagrant: true    # for vagrant VM
 )
 Infrataster::Server.define(
   :app,            # name
@@ -124,6 +124,32 @@ end
 
 [infrataster/example](example)
 
+## How to Run Tests
+
+### Unit Tests
+
+```
+$ bundle exec rake spec:unit
+```
+
+### Integration Tests
+
+Start and provision VMs:
+
+```
+$ bundle exec rake spec:integration:prepare
+```
+
+Run tests:
+
+```
+$ bundle exec rake spec:integration
+```
+
+## Presentations
+
+* https://speakerdeck.com/ryotarai/infrataster-infra-behavior-testing-framework-number-oedo04
+
 ## Contributing
 
 1. Fork it ( http://github.com/ryotarai/infrataster/fork )

data/Rakefile

@@ -1 +1,53 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+def red(str)
+  "\e[31m#{str}\e[m"
+end
+
+ENV['VAGRANT_CWD'] = File.expand_path('spec/integration/vm')
+
+namespace :spec do
+  RSpec::Core::RakeTask.new("unit") do |task|
+    task.pattern = "./spec/unit{,/*/**}/*_spec.rb"
+  end
+
+  RSpec::Core::RakeTask.new("integration") do |task|
+    task.pattern = "./spec/integration{,/*/**}/*_spec.rb"
+  end
+
+  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...")
+        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
+          FileUtils.mv(File.join(tmp, 'browsermob-proxy-2.0-beta-9'), dir)
+        end
+      end
+    end
+
+    task :berks_vendor 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")
+      else
+        puts red('Installing cookbooks by berkshelf...')
+        system "cd #{integartion_dir} && berks vendor vendor/cookbooks"
+      end
+    end
+
+    task :start_vm => ['berks_vendor'] do
+      puts red('Starting VM...')
+      system '/usr/bin/vagrant up'
+    end
+  end
+end
+

data/infrataster.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ryotarai/infrataster"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").delete_if do |path|
+    path.start_with?('example/')
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -24,7 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "capybara"
   spec.add_runtime_dependency "selenium-webdriver"
   spec.add_runtime_dependency "browsermob-proxy"
+  spec.add_runtime_dependency "faraday"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "berkshelf", '~> 3.1.1'
 end

data/lib/infrataster/contexts/base_context.rb

@@ -2,11 +2,11 @@ module Infrataster
   module Contexts
     class BaseContext
       attr_reader :server
-      attr_reader :type
+      attr_reader :resource
 
-      def initialize(server, type)
+      def initialize(server, resource)
         @server = server
-        @type = type
+        @resource = resource
       end
     end
   end

data/lib/infrataster/contexts/capybara_context.rb

@@ -14,7 +14,7 @@ module Infrataster
       def session
         return @session if @session
 
-        address, port, @gateway_finalize_proc = server.from_gateway(type.uri.port)
+        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)
       end
@@ -38,7 +38,7 @@ module Infrataster
       private
       def register_capybara_driver
         proxy = BrowsermobProxy.server.create_proxy
-        proxy.header({"Host" => type.uri.host})
+        proxy.header({"Host" => resource.uri.host})
 
         profile = Selenium::WebDriver::Firefox::Profile.new
         profile.proxy = proxy.selenium_proxy

data/lib/infrataster/contexts/http_context.rb

@@ -1,15 +1,27 @@
-require 'net/http'
-require 'net/https'
+require 'faraday'
 
 module Infrataster
   module Contexts
     class HttpContext < BaseContext
       def response
-        req = Net::HTTP::Get.new('/', {'Host' => type.uri.host})
+        server.from_gateway(resource.uri.port) do |address, port|
+          url = "#{resource.uri.scheme}://#{address}:#{port}"
 
-        server.from_gateway(type.uri.port) do |address, port|
-          Net::HTTP.start(address, port) do |http|
-            http.request(req)
+          conn = Faraday.new(:url => url) do |faraday|
+            faraday.request  :url_encoded
+            faraday.response :logger, Logger
+            faraday.adapter  Faraday.default_adapter
+          end
+
+          conn.public_send(resource.method) do |req|
+            resource.params.each_pair do |k, v|
+              req.params[k] = v
+            end
+            req.headers['Host'] = resource.uri.host
+            resource.headers.each_pair do |k, v|
+              req.headers[k] = v
+            end
+            req.url resource.uri.path
           end
         end
       end

data/lib/infrataster/contexts/mysql_query_context.rb

@@ -16,7 +16,7 @@ module Infrataster
             username: options[:user],
             password: options[:password],
           )
-          client.query(type.query)
+          client.query(resource.query)
         end
       end
     end

data/lib/infrataster/contexts.rb

@@ -1,4 +1,4 @@
-require 'infrataster/types'
+require 'infrataster/resources'
 require 'infrataster/contexts/base_context'
 require 'infrataster/contexts/http_context'
 require 'infrataster/contexts/mysql_query_context'
@@ -10,21 +10,21 @@ module Infrataster
       def from_example(example)
         example_group = example.metadata[:example_group]
 
-        server = find_described(Types::ServerType, example_group).server
-        type = find_described(Types::BaseType, example_group)
+        server = find_described(Resources::ServerResource, example_group).server
+        resource = find_described(Resources::BaseResource, example_group)
 
-        type.context_class.new(server, type)
+        resource.context_class.new(server, resource)
       end
 
       private
-      def find_described(type_class, example_group)
+      def find_described(resource_class, example_group)
         arg = example_group[:description_args].first
-        if arg.is_a?(type_class)
+        if arg.is_a?(resource_class)
           arg
         else
           parent_example_group = example_group[:example_group]
           if parent_example_group
-            find_described(type_class, parent_example_group)
+            find_described(resource_class, parent_example_group)
           else
             raise Error
           end

data/lib/infrataster/helpers/resource_helper.rb

@@ -0,0 +1,24 @@
+require 'infrataster/resources'
+
+module Infrataster
+  module Helpers
+    module ResourceHelper
+      def server(*args)
+        Resources::ServerResource.new(*args)
+      end
+
+      def http(*args)
+        Resources::HttpResource.new(*args)
+      end
+
+      def mysql_query(*args)
+        Resources::MysqlQueryResource.new(*args)
+      end
+
+      def capybara(*args)
+        Resources::CapybaraResource.new(*args)
+      end
+    end
+  end
+end
+

data/lib/infrataster/helpers.rb

@@ -1,4 +1,4 @@
-require 'infrataster/helpers/type_helper'
+require 'infrataster/helpers/resource_helper'
 require 'infrataster/helpers/rspec_helper'
 
 

data/lib/infrataster/{types/base_type.rb → resources/base_resource.rb}

@@ -1,9 +1,9 @@
 module Infrataster
-  module Types
-    class BaseType
+  module Resources
+    class BaseResource
       # do nothing
       def name
-        self.class.name.split('::').last[0...-4]
+        self.class.name.split('::').last[0...(-1 * 'Resource'.size)]
       end
 
       def context_class

data/lib/infrataster/{types/capybara_type.rb → resources/capybara_resource.rb}

@@ -1,9 +1,9 @@
-require 'infrataster/types/base_type'
+require 'infrataster/resources/base_resource'
 require 'uri'
 
 module Infrataster
-  module Types
-    class CapybaraType < BaseType
+  module Resources
+    class CapybaraResource < BaseResource
       Error = Class.new(StandardError)
 
       attr_reader :uri

data/lib/infrataster/resources/http_resource.rb

@@ -0,0 +1,42 @@
+require 'infrataster/resources/base_resource'
+require 'uri'
+
+module Infrataster
+  module Resources
+    class HttpResource < BaseResource
+      Error = Class.new(StandardError)
+
+      attr_reader :uri, :options
+
+      def initialize(url_str, options = {})
+        @options = {params: {}, method: :get, headers: {}}.merge(options)
+        @uri = URI.parse(url_str)
+        unless %w!http https!.include?(@uri.scheme)
+          raise Error, "The provided url, '#{@uri}', is not http or https."
+        end
+      end
+
+      def to_s
+        "http '#{@uri}' with #{@options}"
+      end
+
+      def params
+        @options[:params]
+      end
+
+      def method
+        valid_methods = [:get, :head, :delete, :post, :put, :patch]
+        unless valid_methods.include?(@options[:method])
+          raise Error, "#{@options[:method]} is not supported HTTP method."
+        end
+
+        @options[:method]
+      end
+
+      def headers
+        @options[:headers]
+      end
+    end
+  end
+end
+

data/lib/infrataster/{types/mysql_query_type.rb → resources/mysql_query_resource.rb}

@@ -1,8 +1,8 @@
-require 'infrataster/types/base_type'
+require 'infrataster/resources/base_resource'
 
 module Infrataster
-  module Types
-    class MysqlQueryType < BaseType
+  module Resources
+    class MysqlQueryResource < BaseResource
       Error = Class.new(StandardError)
 
       attr_reader :query

data/lib/infrataster/{types/server_type.rb → resources/server_resource.rb}

@@ -1,6 +1,6 @@
 module Infrataster
-  module Types
-    class ServerType
+  module Resources
+    class ServerResource
       Error = Class.new(StandardError)
 
       attr_reader :name

data/lib/infrataster/resources.rb

@@ -0,0 +1,5 @@
+require 'infrataster/resources/base_resource'
+require 'infrataster/resources/server_resource'
+require 'infrataster/resources/http_resource'
+require 'infrataster/resources/mysql_query_resource'
+require 'infrataster/resources/capybara_resource'

data/lib/infrataster/rspec.rb

@@ -1,7 +1,7 @@
 require 'infrataster'
 require 'rspec'
 
-include Infrataster::Helpers::TypeHelper
+include Infrataster::Helpers::ResourceHelper
 
 RSpec.configure do |config|
   config.include Infrataster::Helpers::RSpecHelper

data/lib/infrataster/server.rb

@@ -8,12 +8,19 @@ module Infrataster
     Error = Class.new(StandardError)
 
     class << self
-      @@servers = []
 
       def define(*args)
         @@servers << Server.new(*args)
       end
 
+      def defined_servers
+        @@servers
+      end
+
+      def clear_defined_servers
+        @@servers = []
+      end
+
       def find_by_name(name)
         server = @@servers.find {|s| s.name == name }
         unless server
@@ -22,6 +29,7 @@ module Infrataster
         server
       end
 
+      Server.clear_defined_servers
     end
 
     attr_reader :name, :address, :options
@@ -70,24 +78,24 @@ module Infrataster
       end
     end
 
+    def from_gateway_open(port)
+      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
+    end
+
     def from_gateway(port)
       if from
-        if block_given?
-          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
-          new_port, finalize_proc = from.gateway_open(@address, port)
+        from.gateway_open(@address, port) do |new_port|
           Logger.debug("tunnel: localhost:#{new_port} -> #{from.address} -> #{@address}:#{port}")
-          ['127.0.0.1', new_port, finalize_proc]
+          yield '127.0.0.1', new_port
         end
       else
-        if block_given?
-          yield @address, port
-        else
-          [@address, port, nil]
-        end
+        yield @address, port
       end
     end
 
@@ -111,7 +119,10 @@ module Infrataster
 
         Dir.mktmpdir do |dir|
           output = File.join(dir, 'ssh-config')
-          system("/usr/bin/vagrant ssh-config #{vagrant_name} > #{output}")
+          `/usr/bin/vagrant ssh-config #{vagrant_name} > #{output}`
+          if $?.exitstatus != 0
+            raise Error, "`vagrant ssh-config` failed. Please check if VMs are running or not."
+          end
           config = Net::SSH::Config.for(@name.to_s, [output])
         end
       else

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/infrataster.rb

@@ -1,5 +1,5 @@
 require "infrataster/version"
-require "infrataster/types"
+require "infrataster/resources"
 require "infrataster/server"
 require "infrataster/helpers"
 require "infrataster/browsermob_proxy"
@@ -8,5 +8,9 @@ require 'logger'
 
 module Infrataster
   Logger = ::Logger.new($stdout)
-  Logger.level = ::Logger::ERROR
+  if ENV['INFRATASTER_LOG']
+    Logger.level = ::Logger.const_get(ENV['INFRATASTER_LOG'].upcase)
+  else
+    Logger.level = ::Logger::ERROR
+  end
 end

data/spec/integration/http_spec.rb

@@ -0,0 +1,44 @@
+require 'integration/spec_helper'
+require 'json'
+
+describe server(:proxy) do
+  describe http('http://app.example.com') do
+    it "sends GET request with Host header" do
+      expect(response.body).to include('app')
+    end
+  end
+
+  describe http('http://static.example.com') do
+    it "sends GET request with Host header" do
+      expect(response.body).to include('static')
+    end
+  end
+end
+
+describe server(:app) do
+  let(:body_as_json) { JSON.parse(response.body) }
+
+  describe http('http://app.example.com') do
+    it "sends GET request" do
+      expect(response.body).to include('app')
+    end
+  end
+
+  describe http('http://app.example.com', params: {'foo' => 'bar'}, headers: {'USER' => 'VALUE'}) do
+    it "sends GET request with params" do
+      expect(body_as_json['method']).to eq('GET')
+      expect(body_as_json['params']).to eq({"foo" => "bar"})
+      expect(body_as_json['headers']['USER']).to eq('VALUE')
+    end
+  end
+
+  describe http('http://app.example.com', method: :post, params: {'foo' => 'bar'}, headers: {'USER' => 'VALUE'}) do
+    it "sends POST request with params" do
+      expect(body_as_json['method']).to eq('POST')
+      expect(body_as_json['params']).to eq({"foo" => "bar"})
+      expect(body_as_json['headers']['USER']).to eq('VALUE')
+    end
+  end
+end
+
+

data/{example/spec → spec/integration}/spec_helper.rb

@@ -2,24 +2,17 @@ require 'infrataster/rspec'
 
 Infrataster::Server.define(
   :proxy,
-  '192.168.33.10',
+  '192.168.44.10',
   vagrant: true,
 )
 Infrataster::Server.define(
   :app,
-  '172.16.33.11',
+  '172.16.44.11',
   vagrant: true,
   from: :proxy
 )
-Infrataster::Server.define(
-  :db,
-  '172.16.33.12',
-  vagrant: true,
-  from: :app,
-  mysql: {user: 'app', password: 'app'}
-)
 
-Infrataster::BrowsermobProxy.bin_path = File.expand_path('../../../vendor/browsermob-proxy/bin/browsermob-proxy', __FILE__)
+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

data/spec/integration/vm/.gitignore

@@ -0,0 +1,3 @@
+vendor/*
+.vagrant
+Berksfile.lock

data/spec/integration/vm/Berksfile

@@ -0,0 +1,2 @@
+source "http://api.berkshelf.com"
+cookbook 'apt'

data/spec/integration/vm/Vagrantfile

@@ -0,0 +1,38 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+COOKBOOK_PATH = ['./cookbooks', './vendor/cookbooks']
+
+INTERNAL_ADDRESSES = {
+  'proxy' => '172.16.44.10',
+  'app' => '172.16.44.11',
+}
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "hashicorp/precise64"
+
+  config.vm.define :proxy do |c|
+    c.vm.network "private_network", ip: "192.168.44.10"
+    c.vm.network "private_network", ip: INTERNAL_ADDRESSES['proxy'], virtualbox__intnet: "infrataster-integration-test"
+
+    c.vm.provision "chef_solo" do |chef|
+      chef.cookbooks_path = COOKBOOK_PATH
+      chef.add_recipe "apt-mirror"
+      chef.add_recipe "proxy"
+      chef.json = {'addresses' => INTERNAL_ADDRESSES}
+    end
+  end
+
+  config.vm.define :app do |c|
+    c.vm.network "private_network", ip: INTERNAL_ADDRESSES['app'], virtualbox__intnet: "infrataster-integration-test"
+
+    c.vm.provision "chef_solo" do |chef|
+      chef.cookbooks_path = COOKBOOK_PATH
+      chef.add_recipe "apt-mirror"
+      chef.add_recipe "app"
+      chef.json = {'addresses' => INTERNAL_ADDRESSES}
+    end
+  end
+end

data/{example/sinatra_app → spec/integration/vm/app}/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
-gem 'thin'