isaac_toolbelt 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67637613745d7fd01f327f5fe5f802e3bc4226c
-  data.tar.gz: 0c498e908136f756af59d50da74caeefad4c4c09
+  metadata.gz: 73bf2d5f4c3c7ab0835722a3cd3af19bc137f7bb
+  data.tar.gz: fc0e46c3b3d77fc4c212d813cf5d3e6a56448bb0
 SHA512:
-  metadata.gz: 0f962fddab766f16c3313a1a567b402c3b0cefd3d2fc6a0b0d74a71bdb36c471a3052579d4b348c54634e48d831057d96bada1d18adc2c6539cc62ea1c7b1c38
-  data.tar.gz: 02ce1492a9ade4a54271feae9ca6c5b65c6b9374f4fb3b8dcfa67e0df0089bc93c48f171f14ae94d3d163191223b1e841f557e0600cf1c9c2b57a7040cebb7d6
+  metadata.gz: 6692437735bc96db5e7202235bd52e0de65c79733b1c3ec944baadeaa0ba79c5d3d7f8142401735f40c7934e5e5c897da73ab2d1b80913b8502ea47810fe670e
+  data.tar.gz: b6086ab841c7bf7965dd53efd4c8bd84a1473d272bd0c792d997298a5c19c9600ff258fe05b640dbefe6fe27c51fdafb14143124218bcbdfb98e079c18b986e5

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 /vendor/bundle
 /.bundle
+.*.swp
+

data/README.md

@@ -11,10 +11,75 @@ It is inspired by [heroku toolbelt](https://toolbelt.heroku.com/).
     $ gem install specific_install
     $ gem specific_install git@github.com:xshellinc/isaac_toolbelt.git
 
+### Ubuntu
+
+If your release doesn't have a ruby2.2-dev package, we recommend using [rbenv](https://github.com/rbenv/rbenv) to set up your Ruby environment.
+
+    $ sudo apt-get install ruby2.2-dev
+
+Install dependencies for the toolbelt.
+
+    $ sudo apt-get install dfu-util libcurl4-openssl-dev libarchive-dev
+
+Install the toolbelt by either ways below.
+
+1. Install from [rubygems.org](https://rubygems.org/gems/isaac_toolbelt)
+
+        $ sudo gem install isaac_toolbelt
+
+2. Install from [GitHub](https://github.com/xshellinc/isaac_toolbelt)
+
+        $ git clone https://github.com/xshellinc/isaac_toolbelt.git
+        $ cd isaac_toolbelt
+        $ bundle install
+        $ gem install isaac_toolbelt
 
 ## Usage
 
-Connect your SBC with USB cable.
+### Quickstart Guide
+
+1. Obtain a git repository url and an access key for a device
+   from [Isaac dashboard](https://dashboard.isaacapp.io/)
+    1. Create an app
+    2. Create a device for the app
+2. Setup an app devloping environment
+    1. Create a new app with a template
+
+        ```sh
+        $ isaac app new <app name> --language=python
+        ```
+
+    2. Setup Git remote server
+
+        ```sh
+        $ cd <app name>
+        $ git remote add origin <app git server url>
+        ```
+
+    3. Add and commit all template files
+
+        ```sh
+        $ git add .
+        $ git commit -m "add files from the template"
+        ```
+
+    4. Push changes to the Git server
+
+        ```sh
+        $ git push --set-upstream origin master
+        ```
+
+3. Prepare a device
+    1. Connect your device by a USB cable
+    2. Flash the device
+
+        ```sh
+        $ isaac device init --ssid=<wifi ap name> --wpa=<wifi password> \
+            --access_key=<access key>
+        ```
+
+The device will start blinking because of the template code at this point.
+Your device listens for changes in the git repository from now on.
 
 ### Show all commands
 

data/bin/isaac

@@ -2,5 +2,124 @@
 
 require "isaac_toolbelt"
 
-IsaacToolbelt::CLI.start
+LOCK_FILE = File.open("/var/tmp/isaac.lock",
+                      File::CREAT|File::TRUNC|File::WRONLY, 0644)
+LOCK_FILE.write(Process.pid)
 
+module CLI
+  class Local < Thor
+    # XXX: Take the run method away from Thor so that we can redefine it.
+    # from https://github.com/ddollar/foreman/blob/59d87c91a2004e05f6b12d4b150dcb4c911eb31c/lib/foreman/cli.rb#L28
+		class << self
+      def is_thor_reserved_word?(word, type)
+				return false if word == "run"
+				super
+      end
+    end
+
+    desc 'start', 'Run the project on the debug mode device that connected via RNDIS'
+    def start
+      IsaacToolbelt::Local.start
+    end
+
+    desc 'stop', 'Stop the sketch'
+    def stop
+      IsaacToolbelt::Local.stop
+    end
+
+    desc 'run', 'Run a command with .env on the debug mode device that connected via RNDIS'
+    def run(*args)
+      IsaacToolbelt::Local.run(args)
+    end
+
+    desc 'debug_node', 'Run node.js app on the device that connected via RNDIS'
+    def debug_node
+      IsaacToolbelt::Local.debug_node
+    end
+  end
+
+  class Device < Thor
+    desc 'init', 'Initialize SBC for use with isaac'
+    option :ssid, :aliases => '-s', :required => true, :type => :string, :desc => 'Specify WiFi SSID'
+    option :wpa, :aliases => '-w', :required => true, :type => :string, :desc => 'Specify WPA Key for the SSID'
+    option :access_key, :aliases => '-a', :required => false, :type => :string, :desc => 'Specify ISAAC access key for the device'
+		def init
+      IsaacToolbelt::Device.init(options[:ssid], options[:wpa], options[:access_key])
+    end
+
+    desc 'info', 'Show device status'
+    def info
+      IsaacToolbelt::Device.info
+    end
+
+    desc 'config:access_key ACCESS_KEY', 'Set ISAAC Access Token'
+    def config_access_key(access_key)
+      IsaacToolbelt::Device.config_access_key(access_key)
+    end
+    map 'config:access_key' => 'config_access_key'
+
+    desc 'config:wifi', 'Configure WiFi'
+    option :ssid, :aliases => '-s', :required => true, :type => :string, :desc => 'Specify WiFi SSID'
+    option :wpa, :aliases => '-w', :required => true, :type => :string, :desc => 'Specify WPA Key for the SSID'
+    def config_wifi
+      IsaacToolbelt::Device.config_wifi(options[:ssid], options[:wpa])
+    end
+    map 'config:wifi' => 'config_wifi'
+
+    desc 'console', 'Shell on the debug mode device that connected via RNDIS'
+    def console
+      IsaacToolbelt::Device.console
+    end
+
+    desc 'logs', 'show logs on the device that connected via RNDIS'
+    def logs
+      IsaacToolbelt::Device.logs
+    end
+
+    desc 'mode', 'Set modes whether production mode or development mode.'
+    def mode(m)
+      IsaacToolbelt::Device.mode(m)
+    end
+
+    desc 'reboot', 'Reboot ISAAC OS'
+    def _reboot
+      IsaacToolbelt::Device._reboot
+    end
+    map 'reboot' => '_reboot'
+  end
+
+  class App < Thor
+    desc 'new <name>', 'Create a new Isaac <name> app'
+    option :language, :required => false, :type => :string, :desc => 'app language [python javascript]'
+    def new(app_name)
+      IsaacToolbelt::App.new(app_name, options[:language])
+    end
+  end
+
+  class Main < Thor
+    desc "local SUBCOMMAND ...", "Run the app on local SBC"
+    subcommand "local", Local
+    desc "device SUBCOMMAND ...", "Configure SBC connected via USB"
+    subcommand "device", Device
+    desc "app SUBCOMMAND ...", "Isaac app"
+    subcommand "app", App
+
+    map %w(-v --version) => :version
+    desc "version", "Show Isaac's version information"
+    def version
+      puts "Isaac toolbelt version #{IsaacToolbelt::VERSION}"
+    end
+  end
+end
+
+# `isaac device mode` without args shows current mode
+if ARGV.length == 2 && ARGV[0] == "device" && ARGV[1] == "mode"
+  puts IsaacToolbelt::Device.current_mode
+else
+  CLI::Main.start(ARGV)
+end
+
+
+at_exit do
+  LOCK_FILE.close
+end

data/lib/app.rb

@@ -0,0 +1,41 @@
+require 'curb'
+
+module IsaacToolbelt::App
+  def self.new(app_name, language)
+    # Create app directory
+    if Dir.exist? app_name
+      puts "ERROR: #{app_name} directory already exists."
+      exit(-1)
+    end
+    # Select a template source
+    url = nil
+    extract_dname = nil
+    language = language.downcase.to_sym unless language.nil?
+    language ||= :python
+    case language
+    when :python
+      url = IsaacToolbelt::ISAAC_EDISON_TEMPLATE_URL
+      extract_dname = "isaac_template_python-master"
+    when :javascript, :js
+      url = "https://codeload.github.com/xshellinc/isaac_template_nodejs/zip/master"
+      extract_dname = "isaac_template_nodejs-master"
+    else
+      puts "ERROR: Unsupported or invalid language was selected"
+      puts "Supported languages are python, javascript"
+      exit -1
+    end
+    unless url.nil?
+      # Get a template
+      template_d = File.join(IsaacToolbelt::ISAAC_DIR, 'templates/edison')
+      FileUtils.mkdir_p template_d unless Dir.exist? template_d
+      template_fname = url.split(/\?/).first.split(/\//).last
+      template_f = File.join(template_d, template_fname)
+      Curl::Easy.download(url, template_f)
+      # Extract template archive
+      extract_d = File.join(template_d, extract_dname)
+      Archive.extract(template_f, template_d)
+      # Copy to app directory
+      FileUtils.cp_r extract_d + "/.", app_name
+    end
+  end
+end

data/lib/isaac_toolbelt.rb

@@ -1,4 +1,5 @@
 require "isaac_toolbelt/version"
+require "app"
 
 require 'digest/sha1'
 require 'sshkit'
@@ -84,7 +85,6 @@ module IsaacToolbelt
   ISAAC_EDISON_IMAGE_URL='https://s3-ap-northeast-1.amazonaws.com/isaac-os-images/edison/toFlash.tar.bz2'
   ISAAC_EDISON_TEMPLATE_URL='https://codeload.github.com/xshellinc/isaac_template_python/zip/master'
 
-
   module Helper
     def check_file(filename)
       unless File.exist?(File.join(Dir.pwd, filename))
@@ -135,7 +135,7 @@ module IsaacToolbelt
 
     # wait until board is booted
     def waitfor(message=nil)
-      until system('ping -W 10 -c 1 192.168.2.15 > /dev/null 2>&1') do
+      until system("ping -W 10 -c 1 #{DEVICE_IP_ADDRESS} > /dev/null 2>&1") do
         puts message || 'waiting board...'
         sleep 1
       end
@@ -182,62 +182,50 @@ module IsaacToolbelt
     end
   end
 
-  class Local < Thor
+  class Local
     extend Helper
-
-    # from https://github.com/ddollar/foreman/blob/59d87c91a2004e05f6b12d4b150dcb4c911eb31c/lib/foreman/cli.rb#L28
-		class << self
-			# Hackery. Take the run method away from Thor so that we can redefine it.
-			def is_thor_reserved_word?(word, type)
-				return false if word == "run"
-				super
-			end
-		end
-
-    desc 'start', 'Run the project on the debug mode device that connected via RNDIS'
-    def start
-      temp_path = self.class.temp_path
-      self.class.transfer_files(temp_path)
-      SSHKit::Coordinator.new(self.class.host).each do
+    def self.start
+      unless Device.mode(:development) == :development
+        puts "Please switch mode to development to develop locally"
+        return
+      end
+      temp_d = temp_path
+      transfer_files(temp_d)
+      SSHKit::Coordinator.new(self.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'
+        execute :ln, '-nfs', temp_d, '/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')
+      #self.class.ssh_run_command("cd #{temp_d}; " + 'honcho start')
+      ssh_run_command("cd /var/isaac/development; " + 'shoreman')
     end
 
-    desc 'stop', 'Stop the sketch'
-    def stop
+    def self.stop
+      hello
     end
 
-    desc 'run', 'Run a command with .env on the debug mode device that connected via RNDIS'
-    def run(*args)
-      temp_path = self.class.temp_path
-      self.class.transfer_files(temp_path)
-      self.class.ssh_run_command("cd #{temp_path}; " + 'honcho run ' + args.shelljoin)
+    def self.run(args)
+      temp_d = temp_path
+      transfer_files(temp_d)
+      ssh_run_command("cd #{temp_d}; " + 'honcho run ' + args.shelljoin)
     end
 
-    desc 'debug_node', 'Run node.js app on the device that connected via RNDIS'
-    def debug_node
-      temp_path = self.class.make_temp_dir(TEMP_ROOT)
-      result = self.class.transfer_files(temp_path)
+    def self.debug_node
+      temp_d = make_temp_dir(TEMP_ROOT)
+      result = transfer_files(temp_d)
       if result
-        self.class.ssh_run_command('cd %s; npm install; node app.js' % [temp_path])
+        ssh_run_command('cd %s; npm install; node app.js' % [temp_d])
       else
         puts 'Transfer failed'
       end
     end
-
-    #map 'shell' => 'console'
-    #map 'shell' => 'shell_'
   end
 
-  class Device < Thor
-    include IsaacToolbelt::Helper
+  class Device
+    extend Helper
 
     def self.curl(url, save_dir)
       filename = url.split('/').last
@@ -264,11 +252,11 @@ module IsaacToolbelt
       return filename
     end
 
-    desc 'init', 'Initialize SBC for use with isaac'
-    option :ssid, :aliases => '-s', :required => true, :type => :string, :desc => 'Specify WiFi SSID'
-    option :wpa, :aliases => '-w', :required => true, :type => :string, :desc => 'Specify WPA Key for the SSID'
-    option :access_key, :aliases => '-a', :required => false, :type => :string, :desc => 'Specify ISAAC access key for the device'
-		def init
+    def self.init(ssid, wpa, access_key)
+      unless LOCK_FILE.flock(File::LOCK_EX|File::LOCK_NB)
+        puts "Only one 'isaac device init' can run at a time."
+        exit
+      end
       unless !!find_executable('dfu-util')
         STDERR.puts 'dfu-util is not installed!'
         STDERR.puts 'try: brew install dfu-util'
@@ -285,18 +273,14 @@ module IsaacToolbelt
       waitfor
 
       # configure WiFi
-      configure_wifi(options[:ssid], options[:wpa])
+      configure_wifi(ssid, wpa)
       waitfor_network
 
-      # install pip dependencies for isaacd : hacky
-      SSHKit::Coordinator.new(host).each do
-        execute :pip, *%w(install --upgrade pip)
-        execute :pip, *%w(install --upgrade setuptools)
-        execute :rm, *%w(-rf /usr/lib/python2.7/site-packages/distribute*)
-        requirements = StringIO.new(REQUIREMENTS_TXT)
-        dst = '/tmp/requirements.txt'
-        upload! requirements, dst
-        execute :pip, *%w(install -r), dst
+      on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+        puts "Updating package database..."
+        execute :opkg, %w(update)
+        puts "Installing NodeJS..."
+        execute :opkg, %w(install nodejs nodejs-npm)
       end
 
       ## install opkg dependencies for isaacd : hacky
@@ -309,11 +293,9 @@ module IsaacToolbelt
       #end
 
       # init isaacd
-      if options[:access_key]
-        set_conf({'access_key' => options[:access_key]})
-        SSHKit::Coordinator.new(host).each do
-          execute :systemctl, *%w(enable isaacd)
-        end
+      set_conf({'access_key' => access_key})
+      on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+        execute :systemctl, *%w(enable isaacd)
       end
 
       # wait until rebooted
@@ -322,8 +304,7 @@ module IsaacToolbelt
       puts 'Your device is ready to develop!'
     end
 
-    desc 'info', 'Show device status'
-    def info
+    def self.info
       waitfor('Please connect the board and wait for a while...')
 
       uname = get_uname()
@@ -346,58 +327,50 @@ module IsaacToolbelt
           end
           puts "  HW Addr: #{lines[0].split.last}" if lines[0].include? "HWaddr"
         end
+        ssid = capture(:iwgetid, "-r")
+        puts "WiFi SSID: #{ssid}"
       end
     end
 
-    desc 'config:access_key ACCESS_KEY', 'Set ISAAC Access Token'
-    def config_access_key(access_key)
+    def self.config_access_key(access_key)
       waitfor
       configure_access_key(access_key)
     end
-    map 'config:access_key' => 'config_access_key'
 
-    desc 'config:wifi', 'Configure WiFi'
-    option :ssid, :aliases => '-s', :required => true, :type => :string, :desc => 'Specify WiFi SSID'
-    option :wpa, :aliases => '-w', :required => true, :type => :string, :desc => 'Specify WPA Key for the SSID'
-    def config_wifi
-      configure_wifi(options[:ssid], options[:wpa])
+    def self.config_wifi(ssid, wpa)
+      configure_wifi(ssid, wpa)
     end
-    map 'config:wifi' => 'config_wifi'
 
-    desc 'console', 'Shell on the debug mode device that connected via RNDIS'
-    def console
+    def self.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
+    def self.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(m)
+    def self.mode(m)
       waitfor
-      if m == "development" || m == "dev" then
-        change_mode :development
-      elsif m == "production" then
-        change_mode :production
-      else
+      m = m.to_sym if m.is_a? String
+      if m != :development && m != :dev && m != :production
         puts DEVICE_MODE
+      elsif m != current_mode
+        change_mode :development if m == :development || m == :dev
+        change_mode :production if m == :production
       end
       puts "Current mode is #{current_mode}."
+      return current_mode
     end
 
-    desc 'reboot', 'Reboot ISAAC OS'
-    def _reboot
+    def self._reboot
       waitfor
       reboot
     end
-    map 'reboot' => '_reboot'
 
     private
-    def prepare_os_image
+    def self.prepare_os_image
       easy = Curl::Easy.new
       easy.follow_location = true
       easy.url = ISAAC_EDISON_IMAGE_URL
@@ -432,7 +405,7 @@ module IsaacToolbelt
       return extract_path
     end
 
-    def flash_os_image(extract_path)
+    def self.flash_os_image(extract_path)
       base_dir = extract_path
       usb_vid = '8087'
       usb_pid = '0a99'
@@ -471,13 +444,13 @@ module IsaacToolbelt
       dfu_download(usb_vid, usb_pid, "rootfs", rootfs_file_path, true)
     end
 
-    def dfu_ifwi_download(usb_vid, usb_pid, alt_name, file_path)
+    def self.dfu_ifwi_download(usb_vid, usb_pid, alt_name, file_path)
       if dfu_alt_name_exists?(usb_vid, usb_pid, alt_name)
         dfu_download(usb_vid, usb_pid, alt_name, file_path)
       end
     end
 
-    def dfu_download(usb_vid, usb_pid, alt_name, file_path, do_reboot=false)
+    def self.dfu_download(usb_vid, usb_pid, alt_name, file_path, do_reboot=false)
       retry_count = 0
       loop do
         params = %W(dfu-util -v -d #{usb_vid}:#{usb_pid} --alt #{alt_name} -D #{file_path})
@@ -500,13 +473,13 @@ module IsaacToolbelt
       end
     end
 
-    def dfu_alt_name_exists?(usb_vid, usb_pid, alt_name)
+    def self.dfu_alt_name_exists?(usb_vid, usb_pid, alt_name)
       dfu_list(usb_vid, usb_pid).select {|e|
         e[:name] == alt_name
       }.count > 0
     end
 
-    def dfu_wait(message=nil)
+    def self.dfu_wait(message=nil)
       usb_vid = '8087'
       usb_pid = '0a99'
       until dfu_device_counts(usb_vid, usb_pid) > 0
@@ -515,7 +488,7 @@ module IsaacToolbelt
       end
     end
 
-    def dfu_device_counts(usb_vid, usb_pid)
+    def self.dfu_device_counts(usb_vid, usb_pid)
       `dfu-util -l -d #{usb_vid}:#{usb_pid}`.split("\n").select{|l0|
         l0 =~ /Found/
       }.select{|l1|
@@ -523,7 +496,7 @@ module IsaacToolbelt
       }.count
     end
 
-    def dfu_list(usb_vid, usb_pid)
+    def self.dfu_list(usb_vid, usb_pid)
       `dfu-util -l -d #{usb_vid}:#{usb_pid}`.split("\n").select{|l0|
         l0 =~ /Found/
       }.map {|str|
@@ -546,7 +519,7 @@ module IsaacToolbelt
       }
     end
 
-    def configure_wifi(ssid, wpa_key)
+    def self.configure_wifi(ssid, wpa_key)
       SSHKit::Coordinator.new(host).each do
         execute :wpa_passphrase, ssid, wpa_key, '>>', '/etc/wpa_supplicant/wpa_supplicant.conf'
         execute :systemctl, *%w(restart wpa_supplicant.service)
@@ -554,30 +527,28 @@ module IsaacToolbelt
       end
     end
 
-    def configure_access_key(access_key)
+    def self.configure_access_key(access_key)
       conf = get_conf
       conf["access_key"] = access_key
       set_conf(conf)
     end
 
-    def get_conf
+    def self.get_conf
       conf = nil
-      SSHKit::Coordinator.new(host).each do
-        conf = YAML.load(capture(:cat, ISAAC_CONF_PATH))
+      on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+        conf = YAML.load(capture(:cat, ISAAC_CONF_PATH)) if test("[ -f #{ISAAC_CONF_PATH} ]")
       end
-      return conf
+      return {} if conf.nil?
+      conf
     end
 
-    def set_conf(conf)
-      y = YAML.dump(conf)
-      upload_io = StringIO.new(y)
-      SSHKit::Coordinator.new(host).each do
-        upload! upload_io, ISAAC_CONF_PATH
+    def self.set_conf(conf)
+      on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+        upload! StringIO.new(YAML.dump(conf)), ISAAC_CONF_PATH
       end
-      return nil
     end
 
-    def get_uname
+    def self.get_uname
       uname = nil
       SSHKit::Coordinator.new(host).each do
         uname = capture(:uname, '-a')
@@ -585,7 +556,7 @@ module IsaacToolbelt
       return uname
     end
     
-    def change_mode(m)
+    def self.change_mode(m)
       if m == :development
         if current_mode == :production
           print "The device is in production mode. Do you wish to change to development mode [yN]: "
@@ -616,42 +587,58 @@ module IsaacToolbelt
       return current_mode
     end
   end
-
-  class App < Thor
-    desc 'new <name>', 'Create a new Isaac <name> app'
-    def new(app_name)
-      # Create app directory
-      if Dir.exist? app_name
-        puts "ERROR: #{app_name} directory already exists."
-        exit(-1)
-      end
-      FileUtils.mkdir app_name
-      # Get a template
-      url = ISAAC_EDISON_TEMPLATE_URL
-      template_d = File.join(ISAAC_DIR, 'templates/edison')
-      FileUtils.mkdir_p template_d unless Dir.exist? template_d
-      template_fname = url.split(/\?/).first.split(/\//).last
-			template_f = File.join(template_d, template_fname)
-      Curl::Easy.download(url, template_f)
-      # Extract template archive
-      extract_d = File.join(template_d, "isaac_template_python-master")
-      Archive.extract(template_f, template_d)
-      # Copy to app directory
-      FileUtils.cp_r extract_d + "/.", app_name
-    end
-  end
-
-  class CLI < Thor
-    register Local, 'local', 'local <COMMAND>', 'Run the app on local SBC'
-    register Device, 'device', 'device <COMMAND>', 'Configure SBC connected via USB'
-    register App, 'app', 'app <COMMAND>', 'Isaac app'
-
-    map %w(-v --version) => :version
-    desc "version", "Show Isaac's version information"
-    def version
-      puts "Isaac toolbelt version #{VERSION}"
-    end
-  end
+#<<<<<<< HEAD
+#
+#  class App < Thor
+#    desc 'new <name>', 'Create a new Isaac <name> app'
+#    option :language, :required => false, :type => :string, :desc => 'app language [python javascript]'
+#    def new(app_name)
+#      # Create app directory
+#      if Dir.exist? app_name
+#        puts "ERROR: #{app_name} directory already exists."
+#        exit(-1)
+#      end
+#      FileUtils.mkdir app_name
+#      # Select a template source
+#      url = nil
+#      extract_dname = nil
+#      case options[:language].to_sym
+#      when :python
+#        url = ISAAC_EDISON_TEMPLATE_URL
+#        extract_dname = "isaac_template_python-master"
+#      when :javascript, :js
+#        url = "https://codeload.github.com/xshellinc/isaac_template_nodejs/zip/master"
+#        extract_dname = "isaac_template_nodejs-master"
+#      end
+#      unless url.nil?
+#        # Get a template
+#        template_d = File.join(ISAAC_DIR, 'templates/edison')
+#        FileUtils.mkdir_p template_d unless Dir.exist? template_d
+#        template_fname = url.split(/\?/).first.split(/\//).last
+#			  template_f = File.join(template_d, template_fname)
+#        Curl::Easy.download(url, template_f)
+#        # Extract template archive
+#        extract_d = File.join(template_d, extract_dname)
+#        Archive.extract(template_f, template_d)
+#        # Copy to app directory
+#        FileUtils.cp_r extract_d + "/.", app_name
+#      end
+#    end
+#  end
+#
+#  class CLI < Thor
+#    register Local, 'local', 'local <COMMAND>', 'Run the app on local SBC'
+#    register Device, 'device', 'device <COMMAND>', 'Configure SBC connected via USB'
+#    register App, 'app', 'app <COMMAND>', 'Isaac app'
+#
+#    map %w(-v --version) => :version
+#    desc "version", "Show Isaac's version information"
+#    def version
+#      puts "Isaac toolbelt version #{VERSION}"
+#    end
+#  end
+#=======
+#>>>>>>> master
 end
 
 Signal.trap(:INT) {

data/lib/isaac_toolbelt/version.rb

@@ -1,3 +1,3 @@
 module IsaacToolbelt
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isaac_toolbelt
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - xshell inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - bin/isaac
 - bin/setup
 - isaac_toolbelt.gemspec
+- lib/app.rb
 - lib/isaac_toolbelt.rb
 - lib/isaac_toolbelt/version.rb
 homepage: https://isaacapp.io/