Merge pull request #35 from kubos/cargo-kubos-install

Adding in command for installing cargo-kubos subcommand.

builder/main.py

@@ -35,7 +35,7 @@ def build_box(args):
 
 def main():
     parser = argparse.ArgumentParser(
-        description='Provision and package the kubostech/base and/or kubostech/kubos-dev box and upload it to the Vagrant Cloud.')
+        description='Provision and package the kubos/base and/or kubos/kubos-dev box and upload it to the Vagrant Cloud.')
 
     parser.add_argument('box_name',
                         nargs=1,

builder/provision.py

@@ -22,7 +22,7 @@
 
 class BoxProvisioner(BoxAutomator):
     STATUS_KEY = 'provision'
-    VAGRANT_REPO_URL = 'https://github.com/kubostech/kubos-vagrant'
+    VAGRANT_REPO_URL = 'https://github.com/kubos/kubos-vagrant'
     DUMP_LOG_LINES = 50 # Number of lines to dump from end of logs on an error
     status_steps = {
                         'base' :      ['file',
@@ -45,7 +45,7 @@ def __init__(self, args):
 
     def update_base_box(self):
         print 'Updating the base box'
-        self.run_cmd('vagrant', 'box', 'update', '--box', 'kubostech/base', '--provider', 'virtualbox')
+        self.run_cmd('vagrant', 'box', 'update', '--box', 'kubos/base', '--provider', 'virtualbox')
 
 
     def clone_vagrant_repo(self):

builder/upload.py

@@ -29,7 +29,7 @@ class BoxUploader(BoxAutomator):
     BOX_NAME = 'kubos'
     CURL = 'curl'
     PROVIDER = 'virtualbox'
-    USER_NAME = 'kubostech'
+    USER_NAME = 'kubos'
     BASE_URL = 'https://atlas.hashicorp.com/api/v1/box/%s/%s' % (USER_NAME, BOX_NAME)
     STATUS_KEY = 'upload'
 

kubos-dev/Vagrantfile

@@ -5,7 +5,7 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "kubostech/base"
+  config.vm.box = "kubos/base"
   config.vm.provision "file", source: "./bin/cargo_config", destination: "~/.cargo/config"
   config.vm.provision "privileged",    type: "shell", path: "./script/privileged-provision.sh"
   config.vm.provision "non-privileged", type: "shell", path: "./script/non-privileged-provision.sh", privileged: false

kubos-dev/script/non-privileged-provision.sh

@@ -10,6 +10,8 @@ echo 'export PATH=$PATH:"~/.cargo/bin"' >> /home/vagrant/.bashrc
 /home/vagrant/.cargo/bin/rustup target install arm-unknown-linux-gnueabihf
 # iobc target
 /home/vagrant/.cargo/bin/rustup target install arm-unknown-linux-gnueabi
+# install cargo-kubos
+cd /home/vagrant/.kubos/kubos/cargo-kubos/ && /home/vagrant/.cargo/bin/cargo install
 
 kubos update --tab-completion
 

kubos-dev/script/privileged-provision.sh

@@ -1,6 +1,5 @@
-pip install pysocks pyserial #Temporary - This will be added to the kubos-cli requirements.txt
-pip install git+https://github.com/kubostech/kubos-cli
-pip install cryptography==1.9
+pip install -r https://raw.githubusercontent.com/kubos/kubos-cli/master/requirements.txt
+pip install git+https://github.com/kubos/kubos-cli
 
 mkdir -p /usr/local/lib/yotta_modules
 mkdir -p /usr/local/lib/yotta_targets