proxy_tester 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7aae648007da5991abb9d47769d96cbef9a46df
-  data.tar.gz: c504f159d9a03377090bdd9b75d23c955de2d193
+  metadata.gz: 88e621906421d1c202cb1c24efdc2f1ad1178de8
+  data.tar.gz: 196aa6248f2e9df7d23ea48ce4be78026c2029fe
 SHA512:
-  metadata.gz: 16d148194590daade9eddc61d2fd4e7e2d09372f03f8f770797e84f9566511cb17a46e4aecc3be3f9eb288a04e5d2d4f195d40e5334b9a8ec2bcc594fba88830
-  data.tar.gz: 3bd66aa6cb76f1916d5a03dc39eb22db4100df2aa177ec6c9f06b56d2550238746b2f92121a28005ed6da875e97867d7d86b49e358f1897980357e09ef630b7b
+  metadata.gz: 9aaafded1e7afbb01bc5dfa51bb0e37fdc94f6f45c010792403badee234eba02c910c6b3cb45de0530f7806a290fd213c401c1a1046be95180035505e67d5abc
+  data.tar.gz: d3487007f645efae55ba0a718a97aa6d7a855cd753c4910ba51e29dc64a8a6de664f86f2fabbb7f6ae12528eb5218f0b351c563f2e24a42446c1f8ab11e64db7

data/.rspec

@@ -1,3 +1,4 @@
+--require 'rspec/legacy_formatters'
 --format Fuubar
 --order rand
 --color

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    proxy_tester (0.1.2)
+    proxy_tester (0.1.7)
       activerecord (~> 4.0)
       activesupport (~> 4.0)
       addressable
       crypt_keeper
       excon
-      fuubar
+      fuubar (>= 2.0.0rc)
       highline
       i18n
       poltergeist
       proxy_pac_rb (~> 0.2.5)
-      rspec
+      rspec (>= 3.0.0)
+      rspec-legacy_formatters
       rugged
       sqlite3
       therubyracer
@@ -21,24 +22,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.8)
+      activesupport (= 4.0.8)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.8)
+      activemodel (= 4.0.8)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.8)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.8)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.6)
+    aes (0.5.0)
     arel (4.0.2)
-    aruba (0.5.4)
+    armor (0.0.3)
+    aruba (0.6.0)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
@@ -48,13 +51,13 @@ GEM
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    capybara (2.2.1)
+    capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.1)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.0)
@@ -67,104 +70,118 @@ GEM
       thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    crypt_keeper (0.13.1)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-    cucumber (1.3.11)
+    crypt_keeper (0.18.1)
+      activerecord (>= 3.1, < 4.2)
+      activesupport (>= 3.1, < 4.2)
+      aes (~> 0.5.0)
+      armor (~> 0.0.2)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    database_cleaner (1.2.0)
+      multi_test (>= 0.1.1)
+    database_cleaner (1.3.0)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
-    docile (1.1.3)
-    dotenv (0.10.0)
+    docile (1.1.5)
+    dotenv (0.11.1)
+      dotenv-deployment (~> 0.0.2)
+    dotenv-deployment (0.0.2)
     erubis (2.7.0)
-    excon (0.32.1)
+    excon (0.38.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     fedux_org-stdlib (0.6.11)
       activesupport
     ffi (1.9.3)
-    filegen (0.4.0)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
-    fuubar (1.3.2)
-      rspec (>= 2.14.0, < 3.1.0)
-      ruby-progressbar (~> 1.3)
+    filegen (0.4.3)
+      activesupport
+    foreman (0.74.0)
+      dotenv (~> 0.11.1)
+      thor (~> 0.19.1)
+    fuubar (2.0.0.rc1)
+      rspec (~> 3.0.rc1)
+      ruby-progressbar (~> 1.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     highline (1.6.21)
-    httparty (0.13.0)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
     json (1.8.1)
     libv8 (3.16.14.3)
-    license_finder (0.9.5.1)
+    license_finder (1.1.0)
       bundler
       httparty
-      rake
       sequel
       sqlite3
       thor
+      xml-simple
     method_source (0.8.2)
-    mime-types (2.2)
-    mini_portile (0.5.2)
+    mime-types (2.3)
+    mini_portile (0.6.0)
     minitest (4.7.5)
     multi_json (1.10.1)
-    multi_test (0.0.3)
+    multi_test (0.1.1)
     multi_xml (0.5.5)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    poltergeist (1.5.0)
+    netrc (0.7.7)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    proxy_pac_rb (0.2.5)
+    proxy_pac_rb (0.2.6)
       activesupport
       addressable
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (1.3.2)
+    pry-byebug (1.3.3)
       byebug (~> 2.7)
-      pry (~> 0.9.12)
+      pry (~> 0.10)
     pry-doc (0.6.0)
       pry (~> 0.9)
       yard (~> 0.8)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.1)
+    rake (10.3.2)
     ref (1.0.5)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    ruby-progressbar (1.4.2)
-    rugged (0.19.0)
-    safe_yaml (1.0.2)
-    sequel (4.9.0)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-legacy_formatters (1.0.0)
+      rspec-core (>= 3.0.0.beta2)
+      rspec-support (>= 3.0.0.beta2)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    ruby-progressbar (1.5.1)
+    rugged (0.21.0)
+    safe_yaml (1.0.3)
+    sequel (4.12.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -175,22 +192,23 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.18.1)
+    thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tins (1.0.1)
+    tins (1.3.0)
     tmrb (1.2.7)
       thor
     tzinfo (0.3.40)
     versionomy (0.4.4)
       blockenspiel (>= 0.4.5)
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.3.2)
+    websocket-driver (0.3.4)
+    xml-simple (1.1.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.3)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby

data/features/step_definitions.rb

@@ -24,7 +24,7 @@ end
 Then(/^a repository named "(.*?)" should exist$/) do |repository|
   in_current_dir do
     with_environment 'HOME' => working_directory do
-      expect(File.exist? File.expand_path(repository)).to be_true
+      expect(File.exist? File.expand_path(repository)).to be_truthy
     end
   end
 end

data/lib/proxy_tester/actions/handle_error.rb

@@ -5,23 +5,21 @@ module ProxyTester
 
       private
 
-      attr_reader :handler_klass, :exception
+      attr_reader :exception, :original_message, :handler_klass, :backtrace
 
       public
 
       def initialize(exception, handler_klass = ErrorHandler)
-        @exception     = exception
-        @handler_klass = handler_klass
+        @exception        = exception.class
+        @original_message = exception.message
+        @backtrace        = exception.backtrace
+        @handler_klass    = handler_klass
       end
 
       def run
-        handler = handler_klass.find exception
-
-        if exception.respond_to? :cause
-          handler.cause = exception.cause
-        else
-          handler.cause = exception
-        end
+        handler                  = handler_klass.find exception
+        handler.original_message = original_message
+        handler.backtrace        = backtrace
 
         handler.execute(parsed_message)
       end
@@ -29,7 +27,7 @@ module ProxyTester
       private
 
       def parsed_message
-        result = JSON.parse(exception.message)
+        result = JSON.parse(original_message)
         return {} unless result.kind_of? Hash
 
         result

data/lib/proxy_tester/error_handler.rb

@@ -11,18 +11,19 @@ module ProxyTester
 
     private
 
-    attr_reader :details_i18n, :summary_i18n, :exit_code
+    attr_reader :details_i18n, :summary_i18n
 
     public
 
-    attr_reader :exception
-    attr_accessor :cause 
+    attr_reader :exception, :status_code, :exit_code
+    attr_accessor :original_message, :backtrace
 
     def initialize(options = {})
       @exception    = options.fetch(:exception)
       @details_i18n = options.fetch(:details)
       @summary_i18n = options.fetch(:summary)
-      @exit_code    = options.fetch(:exit_code)
+      @exit_code    = options.fetch(:exit_code, 1)
+      @status_code  = options.fetch(:status_code, :internal_server_error)
     rescue KeyError => e
       raise ArgumentError, e.message
     end
@@ -36,7 +37,7 @@ module ProxyTester
       end
 
       def find(exception)
-        handlers.find(proc { default_handler }) { |h| h.exception == exception.class }
+        handlers.find(proc { default_handler }) { |h| h.exception == exception }
       end
 
       private
@@ -44,7 +45,7 @@ module ProxyTester
       def default_handler
         mutex.synchronize do
           @default_handler ||= new(
-            exception: Exceptions::DefaultError,
+            exception: StandardError,
             details: 'errors.default.details',
             summary: 'errors.default.summary',
             exit_code: 99,
@@ -87,30 +88,26 @@ module ProxyTester
       use(data)
 
       ProxyTester.ui_logger.fatal details
-      ProxyTester.ui_logger.debug "Resulting Exception: #{exception}"
-      ProxyTester.ui_logger.debug "Resulting Exit Code: #{exit_code}"
-
-      if cause
-        ProxyTester.ui_logger.debug "Cause: #{cause.class}"
-        ProxyTester.ui_logger.debug "Cause Message: #{cause.message}"
-        ProxyTester.ui_logger.debug "Cause Backtrace:\n" + Array(cause.backtrace).join("\n")
-      end
-
+      ProxyTester.ui_logger.debug original_message if original_message
+      ProxyTester.ui_logger.debug "Original Backtrace follows\n" + backtrace.join("\n") if backtrace
       Kernel.exit exit_code
     end
 
-    def to_json
+    def to_hash
       ErrorHandler.mutex.synchronize do
         @details ||= I18n.t(details_i18n)
         @summary ||= I18n.t(summary_i18n)
       end
 
-      JSON.dump(
-          error_summary: summary,
-          error_details: details,
-          result: :failure,
-      )
+      {
+        error_summary: summary,
+        error_details: details,
+        result: :failure,
+      }
     end
 
+    def to_json
+      JSON.dump(to_hash)
+    end
   end
 end

data/lib/proxy_tester/git_repository.rb

@@ -97,7 +97,7 @@ module ProxyTester
     def files_in_repository
       return [] if repository.empty?
 
-      head_commit = repository.lookup(repository.head.target)
+      head_commit = repository.head.target
 
       files = []
       head_commit.tree.walk_blobs(:postorder) do |root, entry| 

data/lib/proxy_tester/rspec/matchers/have_requests_with_status_code.rb

@@ -4,14 +4,14 @@ RSpec::Matchers.define :have_requests_with_status_code do |expected|
     domains_eq? actual, expected
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     expected_domains = format_domains(expected)
     actual_domains   = format_domains(extract_domains(actual))
 
     "expected that \"#{actual.current_url}\" references with the given http status codes:\n#{expected_domains}\n\nBut it references with the given http status codes:\n#{actual_domains}\n"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     expected_domains = format_domains(expected)
     actual_domains   = format_domains(extract_domains(actual))
 

data/lib/proxy_tester/rspec/matchers/reference_domains.rb

@@ -5,14 +5,14 @@ RSpec::Matchers.define :reference_domains do |expected|
     domains_eq? actual, expected
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     expected_domains = format_domains(expected)
     actual_domains   = format_domains(extract_domains(actual))
 
     "expected that \"#{actual.current_url}\" references:\n#{expected_domains}\n\nBut it references:\n#{actual_domains}\n"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     expected_domains = format_domains(expected)
     actual_domains   = format_domains(extract_domains(actual))
 

data/lib/proxy_tester/rspec/matchers/return_proxy.rb

@@ -4,11 +4,11 @@ RSpec::Matchers.define :return_proxy do |expected|
     actual.verbatim == expected
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that \"#{actual.pac_file}\" returns \"#{expected}\", but it returns \"#{actual.verbatim}\" as proxy."
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that \"#{actual.pac_file}\" not returns \"#{expected}\", but it returns \"#{actual.verbatim}\" as proxy."
   end
 

data/lib/proxy_tester/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # ProxyTester
 module ProxyTester
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

data/proxy_tester.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~>4.0'
   spec.add_runtime_dependency 'sqlite3'
   spec.add_runtime_dependency 'crypt_keeper'
-  spec.add_runtime_dependency 'rspec'
-  spec.add_runtime_dependency 'fuubar'
+  spec.add_runtime_dependency 'rspec', '>= 3.0.0'
+  spec.add_runtime_dependency 'fuubar', '>=2.0.0rc'
   spec.add_runtime_dependency 'rspec-legacy_formatters'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'i18n'

data/spec/actions/add_examples_to_test_cases_directory_spec.rb

@@ -20,7 +20,7 @@ describe Actions::AddExamplesToTestCasesDirectory do
         action.run
       end
 
-      expect(path_exists?('test_cases.d/examples')).to be_true
+      expect(path_exists?('test_cases.d/examples')).to be_truthy
     end
 
     it 'respects existing path' do

data/spec/actions/add_test_case_spec.rb

@@ -33,7 +33,7 @@ describe Actions::AddTestCase do
         action.run
       end
 
-      expect(path_exists?('git_repo')).to be_true
+      expect(path_exists?('git_repo')).to be_truthy
     end
 
     it 'respects existing path' do

data/spec/actions/create_directory_spec.rb

@@ -15,7 +15,7 @@ describe Actions::CreateDirectory do
         action.run
       end
 
-      expect(path_exists?('repo')).to be_true
+      expect(path_exists?('repo')).to be_truthy
     end
 
     it 'respects existing path' do
@@ -53,7 +53,7 @@ describe Actions::CreateDirectory do
         action.run
       end
 
-      expect(path_exists?('file')).to be_true
+      expect(path_exists?('file')).to be_truthy
     end
   end
 end

data/spec/actions/create_file_spec.rb

@@ -39,7 +39,7 @@ describe Actions::CreateFile do
         action.run
       end
 
-      expect(path_exists?('file')).to be_true
+      expect(path_exists?('file')).to be_truthy
     end
 
     it 'creates sub directories' do
@@ -61,7 +61,7 @@ describe Actions::CreateFile do
         action.run
       end
 
-      expect(path_exists?('data/file')).to be_true
+      expect(path_exists?('data/file')).to be_truthy
     end
     it 'respects existing path' do
       repository = double('TemplateRepository')
@@ -133,7 +133,7 @@ describe Actions::CreateFile do
         action.run
       end
 
-      expect(path_exists?('file')).to be_true
+      expect(path_exists?('file')).to be_truthy
     end
   end
 end

data/spec/actions/initialize_application_spec.rb

@@ -28,12 +28,12 @@ describe Actions::InitializeApplication do
         end
       end
 
-      expect(path_exists?('config/user_file.csv')).to be_true
-      expect(path_exists?('config/config.yaml')).to be_true
-      expect(path_exists?('test_cases.d')).to be_true
-      expect(path_exists?('test_cases.d/examples/support')).to be_true
-      expect(path_exists?('test_cases.d/examples/example_spec.rb')).to be_true
-      expect(path_exists?('test_cases.d/examples/spec_helper.rb')).to be_true
+      expect(path_exists?('config/user_file.csv')).to be_truthy
+      expect(path_exists?('config/config.yaml')).to be_truthy
+      expect(path_exists?('test_cases.d')).to be_truthy
+      expect(path_exists?('test_cases.d/examples/support')).to be_truthy
+      expect(path_exists?('test_cases.d/examples/example_spec.rb')).to be_truthy
+      expect(path_exists?('test_cases.d/examples/spec_helper.rb')).to be_truthy
       expect(result).to include('config_file:')
     end
   end

data/spec/git_file_spec.rb

@@ -40,7 +40,7 @@ describe GitFile do
   context '#nil?' do
     it 'is always false' do
       file = GitFile.new('file.txt')
-      expect(file.nil?).to be_false
+      expect(file.nil?).to be_falsey
     end
   end
 end

data/spec/rspec_runner_spec.rb

@@ -16,17 +16,17 @@ describe RspecRunner do
   context '#to_s' do
     it 'returns command string' do
       runner = RspecRunner.new(test_cases_directory: working_directory)
-      expect(runner.to_s).to eq('--color --format Fuubar --order rand .')
+      expect(runner.to_s).to eq('--require rspec/legacy_formatters --color --format Fuubar --order rand .')
     end
 
     it 'uses tag if given' do
       runner = RspecRunner.new(test_cases_directory: working_directory, tags: 'my_tag')
-      expect(runner.to_s).to eq('--color --format Fuubar --order rand --tag my_tag .')
+      expect(runner.to_s).to eq('--require rspec/legacy_formatters --color --format Fuubar --order rand --tag my_tag .')
     end
 
     it 'uses multiple tags if given' do
       runner = RspecRunner.new(test_cases_directory: working_directory, tags: ['my_tag', 'new_tag'])
-      expect(runner.to_s).to eq('--color --format Fuubar --order rand --tag my_tag --tag new_tag .')
+      expect(runner.to_s).to eq('--require rspec/legacy_formatters --color --format Fuubar --order rand --tag my_tag --tag new_tag .')
     end
   end
 

data/spec/support/rspec.rb

@@ -1,5 +1,4 @@
 RSpec.configure do |c|
   c.filter_run_including :focus => true
-  c.run_all_when_everything_filtered                = true
-  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_tester
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Dennis Günnewig
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0rc
 - !ruby/object:Gem::Dependency
   name: rspec-legacy_formatters
   requirement: !ruby/object:Gem::Requirement