Skip to content

Add info to JSON and CSV output #30 #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-esser merged 1 commit into from
Dec 14, 2017
Merged

Add info to JSON and CSV output #30 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/deltacode/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,25 +197,40 @@ def to_dict(self):
if self.category == 'added':
return OrderedDict([
('category', 'added'),
('path', self.new_file.path)
('path', self.new_file.path),
('name', self.new_file.name),
('type', self.new_file.type),
('size', self.new_file.size)
])
elif self.category == 'removed':
return OrderedDict([
('category', 'removed'),
('path', self.old_file.path)
('path', self.old_file.path),
('name', self.old_file.name),
('type', self.old_file.type),
('size', self.old_file.size)
])
elif self.category == 'modified':
return OrderedDict([
('category', 'modified'),
('path', self.new_file.path)
('path', self.new_file.path),
('name', self.new_file.name),
('type', self.new_file.type),
('size', self.new_file.size)
])
elif self.category == 'license change':
return OrderedDict([
('category', 'license change'),
('path', self.new_file.path)
('path', self.new_file.path),
('name', self.new_file.name),
('type', self.new_file.type),
('size', self.new_file.size)
])
else:
return OrderedDict([
('category', 'unmodified'),
('path', self.new_file.path)
('path', self.new_file.path),
('name', self.new_file.name),
('type', self.new_file.type),
('size', self.new_file.size)
])
12 changes: 9 additions & 3 deletions src/deltacode/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,15 @@ def generate_csv(delta, result_file):
"""
with open(result_file, 'wb') as out:
csv_out = csv.writer(out)
csv_out.writerow(['Type of delta', 'Path'])
for row in [(f.category, f.old_file.path if f.category == 'removed' else f.new_file.path) for d in delta.deltas for f in delta.deltas.get(d)]:
csv_out.writerow(row)
csv_out.writerow(['Type of delta', 'Path', 'Name', 'Type', 'Size'])
for row in [(
f.category,
f.old_file.path if f.category == 'removed' else f.new_file.path,
f.old_file.name if f.category == 'removed' else f.new_file.name,
f.old_file.type if f.category == 'removed' else f.new_file.type,
f.old_file.size if f.category == 'removed' else f.new_file.size)
for d in delta.deltas for f in delta.deltas.get(d)]:
csv_out.writerow(row)


def generate_json(delta, result_file):
Expand Down
20 changes: 10 additions & 10 deletions tests/data/cli/added1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Type of delta,Path
added,a/a5.py
unmodified,a/a3.py
unmodified,b/b4.py
unmodified,a/a2.py
unmodified,b/b2.py
unmodified,b/b1.py
unmodified,b/b3.py
unmodified,a/a4.py
unmodified,a/a1.py
Type of delta,Path,Name,Type,Size
added,a/a5.py,a5.py,file,200
unmodified,a/a3.py,a3.py,file,200
unmodified,b/b4.py,b4.py,file,200
unmodified,a/a2.py,a2.py,file,200
unmodified,b/b2.py,b2.py,file,200
unmodified,b/b1.py,b1.py,file,200
unmodified,b/b3.py,b3.py,file,200
unmodified,a/a4.py,a4.py,file,200
unmodified,a/a1.py,a1.py,file,200
18 changes: 9 additions & 9 deletions tests/data/cli/modified1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Type of delta,Path
modified,a/a4.py
unmodified,a/a3.py
unmodified,b/b4.py
unmodified,b/b1.py
unmodified,a/a2.py
unmodified,b/b2.py
unmodified,b/b3.py
unmodified,a/a1.py
Type of delta,Path,Name,Type,Size
modified,a/a4.py,a4.py,file,246
unmodified,a/a3.py,a3.py,file,200
unmodified,b/b4.py,b4.py,file,200
unmodified,b/b1.py,b1.py,file,200
unmodified,a/a2.py,a2.py,file,200
unmodified,b/b2.py,b2.py,file,200
unmodified,b/b3.py,b3.py,file,200
unmodified,a/a1.py,a1.py,file,200
8 changes: 4 additions & 4 deletions tests/data/cli/modified_new_license_added.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Type of delta,Path
modified,some/path/c/c1.py
license change,some/path/a/a1.py
license change,some/path/b/b1.py
Type of delta,Path,Name,Type,Size
modified,some/path/c/c1.py,c1.py,file,300
license change,some/path/a/a1.py,a1.py,file,300
license change,some/path/b/b1.py,b1.py,file,300
6 changes: 3 additions & 3 deletions tests/data/cli/modified_new_license_added_low_score.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Type of delta,Path
modified,some/path/a/a1.py
modified,some/path/b/b1.py
Type of delta,Path,Name,Type,Size
modified,some/path/a/a1.py,a1.py,file,350
modified,some/path/b/b1.py,b1.py,file,290
18 changes: 9 additions & 9 deletions tests/data/cli/removed1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Type of delta,Path
removed,a/a4.py
unmodified,a/a3.py
unmodified,b/b4.py
unmodified,b/b1.py
unmodified,a/a2.py
unmodified,b/b2.py
unmodified,b/b3.py
unmodified,a/a1.py
Type of delta,Path,Name,Type,Size
removed,a/a4.py,a4.py,file,200
unmodified,a/a3.py,a3.py,file,200
unmodified,b/b4.py,b4.py,file,200
unmodified,b/b1.py,b1.py,file,200
unmodified,a/a2.py,a2.py,file,200
unmodified,b/b2.py,b2.py,file,200
unmodified,b/b3.py,b3.py,file,200
unmodified,a/a1.py,a1.py,file,200
20 changes: 10 additions & 10 deletions tests/data/cli/renamed1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Type of delta,Path
added,a/a4_renamed_not_modified.py
removed,a/a4.py
unmodified,a/a3.py
unmodified,b/b4.py
unmodified,b/b1.py
unmodified,b/b2.py
unmodified,b/b3.py
unmodified,a/a1.py
unmodified,a/a2.py
Type of delta,Path,Name,Type,Size
added,a/a4_renamed_not_modified.py,a4_renamed_not_modified.py,file,200
removed,a/a4.py,a4.py,file,200
unmodified,a/a3.py,a3.py,file,200
unmodified,b/b4.py,b4.py,file,200
unmodified,b/b1.py,b1.py,file,200
unmodified,b/b2.py,b2.py,file,200
unmodified,b/b3.py,b3.py,file,200
unmodified,a/a1.py,a1.py,file,200
unmodified,a/a2.py,a2.py,file,200
96 changes: 90 additions & 6 deletions tests/test_deltacode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,10 @@ def test_DeltaCode_to_dict_simple_unmodified(self):
('unmodified', [
OrderedDict([
('category', 'unmodified'),
('path', u'test/unmodified.txt')
('path', u'test/unmodified.txt'),
('name', u'unmodified.txt'),
('type', u'file'),
('size', 11)
])
])
])
Expand Down Expand Up @@ -593,9 +596,13 @@ def test_Delta_to_dict_removed(self):
'sha1': 'a',
'original_path': ''
})

expected = {
'category': 'removed',
'path': 'path/removed.txt'
'path': 'path/removed.txt',
'name': 'removed.txt',
'type': 'file',
'size': 20
}

delta = deltacode.Delta(None, old, 'removed')
Expand All @@ -611,9 +618,13 @@ def test_Delta_to_dict_added(self):
'sha1': 'a',
'original_path': ''
})

expected = {
'category': 'added',
'path': 'path/added.txt'
'path': 'path/added.txt',
'name': 'added.txt',
'type': 'file',
'size': 20
}

delta = deltacode.Delta(new, None, 'added')
Expand All @@ -640,7 +651,10 @@ def test_Delta_to_dict_modified(self):

expected = {
'category': 'modified',
'path': 'path/modified.txt'
'path': 'path/modified.txt',
'name': 'modified.txt',
'type': 'file',
'size': 20
}

delta = deltacode.Delta(new, old, 'modified')
Expand All @@ -667,7 +681,10 @@ def test_Delta_to_dict_unmodified(self):

expected = {
'category': 'unmodified',
'path': 'path/unmodified.txt'
'path': 'path/unmodified.txt',
'name': 'unmodified.txt',
'type': 'file',
'size': 20
}

delta = deltacode.Delta(new, old, 'unmodified')
Expand All @@ -677,7 +694,74 @@ def test_Delta_to_dict_unmodified(self):
def test_Delta_to_dict_empty(self):
delta = deltacode.Delta()

assert delta.to_dict() == OrderedDict([('category', 'unmodified'), ('path', '')])
assert delta.to_dict() == OrderedDict([('category', 'unmodified'), ('path', ''), ('name', ''), ('type', ''), ('size', '')])

def test_Delta_to_dict_license_modified(self):
new_scan = self.get_test_loc('deltacode/scan_modified_new_license_added.json')
old_scan = self.get_test_loc('deltacode/scan_modified_old_license_added.json')

result = DeltaCode(new_scan, old_scan)

expected = OrderedDict([
('added', []),
('removed', []),
('modified', [
OrderedDict([
('category', 'modified'),
('path', u'some/path/c/c1.py'),
('name', u'c1.py'),
('type', u'file'),
('size', 300)
]),
OrderedDict([
('category', 'license change'),
('path', u'some/path/a/a1.py'),
('name', u'a1.py'),
('type', u'file'),
('size', 300)
]),
OrderedDict([
('category', 'license change'),
('path', u'some/path/b/b1.py'),
('name', u'b1.py'),
('type', u'file'),
('size', 300)
])
]),
('unmodified', [])
])

assert result.to_dict() == expected

def test_Delta_to_dict_no_license_key_value(self):
new_scan = self.get_test_loc('deltacode/scan_modified_new_no_license_key.json')
old_scan = self.get_test_loc('deltacode/scan_modified_old_no_license_key.json')

result = DeltaCode(new_scan, old_scan)

expected = OrderedDict([
('added', []),
('removed', []),
('modified', [
OrderedDict([
('category', 'modified'),
('path', u'some/path/a/a1.py'),
('name', u'a1.py'),
('type', u'file'),
('size', 250)
]),
OrderedDict([
('category', 'modified'),
('path', u'some/path/b/b1.py'),
('name', u'b1.py'),
('type', u'file'),
('size', 310)
])
]),
('unmodified', [])
])

assert result.to_dict() == expected

def test_Delta_create_object_removed(self):
new = None
Expand Down