Upgrade to Polytrix 0.1.0 - should now be (more) stable.

thoughtworks · Sep 19, 2014 · 4d226d8 · 4d226d8
1 parent f1f16c3
commit 4d226d8
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ tmp
 .sublime*
 tags
 pacto.log
+.polytrix/
diff --git a/Gemfile b/Gemfile
@@ -24,4 +24,4 @@ group :samples do
   gem 'rack'
 end
 
-gem 'polytrix', git: 'https://github.com/rackerlabs/polytrix'
+gem 'polytrix', '~> 0.1.0'
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-sample_apis: sh -c 'cd samples && bundle exec rackup -s puma -o localhost -p $PORT sample_apis/config.ru'
+sample_apis: sh -c 'bundle exec rackup -s puma -o localhost -p $PORT sample_apis/config.ru'
diff --git a/Rakefile b/Rakefile
@@ -36,7 +36,8 @@ end
 desc 'Run the samples'
 task :samples do
   FileUtils.rm_rf('samples/tmp')
-  sh 'bundle exec polytrix exec --code2doc samples/*.rb samples/*.sh'
+  sh 'bundle exec polytrix exec --solo=samples --solo-glob="*.{rb,sh}"'
+  sh 'bundle exec polytrix code2doc --solo=samples --solo-glob="*.{rb,sh}"'
 end
 
 desc 'Build the documentation from the samples'

diff --git a/features/steps/pacto_steps.rb b/features/steps/pacto_steps.rb
@@ -1,5 +1,5 @@
 Given(/^Pacto is configured with:$/) do |string|
-  steps %Q(
+  steps %(
     Given a file named "pacto_config.rb" with:
     """ruby
     #{string}
@@ -8,7 +8,7 @@
 end
 
 Given(/^I have a Rakefile$/) do
-  steps %Q(
+  steps %(
     Given a file named "Rakefile" with:
     """ruby
     require 'pacto/rake_task'
@@ -17,7 +17,7 @@
 end
 
 When(/^I request "(.*?)"$/) do |url|
-  steps %Q{
+  steps %{
     Given a file named "request.rb" with:
     """ruby
     require 'pacto'

diff --git a/polytrix.rb b/polytrix.rb
diff --git a/samples/sample_apis/config.ru → sample_apis/config.ru b/samples/sample_apis/config.ru → sample_apis/config.ru
diff --git a/samples/sample_apis/echo_api.rb → sample_apis/echo_api.rb b/samples/sample_apis/echo_api.rb → sample_apis/echo_api.rb
diff --git a/samples/sample_apis/files_api.rb → sample_apis/files_api.rb b/samples/sample_apis/files_api.rb → sample_apis/files_api.rb
diff --git a/samples/sample_apis/hello_api.rb → sample_apis/hello_api.rb b/samples/sample_apis/hello_api.rb → sample_apis/hello_api.rb
diff --git a/samples/sample_apis/ping_api.rb → sample_apis/ping_api.rb b/samples/sample_apis/ping_api.rb → sample_apis/ping_api.rb
diff --git a/samples/sample_apis/reverse_api.rb → sample_apis/reverse_api.rb b/samples/sample_apis/reverse_api.rb → sample_apis/reverse_api.rb
diff --git a/spec/unit/pacto/stubs/uri_pattern_spec.rb b/spec/unit/pacto/stubs/uri_pattern_spec.rb
@@ -28,21 +28,10 @@ module Pacto
       end
 
       it 'creates a regex that does not allow additional path elements' do
-        $enable_tracing = false
-        $trace_out = open('trace.txt', 'w')
-
-        set_trace_func proc { |event, file, line, id, binding, classname|
-          if $enable_tracing && event == 'call'
-            $trace_out.puts "#{file}:#{line} #{classname}##{id}"
-          end
-        }
-
-        $enable_tracing = true
         request = Fabricate(:request_clause, host: 'myhost.com', path: '/:id')
         pattern = UriPattern.for(request)
         expect(pattern).to match('myhost.com/foo')
         expect(pattern).to_not match('myhost.com/foo/bar')
-        $enable_tracing = false
       end
 
       it 'creates a regex that does allow query parameters', :deprecated do