tool-shed 0.0.7 → 0.0.9

data/lib/shed/style_vacuum.rb

@@ -22,16 +22,13 @@ class StyleVacuum < Tool
 
     @css_dir = opt[:css_dir]
 
+    do_exit unless valid_opts
+
     @style_regex = /styleName\s*=\s*["']\s*\{?\s*([\w.]+)\s*\}?\s*["']/
     @declared_regex = /^\.(\w+)/
 
     @declared, @used, @unused, @undeclared = [], [], [], []
 
-    unless valid_opts
-      @out.puts "#{INVALID_OPTS} The specified css directory does not exist, or does not contain css files."
-      return
-    end
-
     detect
 
     @report = describe
@@ -50,6 +47,9 @@ class StyleVacuum < Tool
     found.length > 0
   end
 
+  #
+  # Scans the project and detects styles referenced in the source and css files.
+  #
   def detect
     puts "Scanning project for styles..."
 
@@ -71,10 +71,8 @@ class StyleVacuum < Tool
   # Summarise the collected data.
   #
   def summarise
-    puts "Declared styles: #{@declared.length.to_s}"
-    puts "Undeclared styles: #{@undeclared.length.to_s}"
-    puts "Used styles: #{@used.length.to_s}"
-    puts "Unused styles: #{@unused.length.to_s}"
+    puts sprintf( "Declared styles: %d\nUndeclared styles: %d\nUsed styles: %d\nUnused styles: %d\n",
+      @declared.length, @undeclared.length, @used.length, @unused.length)
   end
 
   #
@@ -89,4 +87,10 @@ class StyleVacuum < Tool
     desc
   end
 
-end
+  #
+  # Log an error message and raise exit.
+  #
+  def do_exit
+    super "The specified css directory does not exist, or does not contain css files."
+  end
+end

data/lib/shed/tasks.rb

@@ -0,0 +1,84 @@
+require 'rake'
+require 'rake/tasklib'
+
+class HeadersTask < Rake::TaskLib
+
+  attr_writer :paths
+
+  def copyright=(value)
+    make_header(value)
+  end
+
+  def initialize name = :headers
+    @name = name
+    @paths = 'src,test'
+    @header = make_header
+
+    yield self if block_given?
+
+    define
+  end
+
+  def define
+    desc "Updates all ActionScript source files to include copyright headers"
+    task @name do
+      Dir[ "{#{@paths}}/**/*.as" ].each do |uri|
+        src = IO.read( uri )
+        File.open( uri, 'w+' ) do |f|
+          f << src.sub( /.+?(?=package)/m, @header )
+        end
+      end
+    end
+  end
+
+  private
+
+  def make_header(rights=default_rights)
+    @header = as3_header.sub('[COPYRIGHT]', rights)
+  end
+
+  def default_rights
+    "Copyright #{Time.new().year} the original author or authors."
+  end
+
+  def as3_header
+%{//AS3///////////////////////////////////////////////////////////////////////////
+//
+// [COPYRIGHT]
+//
+////////////////////////////////////////////////////////////////////////////////
+
+}
+  end
+end
+
+class ManifestTask < Rake::TaskLib
+  attr_accessor :filter,
+                :src,
+                :output,
+                :silent
+
+  def initialize name = :manifest
+    @name = name
+    @output = 'manifest.xml'
+    @filter = ''
+    @silent = true
+
+    yield self if block_given?
+
+    define
+  end
+
+  def define
+    desc "Generate a manifest file "
+    task @name do
+      Manifest.new(to_hash)
+    end
+  end
+
+  private
+
+  def to_hash
+    { :filter => filter, :src => src, :output => output, :silent => silent }
+  end
+end

data/lib/shed/tool.rb

@@ -107,4 +107,12 @@ class Tool
     declarations.flatten!.sort!.uniq! unless declarations.empty?
     declarations
   end
+
+  #
+  # Log an error message and raise exit.
+  #
+  def do_exit(msg='')
+    @out.puts "#{INVALID_OPTS} #{msg}"
+    exit
+  end
 end

data/lib/shed/version.rb

@@ -5,7 +5,7 @@ module ToolShed #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/tool_shed.rb

@@ -5,14 +5,20 @@ require 'shed/opts/tool_opts'
 
 require 'shed/asdoc_package'
 require 'shed/manifest'
+require 'shed/concrete'
+require 'shed/mixers/actionscript_class'
+require 'shed/mixers/mock4as'
+require 'shed/mixers/just_implement'
 require 'shed/opts/asdoc_package_opts'
-require 'shed/opts/manifest_opts'
 require 'shed/opts/asset_vacuum_opts'
 require 'shed/opts/class_vacuum_opts'
+require 'shed/opts/manifest_opts'
+require 'shed/opts/concrete_opts'
 require 'shed/opts/style_vacuum_opts'
 require 'shed/project_tools'
 require 'shed/search'
 require 'shed/stripper'
+require 'shed/interface'
 require 'shed/asset_vacuum'
 require 'shed/class_vacuum'
 require 'shed/style_vacuum'

data/rakefile.rb

@@ -1,10 +1,8 @@
-
 require 'bundler'
 
 Bundler.require
 
 require 'metric_fu'
-
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -43,3 +41,31 @@ task :default => [:test]
 
 desc "Run all tests and reports"
 task :hudson => ['ci:setup:testunit', :test, 'metrics:all']
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+task :release do
+  puts ""
+  print "Are you sure you want to relase tool-shed #{ToolShed::VERSION::STRING}? [y/N] "
+  exit unless STDIN.gets.index(/y/i) == 0
+  
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  
+  # Build gem and upload
+  sh "gem build tool-shed.gemspec"
+  sh "gem push tool-shed-#{ToolShed::VERSION::STRING}.gem"
+  sh "rm tool-shed-#{ToolShed::VERSION::STRING}.gem"
+  
+  # Commit
+  sh "git commit --allow-empty -a -m 'v#{ToolShed::VERSION::STRING}'"
+  sh "git tag v#{ToolShed::VERSION::STRING}"
+  sh "git push origin master"
+  sh "git push origin v#{ToolShed::VERSION::STRING}"
+end

data/test/fixtures/interface/ISeedPacket.as

@@ -0,0 +1,61 @@
+//AS3///////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2010 the original author or authors.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+//public interface IPacket
+/*
+public interface IPacket
+*/
+package org.shed.bench.box
+{
+
+/**
+ * A trickier fixture to test the <code>as-concrete</code> tool against.
+ *
+ * @langversion ActionScript 3
+ * @playerversion Flash 9.0.0
+ *
+ * @author Simon Gregory
+ */
+public interface ISeedPacket
+{
+    /**
+     * Sets the seed variety.
+     *
+     * @return
+     */
+    function variety(one:Number,
+                     two:String,
+                     three:Function):String;
+
+     /**
+      * Sets the seed variety.
+      *
+      * @return
+      */
+     function age(planted:Date,
+                  details:String="a,b,c"):Date;
+
+    /**
+     * @private
+     */
+    function get material():String;
+    function set material(value:String):void;
+
+    /*
+
+    function cheese(
+                    stilton:Boolean
+                        ):void;
+
+    */
+
+    function have(a:String, ...rest):Boolean;
+
+    function plant(a:String,
+                   b:Boolean=false,
+                   c:Seed=pod):Boolean;
+}
+}

data/test/fixtures/interface/IShed.as

@@ -0,0 +1,17 @@
+package
+{
+
+public interface IShed
+{
+    function get windows():int;
+    function set windows(value:int):void;
+
+    function get doors():uint;
+
+    function set lamps(value:Number):void;
+
+    function openDoor():void;
+    function startHeater(temperature:Number,fuel:String):void;
+    function countTools():Number;
+}
+}

data/test/fixtures/interface/Shed.as

@@ -0,0 +1,14 @@
+package
+{
+
+public class Shed extends Object implements IShed
+{
+
+    public function Shed()
+    {
+        super();
+    }
+
+}
+
+}

data/test/unit/test_asdoc_package.rb

@@ -2,7 +2,7 @@
 
 require File.join(File.dirname(__FILE__), "/../test_helper")
 
-class ASDocPackageTest < Test::Unit::TestCase
+class TestASDocPackage < Test::Unit::TestCase
 
   context "An ASDdoc Package Tool" do
 
@@ -36,13 +36,16 @@ class ASDocPackageTest < Test::Unit::TestCase
   end
 
   context "A ASDocPackage tool should skip specified directories" do
+
     setup do
       src  = File.expand_path(File.dirname(__FILE__)+ "/../fixtures/src")
-      opts = { :verbose => true,
-               :src => src,
-               :output => '/tmp/asdoc-package-tool-test-output.xml',
-               :excludes => ['one'],
-               :silent => true }
+      opts = {
+        :verbose => true,
+        :src => src,
+        :output => '/tmp/asdoc-package-tool-test-output.xml',
+        :excludes => ['one'],
+        :silent => true
+      }
 
       @pack = ASDocPackage.new(opts)
     end
@@ -53,9 +56,11 @@ class ASDocPackageTest < Test::Unit::TestCase
       p = @pack.xml =~ /Package One/ ? true : false
       assert_equal(false,p)
     end
+
   end
 
   context "A asdoc package builder tool invoked on a empty directory" do
+
     setup do
       @output = '/tmp/as-manifest-tool-test.xml'
       src  = File.expand_path(File.dirname(__FILE__)+ "/../fixtures/empty")
@@ -67,6 +72,7 @@ class ASDocPackageTest < Test::Unit::TestCase
     should "not find any files" do
       assert_match(/No.*files found\./, @out.string)
     end
+
   end
 
 end

data/test/unit/test_asdoc_package_opts.rb

@@ -2,7 +2,7 @@
 
 require File.join(File.dirname(__FILE__), "/../test_helper")
 
-class ASDocPackageOptsTest < Test::Unit::TestCase
+class TestASDocPackageOpts < Test::Unit::TestCase
 
   context "A AsDoc Package Tool Options Parser" do
 

data/test/unit/test_asset_vacuum.rb

@@ -59,19 +59,25 @@ class TestAssetVacuum < Test::Unit::TestCase
       should "only search css files referenced in as/mxml for asset references" do
         #Tecnically yes. Sounds like a pain in the ass to me though.
       end
+
     end
 
     context "with incorrect arguments" do
-      setup do
-        opt = {:src => "INVALID", :output => "/tmp/as-asset-vacuum.txt"}
-        @out = StringIO.new
-        @tool = AssetVacuum.new(opt,@out)
-      end
 
       should "fail with a warning message" do
-        assert_match(/#{AssetVacuum::INVALID_OPTS}/, @out.string)
+        opt = {:src => "INVALID", :output => "/tmp/as-asset-vacuum.txt"}
+        out = StringIO.new
+
+        begin
+          AssetVacuum.new(opt,out)
+          flunk
+        rescue SystemExit => e
+          assert_equal 0, e.status
+          assert_match(/#{Tool::INVALID_OPTS} The source/, out.string)
+        end
       end
+
     end
-  end
 
+  end
 end

data/test/unit/test_asset_vacuum_opts.rb

@@ -7,14 +7,12 @@ class TestAssetVacuumOpts < Test::Unit::TestCase
   context "An Asset Vacuum Tool Options Parser" do
 
     should "return default hash if no arguments are specified" do
-
       args = []
       opts = AssetVacuumOpts.parse(args)
 
       assert_equal 'assets.txt', opts[:output]
       assert_equal '.', opts[:src]
       assert_equal false, opts[:verbose]
-
     end
 
     should "display a name" do
@@ -26,5 +24,4 @@ class TestAssetVacuumOpts < Test::Unit::TestCase
     end
 
   end
-
 end

data/test/unit/test_class_vacuum.rb

@@ -34,15 +34,20 @@ class TestClassVacuum < Test::Unit::TestCase
     end
 
     context "with incorrect arguments" do
-      setup do
-        opt = {:manifest => "INVALID", :output => '/tmp/as-class-vacuum.txt'}
-        @out = StringIO.new
-        @tool = ClassVacuum.new(opt,@out)
-      end
 
       should "fail with a warning message" do
-        assert_match(/#{ClassVacuum::INVALID_OPTS}/, @out.string)
+        opt = {:manifest => "INVALID", :output => '/tmp/as-class-vacuum.txt'}
+        out = StringIO.new
+
+        begin
+          ClassVacuum.new(opt,out)
+          flunk
+        rescue SystemExit => e
+          assert_equal 0, e.status
+          assert_match(/#{Tool::INVALID_OPTS}/, out.string)
+        end
       end
+
     end
 
   end