isaac_toolbelt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f3e1214f405ca714c912eb639c9f667c4213d5e
-  data.tar.gz: 304992c3e6f6723c91e44d08d51a4d12df5b48d1
+  metadata.gz: c67637613745d7fd01f327f5fe5f802e3bc4226c
+  data.tar.gz: 0c498e908136f756af59d50da74caeefad4c4c09
 SHA512:
-  metadata.gz: 012a3b2dbc27614acbf650a056e298d9742b38c9a977aeb464fb8b7e62461de315b027602bf0e70d0fd237239e6991101ad6886f47358d48f73b89b8fa8630dd
-  data.tar.gz: a01d906282a3a9f6cbf8d93118ffcd211e992bbf13cdc5be94f6bf2392da2f918cbc76e522db450054c6da2cabaffa7f74cf0c2d0e70db7b7358ae628e41a6f7
+  metadata.gz: 0f962fddab766f16c3313a1a567b402c3b0cefd3d2fc6a0b0d74a71bdb36c471a3052579d4b348c54634e48d831057d96bada1d18adc2c6539cc62ea1c7b1c38
+  data.tar.gz: 02ce1492a9ade4a54271feae9ca6c5b65c6b9374f4fb3b8dcfa67e0df0089bc93c48f171f14ae94d3d163191223b1e841f557e0600cf1c9c2b57a7040cebb7d6

data/lib/isaac_toolbelt.rb

@@ -9,6 +9,7 @@ require 'curb'
 require 'ruby-progressbar'
 require 'archive'
 require 'mkmf'
+include SSHKit::DSL
 
 REQUIREMENTS_TXT = <<"EOF"
 cffi==1.4.2
@@ -81,6 +82,7 @@ module IsaacToolbelt
   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'
+  ISAAC_EDISON_TEMPLATE_URL='https://codeload.github.com/xshellinc/isaac_template_python/zip/master'
 
 
   module Helper
@@ -166,6 +168,18 @@ module IsaacToolbelt
       end
       Process.waitall
     end
+
+    def current_mode
+      msg = ""
+      on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+        msg = capture(:systemctl, "is-active isaacd", raise_on_non_zero_exit: false)
+      end
+      if msg == "active" || msg == "activating"
+        return :production
+      else
+        return :development
+      end
+    end
   end
 
   class Local < Thor
@@ -315,13 +329,24 @@ module IsaacToolbelt
       uname = get_uname()
       conf = get_conf()
 
-      rjust_count = 20
-
-      print "Operating System: ".rjust(rjust_count, ' ')
-      puts "#{uname}"
-
-      print "Access Key: ".rjust(rjust_count, ' ')
-      puts  "#{conf['access_key']}"
+      puts "OS: #{uname}"
+      puts "Access Key: #{conf['access_key']}"
+
+      on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+        %w(usb0 wlan0).each do |interface|
+          ifconfig = capture(:ifconfig, "#{interface}")
+          lines = ifconfig.lines
+          puts "#{interface}"
+          lines[1..-1].each do |l|
+            puts "  IPv4: #{l.split[1].split(":").last}" if l.include? "inet addr:"
+            if l.include? "inet6 addr:"
+              words = l.split
+              puts "  IPv6: #{words[2]} #{words[3]}"
+            end
+          end
+          puts "  HW Addr: #{lines[0].split.last}" if lines[0].include? "HWaddr"
+        end
+      end
     end
 
     desc 'config:access_key ACCESS_KEY', 'Set ISAAC Access Token'
@@ -352,27 +377,16 @@ module IsaacToolbelt
     end
 
     desc 'mode', 'Set modes whether production mode or development mode.'
-    def mode(state)
+    def mode(m)
       waitfor
-      SSHKit::Coordinator.new(host).each do
-        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
-          puts DEVICE_MODE
-        end
+      if m == "development" || m == "dev" then
+        change_mode :development
+      elsif m == "production" then
+        change_mode :production
+      else
+        puts DEVICE_MODE
       end
+      puts "Current mode is #{current_mode}."
     end
 
     desc 'reboot', 'Reboot ISAAC OS'
@@ -382,7 +396,6 @@ module IsaacToolbelt
     end
     map 'reboot' => '_reboot'
 
-
     private
     def prepare_os_image
       easy = Curl::Easy.new
@@ -571,11 +584,67 @@ module IsaacToolbelt
       end
       return uname
     end
+    
+    def 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]: "
+          confirm = STDIN.gets.chomp.downcase
+          if confirm == "yes" || confirm == "y"
+            on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+              # 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)
+            end
+          else
+            puts "Device mode was not changed."
+          end
+        end
+      elsif m == :production
+        on "#{SSH_USERNAME}@#{DEVICE_IP_ADDRESS}" do
+          # 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)
+        end
+      end
+      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"

data/lib/isaac_toolbelt/version.rb

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

metadata

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