bee_python 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 7bb9e26f6b4cbe70cdcf5606e0c5786f0bd25856
-  data.tar.gz: fa9f05a6340b9dc60c08a686437ca1134c46d014
+  metadata.gz: 819f69e52e0d7f7071d5c620eb2197c157de2d23
+  data.tar.gz: 476fd8ad20f33d803a0406619fbfc0f98b6cbf11
 SHA512: 
-  metadata.gz: 21d76bc39e57a3e5d40a6b0963a26d058ef5e9c2aae618734386d8aabc2aabb4a716baf4712f598cf075a3cc0bb5f9c55e4d2135fcf8ea72972d74bdb3826a68
-  data.tar.gz: a9a82265c5c79f3741717cf6b955fde6528394f3596ab7c6d20c56d0635b182fcf7f2338d94bd743f4d049b2861c26ff9d54a2226647966a6ce9ecff9b63a0ab
+  metadata.gz: af3177ae7c6b3eccf9de70c5c4a62b6c3ac02a0937eef63edab42922cf9dd8c0ecf117d01963135d90413665b4ab4cfcb84fd959cc11a05d1572f289793328e6
+  data.tar.gz: 9b119ecdfddfe6b33a6258b28fb021f35c30db6dc91eb5ac652c6c52160c9f23eb5027b305561bc2fc537ba0dec95f1d2362f6c8747e693bfa781773cbe411a7

data/README

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

data/lib/bee_task_python.rb

@@ -290,7 +290,9 @@ module Bee
       # - dest: destination directory where to generate coverage report.
       #   Optional, will print report on console if not set.
       # - data: file where to write coverage data. Optional, defaults to
-      #   file .coverage in current directory.
+      #   file .coverage in current directory. MUST NOT be set in latest
+      #   coverage versions because it doesn't implement this feature
+      #   anymore.
       # - path: a list of directories to add to Python path to run tests.
       #
       # Example
@@ -300,7 +302,6 @@ module Bee
       #      test:  "test/suite.py"
       #      dir:   "test"
       #      dest:  "build/coverage"
-      #      data:  "build/.coverage"
       #      path:  "lib"
       def coverage(params)
         # check parameters
@@ -317,7 +318,7 @@ module Bee
         test = params[:test]
         dir  = params[:dir]
         dest = params[:dest]
-        data = File.expand_path(params[:data] || '.coverage')
+        data = params[:data]
         path = params[:path]
         path = path.map {|d| File.expand_path(d)} if path
         # manage directories and files
@@ -347,32 +348,47 @@ module Bee
               File.exists?(path_dir) and File.directory?(path_dir)
           end
         end
+        if data and data.length > 0
+          data_opt = "-f #{data}"
+        else
+          data_opt = ''
+        end
         # build the python path
         add_python_path(path)
         # run coverage command
         puts "Generating coverage report for #{test_files.length} test(s)..."
-        File.delete(data) if File.exists?(data)
         prev_dir = Dir.pwd
-        for test_file in test_files
-          begin
-            Dir.chdir(dir)
-            command = "coverage -x -f #{data} #{test_file}"
-            puts "Running command: '#{command}'" if @verbose
-            system(command) || error("Error running coverage report")
-          ensure
-            Dir.chdir(prev_dir)
+        begin
+          Dir.chdir(dir)
+          # delete coverage data file
+          if data and File.exists?(data)
+            File.delete(data)
+          elsif File.exists?('.coverage')
+            File.delete('.coverage')
           end
-        end
-        if dest
-          command = "coverage -r -f #{data} -m #{sources} > #{report}"
-          system(command) || error("Error generating coverage report")
-          command = "coverage -a -f #{data} -d #{dest} #{sources}"
-          puts "Running command: '#{command}'" if @verbose
-          system(command) || error("Error generating coverage report")
-        else
-          command = "coverage -r -f #{data} -m #{sources}"
+          # run all tests
+          for test_file in test_files
+            command = "coverage run --append #{data_opt} #{test_file} 2>/dev/null"
+            if @verbose
+              puts "Running command: '#{command}'"
+            else
+              print '.'
+            end
+            system(command) || error("Error running coverage tests")
+          end
+          puts ''
+          # generate coverage report
+          command = "coverage report #{data_opt} -m #{sources}"
           puts "Running command: '#{command}'" if @verbose
           system(command) || error("Error generating coverage report")
+          if dest
+            # generate HTML report
+            command = "coverage html #{data_opt} -d #{dest} #{sources}"
+            puts "Running command: '#{command}'" if @verbose
+            system(command) || error("Error generating coverage report")
+          end
+        ensure
+          Dir.chdir(prev_dir)
         end
       end
 

data/python.yml

@@ -34,7 +34,7 @@
     # Pylint options
     py_chk_opt:     "--generated-members=objects"
     # Pylint configuration file
-    py_chk_cfg:     "pylint.cfg"
+    py_chk_cfg:     "#{File.expand_path('~/.bee/pylint.cfg')}"
     # list of directories with Python source files to document
     py_doc_src:     ["src", "test"]
     # directory where to generate source documentation
@@ -45,6 +45,9 @@
     py_cov_dir:     "#{py_build_dir}/coverage"
     # List of file patterns to include in report
     py_cov_inc:     ["*.py"]
+    # Coverage data file (connot be specified in latest coverage versions)
+    #py_cov_data:    "#{py_build_dir}/.coverage"
+    py_cov_data:    ~
     # main scrip to run
     py_main:        "#{py_src_dir}/#{name}.py"
     # main script arguments as a list
@@ -70,6 +73,9 @@
     py_clean_files:
     - "**/*.pyc"
     - "**/*.pyo"
+    # files to exlude
+    py_clean_excl:
+    - "env/**/*"
 
 # Build targets
 - target:      py_version
@@ -128,7 +134,8 @@
       src:  :py_src_dir
       test: "#{py_test_dir}/#{py_test_files}"
       dir:  :py_test_dir
-      data: "#{py_build_dir}/.coverage"
+      data: "#{defined?(py_cov_data) ? py_cov_data : ''}"
+      dest: :py_cov_dir
 
 - target:      py_run
   description: Run Python script
@@ -142,7 +149,12 @@
   description: Clean generated files
   script:
   - rmdir: :py_clean_dirs
-  - rm:    :py_clean_files
+  - find:
+      root: :base
+      includes: :py_clean_files
+      excludes: :py_clean_excl
+      property: _clean_files
+  - rm:    :_clean_files
 
 - target:      py_deps
   description: Check Python dependencies using PIP

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee_python
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-15 00:00:00 Z
+date: 2014-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bee