puppet-community-mvp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77ade2721786fdca7fd96827ca510e0404a02a8
-  data.tar.gz: ad32f5a43392ed7f23d49d60db3fbe308ae73e2d
+  metadata.gz: e45ff6e06d776fb8c3129789b4f469f25f86ea59
+  data.tar.gz: 640dd10a4620d77281ebb58ec4d097dc40b9bfbd
 SHA512:
-  metadata.gz: be5282a77000b433c3aedd58ddfd29ea594df089007e38e74cb8b18c5c6b576ff048b218ec30cb9f60b8291faa1b62525f8d2c79694444bb3f95df2ede98efc0
-  data.tar.gz: 94894492ffba9d187f9178a17d51e412d80dc7b3434681bf43da79f422c6bbb0ddddba7f347b49ed048e0134a72eefe5ff3d83a615d5c4402d809f3e8010c1ac
+  metadata.gz: 00fffd365248a810b1542eb7e4e370398330d469834a2e5cecab70f0fe370149d8bc87ac7027c9260c6a2d0a8f24a06915e5946bf5d84c5dd6c07a8e4ac95ac3
+  data.tar.gz: ac1e153462e94226eb56621e687667f369aa0ca35f3d34dd6e3c9096e0d7dc56dcb1f4584f0b2072cda3f47a5c5f1b2b645f106d5f314ef45fdcc3d9f6af6a25

data/lib/mvp/itemizer.rb

@@ -58,7 +58,8 @@ class Mvp
     # Build a table with this schema
     # module | version | source | kind | element | count
     def table(itemized, data)
-      modname      = data['slug']
+      modname      = data['name']
+      slug         = data['slug']
       version      = data['version']
       dependencies = data['dependencies']
 
@@ -67,11 +68,21 @@ class Mvp
         kind = kind.to_s
         kind = kind.end_with?('ses') ? kind.chomp('es') : kind.chomp('s')
         elements.map do |name, count|
-          # TODO: this may suffer from collisions, (module foo, function foo, for example)
-          depname = name.split('::').first
+          if name == modname
+            depname = name
+          else
+            # This relies on a little guesswork.
+            segments = name.split('::')                       # First see if its already namespaced and we can just use it
+            segments = name.split('_') if segments.size == 1  # If not, then maybe it follows the pattern like 'mysql_password'
+            depname  = segments.first
+          end
+
+          # There's a chance of collisions here. For example, if you depended on a module
+          # named 'foobar-notify' and you used a 'notify' resource, then the resource would
+          # be improperly linked to that module. That's a pretty small edge case though.
           source  = dependencies.find {|row| row.split('-').last == depname} rescue nil
 
-          { :module => modname, :version => version, :source => source, :kind => kind, :element => name, :count => count }
+          { :module => slug, :version => version, :source => source, :kind => kind, :element => name, :count => count }
         end
       end.flatten(1)
     end

data/lib/mvp/uploader.rb

@@ -16,7 +16,7 @@ class Mvp
       raise "\nThere is a problem with the gCloud configuration: \n #{JSON.pretty_generate(options)}" if @dataset.nil?
 
       @itemized = @dataset.table('forge_itemized') || @dataset.create_table('forge_itemized') do |table|
-                                                        table.name        = 'Itemied dependencies between modules'
+                                                        table.name        = 'Itemized dependencies between modules'
                                                         table.description = 'A list of all types/classes/functions used by each module and where they come from'
                                                         table.schema do |s|
                                                           s.string  "module",  mode: :required
@@ -255,7 +255,7 @@ class Mvp
     end
 
     def version_itemized?(mod, version)
-      str = "SELECT version FROM forge_itemized WHERE name = '#{mod}' UNIQUE"
+      str = "SELECT DISTINCT version FROM forge_itemized WHERE module = '#{mod}'"
       versions = @dataset.query(str).map {|row| row[:version] } rescue []
 
       versions.include? version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-community-mvp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google-cloud
+  name: google-cloud-bigquery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet-itemize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Generate some stats about the Puppet Community.