bee_python 0.0.6 → 0.1.0

data/README

@@ -20,4 +20,4 @@ or go to URL http://www.apache.org/licenses/LICENSE-2.0).
 
 = Copyright
 
-Bee_python version 0.0.6 (C) Michel Casabianca - 2008-2010
+Bee_python version 0.1.0 (C) Michel Casabianca - 2008-2010

data/egg/mysql/mysql.py

@@ -24,11 +24,13 @@ def run_query(query):
                                      db = DATABASE)
         cursor = connection.cursor(MySQLdb.cursors.DictCursor)
         cursor.execute(query)
+        connection.commit()
         return cursor.fetchall()
     finally:
         if cursor:
             cursor.close()
         if connection:
+            connection.rollback()
             connection.close()
 
 def main():

data/egg/project/test.py

@@ -7,7 +7,7 @@ import os
 import sys
 import inspect
 test_dir = os.path.dirname(inspect.currentframe().f_code.co_filename)
-src_dir = os.path.join(test_dir, '../src')
+src_dir = os.path.join(test_dir, '..', 'src')
 sys.path.insert(0, src_dir)
 import <%= name %>
 import unittest

data/lib/bee_task_python.rb

@@ -354,6 +354,46 @@ module Bee
         end
       end
 
+      # Check Python dependencies using PIP (see http://pypi.python.org/pypi/pip).
+      # Takes a single parameter that is the map of dependencies that gives version
+      # for a given dependency. A vesion set to ~ (or nil) indicates that this
+      # dependency is needed in any version (useful for developement libraries used
+      # for development).
+      #
+      # Example:
+      #
+      #   - python.dependencies: { Django: "1.2.3", PyYAML: ~ }
+      def dependencies(dependencies)
+        error "python.deps_check parameter is a Map" unless
+          dependencies.kind_of?(Hash)
+        puts "Checking Python dependencies..."
+        lines = `pip freeze`.strip.split("\n")
+        installed = {}
+        for line in lines
+          if line =~ /^[^#].*/
+            index = line.index('==')
+            name = line[0..index-1]
+            version = line[index+2..-1]
+            installed[name] = version
+          end
+        end
+        for name in dependencies.keys.sort
+          if installed.has_key?(name)
+            if not dependencies[name] or dependencies[name] == '*'
+              puts "#{name}: OK" if @verbose
+            else
+              if dependencies[name] != installed[name]
+                throw "Dependency '#{name}' in bad version ('#{installed[_name]}' installed instead of '#{dependencies[name]}' required)"
+              else
+                puts "#{name} (#{dependencies[name]}): OK" if @verbose
+              end
+            end
+          else
+            throw "Missing dependency '#{name}'"
+          end
+        end
+      end
+
       private
 
       # Add directories to the Python path environment variable.

data/python.yml

@@ -4,7 +4,7 @@
   abstract:    true
   default: [clean, test]
   alias:
-    test:  [py_check, py_test]
+    test:  [py_deps, py_check, py_test]
     doc:   py_doc
     run:   py_run
     clean: py_clean
@@ -46,6 +46,15 @@
     py_cov_inc:     ["*.py"]
     # main scrip to run
     py_main:        "#{py_src_dir}/#{name}.py"
+    # dependencies as a map, for instance:
+    #
+    # py_deps:
+    #   Django: "1.2.3"
+    #   PyYAML: ~
+    #
+    # Set a version to ~ (or null) to indicate that no specific version is needed.
+    # Set dependencies to ~ if you don't want any check (default).
+    py_deps: ~
     # directories to clean
     py_clean_dirs:  [:py_build_dir]
     # files to clean
@@ -122,3 +131,34 @@
   script:
   - rmdir: :py_clean_dirs
   - rm:    :py_clean_files
+
+- target:      py_deps
+  description: Check Python dependencies using PIP
+  script:
+  - if: defined?(py_deps) and py_deps
+    then:
+    - python.dependencies: :py_deps
+
+- target:      py_inst_deps
+  description: Install Python dependencies using PIP
+  script:
+  - if: defined?(py_deps) and py_deps
+    then:
+    - for: _name
+      in:  py_deps.keys.sort
+      do:
+      - if: not py_deps[_name] or py_deps[_name] == '*'
+        then:
+        - print: "Installing '#{_name}'..."
+        - try:
+          - "sudo pip install #{_name}"
+          - print: "OK"
+          catch:
+          - print: "ERROR: could not install '#{_name}'"
+        else:
+        - print: "Installing '#{_name}' in version '#{py_deps[_name]}'..."
+        - try:
+          - "sudo pip install #{_name}==#{py_deps[_name]}"
+          - print: "OK"
+          catch:
+          - print: "ERROR: could not install '#{_name}' in version '#{py_deps[_name]}'"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee_python
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-04 00:00:00 Z
+date: 2012-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bee