about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-10-06 01:08:36 +0000
committerEric Wong <normalperson@yhbt.net>2010-10-06 01:17:01 +0000
commitcb48b1bc7231db7f53bec6e88e696dc53153750d (patch)
tree093f08d9a591d4f1b2da130521b64d9f8fa56d53
parent4c59a4861bf3f8d25335696c1f8cbce3cd5db902 (diff)
Mostly internal cleanups for future versions of Rainbows! and
people trying out Rubinius.  There are tiny performance
improvements for Ruby 1.9.2 users which may only be noticeable
with Rainbows!

Unicorn 1.1.x users are NOT required to upgrade.
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--GNUmakefile2
-rw-r--r--Rakefile11
-rw-r--r--lib/unicorn/const.rb5
4 files changed, 12 insertions, 8 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 88b943a..715a37b 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.0.0.GIT
+DEF_VER=v2.0.0pre1.GIT
 
 LF='
 '
diff --git a/GNUmakefile b/GNUmakefile
index 3741db5..2a12667 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -178,7 +178,7 @@ NEWS: GIT-VERSION-FILE .manifest
         $(RAKE) -s news_rdoc > $@+
         mv $@+ $@
 
-SINCE = 0.991.0
+SINCE = 1.1.4
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
diff --git a/Rakefile b/Rakefile
index 626eb42..d29aaa6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -163,13 +163,18 @@ task :fm_update do
   req = {
     "auth_code" => api_token,
     "release" => {
-      "tag_list" => "Stable",
+      "tag_list" => "Experimental",
       "version" => version,
       "changelog" => changelog,
     },
   }.to_json
-  Net::HTTP.start(uri.host, uri.port) do |http|
-    p http.post(uri.path, req, {'Content-Type'=>'application/json'})
+
+  if ! changelog.strip.empty? && version =~ %r{\A[\d\.]+\d+\z}
+    Net::HTTP.start(uri.host, uri.port) do |http|
+      p http.post(uri.path, req, {'Content-Type'=>'application/json'})
+    end
+  else
+    warn "not updating freshmeat for v#{version}"
   end
 end
 
diff --git a/lib/unicorn/const.rb b/lib/unicorn/const.rb
index 9cb4dcd..ec5444d 100644
--- a/lib/unicorn/const.rb
+++ b/lib/unicorn/const.rb
@@ -7,9 +7,8 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  # The current version of Unicorn, currently 2.0.0pre
-  # this constant is deprecated and will soon move to Unicorn::VERSION
-  UNICORN_VERSION="2.0.0pre"
+  # The current version of Unicorn, currently 2.0.0pre1
+  UNICORN_VERSION = "2.0.0pre1"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"