bamboo 2009.11.1 → 2010.1.1

raw patch · 5 files changed

+31/−20 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Nemesis +20/−17
• bamboo.cabal +1/−1
• changelog.md +7/−0
• readme.md +2/−1
• src/Bamboo/Helper/StateHelper.hs +1/−1

@@ -18,31 +18,31 @@     ]      desc "prepare cabal dist"-  task "dist" $ do+  task "dist" - do     sh "cabal clean"     sh "cabal configure"     sh "cabal sdist"    desc "start console"-  task "i" (sh "ghci -isrc src/Main.hs")+  task "i" (sh "ghci -Wall -isrc src/Main.hs")    desc "put all .hs files in manifest"-  task "manifest" $ sh "find . | grep 'hs$' > manifest"+  task "manifest" - sh "find . | grep 'hs-' > manifest"        desc "kibro refresh"-  task "r" $ sh "kibro refresh"+  task "r" - sh "kibro refresh"    desc "kibro restart"-  task "rs" $ sh "kibro stop; kibro start"+  task "rs" - sh "kibro stop; kibro start"    desc "kibro start"-  task "s" $ sh "kibro start"+  task "s" - sh "kibro start"    desc "kibro stop"-  task "st" $ sh "kibro stop"+  task "st" - sh "kibro stop"      desc "kill"-  task "kill" $ do+  task "kill" - do     kill "fcgi"     kill "lighttpd"     return ()@@ -50,20 +50,23 @@   desc "run"   bin "run" "Main" +  desc "upload"+  task "upload" - sh "scp -C .bin/run easymic.com:~/link/bamboo/.bin/run-deploy"+   desc "deploy"-  task "deploy" $ sh "scp -C .bin/run easymic.com:~/link/bamboo/.bin"+  task "deploy" - sh "mv .bin/run-deploy .bin/run"   -  task "go" $ sh ".bin/run"+  task "go" - sh ".bin/run"      desc "show sloc"-  task "stat" $ sh "cloc -match-f=hs$ --quiet ."+  task "stat" - sh "cloc -match-f=hs- --quiet ."      where-    ghci n x = task n $ sh $ "ghci -isrc src/" ++ x ++ ".hs"-    bin n x = task n $ do-      sh $ "ghc --make -Wall -O1 -threaded -isrc src/" ++ x ++ ".hs -o .bin/" ++ n-      sh $ "echo done.."-      sh $ ".bin/" ++ n+    ghci n x = task n - sh - "ghci -isrc src/" ++ x ++ ".hs"+    bin n x = task n - do+      sh - "ghc --make -Wall -threaded -O1 -isrc src/" ++ x ++ ".hs -o .bin/" ++ n+      sh - "echo done.."+      sh - ".bin/" ++ n      kill x = -  system $ "ps -A | grep " ++ x ++ " | awk '{print $1}' | xargs kill -9"+  system - "ps -A | grep " ++ x ++ " | awk '{print -1}' | xargs kill -9"

@@ -1,5 +1,5 @@ Name:                 bamboo-Version:              2009.11.1+Version:              2010.1.1 Build-type:           Simple Synopsis:             A simple blog engine on Hack License:              GPL

@@ -1,3 +1,10 @@+2010.1.1+--------++### Fix++* fix 2010 date+ 2009.11.1 --------- 

@@ -40,7 +40,7 @@  By it's middleware nature, bamboo could be used with other hack middleware to achieve extensibility; Bamboo plugins are also middleware, so they can be used not only in bamboo, but any other CMS like web application. -## [Demo](http://jinjing.easymic.com)+## [Demo](http://jinjing.funkymic.com)  ## Easy install in 3 steps @@ -107,6 +107,7 @@ * [Hack](http://github.com/nfjinjing/hack) * [Hack Contrib](http://github.com/nfjinjing/hack-contrib) * [bamboo-theme-blueprint](http://github.com/nfjinjing/bamboo-theme-blueprint)+* [bamboo-theme-mini-html5](http://github.com/nfjinjing/bamboo-theme-mini-html5) * [bamboo-launcher](http://github.com/nfjinjing/bamboo-launcher) * [bamboo-plugin-highlight](http://github.com/nfjinjing/bamboo-plugin-highlight) * [bamboo-plugin-photo](http://github.com/nfjinjing/bamboo-plugin-photo)

@@ -20,7 +20,7 @@ -- global parse_date :: String -> String -> Maybe CalendarTime parse_date format s = parseCalendarTime defaultTimeLocale format s ^-  (\d -> if d.ctYear < 1910 then d {ctYear = d.ctYear + 100} else d )+  (\d -> if d.ctYear < 1980 then d {ctYear = d.ctYear + 100} else d )  format_time :: String -> CalendarTime -> String format_time = formatCalendarTime defaultTimeLocale