public
Description: A very fast & simple Ruby web server
Homepage: http://code.macournoyer.com/thin/
Clone URL: git://github.com/macournoyer/thin.git
Search Repo:
Merge git://git.bantamtech.com/thin into kevin
Removed changes.txt, moved changes to CHANGELOG
Removed spec/parser_spec.rb, specs already in spec/request_spec.rb

Conflicts:

  COMMITTERS
macournoyer (author)
Thu Jan 17 19:33:48 -0800 2008
commit  2176ea64e2ac15f2535c76ddf3a60046e39a112c
tree    9f1097cfd9fd31a67d9873e5540357471edf081c
parent  d5b8163b27f3f667cc7c2c418e46e5e1e2e77418 parent  da56b598d40e1b7abd0d73b682399b81c056576b
...
1
 
 
2
3
4
...
1
2
3
4
5
6
0
@@ -1,4 +1,6 @@
0
 == 0.5.3 Purple Yogurt release
0
+ * win32 pre-compiled gem now available
0
+ * change rake task configuration to allow win32 gem build
0
  * Add prefix option to thin script to mount app under a given path.
0
 
0
 == 0.5.2 Cheezburger release
...
1
2
 
3
...
1
 
2
3
0
@@ -1,4 +1,4 @@
0
 Marc-Andre Cournoyer <macournoyer@gmail.com>
0
-Kevin Williams
0
+Kevin Williams <kevwil@gmail.com>
0
 James Golick
...
1
2
 
3
4
5
6
 
7
8
9
10
11
12
13
14
15
16
17
18
...
1
2
3
4
5
6
7
8
9
10
11
 
 
 
 
 
 
 
 
 
0
@@ -1,19 +1,12 @@
0
 RUBY_1_9 = RUBY_VERSION =~ /^1\.9/
0
 WIN = (PLATFORM =~ /mswin|cygwin/)
0
+SUDO = (WIN ? "" : "sudo")
0
 
0
 require 'rake'
0
 require 'rake/clean'
0
 require 'lib/thin'
0
+
0
 Dir['tasks/**/*.rake'].each { |rake| load rake }
0
 
0
 task :default => [:compile, :spec]
0
-
0
-task :install => :compile do
0
- sh %{rake package}
0
- sh %{sudo #{gem} install pkg/#{Thin::NAME}-#{Thin::VERSION::STRING}}
0
-end
0
-
0
-task :uninstall => :clean do
0
- sh %{sudo #{gem} uninstall #{Thin::NAME}}
0
-end
0
...
7
8
9
 
10
11
12
13
 
 
14
15
16
...
7
8
9
10
11
12
13
 
14
15
16
17
18
0
@@ -7,10 +7,12 @@
0
  * IPv6 support (should be able to bind to ::1)
0
  
0
 == TASKS
0
+ * Apply patch: http://groups.google.com/group/thin-ruby/browse_thread/thread/c2e157f0792f6054/9cd8b6af27854d38#9cd8b6af27854d38
0
  * Provide precompiled win32 binaries in Gem
0
  * Load options from a config file
0
  * Create a Stats adapter to show server stats in the browser
0
- * Check for memory usage/leaks using dike or other.
0
+ * Check for memory usage/leaks using dike or other:
0
+ http://blog.evanweaver.com/articles/2007/05/06/leak-proof-direct-heap-instrumentation-for-bleak_house/
0
  * Change benchmarking tests to use
0
    http://blog.evanweaver.com/files/doc/fauna/benchmark_unit/
0
  * Add a better god sample file in example/,
...
73
74
75
 
 
 
 
76
77
78
...
73
74
75
76
77
78
79
80
81
82
0
@@ -73,6 +73,10 @@
0
     server.timeout = options[:timeout]
0
   
0
     if options[:daemonize]
0
+ if RUBY_PLATFORM =~ /mswin/
0
+ puts "Error: daemonizing not supported on Windows."
0
+ exit 1
0
+ end
0
       server.change_privilege options[:user], options[:group] if options[:user] && options[:group]
0
       server.daemonize
0
     end
...
15
16
17
18
19
20
21
22
23
24
 
 
 
 
25
26
27
28
...
59
60
61
62
63
 
 
64
65
 
 
 
 
 
 
 
 
 
66
67
68
...
15
16
17
 
 
 
 
 
 
18
19
20
21
22
23
24
25
26
...
57
58
59
 
 
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
0
@@ -15,13 +15,11 @@
0
 
0
   s.required_ruby_version = '>= 1.8.6' # Makes sure the CGI eof fix is there
0
   
0
- if WIN
0
- s.add_dependency 'eventmachine', '>= 0.8.1' # Latest precompiled version released
0
- else
0
- s.add_dependency 'eventmachine'
0
- s.add_dependency 'daemons', '>= 1.0.9' # Daemonizing doesn't work on win
0
- end
0
   s.add_dependency 'rack', '>= 0.2.0'
0
+ s.add_dependency 'eventmachine', '>= 0.8.1'
0
+ unless WIN
0
+ s.add_dependency 'daemons', '>= 1.0.9'
0
+ end
0
 
0
   s.files = %w(COPYING CHANGELOG README Rakefile) +
0
                             Dir.glob("{benchmark,bin,doc,example,lib,spec}/**/*") +
0
0
@@ -59,10 +57,19 @@
0
   desc 'Upload gem to rubyforge.org'
0
   task :upload_rubyforge => :gem do
0
     sh 'rubyforge login'
0
- sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/thin-#{Thin::VERSION::STRING}.gem"
0
- sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/thin-#{Thin::VERSION::STRING}.gem"
0
+ sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
0
+ sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
0
   end
0
 end
0
+
0
+task :install => [:clobber, :compile, :package] do
0
+ sh "#{SUDO} #{gem} install pkg/#{spec.full_name}.gem"
0
+end
0
+
0
+task :uninstall => :clean do
0
+ sh "#{SUDO} #{gem} uninstall -v #{Thin::VERSION::STRING} -x #{Thin::NAME}"
0
+end
0
+
0
 
0
 def gem
0
   RUBY_1_9 ? 'gem19' : 'gem'

Comments

    No one has commented yet.