squash_ios_symbolicator 1.0.1 → 1.1.1

data/README.md

@@ -38,6 +38,13 @@ This gem uses `dwarfdump` to perform its symbolication. You'll therefore need
 the Xcode Command Line tools installed on the machine that will be performing
 the symbolication upload.
 
+If you wish to use the symbolication tools provided in your own Ruby program,
+you will need to add this gem to your Gemfile:
+
+```` ruby
+gem 'squash_ios_symbolicator', :require => 'squash/symbolicator'
+````
+
 Usage
 -----
 

data/bin/squash_release

@@ -17,6 +17,7 @@
 require 'optparse'
 require 'rubygems'
 require 'squash/uploader'
+require 'plist'
 
 def git_revision(dir)
   head = File.read(File.join(dir, '.git', 'HEAD')).chomp
@@ -27,25 +28,31 @@ def git_revision(dir)
   end
 end
 
+infoplist = Plist.parse_xml(ENV['INFOPLIST_FILE'])
+
 project_dir = Dir.getwd
 revision    = nil
-options     = {}
+build       = infoplist['CFBundleVersion']
+version     = infoplist['CFBundleShortVersionString']
+options     = {:success => [Net::HTTPSuccess, 422]}
 
 parser = OptionParser.new do |parser|
-  parser.banner = "Usage: squash_release [options] YOUR_SQUASH_HOST YOUR_API_KEY ENVIRONMENT BUILD_NUMBER"
+  parser.banner = "Usage: squash_release [options] YOUR_SQUASH_HOST YOUR_API_KEY ENVIRONMENT"
   parser.on('-o', '--open-timeout N', Integer, "HTTP connection open timeout") { |ot| options[:open_timeout] = ot }
   parser.on('-r', '--read-timeout N', Integer, "HTTP connection data received timeout") { |rt| options[:read_timeout] = rt }
   parser.on('-k', '--[no-]skip-verification', "Do not perform SSL peer verification") { |sv| options[:skip_verification] = sv }
 
   parser.on('-p', '--project-dir F', "Specify a custom project directory (default current directory)") { |pd| project_dir = pd }
   parser.on('-r', '--revision R', "Specify a code revision that was deployed (default current revision)") { |r| revision = r }
+  parser.on('-b', '--build B', "Specify a machine-readble build number that was deployed (default from Info.plist)") { |b| build = b }
+  parser.on('-v', '--product-version V', "Specify a human-readable version that was deployed (default from Info.plist)") { |v| version = v }
 
   parser.on('-h', '--help', "Show this message") { puts parser; exit }
   parser.on('--version', "Display version number of this program") { puts "1.0.0"; exit }
 end
 parser.parse!(ARGV)
 
-if ARGV.size != 4
+if ARGV.size != 3
   puts parser
   exit 1
 end
@@ -53,7 +60,6 @@ end
 host        = ARGV.shift
 api_key     = ARGV.shift
 environment = ARGV.shift
-build       = ARGV.shift
 revision    = revision || git_revision(project_dir)
 
 Squash::Uploader.new(host, options).transmit '/api/1.0/deploy.json',
@@ -63,6 +69,7 @@ Squash::Uploader.new(host, options).transmit '/api/1.0/deploy.json',
                                                  'deploy'      => {
                                                      'deployed_at' => Time.now,
                                                      'revision'    => revision,
-                                                     'build'       => build
+                                                     'build'       => build,
+                                                     'version'     => version
                                                  }
                                              }

data/bin/symbolicate

@@ -21,7 +21,7 @@ require 'yaml'
 
 require 'rubygems'
 require 'squash/uploader'
-require 'squash_ios_symbolicator'
+require 'squash/symbolicator'
 
 def git_revision(dir)
   head = File.read(File.join(dir, '.git', 'HEAD')).chomp
@@ -66,7 +66,7 @@ else
   end
 end
 
-sym   = Symbolicator.new(dsym_file, project_dir)
+sym   = Squash::Symbolicator.new(dsym_file, project_dir)
 archs = sym.architectures
 uuids = Hash.new
 archs.each do |arch, uuid|
@@ -75,10 +75,10 @@ end
 
 Squash::Uploader.new(host, options).transmit '/api/1.0/symbolication.json',
                                              'symbolications' =>
-                                                 uuids.map do |uuid, (symbols, lines)|
+                                                 uuids.map { |uuid, (symbols, lines)|
                                                    {
                                                        'uuid'    => uuid,
                                                        'symbols' => Base64.encode64(Zlib::Deflate.deflate(symbols.to_yaml)),
                                                        'lines'   => Base64.encode64(Zlib::Deflate.deflate(lines.to_yaml))
                                                    }
-                                                 end
+                                                 }

data/lib/squash/symbolicator.rb

@@ -78,6 +78,7 @@ module Squash
 
             current_subprogram[tag] = value
           elsif line =~ /^0x[0-9a-f]+:\s+TAG_(\w+)/
+            next unless %w(low_pc high_pc decl_file decl_line name).all? { |k| current_subprogram.include? k }
             current_subprogram['decl_file'].sub!(/^#{Regexp.escape @project_dir}\//, '') if @project_dir
             symbolications.add current_subprogram['low_pc'],
                                current_subprogram['high_pc'],

data/lib/squash/symbolicator/lines.rb

@@ -12,14 +12,25 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'serialbox'
+
+Squash::Symbolicator::Line = Struct.new(:start_address, :file, :line, :column)
+
 # An address ranged mapped to a specific line of code, as part of a {Lines}
 # aggregation. No symbol data is included.
 
-Squash::Symbolicator::Line = Struct.new(:start_address, :file, :line, :column)
+class Squash::Symbolicator::Line
+  include SerialBox
+  serialize_with :JSON
+  serialize_fields do |s|
+    s.serialize :start_address, :file, :line, :column
+  end
 
-Squash::Symbolicator::Line.send(:define_method, :<=>) do |other|
-  raise ArgumentError unless other.kind_of?(Squash::Symbolicator::Line)
-  start_address <=> other.start_address
+  # @private
+  def <=>(other)
+    raise ArgumentError unless other.kind_of?(Squash::Symbolicator::Line)
+    start_address <=> other.start_address
+  end
 end
 
 # An aggregation of the `Symbolicator::Line`s of a binary class. This class
@@ -28,6 +39,10 @@ end
 class Squash::Symbolicator::Lines
   include Enumerable
 
+  include SerialBox
+  serialize_with :JSON
+  serialize_fields { |s| s.serialize :@lines }
+
   # Creates a new empty aggregation.
 
   def initialize

data/lib/squash/symbolicator/symbols.rb

@@ -12,18 +12,27 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+Squash::Symbolicator::Symbol = Struct.new(:start_address, :end_address, :file, :line, :ios_method)
+
 # An address ranged mapped to a symbol (method or function name), as part of a
 # {Symbols} aggregation. The file and line where the symbol is declared is also
 # included.
 
-Squash::Symbolicator::Symbol = Struct.new(:start_address, :end_address, :file, :line, :ios_method)
+class Squash::Symbolicator::Symbol
+  include SerialBox
+  serialize_with :JSON
+  serialize_fields do |s|
+    s.serialize :start_address, :end_address, :file, :line, :ios_method
+  end
 
-Squash::Symbolicator::Symbol.send(:define_method, :<=>) do |other|
-  raise ArgumentError unless other.kind_of?(Squash::Symbolicator::Symbol)
-  if start_address == other.start_address
-    end_address <=> other.end_address
-  else
-    start_address <=> other.start_address
+  # @private
+  def <=>(other)
+    raise ArgumentError unless other.kind_of?(Squash::Symbolicator::Symbol)
+    if start_address == other.start_address
+      end_address <=> other.end_address
+    else
+      start_address <=> other.start_address
+    end
   end
 end
 
@@ -33,6 +42,10 @@ end
 class Squash::Symbolicator::Symbols
   include Enumerable
 
+  include SerialBox
+  serialize_with :JSON
+  serialize_fields { |s| s.serialize :@symbols }
+
   # Creates a new empty aggregation.
 
   def initialize

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squash_ios_symbolicator
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tim Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-04 00:00:00 Z
+date: 2013-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -42,7 +42,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id002
-  name: squash_uploader
+  name: serialbox
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -51,14 +51,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 1
+        version: 1.0.1
   version_requirements: *id003
-  name: rspec
+  name: squash_uploader
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +72,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id004
-  name: yard
+  name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -84,7 +86,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id005
-  name: redcarpet
+  name: yard
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -98,6 +100,20 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id006
+  name: redcarpet
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id007
   name: jeweler
   prerelease: false
   type: :development