Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
v0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@rimusz
rimusz committed Jan 25, 2016
1 parent 2fdb894 commit e90ffa1
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 80 deletions.
17 changes: 8 additions & 9 deletions src/Kube-Cluster.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
011BBA3B1A2A842A00AAB35B /* change_release_channel.command in Resources */ = {isa = PBXBuildFile; fileRef = 011BBA3A1A2A842A00AAB35B /* change_release_channel.command */; };
01689B731A2D1A260099CB78 /* fleet in Resources */ = {isa = PBXBuildFile; fileRef = 01689B721A2D1A260099CB78 /* fleet */; };
01741B63190DB80500BB1F91 /* first-init.command in Resources */ = {isa = PBXBuildFile; fileRef = 01741B62190DB80500BB1F91 /* first-init.command */; };
019410681BE11DFA00723E19 /* kill_VM.command in Resources */ = {isa = PBXBuildFile; fileRef = 019410671BE11DFA00723E19 /* kill_VM.command */; };
019410681BE11DFA00723E19 /* kill_VMs.command in Resources */ = {isa = PBXBuildFile; fileRef = 019410671BE11DFA00723E19 /* kill_VMs.command */; };
01BB60D31AB74AE60069BF30 /* k8s in Resources */ = {isa = PBXBuildFile; fileRef = 01BB60D21AB74AE60069BF30 /* k8s */; };
01D3685918E5C184006510B5 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 01D3685818E5C184006510B5 /* icon.icns */; };
01E2853E18A6C4E300BC630D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01E2853D18A6C4E300BC630D /* Cocoa.framework */; };
Expand Down Expand Up @@ -51,7 +51,7 @@
0133608F18A70E0C0024B1CB /* Kube-Cluster.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Kube-Cluster.entitlements"; sourceTree = "<group>"; };
01689B721A2D1A260099CB78 /* fleet */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fleet; sourceTree = SOURCE_ROOT; };
01741B62190DB80500BB1F91 /* first-init.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "first-init.command"; sourceTree = SOURCE_ROOT; };
019410671BE11DFA00723E19 /* kill_VM.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = kill_VM.command; sourceTree = "<group>"; };
019410671BE11DFA00723E19 /* kill_VMs.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = kill_VMs.command; sourceTree = "<group>"; };
01BB60D21AB74AE60069BF30 /* k8s */ = {isa = PBXFileReference; lastKnownFileType = folder; path = k8s; sourceTree = SOURCE_ROOT; };
01D3685818E5C184006510B5 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = icon.icns; path = ../icon.icns; sourceTree = "<group>"; };
01E2853A18A6C4E300BC630D /* Kube-Cluster.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Kube-Cluster.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -127,7 +127,7 @@
01E2853118A6C4E300BC630D = {
isa = PBXGroup;
children = (
01E2854318A6C4E300BC630D /* Kube-Cluster */,
01E2854318A6C4E300BC630D /* kube-cluster */,
014E6F8B18B63AF700E697C0 /* Installation Files */,
01E285B918A6E23C00BC630D /* Scripts */,
01E2853C18A6C4E300BC630D /* Frameworks */,
Expand Down Expand Up @@ -163,7 +163,7 @@
name = "Other Frameworks";
sourceTree = "<group>";
};
01E2854318A6C4E300BC630D /* Kube-Cluster */ = {
01E2854318A6C4E300BC630D /* kube-cluster */ = {
isa = PBXGroup;
children = (
0133608F18A70E0C0024B1CB /* Kube-Cluster.entitlements */,
Expand All @@ -178,7 +178,6 @@
01D3685818E5C184006510B5 /* icon.icns */,
01E2854418A6C4E300BC630D /* Supporting Files */,
);
name = "Kube-Cluster";
path = "kube-cluster";
sourceTree = "<group>";
};
Expand All @@ -204,7 +203,7 @@
011BBA3A1A2A842A00AAB35B /* change_release_channel.command */,
1347C2F81C30570D0083CDF9 /* change_sudo_password.command */,
1329DEA31BD4FB5F008AA719 /* destroy.command */,
019410671BE11DFA00723E19 /* kill_VM.command */,
019410671BE11DFA00723E19 /* kill_VMs.command */,
1329DEA81BD4FB5F008AA719 /* ssh_master.command */,
131540881C55C65C0015936E /* ssh_node1.command */,
1315408A1C55C68A0015936E /* ssh_node2.command */,
Expand Down Expand Up @@ -304,7 +303,7 @@
01689B731A2D1A260099CB78 /* fleet in Resources */,
01BB60D31AB74AE60069BF30 /* k8s in Resources */,
01E2854E18A6C4E300BC630D /* Credits.rtf in Resources */,
019410681BE11DFA00723E19 /* kill_VM.command in Resources */,
019410681BE11DFA00723E19 /* kill_VMs.command in Resources */,
1329DE921BD4F974008AA719 /* files in Resources */,
13FE22171C1C40C700F465F1 /* bin in Resources */,
1329DE901BD4F95F008AA719 /* settings in Resources */,
Expand Down Expand Up @@ -447,7 +446,7 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "kube-cluster/Kube-Cluster-Prefix.pch";
INFOPLIST_FILE = "kube-cluster/Kube-Cluster-Info.plist";
INFOPLIST_FILE = "Kube-Cluster/Kube-Cluster-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -469,7 +468,7 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "kube-cluster/Kube-Cluster-Prefix.pch";
INFOPLIST_FILE = "kube-cluster/Kube-Cluster-Info.plist";
INFOPLIST_FILE = "Kube-Cluster/Kube-Cluster-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand Down
28 changes: 14 additions & 14 deletions src/Kube-Cluster/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ @interface AppDelegate ()
@implementation AppDelegate

- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
[[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
[NSUserNotificationCenter defaultUserNotificationCenter].delegate = self;

self.vmManager = [[VMManager alloc] init];

self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
[self.statusItem setMenu:self.statusMenu];
[self.statusItem setImage: [NSImage imageNamed:@"StatusItemIcon"]];
(self.statusItem).menu = self.statusMenu;
(self.statusItem).image = [NSImage imageNamed:@"StatusItemIcon"];
[self.statusItem setHighlightMode:YES];

BOOL isDir;
if ([[NSFileManager defaultManager] fileExistsAtPath:[[NSURL ks_homeURL] path] isDirectory:&isDir] && isDir) {
NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
if ([[NSFileManager defaultManager] fileExistsAtPath:[NSURL ks_homeURL].path isDirectory:&isDir] && isDir) {
NSString *resourcePath = [NSBundle mainBundle].resourcePath;
[resourcePath writeToURL:[NSURL ks_resourcePathURL] atomically:YES encoding:NSUTF8StringEncoding error:nil];

NSString *version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
Expand All @@ -44,7 +44,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
[alert setMessageText:NSLocalizedString(@"NotSetupAlertMessage", nil)];
[alert setInformativeText:NSLocalizedString(@"NotSetupAlertInformativeText", nil)];
[alert setAlertStyle:NSWarningAlertStyle];
alert.alertStyle = NSWarningAlertStyle;

if ([alert runModal] == NSAlertFirstButtonReturn) {
// OK clicked
Expand All @@ -65,7 +65,7 @@ - (IBAction)Start:(id)sender {
switch (vmStatus) {
case VMStatusDown: {
BOOL isDir;
if ([[NSFileManager defaultManager] fileExistsAtPath:[[NSURL ks_homeURL] path] isDirectory:&isDir] && isDir) {
if ([[NSFileManager defaultManager] fileExistsAtPath:[NSURL ks_homeURL].path isDirectory:&isDir] && isDir) {
[self notifyUserWithTitle:NSLocalizedString(@"WillSetupNotificationTitle", nil) text:NSLocalizedString(@"WillSetupNotificationMessage", nil)];
[self.vmManager start];
}
Expand All @@ -75,7 +75,7 @@ - (IBAction)Start:(id)sender {
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
[alert setMessageText:NSLocalizedString(@"NotSetupAlertMessage", nil)];
[alert setInformativeText:NSLocalizedString(@"NotSetupAlertInformativeText", nil)];
[alert setAlertStyle:NSWarningAlertStyle];
alert.alertStyle = NSWarningAlertStyle;

if ([alert runModal] == NSAlertFirstButtonReturn) {
// OK clicked
Expand Down Expand Up @@ -232,15 +232,15 @@ - (IBAction)destroy:(id)sender {

- (IBAction)initialInstall:(id)sender {
BOOL isDir;
if ([[NSFileManager defaultManager] fileExistsAtPath:[[NSURL ks_homeURL] path] isDirectory:&isDir] && isDir) {
NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"HomeFolderExistsAlertInformativeText", nil), [[NSURL ks_homeURL] path]];
if ([[NSFileManager defaultManager] fileExistsAtPath:[NSURL ks_homeURL].path isDirectory:&isDir] && isDir) {
NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"HomeFolderExistsAlertInformativeText", nil), [NSURL ks_homeURL].path];
[self alertWithMessage:NSLocalizedString(@"AppName", nil) infoText:msg];
}
else {
NSLog(@"Folder does not exist: '%@'", [NSURL ks_homeURL]);
[[NSFileManager defaultManager] createDirectoryAtURL:[NSURL ks_envURL] withIntermediateDirectories:YES attributes:nil error:nil];

NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
NSString *resourcePath = [NSBundle mainBundle].resourcePath;
[resourcePath writeToURL:[NSURL ks_resourcePathURL] atomically:YES encoding:NSUTF8StringEncoding error:nil];

NSString *version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
Expand Down Expand Up @@ -443,9 +443,9 @@ - (void)notifyUserWithText:(NSString *_Nullable)text {
- (void)alertWithMessage:(NSString *)message infoText:(NSString *)infoText {
NSAlert *alert = [[NSAlert alloc] init];

[alert setAlertStyle:NSInformationalAlertStyle];
[alert setMessageText:message];
[alert setInformativeText:infoText];
alert.alertStyle = NSInformationalAlertStyle;
alert.messageText = message;
alert.informativeText = infoText;
[alert runModal];
}

Expand Down
53 changes: 17 additions & 36 deletions src/Kube-Cluster/Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@
</menuItem>
<menuItem title="Redo" keyEquivalent="Z" id="215">
<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
<connections>
<action selector="redo:" target="-1" id="231"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="206">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
Expand Down Expand Up @@ -199,11 +196,7 @@
<action selector="performFindPanelAction:" target="-1" id="489"/>
</connections>
</menuItem>
<menuItem title="Jump to Selection" keyEquivalent="j" id="210">
<connections>
<action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
</connections>
</menuItem>
<menuItem title="Jump to Selection" keyEquivalent="j" id="210"/>
</items>
</menu>
</menuItem>
Expand Down Expand Up @@ -287,21 +280,12 @@
<items>
<menuItem title="Make Upper Case" id="452">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="uppercaseWord:" target="-1" id="464"/>
</connections>
</menuItem>
<menuItem title="Make Lower Case" id="465">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="lowercaseWord:" target="-1" id="468"/>
</connections>
</menuItem>
<menuItem title="Capitalize" id="466">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="capitalizeWord:" target="-1" id="467"/>
</connections>
</menuItem>
</items>
</menu>
Expand Down Expand Up @@ -516,23 +500,14 @@
<menuItem id="510">
<string key="title"> Default</string>
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="makeBaseWritingDirectionNatural:" target="-1" id="525"/>
</connections>
</menuItem>
<menuItem id="511">
<string key="title"> Left to Right</string>
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="526"/>
</connections>
</menuItem>
<menuItem id="512">
<string key="title"> Right to Left</string>
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="527"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="513"/>
<menuItem title="Selection" enabled="NO" id="514">
Expand All @@ -541,23 +516,14 @@
<menuItem id="515">
<string key="title"> Default</string>
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="makeTextWritingDirectionNatural:" target="-1" id="528"/>
</connections>
</menuItem>
<menuItem id="516">
<string key="title"> Left to Right</string>
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="529"/>
</connections>
</menuItem>
<menuItem id="517">
<string key="title"> Right to Left</string>
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="530"/>
</connections>
</menuItem>
</items>
</menu>
Expand Down Expand Up @@ -673,12 +639,21 @@
<menuItem isSeparatorItem="YES" id="jV7-Ne-Ped"/>
<menuItem title="SSH to k8smaster-01" id="dvF-TI-XNx">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="runSshMaster:" target="494" id="bSn-oJ-FEy"/>
</connections>
</menuItem>
<menuItem title="SSH to k8snode-01" id="R3P-Zp-RBe">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="runSshNode1:" target="494" id="VyE-df-s7M"/>
</connections>
</menuItem>
<menuItem title="SSH to k8snode-02" id="k3S-vt-DSV">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="runSshNode2:" target="494" id="KCN-PW-UdW"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="B1N-0s-OFg"/>
<menuItem title="Preset OS shell" id="YiP-H1-GtD">
Expand All @@ -703,9 +678,15 @@
<menuItem isSeparatorItem="YES" id="k2D-0b-tel"/>
<menuItem title="k8snode-01 cAdvisor" id="bXS-8Q-f6a">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="node1_cAdvisor:" target="494" id="tvn-pN-2W8"/>
</connections>
</menuItem>
<menuItem title="k8snode-02 cAdvisor" id="714-JA-kJc">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="node2_cAdvisor:" target="494" id="lag-IY-Lhq"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="JNE-kH-7PZ"/>
<menuItem title="Updates" id="VT6-tu-oxP" userLabel="Menu Item - Updates">
Expand Down Expand Up @@ -800,7 +781,7 @@
</connections>
</menuItem>
</items>
<point key="canvasLocation" x="-373.5" y="117.5"/>
<point key="canvasLocation" x="-428.5" y="6.5"/>
</menu>
</objects>
</document>
2 changes: 1 addition & 1 deletion src/Kube-Cluster/VMManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, VMStatus) {

@interface VMManager : NSObject

- (VMStatus)checkVMStatus;
@property (NS_NONATOMIC_IOSONLY, readonly) VMStatus checkVMStatus;
- (void)start;
- (void)halt;
- (void)kill;
Expand Down
Loading

0 comments on commit e90ffa1

Please sign in to comment.