bee_python 0.0.2 → 0.0.3

data/build/README

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

data/lib/bee_task_python.rb

@@ -1,4 +1,19 @@
-require 'bee_task'
+# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>                                                                                                                                          
+#
+# 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.
+
+require 'rubygems'
+require 'bee_task_package'
 require 'fileutils'
 
 module Bee
@@ -26,10 +41,9 @@ module Bee
           script = File.join(File.expand_path(File.dirname(__FILE__)),
                              '..', 'tools', 'compile', 'compile.py')
           for file in files
-            puts "Compiling Python source file '#{file}'" if
-              @build.listener.verbose
+            puts "Compiling Python source file '#{file}'" if @verbose
             command = "python #{script} #{file}"
-            puts "Running command: '#{command}'" if @build.listener.verbose
+            puts "Running command: '#{command}'" if @verbose
             ok = system(command)
             error "Error compiling Python source file '#{file}'" unless ok
           end
@@ -106,7 +120,7 @@ module Bee
         command += " #{options}" if options
         command += " --only" if only
         command += " #{files.join(' ')}"
-        puts "Running command: '#{command}'" if @build.listener.verbose
+        puts "Running command: '#{command}'" if @verbose
         ok = system(command)
         error "Error checking Python source files" unless ok or lenient
       end
@@ -186,7 +200,7 @@ module Bee
         command += " --rcfile=#{config}" if config
         command += " #{options}" if options
         command += " #{files.join(' ')}"
-        puts "Running command: '#{command}'" if @build.listener.verbose
+        puts "Running command: '#{command}'" if @verbose
         ok = system(command)
         error "Error checking Python source files" unless ok or lenient
       end
@@ -243,7 +257,7 @@ module Bee
         command += " -o #{dest}"
         command += " #{options}" if options
         command += " #{files.join(' ')}"
-        puts "Running command: '#{command}'" if @build.listener.verbose
+        puts "Running command: '#{command}'" if @verbose
         ok = system(command)
         error "Error generating documentation for Python source files" unless
           ok
@@ -268,7 +282,7 @@ module Bee
           script = File.join(File.expand_path(File.dirname(__FILE__)),
                              '..', 'tools', 'test', 'suite.py')
           command = "python #{script} #{files.join(' ')}"
-          puts "Running command: '#{command}'" if @build.listener.verbose
+          puts "Running command: '#{command}'" if @verbose
           ok = system(command)
           error "Error running Python test(s)" unless ok
         end
@@ -353,7 +367,7 @@ module Bee
           begin
             Dir.chdir(dir)
             command = "python #{coverage} -x -f #{data} #{test_file}"
-            puts "Running command: '#{command}'" if @build.listener.verbose
+            puts "Running command: '#{command}'" if @verbose
             system(command) || error("Error running coverage report")
           ensure
             Dir.chdir(prev_dir)
@@ -363,11 +377,11 @@ module Bee
           command = "python #{coverage} -r -f #{data} -m #{sources} > #{report}"
           system(command) || error("Error generating coverage report")
           command = "python #{coverage} -a -f #{data} -d #{dest} #{sources}"
-          puts "Running command: '#{command}'" if @build.listener.verbose
+          puts "Running command: '#{command}'" if @verbose
           system(command) || error("Error generating coverage report")
         else
           command = "python #{coverage} -r -f #{data} -m #{sources}"
-          puts "Running command: '#{command}'" if @build.listener.verbose
+          puts "Running command: '#{command}'" if @verbose
           system(command) || error("Error generating coverage report")
         end
       end
@@ -379,8 +393,7 @@ module Bee
       def add_python_path(dirs)
         if dirs and dirs.length > 0
           dirs = Array(dirs)
-          puts "Adding to PYTHONPATH: '#{dirs.join(',')}'" if 
-            @build.listener.verbose
+          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

data/test/tc_bee_task_python.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'bee'
 require 'test/unit'
 $:.unshift(File.join(File.expand_path(File.dirname(__FILE__))))
+require 'bee_context'
 require 'test_build'
 require 'test_build_listener'
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -14,7 +14,7 @@ class TestBeeTaskPython < Test::Unit::TestCase
   # Create a context object and load tasks in it.
   def setup
     super
-    @context = Bee::Context.new(nil)
+    @context = Bee::Context.new()
     @listener = TestBuildListener.new
     @build = TestBuild.new(@context, @listener)
     @package = Bee::Task::Python.new(@build)

data/test/test_build_listener.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2008 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,30 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Test build listener.
+require 'rubygems'
+
 class TestBuildListener
 
+  attr_reader :formatter
   attr_reader :started
   attr_reader :finished
   attr_reader :targets
   attr_reader :tasks
   attr_reader :success
   attr_reader :errors
-  attr_accessor :output
-  attr_reader :verbose
-  
-  def initialize
-    @targets = []
-    @tasks = []
-    @output = ''
-    @verbose = false
+  attr_accessor :throw_error
+  attr_accessor :prompt
+
+  def initialize()
+    reset
   end
-  
-  def build_started(build)
+
+  def build_started(build, dry=false)
     @started = true
   end
 
-  def build_finished(build)
+  def build_finished()
     @finished = true
   end
 
@@ -44,11 +43,56 @@ class TestBuildListener
   end
 
   def task(task)
-    @tasks << tasks
+    @tasks << task
   end
 
   def error(exception)
-    @errors = exception
+    if throw_error
+      raise exception
+    else
+      @errors << exception
+    end
+  end
+
+  def recover
+    @success = true
+  end
+
+  def reset
+    @formatter = TestBuildFormatter.new(self)
+    @started = false
+    @finished = false
+    @targets = []
+    @tasks = []
+    @success = false
+    @errors = []
+    @throw_error = false
+    @prompt = ''
+  end
+
+  def output()
+    return @formatter.output
+  end
+
+  def clear()
+    @formatter.clear()
+  end
+
+  def error?
+    return @errors.length > 0
+  end
+
+end
+
+class TestBuildFormatter
+
+  attr_reader :verbose
+  attr_reader :output
+
+  def initialize(listener)
+    @listener = listener
+    @verbose = false
+    @output = ''
   end
 
   def print(text)
@@ -59,4 +103,8 @@ class TestBuildListener
     @output << text + "\n"
   end
 
+  def clear()
+    @output = ''
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee_python
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.11.0
     version: 
 description: 
 email: michel.casabianca@gmail.com