furnace-swf 0.0.4 → 0.0.5

data/bin/furnace-swf

@@ -79,33 +79,43 @@ File.open(opts[:input]) do |file|
   end
 end
 
+def find_tag(swf, name)
+  abc_tags = swf.stream.tags(SWF::DoABCTag, SWF::DoABC2Tag)
+
+  if name =~ /\d+/
+    abc_tags[name.to_i]
+  else
+    abc_tags.find { |tag| tag.name == name }
+  end
+end
+
 case subcommand
 when 'abclist'
   puts "ABC tags:"
 
-  swf.stream.tags(SWF::DoABCTag).each do |tag|
-    puts "  #{tag.name.inspect}: #{tag.bytecode.length} byte(s)"
+  swf.stream.tags(SWF::DoABCTag, SWF::DoABC2Tag).each_with_index do |tag, index|
+    puts " #{index}) #{tag.name.inspect}: #{tag.bytecode.length} byte(s)"
   end
 
 when 'abcextract'
-  if tag = swf.stream.tags(SWF::DoABCTag).find { |tag| tag.name == subopts[:name] }
+  if tag = find_tag(swf, subopts[:name])
     File.open(subopts[:output], 'w') do |f|
       f.write tag.bytecode
     end
   else
-    $stderr.puts "Tag #{subopts[:name].inspect} was not found"
+    $stderr.puts "Tag `#{subopts[:name]}' was not found"
     exit -1
   end
 
 when 'abcreplace'
-  if tag = swf.stream.tags(SWF::DoABCTag).find { |tag| tag.name == subopts[:name] }
+  if tag = find_tag(swf, subopts[:name])
     tag.bytecode = subopts[:input].read
 
     File.open(subopts[:output], 'w') do |f|
       swf.write f
     end
   else
-    $stderr.puts "Tag #{subopts[:name].inspect} was not found"
+    $stderr.puts "Tag `#{subopts[:name]}' was not found"
     exit -1
   end
 end

data/furnace-swf.gemspec

@@ -13,11 +13,13 @@ Gem::Specification.new do |s|
                   %q{Flash SWF files. It can be used with furnace-avm2 in } <<
                   %q{order to achieve impressive results.}
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9.1'
+
   s.add_runtime_dependency "bindata"
   s.add_runtime_dependency "trollop"
 end

data/lib/furnace-swf/swf/stream.rb

@@ -14,8 +14,8 @@ module Furnace::SWF
           BigDecimal.new(frame_rate_lo) / 100
     end
 
-    def tags(type)
-     tag_wrappers.select { |tw| tw.content.is_a? type }.map(&:content)
+    def tags(*types)
+      tag_wrappers.select { |tw| types.any? { |type| tw.content.is_a? type } }.map(&:content)
     end
 
     def real_num_bytes

data/lib/furnace-swf/swf/tags/do_abc2_tag.rb

@@ -0,0 +1,9 @@
+module Furnace::SWF
+  class DoABC2Tag < Tag
+    type 82
+
+    uint32  :flags
+    stringz :name
+    string  :bytecode, :read_length => lambda { parent.real_length - 4 - name.length - 1 }
+  end
+end

data/lib/furnace-swf/swf/tags/do_abc_tag.rb

@@ -1,9 +1,15 @@
 module Furnace::SWF
   class DoABCTag < Tag
-    type 82
+    type 72
 
-    uint32  :flags
-    stringz :name
-    string  :bytecode, :read_length => lambda { parent.real_length - 4 - name.length - 1 }
+    string  :bytecode, :read_length => lambda { parent.real_length }
+
+    def name
+      "<DoABCTag>"
+    end
+
+    def flags
+      0
+    end
   end
 end

data/lib/furnace-swf/version.rb

@@ -1,3 +1,3 @@
 module Furnace::SWF
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnace-swf
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -70,6 +70,7 @@ files:
 - lib/furnace-swf/swf/tag.rb
 - lib/furnace-swf/swf/tag_wrapper.rb
 - lib/furnace-swf/swf/tags/define_binary_data_tag.rb
+- lib/furnace-swf/swf/tags/do_abc2_tag.rb
 - lib/furnace-swf/swf/tags/do_abc_tag.rb
 - lib/furnace-swf/swf/tags/symbol_class_tag.rb
 - lib/furnace-swf/swf/ubit.rb
@@ -85,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,8 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Flash SWF file reader and writer
 test_files: []
+has_rdoc: