pacto-server 0.4.0.rc1 → 0.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118b6d643b8f3a10e313cf65837f2f58d03f0d44
-  data.tar.gz: 063e07bd7f75b897ffe798c9591f43d67ac624bd
+  metadata.gz: 48d92c082f19c254b64fa04ff72916ca26006864
+  data.tar.gz: dfdbd70436fe3d864b3a6743fdf150be10964e75
 SHA512:
-  metadata.gz: cef2e211096315d6b92487bddc64bb3401f2ece8fe4cc777314ab798125117073fe0084189f4b0c09be572f77033bc83a6a1630872a8d6f934f5ed820950eb68
-  data.tar.gz: 54a2f790dbe2489fc0470b285f65cf6e2de8ca584e7f0a1067be6bf77e03af208530cf28dda580e19d953cdbd578f9fc24510378b8ed06907d45111ae05f3e81
+  metadata.gz: 633eeeacc1f2b780fe66504de21391427baea0470d67615b19299d1291aee6483158bd515f0bbbf83eb4b23ec8ac19f3fbbedce84ffb463a8ca4465acd4fcf94
+  data.tar.gz: 596c074835077add5d5cbc4988730e7e821fe6bcce5b09a0180cc265ebba59b95216fb49456ed336a4c9f303666512c00f19181c7d0b95facf4f9783d2800cae

data/bin/pacto-server

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-require 'goliath/api'
-require 'goliath/runner'
-require 'pacto/server'
+require 'pacto/server/cli'
 
-runner = Goliath::Runner.new(ARGV, Pacto::Server::API.new(:pwd => Dir.pwd))
-runner.log_file = File.expand_path(runner.log_file, Dir.pwd) if runner.log_file
-runner.app = Goliath::Rack::Builder.build(Pacto::Server::API, runner.api)
-runner.run
+Pacto::Server::CLI.start

data/lib/pacto/server/cli.rb

@@ -0,0 +1,66 @@
+require 'thor'
+require 'pacto/server'
+
+module Pacto
+  module Server
+    class CLI < Thor
+      class << self
+        DEFAULTS = {
+          stdout: true,
+          log_file: 'pacto.log',
+          # :config => 'pacto/config/pacto_server.rb',
+          strict: false,
+          stub: true,
+          live: false,
+          generate: false,
+          verbose: true,
+          validate: true,
+          directory: File.join(Dir.pwd, 'contracts'),
+          port: 9000,
+          format: :legacy,
+          stenographer_log_file: File.expand_path('pacto_stenographer.log', Dir.pwd),
+          strip_port: true
+        }
+
+        def server_options
+          method_option :port, default: 4567, desc: 'The port to run the server on'
+          method_option :directory, default: DEFAULTS[:directory], desc: 'The directory containing contracts'
+          method_option :strict, default: DEFAULTS[:strict], desc: 'Whether Pacto should use strict matching or not'
+          method_option :format, default: DEFAULTS[:format], desc: 'The contract format to use'
+          method_option :strip_port, default: DEFAULTS[:strip_port], desc: 'If pacto should remove the port from URLs before forwarding'
+        end
+      end
+
+      desc 'stub [CONTRACTS...]', 'Launches a stub server for a set of contracts'
+      method_option :port, type: :numeric, desc: 'The port to listen on', default: 3000
+      method_option :spy, type: :boolean, desc: 'Display traffic received by Pacto'
+      server_options
+      def stub(*_contracts)
+        setup_interrupt
+        server_options = @options.dup
+        server_options[:stub] = true
+        Pacto::Server::HTTP.run('0.0.0.0', options.port, server_options)
+      end
+
+      desc 'proxy [CONTRACTS...]', 'Launches an intercepting proxy server for a set of contracts'
+      method_option :to, type: :string, desc: 'The target host for forwarded requests'
+      method_option :port, type: :numeric, desc: 'The port to listen on', default: 3000
+      method_option :spy, type: :boolean, desc: 'Display traffic received by Pacto'
+      def proxy(*_contracts)
+        setup_interrupt
+        server_options = @options.dup
+        server_options[:live] = true
+        Pacto::Server::HTTP.run('0.0.0.0', options.port, server_options)
+      end
+
+      private
+
+      def setup_interrupt
+        trap('INT') do
+          say 'Exiting...'
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/pacto/server/config.rb

@@ -1,51 +1,2 @@
 # -*- encoding : utf-8 -*-
-def token_map
-  if File.readable? '.tokens.json'
-    MultiJson.load(File.read '.tokens.json')
-  else
-    {}
-  end
-end
-
-def prepare_contracts(contracts)
-  contracts.stub_providers if options[:stub]
-end
-
-config[:backend_host] = options[:backend_host]
-config[:strip_port] = options[:strip_port]
-config[:strip_dev] = options[:strip_dev]
-config[:port] = port
-contracts_path = options[:directory] || File.expand_path('contracts', Dir.pwd)
-Pacto.configure do |pacto_config|
-  pacto_config.logger = options[:pacto_logger] || logger
-  pacto_config.loggerl.log_level = config[:pacto_log_level] if config[:pacto_log_level]
-  pacto_config.contracts_path = contracts_path
-  pacto_config.strict_matchers = options[:strict]
-  pacto_config.generator_options = {
-    schema_version: :draft3,
-    token_map: token_map
-  }
-  pacto_config.stenographer_log_file = options[:stenographer_log_file]
-end
-
-if options[:generate]
-  Pacto.generate!
-  logger.info 'Pacto generation mode enabled'
-end
-
-if options[:recursive_loading]
-  Dir["#{contracts_path}/*"].each do |host_dir|
-    host = File.basename host_dir
-    prepare_contracts Pacto.load_contracts(host_dir, "https://#{host}", options[:format])
-  end
-else
-  host_pattern = options[:backend_host] || 'https://{server}'
-  prepare_contracts Pacto.load_contracts(contracts_path, host_pattern, options[:format])
-end
-
-Pacto.validate! if options[:validate]
-
-if options[:live]
-  #  WebMock.reset!
-  WebMock.allow_net_connect!
-end
+Pacto::Server::Settings::OptionHandler.new(port, logger, config).handle(options)

data/lib/pacto/server/proxy.rb

@@ -0,0 +1,49 @@
+module Pacto
+  module Server
+    module Proxy
+      def proxy_request(pacto_request)
+        prepare_to_forward(pacto_request)
+        pacto_response = forward(pacto_request)
+        prepare_to_respond(pacto_response)
+        pacto_response.body = rewrite(pacto_response.body)
+        pacto_response
+      end
+
+      def prepare_to_forward(pacto_request)
+        host = host_for(pacto_request)
+        fail 'Could not determine request host' if host.nil?
+        host.gsub!('.dev', '.com') if settings[:strip_dev]
+        scheme, host = host.split('://')
+        host, scheme = scheme, host if host.nil?
+        host, _port = host.split(':')
+        scheme ||= 'https'
+        pacto_request.uri = Addressable::URI.heuristic_parse("#{scheme}://#{host}#{pacto_request.uri}")
+        # FIXME: We're stripping accept-encoding and transfer-encoding rather than dealing with the encodings
+        pacto_request.headers.delete_if { |k, _v| %w(host content-length accept-encoding transfer-encoding).include? k.downcase }
+      end
+
+      def rewrite(body)
+        return body unless settings[:strip_dev]
+        # FIXME: This is pretty hacky and needs to be rethought, but here to support hypermedia APIs
+        # This rewrites the response body so that URLs that may link to other services are rewritten
+        # to also passs through the Pacto server.
+        body.gsub('.com', ".dev:#{settings[:port]}").gsub(/https\:([\w\-\.\\\/]+).dev/, 'http:\1.dev')
+      end
+
+      def forward(pacto_request)
+        Pacto::Consumer::FaradayDriver.new.execute(pacto_request)
+      end
+
+      def prepare_to_respond(pacto_response)
+        pacto_response.headers.delete_if { |k, _v| %w(connection content-encoding content-length transfer-encoding).include? k.downcase }
+      end
+
+      private
+
+      def host_for(pacto_request)
+        # FIXME: Need case insensitive fetch for headers
+        pacto_request.uri.site || pacto_request.headers.find { |key, _| key.downcase == 'host' }[1]
+      end
+    end
+  end
+end

data/lib/pacto/server/settings.rb

@@ -3,7 +3,7 @@ module Pacto
   module Server
     module Settings
       def options_parser(opts, options) # rubocop:disable MethodLength
-        options[:format] ||= :default
+        options[:format] ||= :legacy
         options[:strict] ||= false
         options[:directory] ||= File.expand_path('contracts', @original_pwd)
         options[:config] ||= File.expand_path('../config.rb', __FILE__)
@@ -24,6 +24,72 @@ module Pacto
         opts.on('--stenographer-log-file', 'Location for the stenographer log file') { |val| options[:stenographer_log_file] = val }
         opts.on('--log-level [LEVEL]', [:debug, :info, :warn, :error, :fatal], 'Pacto log level ( debug, info, warn, error or fatal)') { |val| options[:pacto_log_level] = val }
       end
+
+      class OptionHandler
+        attr_reader :port, :logger, :config, :options
+
+        def initialize(port, logger, config = {})
+          @port, @logger, @config = port, logger, config
+        end
+
+        def token_map
+          if File.readable? '.tokens.json'
+            MultiJson.load(File.read '.tokens.json')
+          else
+            {}
+          end
+        end
+
+        def prepare_contracts(contracts)
+          contracts.stub_providers if options[:stub]
+        end
+
+        def handle(options) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+          @options = options
+          config[:backend_host] = options[:backend_host]
+          config[:strip_port] = options[:strip_port]
+          config[:strip_dev] = options[:strip_dev]
+          config[:port] = port
+          contracts_path = options[:directory] || File.expand_path('contracts', Dir.pwd)
+          Pacto.configure do |pacto_config|
+            pacto_config.logger = options[:pacto_logger] || logger
+            pacto_config.loggerl.log_level = config[:pacto_log_level] if config[:pacto_log_level]
+            pacto_config.contracts_path = contracts_path
+            pacto_config.strict_matchers = options[:strict]
+            pacto_config.generator_options = {
+              schema_version: :draft3,
+              token_map: token_map
+            }
+            pacto_config.stenographer_log_file = options[:stenographer_log_file]
+          end
+
+          if options[:generate]
+            Pacto.generate!
+            logger.info 'Pacto generation mode enabled'
+          end
+
+          if options[:recursive_loading]
+            Dir["#{contracts_path}/*"].each do |host_dir|
+              host = File.basename host_dir
+              prepare_contracts Pacto.load_contracts(host_dir, "https://#{host}", options[:format])
+            end
+          else
+            host_pattern = options[:backend_host] || '{scheme}://{server}'
+            if File.exist? contracts_path
+              prepare_contracts Pacto.load_contracts(contracts_path, host_pattern, options[:format])
+            end
+          end
+
+          Pacto.validate! if options[:validate]
+
+          if options[:live]
+            #  WebMock.reset!
+            WebMock.allow_net_connect!
+          end
+
+          config
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacto-server
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0.rc2
 platform: ruby
 authors:
 - ThoughtWorks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacto
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0.rc1
+        version: 0.4.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0.rc1
+        version: 0.4.0.rc2
 - !ruby/object:Gem::Dependency
-  name: goliath
+  name: reel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.5'
 description: Pacto Server let's you run Pacto as a standalone server to arbitrate
   contract disputes between a service provider and one or more consumers in any programming
   language. It's Pacto beyond Ruby
@@ -77,8 +49,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/pacto-server
-- lib/pacto/server/api.rb
+- lib/pacto/server/cli.rb
 - lib/pacto/server/config.rb
+- lib/pacto/server/proxy.rb
 - lib/pacto/server/settings.rb
 homepage: http://thoughtworks.github.io/pacto/
 licenses:

data/lib/pacto/server/api.rb

@@ -1,102 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'pacto/server/settings'
-
-module Pacto
-  module Server
-    class API < Goliath::API
-      include Pacto::Server::Settings
-      use ::Rack::ContentLength
-
-      def initialize(*args)
-        @original_pwd = Dir.pwd
-        super
-      end
-
-      def on_headers(env, headers)
-        env.logger.debug 'receiving headers: ' + headers.inspect
-        env['client-headers'] = headers
-      end
-
-      def on_body(env, data)
-        env.logger.debug 'received data: ' + data
-        (env['async-body'] ||= '') << data
-      end
-
-      def response(env)
-        log_request(env)
-        req = prepare_pacto_request(env)
-        env.logger.info "sending: #{req}"
-        resp = Pacto::Consumer::FaradayDriver.new.execute(req)
-        process_pacto_response resp, env
-      rescue => e
-        backtrace = e.backtrace.join("\n")
-        env.logger.warn "responding with error: #{e.message}, backtrace: #{backtrace}"
-        [500, {}, e.message]
-      end
-
-      private
-
-      def log_request(env)
-        method = env['REQUEST_METHOD'].upcase
-        env.logger.info "received: #{method} #{env['REQUEST_URI']} with headers #{env['client-headers']}"
-      end
-
-      def prepare_pacto_request(env)
-        PactoRequest.new(
-          body: env['async-body'],
-          headers: filter_request_headers(env),
-          method: env['REQUEST_METHOD'].downcase.to_sym,
-          uri: determine_proxy_uri(env)
-        )
-      end
-
-      def process_pacto_response(resp, _env)
-        code = resp.status
-        safe_response_headers = normalize_headers(resp.headers).reject { |k, _v| %w(connection content-encoding content-length transfer-encoding).include? k.downcase }
-        body = proxy_rewrite(resp.body)
-        env.logger.info "received response: #{resp.inspect}"
-        env.logger.debug "response body: #{body}"
-        [code, safe_response_headers, body]
-      end
-
-      def determine_proxy_uri(env)
-        path = env[Goliath::Request::REQUEST_PATH]
-        if env.config[:backend_host]
-          uri = Addressable::URI.heuristic_parse("#{env.config[:backend_host]}#{path}")
-        else
-          host = env['HTTP_HOST']
-          host.gsub!('.dev', '.com') if env.config[:strip_dev]
-          uri = Addressable::URI.heuristic_parse("https://#{host}#{path}")
-          uri.port = nil if env.config[:strip_port]
-        end
-        uri
-      end
-
-      def filter_request_headers(env)
-        headers = env['client-headers']
-        safe_headers = headers.reject { |k, _v| %w(host content-length transfer-encoding).include? k.downcase }
-        env.logger.debug "filtered headers: #{safe_headers}"
-        safe_headers
-      end
-
-      def port
-        env.config[:port]
-      end
-
-      def normalize_headers(headers)
-        headers.each_with_object({}) do |elem, res|
-          key = elem.first.dup
-          value = elem.last
-          key.gsub!('_', '-')
-          key = key.split('-').map(&:capitalize).join '-'
-          res[key] = value
-        end
-      end
-
-      def proxy_rewrite(body)
-        # FIXME: How I usually deal with rels, but others may not want this behavior.
-        body.gsub('.com', ".dev:#{port}").gsub(/https\:([\w\-\.\\\/]+).dev/, 'http:\1.dev')
-      end
-    end
-  end
-end