v0.1.6

README.md

@@ -14,16 +14,16 @@ How to install CoreOS-xhyve UI
 
 **WARNING**
  -----------
-  - xhyve is a very new project, expect bugs! You must be running OS X 10.10.3 Yosemite or later and 2010 or later Mac for this to work.
+  - [xhyve](https://github.com/mist64/xhyve) is a very new project, but is very cool! You must be running OS X 10.10.3 Yosemite or later and 2010 or later Mac for this to work.
   - if you use any version of VirtualBox prior to 5.0 then xhyve will crash your system either if VirtualBox is running or had been run previously after the last reboot (see xhyve's issues [#5](mist64/xhyve#5) and [#9](mist64/xhyve#9) for the full context). So, if you are unable to update VirtualBox to version 5, or later, and were using it in your current session please do restart your Mac before attempting to run xhyve.
 
 
 ####Required software:
-* Is only [iTerm 2](http://www.iterm2.com/#/section/downloads) 
-* As [xhyve](https://github.com/mist64/xhyve) is prebuilt in the App itself.
+* The only required software is [iTerm 2](http://www.iterm2.com/#/section/downloads) 
+* As [xhyve](https://github.com/mist64/xhyve) is integreted to the App.
 
 ####Download:
-* Download `CoreOS-xhyve UI latest.dmg` from the [Releases Page](https://github.com/rimusz/coreos-xhyve-ui/releases) and open it and drag the App e.g to your Desktop.
+* Download `CoreOS-xhyve UI latest.dmg` from the [Releases Page](https://github.com/rimusz/coreos-xhyve-ui/releases), open it and drag the App e.g to your Desktop.
 
 ###Install:
 * Start the `CoreOS-xhyve UI` and from menu `Setup` choose `Initial setup of CoreOS-xhyve UI` 
@@ -52,6 +52,7 @@ Just start `CoreOS-xhyve UI` application and you will find a small icon with the
 
 * There you can `Up`, `Halt`, `Reload` CoreOS VM
 * `SSH to core-01` (vagrant ssh) will open VM shell
+* `Attache to VM's console` will open console
 * Under `Up` OS Shell will be opened when VM boot finishes up and it will have such environment pre-set:
 
 ````
@@ -68,14 +69,13 @@ script are stored
 * `Updates/Fetch latest CoreOS ISO` will download the lasted CoreOS ISO file for the currently set release channel. 
 * [Fleet-UI](http://fleetui.com) dashboard will show running `fleet` units and etc
 * [DockerUI](https://github.com/crosbymichael/dockerui) will show all running containers and etc
-* Put your fleet units into `~/coreos-xhyve-ui/fleet` and will be automaticly deployed on each VM boot.
-* This App has much automation as possible to make easier to use CoreOS on OS X, you can change CoreOS release channel and reload VM and your downloaded docker images will remain stored in an extra persistant disk.
-* VM's console window will be openned in Terminal.app 
+* Put your fleet units into `~/coreos-xhyve-ui/fleet` and they will be automaticly deployed on each VM boot.
+* This App has as much automation as possible to make easier to use CoreOS on OS X, e.g. you can change CoreOS release channel and reload VM and your downloaded docker images will remain stored in an extra persistant disk. 
 
 To-dos
 -----------
 * Mount /Users folder via nfs to CoreOS VM
-* Nicely hide/unhide VM's console window
+
 
 Credits
 -----------

src/CoreOS-xhyve UI.xcodeproj/project.pbxproj

@@ -12,10 +12,11 @@
 		01741B57190DB7B800BB1F91 /* coreos-xhyve-install.command in Resources */ = {isa = PBXBuildFile; fileRef = 01741B56190DB7B800BB1F91 /* coreos-xhyve-install.command */; };
 		01741B63190DB80500BB1F91 /* first-init.command in Resources */ = {isa = PBXBuildFile; fileRef = 01741B62190DB80500BB1F91 /* first-init.command */; };
 		01741B65190DB81400BB1F91 /* up.command in Resources */ = {isa = PBXBuildFile; fileRef = 01741B64190DB81400BB1F91 /* up.command */; };
-		01741B67190DB82100BB1F91 /* update_osx_clients_units.command in Resources */ = {isa = PBXBuildFile; fileRef = 01741B66190DB82100BB1F91 /* update_osx_clients_units.command */; };
+		01741B67190DB82100BB1F91 /* update_osx_clients_files.command in Resources */ = {isa = PBXBuildFile; fileRef = 01741B66190DB82100BB1F91 /* update_osx_clients_files.command */; };
 		019662121B04C562005FA955 /* bin in Resources */ = {isa = PBXBuildFile; fileRef = 019662111B04C562005FA955 /* bin */; };
 		019662141B04C598005FA955 /* settings in Resources */ = {isa = PBXBuildFile; fileRef = 019662131B04C598005FA955 /* settings */; };
 		019662181B04C6EA005FA955 /* files in Resources */ = {isa = PBXBuildFile; fileRef = 019662171B04C6EA005FA955 /* files */; };
+		01993A4F1B63DD730096E2E1 /* halt.command in Resources */ = {isa = PBXBuildFile; fileRef = 01993A4E1B63DD730096E2E1 /* halt.command */; };
 		01AD94BF1A278C94009A400B /* fetch_latest_iso.command in Resources */ = {isa = PBXBuildFile; fileRef = 01AD94BE1A278C94009A400B /* fetch_latest_iso.command */; };
 		01B675D61B602FC2004349CC /* check_vm_status.command in Resources */ = {isa = PBXBuildFile; fileRef = 01B675D51B602FC2004349CC /* check_vm_status.command */; };
 		01C7F8F41B63B3B600CF2E26 /* console.command in Resources */ = {isa = PBXBuildFile; fileRef = 01C7F8F31B63B3B600CF2E26 /* console.command */; };
@@ -42,10 +43,11 @@
 		01741B56190DB7B800BB1F91 /* coreos-xhyve-install.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "coreos-xhyve-install.command"; sourceTree = SOURCE_ROOT; };
 		01741B62190DB80500BB1F91 /* first-init.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "first-init.command"; sourceTree = SOURCE_ROOT; };
 		01741B64190DB81400BB1F91 /* up.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = up.command; sourceTree = SOURCE_ROOT; };
-		01741B66190DB82100BB1F91 /* update_osx_clients_units.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_osx_clients_units.command; sourceTree = SOURCE_ROOT; };
+		01741B66190DB82100BB1F91 /* update_osx_clients_files.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_osx_clients_files.command; sourceTree = SOURCE_ROOT; };
 		019662111B04C562005FA955 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bin; sourceTree = SOURCE_ROOT; };
 		019662131B04C598005FA955 /* settings */ = {isa = PBXFileReference; lastKnownFileType = folder; path = settings; sourceTree = SOURCE_ROOT; };
 		019662171B04C6EA005FA955 /* files */ = {isa = PBXFileReference; lastKnownFileType = folder; path = files; sourceTree = SOURCE_ROOT; };
+		01993A4E1B63DD730096E2E1 /* halt.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = halt.command; sourceTree = "<group>"; };
 		01AD94BE1A278C94009A400B /* fetch_latest_iso.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = fetch_latest_iso.command; sourceTree = "<group>"; };
 		01B675D51B602FC2004349CC /* check_vm_status.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = check_vm_status.command; sourceTree = "<group>"; };
 		01C7F8F31B63B3B600CF2E26 /* console.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = console.command; sourceTree = "<group>"; };
@@ -169,14 +171,15 @@
 				01D1B9861B60D9A70059B73E /* CoreOS-xhyve_UI_VM.command */,
 				01B675D51B602FC2004349CC /* check_vm_status.command */,
 				0145318318FF209D007F9C95 /* coreos-xhyve.command */,
+				0111FADA1A7FA2A10021F258 /* os_shell.command */,
+				01C7F8F31B63B3B600CF2E26 /* console.command */,
 				01CFC2DB1A2AA48300F251C2 /* change_release_channel.command */,
 				01CFC2DC1A2AA48300F251C2 /* destroy.command */,
 				01741B64190DB81400BB1F91 /* up.command */,
-				01C7F8F31B63B3B600CF2E26 /* console.command */,
+				01993A4E1B63DD730096E2E1 /* halt.command */,
 				01CFC2DD1A2AA48300F251C2 /* reload.command */,
-				0111FADA1A7FA2A10021F258 /* os_shell.command */,
 				01AD94BE1A278C94009A400B /* fetch_latest_iso.command */,
-				01741B66190DB82100BB1F91 /* update_osx_clients_units.command */,
+				01741B66190DB82100BB1F91 /* update_osx_clients_files.command */,
 			);
 			name = Scripts;
 			sourceTree = "<group>";
@@ -262,6 +265,7 @@
 				01741B65190DB81400BB1F91 /* up.command in Resources */,
 				01C7F8F41B63B3B600CF2E26 /* console.command in Resources */,
 				01D1B9891B60F2AD0059B73E /* xhyve in Resources */,
+				01993A4F1B63DD730096E2E1 /* halt.command in Resources */,
 				01CFC2E01A2AA48300F251C2 /* reload.command in Resources */,
 				0111FADB1A7FA2A20021F258 /* os_shell.command in Resources */,
 				019662141B04C598005FA955 /* settings in Resources */,
@@ -274,7 +278,7 @@
 				01CFC2DE1A2AA48300F251C2 /* change_release_channel.command in Resources */,
 				01E2854E18A6C4E300BC630D /* Credits.rtf in Resources */,
 				01E2855418A6C4E300BC630D /* MainMenu.xib in Resources */,
-				01741B67190DB82100BB1F91 /* update_osx_clients_units.command in Resources */,
+				01741B67190DB82100BB1F91 /* update_osx_clients_files.command in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

src/CoreOS-xhyve UI/AppDelegate.m

@@ -119,7 +119,11 @@ - (IBAction)Stop:(id)sender {
 
     NSString *scriptName = [[NSString alloc] init];
     NSString *arguments = [[NSString alloc] init];
-    [self runScript:scriptName = @"coreos-xhyve" arguments:arguments = @"sudo halt"];
+    [self runScript:scriptName = @"halt" arguments:arguments = @""];
+
+    notification.title = @"CoreOS-xhyve UI";
+    notification.informativeText = @"VM is stopped";
+    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
 }
 
 - (IBAction)Restart:(id)sender {
@@ -145,8 +149,7 @@ - (IBAction)updates:(id)sender {
 
     NSString *appName = [[NSString alloc] init];
     NSString *arguments = [[NSString alloc] init];
-    [self runApp:appName = @"iTerm" arguments:arguments = [_resoucesPathFromApp stringByAppendingPathComponent:@"update_osx_clients_units.command"]];
-    //     NSLog(@"Apps arguments: '%@'", [_resoucesPathFromApp stringByAppendingPathComponent:@"update.command"]);
+    [self runApp:appName = @"iTerm" arguments:arguments = [_resoucesPathFromApp stringByAppendingPathComponent:@"update_osx_clients_files.command"]];
 }
 
 
@@ -162,7 +165,6 @@ - (IBAction)fetchLatestISO:(id)sender {
     [self runApp:appName = @"iTerm" arguments:arguments = [_resoucesPathFromApp stringByAppendingPathComponent:@"fetch_latest_iso.command"]];
     //     NSLog(@"Apps arguments: '%@'", [_resoucesPathFromApp stringByAppendingPathComponent:@"update.command"]);
 }
-
 // Updates menu
 
 
@@ -358,7 +360,7 @@ - (void)checkVMStatus {
 
     NSString *string;
     string = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
-    //    NSLog (@"Returned:\n%@", string);
+        NSLog (@"Returned:\n%@", string);
 
     // send a notification on to the screen
     NSUserNotification *notification = [[NSUserNotification alloc] init];

src/CoreOS-xhyve UI/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8152.3" systemVersion="15A226f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8152.3"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -678,12 +678,18 @@
                     </connections>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="jV7-Ne-Ped"/>
-                <menuItem title="SSH to core-01" id="Khg-WF-X5I">
+                <menuItem title="SSH to VM" id="Khg-WF-X5I">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
                         <action selector="runSsh:" target="494" id="41e-Q4-LMK"/>
                     </connections>
                 </menuItem>
+                <menuItem title="Attach to VM's console" id="NVQ-p7-0FG">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="attachConsole:" target="494" id="mYh-Wf-8sv"/>
+                    </connections>
+                </menuItem>
                 <menuItem isSeparatorItem="YES" id="lIy-88-Fmd"/>
                 <menuItem title="OS Shell" id="dvF-TI-XNx">
                     <modifierMask key="keyEquivalentModifierMask"/>

src/CoreOS-xhyve UI/CoreOS-xhyve UI-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.5</string>
+	<string>0.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>29</string>
+	<string>25</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/CoreOS-xhyve_UI_VM.command

@@ -28,7 +28,3 @@ export XHYVE=~/coreos-xhyve-ui/bin/xhyve
 
 # Stop webserver
 "${res_folder}"/bin/webserver stop
-
-# Close terminal window
-#osascript -e 'tell application "Terminal" to close (every window whose name contains "CoreOS-xhyve_UI_VM")' &
-#exit

src/check_vm_status.command

@@ -6,7 +6,7 @@
 # get App's Resources folder
 res_folder=$(cat ~/coreos-xhyve-ui/.env/resouces_path)
 
-status=$(ps aux | grep "[c]oreos-xhyve-ui" | awk '{print $2}')
+status=$(ps aux | grep "[c]oreos-xhyve-ui/bin/xhyve" | awk '{print $2}')
 
 if [ "$status" = "" ]; then
     echo "VM is stopped"

src/console.command

@@ -11,7 +11,7 @@ function pause(){
 }
 
 # check VM status
-status=$(ps aux | grep "[c]oreos-xhyve-ui" | awk '{print $2}')
+status=$(ps aux | grep "[c]oreos-xhyve-ui/bin/xhyve" | awk '{print $2}')
 if [ "$status" = "" ]; then
     echo " "
     echo "CoreOS VM is not running, please start VM !!!"
@@ -22,4 +22,4 @@ fi
 # Attach to VM's console
 echo "Attaching to VM's console ..."
 echo " "
-"${res_folder}"/bin/dtach -a ~/coreos-xhyve-ui/.env/.coreos-xhyve.console
+"${res_folder}"/bin/dtach -a ~/coreos-xhyve-ui/.env/.console

src/coreos-xhyve-install.command

@@ -19,6 +19,8 @@
 
     # copy files to ~/coreos-xhyve-ui/bin
     cp -f "$1"/files/* ~/coreos-xhyve-ui/bin
+    # copy xhyve to bin folder
+    cp -f "$1"/bin/xhyve ~/coreos-xhyve-ui/bin
     chmod 755 ~/coreos-xhyve-ui/bin/*
 
     # copy user-data

src/coreos-xhyve.command

@@ -15,7 +15,7 @@ status=$(ps aux | grep "[c]oreos-xhyve-ui" | awk '{print $2}')
 if [ "$status" = "" ]; then
     echo " "
     echo "CoreOS VM is not running, please start VM !!!"
-    ###pause "Press any key to continue ..."
+    pause "Press any key to continue ..."
     exit 1
 fi
 

src/fetch_latest_iso.command

@@ -6,11 +6,14 @@
 # get App's Resources folder
 res_folder=$(cat ~/coreos-xhyve-ui/.env/resouces_path)
 
+CHANNEL=$(cat ~/coreos-xhyve-ui/custom.conf | grep CHANNEL= | head -1 | cut -f2 -d"=")
+
 function pause(){
 read -p "$*"
 }
 
-echo "Fetching lastest iso ..."
+echo " "
+echo "Fetching lastest CoreOS $CHANNEL channel ISO ..."
 echo " "
 
 cd ~/coreos-xhyve-ui/

src/first-init.command

@@ -19,12 +19,12 @@ echo "Reading ssh key from $HOME/.ssh/id_rsa.pub  "
 file="$HOME/.ssh/id_rsa.pub"
 if [ -f "$file" ]
 then
-    echo " $file found, updating custom.conf..."
+    echo "$file found, updating custom.conf..."
     echo "SSHKEY='$(cat $HOME/.ssh/id_rsa.pub)'" >> ~/coreos-xhyve-ui/custom.conf
 else
-    echo " $file not found."
-    echo " please run 'ssh-keygen -t rsa' before you continue !!!"
-    pause ' Press [Enter] key to continue...'
+    echo "$file not found."
+    echo "please run 'ssh-keygen -t rsa' before you continue !!!"
+    pause 'Press [Enter] key to continue...'
     echo "SSHKEY="$(cat $HOME/.ssh/id_rsa.pub)"" >> ~/coreos-xhyve-ui/custom.conf
 fi
 #
@@ -65,7 +65,7 @@ do
     echo " 2)  Beta "
     echo " 3)  Stable "
     echo " "
-    echo " Select an option:"
+    echo -n "Select an option: "
 
     read RESPONSE
     XX=${RESPONSE:=Y}
@@ -75,6 +75,7 @@ do
         VALID_MAIN=1
         sed -i "" "s/CHANNEL=stable/CHANNEL=alpha/" ~/coreos-xhyve-ui/custom.conf
         sed -i "" "s/CHANNEL=beta/CHANNEL=alpha/" ~/coreos-xhyve-ui/custom.conf
+        CHANNEL=alpha
         LOOP=0
     fi
 
@@ -83,6 +84,7 @@ do
         VALID_MAIN=1
         sed -i "" "s/CHANNEL=alpha/CHANNEL=beta/" ~/coreos-xhyve-ui/custom.conf
         sed -i "" "s/CHANNEL=stable/CHANNEL=beta/" ~/coreos-xhyve-ui/custom.conf
+        CHANNEL=beta
         LOOP=0
     fi
 
@@ -91,6 +93,7 @@ do
         VALID_MAIN=1
         sed -i "" "s/CHANNEL=alpha/CHANNEL=stable/" ~/coreos-xhyve-ui/custom.conf
         sed -i "" "s/CHANNEL=beta/CHANNEL=stable/" ~/coreos-xhyve-ui/custom.conf
+        CHANNEL=stable
         LOOP=0
     fi
 
@@ -104,24 +107,22 @@ done
 
 # now let's fetch ISO file
 echo " "
-echo "Fetching lastest iso ..."
+echo "Fetching lastest CoreOS $CHANNEL channel ISO ..."
 echo " "
 cd ~/coreos-xhyve-ui/
 "${res_folder}"/bin/coreos-xhyve-fetch -f custom.conf
 echo " "
 #
 
 echo " "
-#echo "CoreOS VM will be started in a new Terminal.app window ..."
-#pause 'Press [Enter] key to continue...'
 # Start VM
-#open -a Terminal.app "${res_folder}"/CoreOS-xhyve_UI_VM.command
 echo "Starting VM ..."
-"${res_folder}"/bin/dtach -n ~/coreos-xhyve-ui/.env/.coreos-xhyve.console -z
+"${res_folder}"/bin/dtach -n ~/coreos-xhyve-ui/.env/.console -z "${res_folder}"/CoreOS-xhyve_UI_VM.command
 #
 
 # wait till VM is booted up
-echo "You can connect to VM console from menu 'core-01 console' "
+echo "You can connect to VM console from menu 'Attach to VM's console' "
+echo "When you done with console just close it's window/tab with cmd+w "
 echo "Waiting for VM to boot up..."
 sleep 5
 # get VM IP
@@ -131,8 +132,6 @@ until cat ~/coreos-xhyve-ui/.env/ip_address | grep 192.168.64 >/dev/null 2>&1; d
 vm_ip=$(cat ~/coreos-xhyve-ui/.env/ip_address)
 
 echo " "
-echo "Assigned static VM's IP $vm_ip"
-echo "  "
 #
 spin='-\|/'
 i=0
@@ -191,10 +190,13 @@ fleetctl list-machines
 echo " "
 
 #
+
 echo "Installation has finished, CoreOS VM is up and running !!!"
+echo " "
+echo "Assigned static VM's IP: $vm_ip"
+echo " "
 echo "Enjoy CoreOS-xhyve VM on your Mac !!!"
-echo ""
+echo " "
 echo "Run from menu 'OS Shell' to open a terninal window with rkt, docker, fleetctl and etcdctl pre-set !!!"
-echo ""
+echo " "
 pause 'Press [Enter] key to continue...'
-

src/halt.command

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+#  halt.command
+# stop VM via ssh
+
+# get App's Resources folder
+res_folder=$(cat ~/coreos-xhyve-ui/.env/resouces_path)
+
+# get VM IP
+#vm_ip=$( ~/coreos-xhyve-ui/mac2ip.sh $(cat ~/coreos-xhyve-ui/.env/mac_address))
+vm_ip=$(cat ~/coreos-xhyve-ui/.env/ip_address)
+
+# check VM status
+status=$(ps aux | grep "[c]oreos-xhyve-ui/bin/xhyve" | awk '{print $2}')
+if [ "$status" = "" ]; then
+    echo "CoreOS VM is not running !!!"
+    exit 1
+fi
+
+ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no core@$vm_ip sudo halt

src/os_shell.command

@@ -15,7 +15,7 @@ read -p "$*"
 }
 
 # check VM status
-status=$(ps aux | grep "[c]oreos-xhyve-ui" | awk '{print $2}')
+status=$(ps aux | grep "[c]oreos-xhyve-ui/bin/xhyve" | awk '{print $2}')
 if [ "$status" = "" ]; then
     echo " "
     echo "CoreOS VM is not running, please start VM !!!"