docstat 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ce34590bd2d470e7674bb571b72f85fad250d3
-  data.tar.gz: 6faca26dbc2e2d33c2751f82d6ea6e2f0543560d
+  metadata.gz: 14786323d354b90b784dccef3f9dd4af2eca444b
+  data.tar.gz: 8864f337f2487fab2d263ca75dfd6e3050e20073
 SHA512:
-  metadata.gz: b3c746b7448282694953656e1ae2ae33fb108b55af3c9f7886903d3b518feeb092ccded817a9b783542b1736fe80eb4a3c1cee5497f099d43b5f6d8b321ef8e5
-  data.tar.gz: 8973fdb988e025129caebd03a7af2eb032260849728d78da08300101132f4bc15a48033aa2b3b2d8f8b8503e8088a6e9ec8854357835dedb25516a245d0f6645
+  metadata.gz: fd770740286f4ab4074dd2b5415ae8ae0b75dd94a2e19305bf8a33758d4c4248fdc1448b4baa224e69d3164fbc17ba2d39e48d2f4b38e8d17aaee4cfc6f8c732
+  data.tar.gz: a868e36d33858f672a20a4f2c8e60124d7eb2dd74fbcc8b863d9eca21ba45f6cf8a678af68206ffee7ac3b212b9a5d2a48ff7867e50a1d305839f8faf72857d2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.4
+
+* Fix breakage when no selector in a library returns a value
+
 # 1.0.3
 
 * Ensure tokens without parent containers are included in metrics

data/bin/docstat

@@ -8,7 +8,7 @@ elsif docset_path = ARGV[0]
   stats  = DocStat.process(docset_path)
   tokens = stats['containers'].map {|c| c['tokens']}.flatten
   ratio  = stats['ratio']
-  print "#{tokens.size} tokens, #{((ratio*1000).to_i/1000.0) * 100}% documented"
+  print "#{tokens.size} tokens, #{((ratio*1000).to_i/1000.0) * 100}% documented\n"
 else
   print "No Documentation Set (*.docset) directory specified\n"
   exit(1)

data/bin/docstat-test

@@ -6,7 +6,7 @@ if ARGV.include?('--version') || ARGV.include?('-v')
   print "#{DocStat::VERSION}\n"
 elsif docset_path = ARGV[0] and passing_ratio = (ARGV[1] || '0.9')
   state = DocStat.test_ratio(docset_path, passing_ratio.to_f) ? 'PASSED' : 'FAILED'
-  print "Documentation coverage must be greater than or equal to #{passing_ratio.to_f * 100}%: #{state}"
+  print "Documentation coverage must be greater than or equal to #{passing_ratio.to_f * 100}%: #{state}\n"
   exit(state ? 0 : 1)
 else
   print "No Documentation Set (*.docset) directory specified\n"

data/lib/docstat/container.rb

@@ -6,16 +6,24 @@ module DocStat
   class Container
     attr_reader :name, :tokens
 
-    QUERY = "select ZCONTAINERNAME,ZTOKENNAME,ZTYPENAME,ZTOKENMETAINFORMATION.ZABSTRACT,ZDECLARATION,ZRETURNVALUE.ZABSTRACT from ZTOKEN \
+    QUERY = "select ZCONTAINERNAME,ZTOKENNAME,ZTYPENAME,ZTOKENMETAINFORMATION.ZABSTRACT,ZDECLARATION from ZTOKEN \
+      left join ZCONTAINER on ZTOKEN.ZCONTAINER = ZCONTAINER.Z_PK \
+      left join ZTOKENTYPE on ZTOKEN.ZTOKENTYPE = ZTOKENTYPE.Z_PK \
+      left join ZTOKENMETAINFORMATION on ZTOKEN.Z_PK = ZTOKENMETAINFORMATION.ZTOKEN \
+      order by ZCONTAINERNAME"
+
+    QUERY_WITH_RETURN_VALUES = "select ZCONTAINERNAME,ZTOKENNAME,ZTYPENAME,ZTOKENMETAINFORMATION.ZABSTRACT,ZDECLARATION,ZRETURNVALUE.ZABSTRACT from ZTOKEN \
       left join ZCONTAINER on ZTOKEN.ZCONTAINER = ZCONTAINER.Z_PK \
       left join ZTOKENTYPE on ZTOKEN.ZTOKENTYPE = ZTOKENTYPE.Z_PK \
       left join ZTOKENMETAINFORMATION on ZTOKEN.Z_PK = ZTOKENMETAINFORMATION.ZTOKEN \
       left join ZRETURNVALUE on ZTOKENMETAINFORMATION.ZRETURNVALUE = ZRETURNVALUE.Z_PK \
       order by ZCONTAINERNAME"
 
+    RETURNVALUES_QUERY = "SELECT * FROM sqlite_master WHERE type='table'"
+
     def self.from_sqlite path
       db = SQLite3::Database.new(path)
-      rows = db.execute(QUERY).to_a
+      rows = has_return_values?(db) ? db.execute(QUERY_WITH_RETURN_VALUES) : db.execute(QUERY)
       container_groups = rows.group_by {|r| r.first }
       groups = container_groups.map do |name, tokens|
         self.new(name, tokens)
@@ -28,6 +36,10 @@ module DocStat
       @name, @tokens = name, tokens.map {|t| Token.new(t)}
     end
 
+    def self.has_return_values? database
+      database.execute(RETURNVALUES_QUERY).detect {|r| r[1] == 'ZRETURNVALUE'} != nil
+    end
+
     def to_hash
       {
         "name"   => name,

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DocStat
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docstat
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Delisa Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: prettybacon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,10 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A command-line utility for checking the documentation coverage of a Cocoa
   library
 test_files: []
-has_rdoc: