isaac_toolbelt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01eeb3a9a2a8173a9059f47bd45c50d569f050c3
-  data.tar.gz: 6b66188c4c5d9c6f2c0ac090f91545435c5dae6b
+  metadata.gz: 5f3e1214f405ca714c912eb639c9f667c4213d5e
+  data.tar.gz: 304992c3e6f6723c91e44d08d51a4d12df5b48d1
 SHA512:
-  metadata.gz: f2d8cedc9bf9bc326c196088e73e70d2018f987b5913b450802592d72feb9669e556e989bf438d750b806356ce638cd031105fa8c24d8b53d9bb0755daef63c5
-  data.tar.gz: be3a23b24ed7bc56b8cd6e2f816d49f2f95863b200df06f4fa67cfd0650a448447bda83fedfd3dffa0d940535c2071e65eede1216f5c43c17da2f12d747652be
+  metadata.gz: 012a3b2dbc27614acbf650a056e298d9742b38c9a977aeb464fb8b7e62461de315b027602bf0e70d0fd237239e6991101ad6886f47358d48f73b89b8fa8630dd
+  data.tar.gz: a01d906282a3a9f6cbf8d93118ffcd211e992bbf13cdc5be94f6bf2392da2f918cbc76e522db450054c6da2cabaffa7f74cf0c2d0e70db7b7358ae628e41a6f7

data/lib/isaac_toolbelt.rb

@@ -78,7 +78,7 @@ module IsaacToolbelt
   DEVICE_IP_ADDRESS = '192.168.2.15'
   SSH_USERNAME = 'root'
   SSH_OPTIONS = '-o PreferredAuthentications=keyboard-interactive -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=1 -o ServerAliveCountMax=3'
-  TEMP_ROOT = '/tmp/isaac'
+  TEMP_ROOT = '/var/isaac/tmp'
   ISAAC_CONF_PATH = '/etc/isaac.conf'
   ISAAC_EDISON_IMAGE_URL='https://s3-ap-northeast-1.amazonaws.com/isaac-os-images/edison/toFlash.tar.bz2'
 
@@ -131,8 +131,9 @@ module IsaacToolbelt
       end
     end
 
+    # wait until board is booted
     def waitfor(message=nil)
-      until system('ping -c 1 192.168.2.15 > /dev/null 2>&1') do
+      until system('ping -W 10 -c 1 192.168.2.15 > /dev/null 2>&1') do
         puts message || 'waiting board...'
         sleep 1
       end
@@ -183,7 +184,20 @@ module IsaacToolbelt
     def start
       temp_path = self.class.temp_path
       self.class.transfer_files(temp_path)
-      self.class.ssh_run_command("cd #{temp_path}; " + 'honcho start')
+      SSHKit::Coordinator.new(self.class.host).each do
+        # start isaac-local
+        execute :systemctl, *%w(stop isaac-local)
+        #execute :systemctl, *%w(start isaac-local)
+        execute :ln, '-nfs', temp_path, '/var/isaac/development'
+      end
+      #self.class.ssh_run_command('journalctl -n 5 -f -u isaac-local')
+      #self.class.ssh_run_command('tail -f /var/log/isaac-local.log')
+      #self.class.ssh_run_command("cd #{temp_path}; " + 'honcho start')
+      self.class.ssh_run_command("cd /var/isaac/development; " + 'shoreman')
+    end
+
+    desc 'stop', 'Stop the sketch'
+    def stop
     end
 
     desc 'run', 'Run a command with .env on the debug mode device that connected via RNDIS'
@@ -296,6 +310,8 @@ module IsaacToolbelt
 
     desc 'info', 'Show device status'
     def info
+      waitfor('Please connect the board and wait for a while...')
+
       uname = get_uname()
       conf = get_conf()
 
@@ -310,6 +326,7 @@ module IsaacToolbelt
 
     desc 'config:access_key ACCESS_KEY', 'Set ISAAC Access Token'
     def config_access_key(access_key)
+      waitfor
       configure_access_key(access_key)
     end
     map 'config:access_key' => 'config_access_key'
@@ -324,21 +341,32 @@ module IsaacToolbelt
 
     desc 'console', 'Shell on the debug mode device that connected via RNDIS'
     def console
+      waitfor('Please connect the board and wait for a while...')
       ssh_run_command('')
     end
 
     desc 'logs', 'show logs on the device that connected via RNDIS'
     def logs
+      waitfor('Please connect the board and wait for a while...')
       ssh_run_command('journalctl -f')
     end
 
     desc 'mode', 'Set modes whether production mode or development mode.'
     def mode(state)
+      waitfor
       SSHKit::Coordinator.new(host).each do
-        if state == "development" then 
+        if state == "development" then
+          # stop isaacd
           execute :systemctl, *%w(stop isaacd)
           execute :systemctl, *%w(disable isaacd)
+          # start isaac-local
+          execute :systemctl, *%w(enable isaac-local)
+          execute :systemctl, *%w(start isaac-local)
         elsif state == "production" then
+          # stop isaac-local
+          execute :systemctl, *%w(stop isaac-local)
+          execute :systemctl, *%w(disable isaac-local)
+          # start isaacd
           execute :systemctl, *%w(enable isaacd)
           execute :systemctl, *%w(start isaacd)
         else
@@ -349,6 +377,7 @@ module IsaacToolbelt
 
     desc 'reboot', 'Reboot ISAAC OS'
     def _reboot
+      waitfor
       reboot
     end
     map 'reboot' => '_reboot'
@@ -547,11 +576,18 @@ module IsaacToolbelt
   class CLI < Thor
     register Local, 'local', 'local <COMMAND>', 'Run the app on local SBC'
     register Device, 'device', 'device <COMMAND>', 'Configure SBC connected via USB'
+
+    map %w(-v --version) => :version
+    desc "version", "Show Isaac's version information"
+    def version
+      puts "Isaac toolbelt version #{VERSION}"
+    end
   end
 end
 
 Signal.trap(:INT) {
-  puts 'Quit'
+  puts "Quitting..."
+  puts
   exit 1
 }
 

data/lib/isaac_toolbelt/version.rb

@@ -1,3 +1,3 @@
 module IsaacToolbelt
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isaac_toolbelt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - xshell inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler