Merge branch 'master' of git://github.com/couchapp/couchapp

Conflicts: src/couchapp/app.py src/couchapp/extensions.py
couchapp · Dec 7, 2009 · 54c3e83 · 54c3e83
2 parents 0f9ee77 + 9b97679
commit 54c3e83
Show file tree

Hide file tree

Showing 88 changed files with 5,735 additions and 7,026 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ setuptools-*
 .svn/*
 .DS_Store
 *.so
+distribute-0.6.8-py2.6.egg
+distribute-0.6.8.tar.gz
+
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,6 @@ include LICENSE
 include README.md
 include THANKS.txt
 include ez_setup.py
-recursive-include app-template *
+recursive-include templates *
 recursive-include vendor *
-recursive-include tests/testapp *
+recursive-include tests/testapp *
diff --git a/README.md b/README.md
@@ -211,12 +211,7 @@ Also, join us on [irc.freenode.net in the #couchapp room](irc://irc.freenode.net
 
 ### Apps Using CouchApp
 
-There are a few apps out there already using CouchApp. Please send a pull request adding yours to the list if you're using it too.
-
-* [Sofa](http://github.com/jchris/sofa)
-* [Couch-Wiki](http://github.com/janl/couch-wiki)
-* [CouchDB Twitter Client](http://github.com/jchris/couchdb-twitter-client)
-
+There are a [few apps](http://wiki.github.com/couchapp/couchapp/apps) out there already using CouchApp. Please send a pull request adding yours to the list if you're using it too.
 
 ## License
 

diff --git a/TODO b/TODO
@@ -1,8 +1,8 @@
 
-TODO : 0.4
+TODO : 0.5
 ------------
-- replace httplib2 and couchdb contrib by a thin client
 - more unitests
-- new application inheriting feature (bug #6)
-- specify app name in .couchapprc (bug #7)
-- PIP compliant.
+- couchdbdesktop compatibility
+- cleaner hook system
+- instant updates
+- .ignore file.
diff --git a/bin/CouchApp.py b/bin/CouchApp.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008,2009 Benoit Chesneau <benoitc@e-engura.org>
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at#
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+try:
+    import couchapp.dispatch
+except ImportError:
+    import sys
+    sys.stderr.write("abort: couldn't find couchapp lib in [%s]\n" % sys.path)
+    sys.stderr.write("check your install.\n")
+    sys.exit(-1)
+
+
+couchapp.dispatch.run()
diff --git a/bin/couchapp b/bin/couchapp
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008,2009 Benoit Chesneau <benoitc@e-engura.org>
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at#
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+try:
+    import couchapp.dispatch
+except ImportError:
+    import sys
+    sys.stderr.write("abort: couldn't find couchapp lib in [%s]\n" % sys.path)
+    sys.stderr.write("check your install.\n")
+    sys.exit(-1)
+
+
+couchapp.dispatch.run()
diff --git a/contrib/macosx/Readme.html b/contrib/macosx/Readme.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- This is the second screen displayed during the install. -->
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <title></title>
+  <style type="text/css">
+    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
+    p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
+    p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}
+    p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed}
+    span.s1 {text-decoration: underline}
+    span.s2 {font: 12.0px Courier}
+  </style>
+</head>
+<body>
+<p class="p1"><b>Before you install</b></p>
+<p class="p2"><br></p>
+<p class="p3">This is an OS X 10.6 version of Couchapp that depends on the default Python 2.6 installation.</p>
+<p class="p2"><br></p>
+<p class="p1"><b>After you install</b></p>
+<p class="p2"><br></p>
+<p class="p3">This package installs the <span class="s2">couchapp</span> executable in <span class="s2">/usr/local/bin</span> and the Couchapp files in <span class="s2">/Library/Python/2.6/site-packages/Couchapp.</span></p>
+<p class="p2"><br></p>
+<p class="p1"><b>Documentation</b></p>
+<p class="p2"><br></p>
+<p class="p3">Visit the <a href="http://benoitc.github.com/couchapp">Couchapp web site and wiki</a></p>
+<p class="p2"><br></p>
+<p class="p3">You can also visit the, <a href="http://couchdb.apache.org/">CouchDB website</a></p>
+<p class="p2"><br></p>
+<p class="p1"><b>Reporting problems</b></p>
+<p class="p2"><br></p>
+<p class="p3">If you run into any problems, please file a bug online:</p>
+<p class="p3"><a href="http://github.com/couchapp/couchapp/issues">http://github.com/couchapp/couchapp/issues</a></p>
+</body>
+</html>
diff --git a/contrib/macosx/Welcome.html b/contrib/macosx/Welcome.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- This is the second screen displayed during the install. -->
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <title></title>
+  <style type="text/css">
+    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
+    p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
+  </style>
+</head>
+<body>
+<p class="p1">This is a prepackaged release of <a href="http://benoitc.github.com/couchapp">couchapp</a> for Mac OS X.</p>
+<p class="p2"><br></p>
+<br>
+<p>
+Please be sure to read the latest <a href="http://benoitc.github.com/couchapp/changelog.htm">changes</a>.</p>
+</body>
+</html>
diff --git a/contrib/macosx/build.txt b/contrib/macosx/build.txt
@@ -0,0 +1,10 @@
+To build a macosx dmg :
+
+
+install py2app from http://pythonmac.org/packages
+
+make sure /usr/local/bin is in your path
+
+run bdist_mpkg in top-level couchapp source directory
+
+find dmg in dist directory
diff --git a/contrib/win32/couchapp.bat b/contrib/win32/couchapp.bat
@@ -0,0 +1,7 @@
+@echo off
+rem couchapp script for windows
+
+setlocal
+
+%~dp0..\python "%~dp0couchapp" %*
+endlocal
diff --git a/contrib/win32/couchapp.iss b/contrib/win32/couchapp.iss
@@ -0,0 +1,67 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{0CDA65F1-9FD8-42C5-8DD0-F65F7E8B7304}
+AppName=Couchapp
+AppVerName=Couchapp 0.5
+AppPublisher=Benoît Chesneau
+AppPublisherURL=http://benoitc.github.com/couchapp
+AppSupportURL=http://benoitc.github.com/couchapp
+AppUpdatesURL=http://benoitc.github.com/couchapp
+DefaultDirName={pf}\Couchapp
+DefaultGroupName=Couchapp
+LicenseFile=LICENSE
+InfoAfterFile=contrib\win32\postinstall.txt
+OutputBaseFilename=couchapp-0.5
+Compression=lzma
+SolidCompression=yes
+SourceDir=..\..
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: dist\couchapp.exe; DestDir: {app}; Flags: ignoreversion
+Source: dist\_hashlib.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\_socket.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\_ssl.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\_win32sysloader.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\API-MS-Win-Core-LocalRegistry-L1-1-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\API-MS-Win-Core-ProcessThreads-L1-1-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\API-MS-Win-Security-Base-L1-1-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\bz2.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\couchapp.exe; DestDir: {app}; Flags: ignoreversion
+Source: dist\library.zip; DestDir: {app}; Flags: ignoreversion
+Source: dist\POWRPROF.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\python26.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\pythoncom26.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\pywintypes26.dll; DestDir: {app}; Flags: ignoreversion
+Source: dist\select.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\unicodedata.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\w9xpopen.exe; DestDir: {app}; Flags: ignoreversion
+Source: dist\win32api.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\win32com.shell.shell.pyd; DestDir: {app}; Flags: ignoreversion
+Source: dist\couchapp\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: ignoreversion
+Source: dist\Microsoft.VC*.MFC.manifest; DestDir: {app}
+Source: dist\mfc*.dll; DestDir: {app}
+Source: dist\msvc*.dll; DestDir: {app}
+Source: dist\add_path.exe; DestDir: {app}
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: {group}\Couchapp; Filename: {app}\couchapp.exe
+Name: {commondesktop}\Couchapp; Filename: {app}\couchapp.exe; Tasks: desktopicon
+
+[Run]
+Filename: {app}\add_path.exe; Parameters: {app}; Description: Add the installation path to the search path; Flags: postinstall
+
+[UninstallRun]
+Filename: {app}\add_path.exe; Parameters: /del {app}
diff --git a/contrib/win32/postinstall.txt b/contrib/win32/postinstall.txt
@@ -0,0 +1,9 @@
+Welcome to Couchapp for Windows!
+---------------------------------
+
+For configuration and usage directions, please read the ReadMe.md
+file that comes with this package.
+
+Also check the release notes at:
+
+ http://benoitc.github.com/couchapp/changelog.html
diff --git a/couchapp/__init__.py b/couchapp/__init__.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008,2009 Benoit Chesneau <benoitc@e-engura.org>
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at#
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+__version__ = "0.5"