bee_python 0.1.3 → 0.2.0

data/README

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

data/lib/bee_task_python.rb

@@ -356,17 +356,67 @@ module Bee
 
       # 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
+      # for a given dependency. A version 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)
+      def dependencies(deps)
+        error "python.dependencies parameter is a Map" unless
+          deps.kind_of?(Hash)
         puts "Checking Python dependencies..."
+        installed = installed_dependencies()
+        check_dependencies(deps, installed)
+      end
+
+      # Check Python dependencies using PIP (see http://pypi.python.org/pypi/pip).
+      # Takes a single parameter that is the requirements file name. A dependency
+      # may specify no version, in this case we check that dependency in installed
+      # in any version..
+      #
+      # Example:
+      #
+      #   - python.requirements: requirements.txt
+      def requirements(reqs)
+        error "python.requirements parameter is a string" unless
+            reqs.kind_of?(String)
+        puts "Checking Python requirements..."
+        installed = installed_dependencies()
+        content = File.read(reqs).strip
+        dependencies = {}
+        for line in content
+          if line =~ /.+==.+/
+            name, version = line.scan(/[^=]+/).map{|e| e.strip}
+            dependencies[name] = version
+          else
+            dependencies[line.strip] = nil
+          end
+        end
+        check_dependencies(dependencies, installed)
+      end
+
+      private
+
+      # Add directories to the Python path environment variable.
+      # - dirs: directory (string) or list of directories to add to path.
+      def add_python_path(dirs)
+        if dirs and dirs.length > 0
+          dirs = Array(dirs)
+          puts "Adding to PYTHONPATH: '#{dirs.join(',')}'" if @verbose
+          if ENV['PYTHONPATH']
+            ENV['PYTHONPATH'] = dirs.join(File::PATH_SEPARATOR) +
+              File::PATH_SEPARATOR + ENV['PYTHONPATH'] if dirs.length > 0
+          else
+            ENV['PYTHONPATH'] = dirs.join(File::PATH_SEPARATOR)
+          end
+        end
+      end
+
+      # Get installed dependencies running PIP and return them as a map
+      # with dependencies names and versions.
+      def installed_dependencies
         lines = `pip freeze`.strip.split("\n")
         installed = {}
         for line in lines
@@ -377,6 +427,12 @@ module Bee
             installed[name] = version
           end
         end
+        installed
+      end
+
+      # Check that dependencies (as a map) are installed. Throws an error if
+      # not.
+      def check_dependencies(dependencies, installed)
         for name in dependencies.keys.sort
           if installed.has_key?(name)
             if not dependencies[name] or dependencies[name] == '*'
@@ -394,23 +450,6 @@ module Bee
         end
       end
 
-      private
-
-      # Add directories to the Python path environment variable.
-      # - dirs: directory (string) or list of directories to add to path.
-      def add_python_path(dirs)
-        if dirs and dirs.length > 0
-          dirs = Array(dirs)
-          puts "Adding to PYTHONPATH: '#{dirs.join(',')}'" if @verbose
-          if ENV['PYTHONPATH']
-            ENV['PYTHONPATH'] = dirs.join(File::PATH_SEPARATOR) +
-              File::PATH_SEPARATOR + ENV['PYTHONPATH'] if dirs.length > 0
-          else
-            ENV['PYTHONPATH'] = dirs.join(File::PATH_SEPARATOR)
-          end
-        end
-      end
-
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee_python
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-07 00:00:00 +02:00
+date: 2013-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency