Merge pull request #101 from JoyStream/development

dev to master - v0.2.0

Author: mnaamani

.gitignore

@@ -7,3 +7,4 @@ conanbuildinfo*
 node_modules/
 dist/
 joystream.log
+bin/

.travis.yml

@@ -1,18 +1,52 @@
-dist: trusty
-sudo: false
 language: node_js
+
 node_js:
   - "7"
-os:
-  - osx
-  - linux
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: false
+    - os: osx
+      osx_image: xcode7.3
+      sudo: false
+
 addons:
   apt:
     sources:
       - george-edison55-precise-backports
     packages:
       - cmake
       - cmake-data
+  apt:
+    packages:
+    - fakeroot
+
 before_install:
-  - if [ "$TRAVIS_OS_NAME" = osx ]; then pip install conan; else pip install --user conan; fi
-  - "conan remote add joystream https://api.bintray.com/conan/joystream/joystream True"
+  - if [[ "$TRAVIS_OS_NAME" = osx ]]; then
+      rvm install ruby-2.3.3;
+      rvm --default use 2.3.3;
+      ruby --version;
+      brew update;
+      brew upgrade python;
+      export PATH="/usr/local/opt/python/libexec/bin:$PATH";
+      export PYTHONPATH=`brew --prefix`/lib/python2.7/site-packages:$PYTHONPATH;
+      pip install --upgrade pip setuptools;
+    fi
+  # Install conan
+  - if [ "$TRAVIS_OS_NAME" = osx ]; then
+      pip install "conan==0.28.1";
+      pip uninstall pyopenssl;
+      pip uninstall cryptography;
+      pip install "pyopenssl>=16.0.0, <17.0.0";
+    else
+      pip install --user "conan==0.28.1";
+    fi
+  - conan remote add joystream https://api.bintray.com/conan/joystream/joystream True
+
+install:
+
+script:
+  - npm install
+  - npm test

appveyor.yml

@@ -0,0 +1,28 @@
+platform:
+  - x64
+
+environment:
+  # Node version
+  nodejs_version: "7"
+
+init:
+  - git config --global core.autocrlf input
+
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  # use npm@4.6.1 due to issues between npm5 and postinstall-build module behaviour
+  # https://github.com/exogen/postinstall-build/issues/29
+  - npm install -g npm@4.6.1
+  - npm config set loglevel warn
+  - pip install "conan==0.28.1"
+  - conan remote add joystream https://api.bintray.com/conan/joystream/joystream True
+
+build_script:
+  - npm install
+
+deploy_script:
+
+test: on
+
+test_script:
+  npm test

build.js

@@ -11,12 +11,21 @@ if(process.platform === 'win32') {
   process.chdir('../');
 }
 
-function clean() {
+function clean () {
+    function remove (path) {
+      if (!fs.existsSync(path)) return
+      try {
+        fs.unlinkSync(path)
+      } catch (e) {}
+    }
+
+    remove('./conaninfo.txt')
+    remove('./conanbuildinfo.cmake')
+    remove('./conanbuildinfo.txt')
+
     try {
-        fs.unlinkSync('./conaninfo.txt')
-        fs.unlinkSync('./conanbuildinfo.cmake')
-        rimraf.sync(CMAKEJS_BUILD_DIR)
-    } catch(e){}
+      rimraf.sync(CMAKEJS_BUILD_DIR)
+    } catch (e) {}
 }
 
 function getRuntimeAndVersion() {
@@ -132,6 +141,7 @@ function rebuild(opts){
 }
 
 clean()
+
 getRuntimeAndVersion()
   .then(conanInstall)
   .then(rebuild)

conanfile.py

@@ -5,12 +5,12 @@ class JoyStreamNode(ConanFile):
     requires = ("Libtorrent/1.1.1@joystream/stable",
                 "LibtorrentNode/0.0.6@joystream/stable",
                 "CoinCore/0.1.2@joystream/stable",
-                "Common/0.1.2@joystream/stable",
+                "Common/0.1.3@joystream/stable",
                 "PaymentChannel/0.1.2@joystream/stable",
                 "ProtocolWire/0.1.2@joystream/stable",
-                "ProtocolStateMachine/0.1.2@joystream/stable",
-                "ProtocolSession/0.1.4@joystream/stable",
-                "Extension/0.1.6@joystream/stable",
+                "ProtocolStateMachine/0.2.0@joystream/stable",
+                "ProtocolSession/0.2.1@joystream/stable",
+                "Extension/0.2.0@joystream/stable",
                 "Boost/1.60.0@lasote/stable",
                 "OpenSSL/1.0.2j@lasote/stable")
 

examples/.gitignore

@@ -1,5 +1,6 @@
-purchase/buyer/
-purchase/seller/
+buyer/downloads/
+seller/downloads/
 
-dht/buyer/
-dht/seller/
+sintel.mp4
+"stock footage - clouds.m2ts"
+joystream.log

examples/basic/README.md

@@ -47,6 +47,10 @@ function letsBuy (torrent) {
     })
   })
 
+  torrent.on('allSellersGone', function() {
+    lookingForSeller = true
+  })
+
   // Wait for one suitable seller and start downloading
   torrent.on('peerPluginStatusUpdates', function (peerStatuses) {
     if (!lookingForSeller) return