updating examples

Author: vsoch

examples/classify/classify_image/count_files.py

@@ -3,25 +3,20 @@
 # This is an example of counting files using an image diff
 
 from singularity.analysis.classify import (
-    get_diff,
     file_counts,
     extension_counts
 )
 
-image_package = "python:3.6.0.img.zip"
-
-# The diff is a dict of folders --> files that differ between 
-# image and it's closest OS
-diff = get_diff(image_package=image_package)
+container = "ubuntu.simg"
 
 # Now we might be interested in counting different things
-readme_count = file_counts(diff=diff)
-copyright_count = file_counts(diff=diff,patterns=['copyright'])
-authors_count = file_counts(diff=diff,patterns=['authors','thanks','credit'])
-todo_count = file_counts(diff=diff,patterns=['todo'])
+readme_count = file_counts(container)
+copyright_count = file_counts(container, patterns=['copyright'])
+authors_count = file_counts(container, patterns=['authors','thanks','credit'])
+todo_count = file_counts(container, patterns=['todo'])
 
 # Or getting a complete dict of extensions
-extensions = extension_counts(diff=diff)
+extensions = extension_counts(container)
 
 # Return files instead of counts
-extensions = extension_counts(diff=diff,return_counts=False)
+extensions = extension_counts(container, return_counts=False)

examples/classify/classify_image/derive_tags.py

@@ -5,28 +5,19 @@
 import os
 os.environ['MESSAGELEVEL'] = 'CRITICAL'
 
-from singularity.analysis.classify import (
-    get_tags,
-    get_diff
-)
-
-image_package = "python:3.6.0.img.zip"
+from singularity.analysis.classify import get_tags
+from singularity.package import get_container_contents
 
 # The algorithm works as follows:
-#      1) first compare package to set of base OS (provided with shub)
-#      2) subtract the most similar os from image, leaving "custom" files
-#      3) organize custom files into dict based on folder name
-#      4) return search_folders as tags
+#      1) organize custom files into dict based on folder name
+#      2) return search_folders as tags
 
 # Default tags will be returned as software in "bin"
-tags = get_tags(image_package=image_package)
+tags = get_tags(container)
 
-# We can also get the raw "diff" between the image and it's base
-# which is usable in other functions (and we don't have to calc 
-# it again)
-diff = get_diff(image_package=image_package)
+# We can also get the raw list of flies
+file_list = get_container_contents(container)['all']
 
 # We can specify other folders of interest
 folders = ['init','init.d','bin','systemd']
-tags = get_tags(search_folders=folders,diff=diff)
-# Most similar OS found to be %s debian:7.11
+tags = get_tags(container, search_folders=folders)

examples/classify/classify_image/estimate_os.py

@@ -1,35 +1,9 @@
 from glob import glob
 
-from singularity.analysis.reproduce import (
-    assess_replication, 
-    assess_differences
-)
+from singularity.analysis.reproduce import assess_differences
 
 image_files=glob('*.img')
 
-# ASSESS REPLICATION #######################################
-# returns booleans for if the hashes for levels are the same
-
-assess_replication(image_files[0],image_files[1])
-
-{'BASE': False,
- 'ENVIRONMENT': False,
- 'IDENTICAL': False,
- 'LABELS': True,
- 'RECIPE': False,
- 'REPLICATE': False,
- 'RUNSCRIPT': False}
-
-assess_replication(image_files[0],image_files[0])
-
-{'BASE': True,
- 'ENVIRONMENT': True,
- 'IDENTICAL': True,
- 'LABELS': True,
- 'RECIPE': True,
- 'REPLICATE': True,
- 'RUNSCRIPT': True}
-
 # ASSESS DIFFERENCES #######################################
 # returns dictionary with 
 

examples/classify/classify_image/python:3.6.0.img.zip

@@ -44,7 +44,7 @@
 # We might want to get a dictionary of content hashes for all files
 # of one container at one level!
 digest = get_content_hashes(image_path)
-digest['./usr/bin/pinky']
+digest['hashes']['/usr/bin/chfn']
 # 'ee2b438c278011bdac1a3a927e2d37519a8ed9c7'
 
 # We can also get a hash of the entire image file, this is done on the