apparat 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apparat (0.0.1)
+    apparat (0.0.2)
       sprout (>= 1.1.15.pre)
 
 GEM

data/README.md

@@ -6,23 +6,27 @@ As I only need this to work on my dev machine there's a good chance you're going
 
 ## Install
 
-    git clone [this repo]
-    cd sprout-apparat
-    bundle install
-    gem build apparat.gemspec
     gem install apparat
 
 #### Or
 
+	git clone [this repo]
+    cd sprout-apparat
+    bundle install
+    gem build apparat.gemspec
     gem install apparat
 
-#### You need scala
+#### You need [Scala]((http://www.scala-lang.org)
 
-Until it's bundled with the gem then you need to install [scala 2.8.2](http://www.scala-lang.org/downloads). I had scala 2.9.1 installed via homebrew but it turned out to be incompatible with apparat. So I dropped 2.8.2 into `/usr/local/Cellar/scala` and switched to it with `brew switch scala 2.8.2`.
+Until it's bundled with the gem you need to install [scala 2.8.2](http://www.scala-lang.org/downloads). I had scala 2.9.1 installed via homebrew but it turned out to be incompatible with apparat. So I dropped 2.8.2 into `/usr/local/Cellar/scala` and switched to it with `brew switch scala 2.8.2`, bingo!
 
 ## Usage
 
-Add the following to your rake file
+Add this to your gem file
+
+    gem 'apparat'
+
+Then the following to your rake file
 
     dump :dump do |t|
 		t.input = 'input.swf'
@@ -53,25 +57,29 @@ Add the following to your rake file
 		t.macro = true
 	end
 
-## MIT License
+Then run with
+
+    rake reduce
+
+## Released under the MIT License
 
-Copyright 2012 Simon Gregory
+	Copyright 2012 Simon Gregory
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+	Permission is hereby granted, free of charge, to any person obtaining
+	a copy of this software and associated documentation files (the
+	'Software'), to deal in the Software without restriction, including
+	without limitation the rights to use, copy, modify, merge, publish,
+	distribute, sublicense, and/or sell copies of the Software, and to
+	permit persons to whom the Software is furnished to do so, subject to
+	the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+	The above copyright notice and this permission notice shall be
+	included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+	THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -31,7 +31,7 @@ CLEAN.add '*.gem'
 
 task :release do
   puts ""
-  print "Are you sure you want to relase Apparat #{Apparat::GEM_VERSION}? [y/N] "
+  print "Are you sure you want to release Apparat #{Apparat::GEM_VERSION}? [y/N] "
   exit unless STDIN.gets.index(/y/i) == 0
 
   unless `git branch` =~ /^\* master$/

data/as3/apparat/coverage/Coverage.as

@@ -0,0 +1,115 @@
+/**
+ * This file originates from the Flexmojos project under the following licence:
+ *
+ * Flexmojos is a set of maven goals to allow maven users to compile, optimize
+ * and test Flex SWF, Flex SWC, Air SWF and Air SWC.
+ * Copyright (C) 2008-2012 Marvin Froeder <marvin@flexmojos.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package apparat.coverage
+{
+
+public final class Coverage
+{
+    private static var _coverage:CoverageDataCollector;
+    private static function get coverage():CoverageDataCollector
+    {
+        if (_coverage == null) _coverage = new CoverageDataCollector()
+        return _coverage
+    }
+
+    private static var cache:Object = {}
+
+    public static function onSample(file:String, line:int):void
+    {
+        if (cache[file] == null) cache[file] = []
+        if (contains(cache[file], line)) return
+
+        cache[file].push(line)
+
+        coverage.collect(file, line)
+    }
+
+    public static function toXml():void
+    {
+        var data:Object = coverage.result();
+        for ( var cls:String in data )
+        {
+            trace(data[cls].toXml())
+        }
+    }
+
+    private static function contains(array:Array, item:*):Boolean
+    {
+        return (array.indexOf(item) != -1)
+    }
+}
+}
+
+internal class CoverageDataCollector
+{
+    private var map:Object = {}
+
+    public function collect(classname:String, lineNumber:int):void
+    {
+        var data:TestCoverageReport
+
+        if ((data = map[classname]) == null)
+        {
+            data = new TestCoverageReport(classname);
+            map[classname] = data;
+        }
+
+        data.touch(lineNumber)
+    }
+
+    public function result():Object
+    {
+        var result:Object = map
+        map = {}
+        return result
+    }
+}
+
+internal class TestCoverageReport
+{
+    public var classname:String
+    public var touched:Array = []
+
+    public function TestCoverageReport(classname:String)
+    {
+        this.classname = classname;
+    }
+
+    public function touch(lineNumber:int):void
+    {
+        touched.splice(touched.length, 0, lineNumber)
+    }
+
+    public function toXml():String
+    {
+        var genxml:String = "<coverage classname=\""+ classname + "\">";
+
+        for each ( var line:int in touched )
+        {
+              genxml = genxml.concat("<touch>",line,"</touch>");
+        }
+
+        genxml += "</coverage>";
+
+        return genxml;
+    }
+}

data/lib/apparat.rb

@@ -1,6 +1,7 @@
 require 'sprout'
 
 require 'apparat/concrete'
+require 'apparat/coverage'
 require 'apparat/dump'
 require 'apparat/reducer'
 require 'apparat/scala'
@@ -19,7 +20,7 @@ Sprout::Specification.new do |s|
     t.url = Apparat::ZIP
     t.md5 = Apparat::MD5
     t.add_executable :concrete, "apparat-#{Apparat::VERSION}/concrete"
-    #t.add_executable :coverage, "apparat-#{Apparat::VERSION}/coverage"
+    t.add_executable :coverage, "apparat-#{Apparat::VERSION}/coverage"
     t.add_executable :dump, "apparat-#{Apparat::VERSION}/dump"
     t.add_executable :reducer, "apparat-#{Apparat::VERSION}/reducer"
     t.add_executable :stripper, "apparat-#{Apparat::VERSION}/stripper"

data/lib/apparat/coverage.rb

@@ -0,0 +1,33 @@
+module Apparat
+
+  class Coverage < Sprout::Executable::Base
+
+    ##
+    # The swf to add coverage output to
+    #
+    add_param :input, File, { :required => true, :shell_name => '-i', :delimiter => ' ' }
+
+    ##
+    # Optional coverage swf to generate.
+    #
+    add_param :output, String, { :shell_name => '-o', :delimiter => ' ' }
+
+    ##
+    # The source path to use. To define multiple paths seperate with :
+    #
+    add_param :source, String, { :shell_name => '-s', :delimiter => ' ' }
+
+    ##
+    # The default executable target
+    #
+    set :executable, :coverage
+
+  end
+
+end
+
+def coverage *args, &block
+  exe = Apparat::Coverage.new
+  exe.to_rake(*args, &block)
+  exe
+end

data/lib/apparat/version.rb

@@ -1,7 +1,7 @@
 module Apparat
   NAME    = 'apparat'
   VERSION = '1.0-RC9'
-  GEM_VERSION = "0.0.1"
+  GEM_VERSION = "0.0.2"
   MD5 = '72c69dbcb91c4574cc58abf61fabc7cf'
   ZIP = "http://apparat.googlecode.com/files/apparat-#{VERSION}-bin.zip"
 end

data/test/unit/coverage_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class StripperTest < Test::Unit::TestCase
+  include Sprout::TestHelper
+
+  context "A Coverage tool" do
+
+    setup do
+      @fixtures = File.join fixtures, 'coverage', 'tmp'
+      @fixture = "#{@fixtures}/cover-me.swf"
+
+      FileUtils.makedirs @fixtures
+      FileUtils.touch @fixture
+    end
+
+    teardown do
+      remove_file @fixtures
+    end
+
+    should "accept input" do
+      tool = Apparat::Coverage.new
+      tool.input = @fixture
+      tool.output = 'coverage/covered.swf'
+      tool.source = 'src/'
+
+      assert_equal "-i #{@fixture} -o coverage/covered.swf -s src/", tool.to_shell
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apparat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprout
-  requirement: &70355537477660 !ruby/object:Gem::Requirement
+  requirement: &70234602509880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.15.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70355537477660
+  version_requirements: *70234602509880
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70355537467600 !ruby/object:Gem::Requirement
+  requirement: &70234602509500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,16 +32,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355537467600
+  version_requirements: *70234602509500
 description: Project Sprouts support for Apparat
 email: projectsprouts@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- as3/apparat/coverage/Coverage.as
 - Gemfile
 - Gemfile.lock
 - lib/apparat/concrete.rb
+- lib/apparat/coverage.rb
 - lib/apparat/dump.rb
 - lib/apparat/reducer.rb
 - lib/apparat/scala.rb
@@ -52,6 +54,7 @@ files:
 - Rakefile
 - README.md
 - test/unit/concrete_test.rb
+- test/unit/coverage_test.rb
 - test/unit/dump_test.rb
 - test/unit/reducer_test.rb
 - test/unit/stripper_test.rb
@@ -70,9 +73,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2599133739274712709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: