Permalink
Browse files

+ 4.0.0pre6

  • Loading branch information...
1 parent 3a232d9 commit ae4916d7227bfd2467d61b2a6c0d11c1e58ff193 @floere committed Dec 16, 2011
Showing with 18 additions and 5 deletions.
  1. +2 −2 generators/prototypes/all_in_one/sinatra/Gemfile
  2. +1 −1 generators/prototypes/client/sinatra/Gemfile
  3. +6 −0 history.textile
  4. +7 −0 integration
  5. +1 −1 specs
  6. +1 −1 version.rb
@@ -2,15 +2,15 @@ source :gemcutter
# Gems required by the Picky client.
#
-gem 'picky-client', '~> 4.0.0pre5'
+gem 'picky-client', '~> 4.0.0pre6'
gem 'i18n'
gem 'activesupport', :require => 'active_support/core_ext'
gem 'sinatra'
gem 'haml'
# Gems required by the Picky server.
#
-gem 'picky', '~> 4.0.0pre5'
+gem 'picky', '~> 4.0.0pre6'
gem 'rake'
gem 'rack'
gem 'rack_fast_escape', '2009.06.24' # Optional.
@@ -2,7 +2,7 @@ source :gemcutter
# Gems required by the Picky client.
#
-gem 'picky-client', '~> 4.0.0pre5'
+gem 'picky-client', '~> 4.0.0pre6'
gem 'i18n'
gem 'activesupport', :require => 'active_support/core_ext'
gem 'sinatra'
View
@@ -1,5 +1,11 @@
h2. Upcoming Version
+* hanke: Ready for 4.0.0.
+
+h2. Version 4.0.0pre6
+
+* hanke: (server) Similarity API fixed.
+
h2. Version 4.0.0pre5
* hanke: (statistics) Only use 0.01s for checking the log file instead of 0.1.
View
@@ -143,6 +143,11 @@ def run_server_speed_tests
end
end
+def run_statistics
+ # system "picky stats sandbox/server/log/search.log &"
+ # system "open -a 'Google Chrome' http://localhost:4567/"
+end
+
def kill_server
puts "Killing server (if there)"
system "ps ax | grep 'unicorn -c unicorn.rb' | awk '{print $1}' | xargs kill"
@@ -205,6 +210,8 @@ begin
run_search_requests_on_client
open_client_in_browser
+ run_statistics
+
kill_server
delete_server_directory
View
2 specs
@@ -11,4 +11,4 @@ system "cd generators; #{ 'bundle update;' if remote } bundle exec rake"
system "cd statistics; #{ 'bundle update;' if remote } bundle exec rake"
system "cd client; #{ 'bundle update;' if remote } bundle exec rake"
system "cd server; #{ 'bundle update;' if remote } bundle exec rake"
-system "cd server/test_project; #{ 'bundle update;' if remote } bundle exec rake"
+system "cd server/test_project; #{ 'bundle update;' if remote } rake"
View
@@ -1,3 +1,3 @@
module Picky
- VERSION = '4.0.0pre5'
+ VERSION = '4.0.0pre6'
end

0 comments on commit ae4916d

Please sign in to comment.