feat(version): update version

bin/hook-requests.py

@@ -0,0 +1,4 @@
+from hookutils import collect_data_files
+
+# Get the cacert.pem
+datas = collect_data_files('requests') 

bin/package_osx.sh

@@ -15,7 +15,7 @@ print gdc_client.version.__version__
 echo "Creating package for version ${VERSION}"
 
 # Create binary
-pyinstaller --clean --noconfirm --onefile -c gdc-client
+pyinstaller --clean --additional-hooks-dir=. --noconfirm --onefile -c gdc-client
 
 # Bundle app
 APPNAME="gdc-client"

bin/package_ubuntu.sh

@@ -13,7 +13,7 @@ print gdc_client.version.__version__
 """)
 
 # Create binary
-pyinstaller --clean --noconfirm --onefile -c gdc-client
+pyinstaller --clean --additional-hooks-dir=. --noconfirm --onefile -c gdc-client
 
 # Zip dist
 SOURCE_DIR='dist'

bin/package_windows.sh

@@ -8,4 +8,4 @@ set -x
 /c/Python27/Scripts/pip.exe install PyInstaller==2.1
 
 # Create binary
-/c/Python27/Scripts/pyinstaller -F --clean --noconfirm --onefile -c gdc-client -i ../resources/gdc_client.ico
+/c/Python27/Scripts/pyinstaller -F --clean --additional-hooks-dir=. --noconfirm --onefile -c gdc-client -i ../resources/gdc_client.ico

gdc_client/repl/__init__.py

@@ -342,13 +342,14 @@ def _get_upload_client(self, manifest):
                 multipart=self.get('multipart', bool),
                 part_size=self.get('part_size', int),
                 server=self.settings['server'],
-                files=files, verify=self.get('verify', bool))
+                files=files, verify=self.get('verify', bool), manifest_name=manifest)
             return client
 
 
     def do_upload(self, manifest):
     	'''upload files given a manifest path'''
         client = self._get_upload_client(manifest)
+        client.upload()
 
     def do_abort(self, manifest):
         '''abort a partially uploaded file'''

gdc_client/upload/client.py

@@ -138,13 +138,13 @@ def __init__(self, token, processes, server, part_size,
         self.headers = {'X-Auth-Token': token}
         self.manifest_name = manifest_name
         self.verify = verify
-        if OS_WINDOWS:
-            try:
-                # this only works in executable built by pyinstaller
-                self.verify = os.path.join(
-                    sys._MEIPASS, 'cacert.pem') if verify else verify
-            except:
-                print 'Using system default CA'
+        try:
+            # this only works in executable built by pyinstaller
+            self.verify = os.path.join(
+                sys._MEIPASS, 'requests', 'cacert.pem') if verify else verify
+        except:
+            print 'Using system default CA'
+
         self.files = files
         self.incompleted = deque(copy.deepcopy(self.files))
         self.server = server
@@ -272,10 +272,10 @@ def _upload(self):
 
         with open(self.file_path, 'rb') as f:
             try:
-                # r = requests.put(self.url+"/_dry_run", headers=self.headers, verify=self.verify)
-                # if r.status_code != 200:
-                    # print "Can't upload:{}".format(r.text)
-                    # return
+                r = requests.put(self.url+"/_dry_run", headers=self.headers, verify=self.verify)
+                if r.status_code != 200:
+                    print "Can't upload:{}".format(r.text)
+                    return
                 self.pbar = ProgressBar(
                     widgets=[Percentage(), Bar()], maxval=self.file_size).start()
                 stream = Stream(f, self.pbar, self.file_size)

gdc_client/version.py

@@ -1 +1 @@
-__version__ = 'v0.2.15.2'
+__version__ = 'v0.2.18.2'