Fix hidden directory issue

Contents were being extracted to the a hidden directory. This PR
addresses this issue. Also updated the version number in the readme and
setup.py. Closes #27.

README.md

@@ -9,7 +9,7 @@ $ kai yourfile
 ```
 
 ## Version
-`v0.0.5`
+`v0.0.6`
 
 ## Installation
 ```shell

kai/extractors.py

@@ -44,24 +44,22 @@ def __init__(self, filename, destination='.'):
 
     @classmethod
     def supports(cls, filename):
-        """
-        Returns True if the extractor supports the given file
-        """
+        """Returns True if the extractor supports the given file"""
         for supported_extension in cls.supported_extensions:
             if filename.endswith(supported_extension):
                 return True
         return False
 
-    def extract(self):
-        raise NotImplementedError()
-
     @staticmethod
     def strip_extension(full_path, extension):
         return os.path.basename(full_path[:-len(extension)])
 
+    def extract(self):
+        raise NotImplementedError()
+
 
 class TarExtractor(Extractor):
-    supported_extensions = ['tar', 'tar.gz', 'tgz', 'tar.bz2', 'tbz']
+    supported_extensions = ['.tar', '.tar.gz', '.tgz', '.tar.bz2', '.tbz']
 
     def extract(self):
         mode_map = {
@@ -72,12 +70,9 @@ def extract(self):
             '.tar': 'r:'}
         for file_extension, mode in mode_map.items():
             if self.filename.endswith(file_extension):
-                destination = '{}{}'.format(
-                    self.destination,
-                    self.strip_extension(self.filename, file_extension))
                 with tarfile.open(self.filename, mode) as archive:
-                    archive.extractall(path=destination)
-                return destination
+                    archive.extractall(path=self.destination)
+                return self.destination
         raise ExtractorError(
             'Failed to extract {} as tar file.'.format(self.filename))
 
@@ -86,20 +81,16 @@ class ZipExtractor(Extractor):
     supported_extensions = ['.zip']
 
     def extract(self):
-        destination = '{}{}'.format(
-            self.destination, self.strip_extension(self.filename, '.zip'))
         with zipfile.ZipFile(self.filename, 'r') as archive:
-            archive.extractall(path=destination)
-        return destination
+            archive.extractall(path=self.destination)
+        return self.destination
 
 
 class RarExtractor(Extractor):
-    """ Extracting RAR file """
+    """Extracting RAR file"""
     supported_extensions = ['.rar']
 
     def extract(self):
-        destination = '{}{}'.format(
-            self.destination, self.strip_extension(self.filename, '.rar'))
         with rarfile.RarFile(self.filename, 'r') as archive:
-            archive.extractall(path=destination)
-        return destination
+            archive.extractall(path=self.destination)
+        return self.destination

kai/kai.py

@@ -7,17 +7,13 @@
 
 
 def extract(filename, destination='.'):
-    """
-    Attempts to extract the given archive to the given destination
-    """
+    """Attempts to extract the given archive to the given destination"""
     extractor = ExtractorFactory.create(filename, destination)
     return extractor.extract()
 
 
 def parse_arguments():
-    """
-    Create a custom command line parser and return the arguments
-    """
+    """Create a custom command line parser and return the arguments"""
     parser = argparse.ArgumentParser(description="Easily extract anything")
     parser.add_argument('filename', help='File to extract')
     parser.add_argument('destination', nargs='?', default='.',
@@ -26,12 +22,9 @@ def parse_arguments():
 
 
 def main():
-    """
-    Parses command line aruments and extracts a given archive accordingly
-    """
+    """Parses command line aruments and extracts a given archive"""
     args = parse_arguments()
-    destination = extract(args.filename, args.destination)
-    print('Contents extracted to {}'.format(destination))
+    extract(args.filename, args.destination)
 
 if __name__ == '__main__':
     main()

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='kai',
-    version='0.0.5',
+    version='0.0.6',
     description=description,
     long_description=description,
     author='Brian Bates',

tests/features/environment.py

@@ -9,4 +9,4 @@ def before_all(context):
 
 def after_all(context):
     """Remove the directory after the tests are complete"""
-    shutil.rmtree(context.test_dir)
+    # shutil.rmtree(context.test_dir)

tests/features/steps/basic_files_steps.py

@@ -80,10 +80,8 @@ def step_invoke_kai(context):
 
 @then(u'the file is extracted into the specified directory')
 def step_verify_contents(context):
-    extracted_files = os.listdir(context.extracted_dir)
-    for filename in extracted_files:
+    for filename, expected in context.expected_hash.items():
         path = os.path.join(context.extracted_dir, filename)
-        expected = context.expected_hash[filename]
         actual = compute_hash(path)
         assert expected == actual, (
             'Failure: Extracted files are different:'